diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/contents/PopUp.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/contents/PopUp.jsx index ead34b9..f3b6046 100644 --- a/egovframe-template-simple-react-contribution/src/pages/admin/contents/PopUp.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/admin/contents/PopUp.jsx @@ -161,7 +161,7 @@ function PopUp(props) { } {listPopup.map((it)=>(
-
{it.seq}
+
{it.number}
{it.popupTitle}
{it.startDate} ~ {it.endDate}
{it.useYn === 'Y' ? onChangeActivationSwitch(e, it.seq)} defaultChecked /> : onChangeActivationSwitch(e, it.seq)} {...label} />}
diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/contents/StandardResearch.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/contents/StandardResearch.jsx index 82d9d9b..d82b48b 100644 --- a/egovframe-template-simple-react-contribution/src/pages/admin/contents/StandardResearch.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/admin/contents/StandardResearch.jsx @@ -134,7 +134,7 @@ function StandardResearch(props) { } {list.map((it)=>(
-
{it.id}
+
{it.number}
{it.title}
{it.researchStartDate} ~ {it.researchEndDate}
{it.director}
diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/popUp/service/impl/PopUpApiServiceImpl.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/popUp/service/impl/PopUpApiServiceImpl.java index 00266c3..c6664cc 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/popUp/service/impl/PopUpApiServiceImpl.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/popUp/service/impl/PopUpApiServiceImpl.java @@ -55,7 +55,8 @@ public class PopUpApiServiceImpl extends EgovAbstractServiceImpl implements PopU .stream() .map(item -> { Map codeMap = new HashMap<>(); - codeMap.put("seq", totalRecordCount - pageable.getPageNumber() * pageable.getPageSize() - index.getAndIncrement()); + codeMap.put("number", totalRecordCount - (long) pageable.getPageNumber() * pageable.getPageSize() - index.getAndIncrement()); + codeMap.put("seq", item.getPopupSeq()); codeMap.put("popupTitle", item.getPopupTitle()); codeMap.put("startDate", item.getPopupStartDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); codeMap.put("endDate", item.getPopupEndDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); @@ -67,7 +68,6 @@ public class PopUpApiServiceImpl extends EgovAbstractServiceImpl implements PopU codeMap.put("createDate", item.getFrstCrtDt()); codeMap.put("updateDate", item.getLastChgDt()); codeMap.put("base64String", null); - //nCount ++; return codeMap; }) .collect(Collectors.toList()); diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/standardResearch/service/impl/AdminStandardResearchServiceImpl.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/standardResearch/service/impl/AdminStandardResearchServiceImpl.java index 6547cbc..d2095c3 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/standardResearch/service/impl/AdminStandardResearchServiceImpl.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/standardResearch/service/impl/AdminStandardResearchServiceImpl.java @@ -31,6 +31,7 @@ import java.time.format.DateTimeFormatter; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; @Service("adminStandardResearchService") @@ -55,10 +56,12 @@ public class AdminStandardResearchServiceImpl extends EgovAbstractServiceImpl im long totalRecordCount = tnResearchRepositoryLightweight.countByUseYn("Y"); + AtomicInteger index = new AtomicInteger(); List> list = tnResearchRepositoryLightweight.findByUseYn("Y", pageable) .stream() .map(item -> { Map codeMap = new HashMap<>(); + codeMap.put("number", totalRecordCount - (long) pageable.getPageNumber() * pageable.getPageSize() - index.getAndIncrement()); codeMap.put("id", item.getRsSeq()); codeMap.put("title", item.getRsTitle()); codeMap.put("researchStartDate", item.getRsStartDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));