From 1f20255dd90131ee0cebc15b4e4f8f1bc670691a Mon Sep 17 00:00:00 2001 From: thkim Date: Mon, 22 Jan 2024 10:28:12 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EA=B4=80=EB=A6=AC=EC=9E=90=20-=20?= =?UTF-8?q?=EC=9C=84=EC=9B=90=ED=9A=8C=EA=B4=80=EB=A6=AC=20-=20=EC=9C=84?= =?UTF-8?q?=EC=9B=90=ED=9A=8C=20=EC=9D=BC=EC=A0=95=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20=EA=B1=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/EgovIndvdlSchdulManageServiceImpl.java | 16 +++++++++++++++- .../repository/TnCmtEventRepository.java | 2 +- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/committee/schedules/service/impl/EgovIndvdlSchdulManageServiceImpl.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/committee/schedules/service/impl/EgovIndvdlSchdulManageServiceImpl.java index 77f14fa..0b10b9a 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/committee/schedules/service/impl/EgovIndvdlSchdulManageServiceImpl.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/committee/schedules/service/impl/EgovIndvdlSchdulManageServiceImpl.java @@ -17,6 +17,7 @@ import org.egovframe.rte.fdl.cmmn.EgovAbstractServiceImpl; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; +import java.time.format.DateTimeFormatter; import java.util.*; import java.util.stream.Collectors; @@ -246,8 +247,21 @@ public class EgovIndvdlSchdulManageServiceImpl extends EgovAbstractServiceImpl i commandMap.put("searchMonth", sSearchDate); commandMap.put("searchMode", "MONTH"); + List> resultList = tnCmtEventRepository.getByYyyyMm(sSearchDate) + .stream() + .map(item -> { + Map mapDto = new HashMap<>(); + mapDto.put("evt_start_dt", item.getEvtStartDt().format(DateTimeFormatter.ofPattern("yyyyMMdd HH:mm:ss.SSS"))); + mapDto.put("evt_end_dt", item.getEvtEndDt().format(DateTimeFormatter.ofPattern("yyyyMMdd HH:mm:ss.SSS"))); + mapDto.put("schdulId", item.getEvtSeq()); + mapDto.put("schdulNm", item.getEvtTitle()); + + return mapDto; + }) + .collect(Collectors.toList()); + dto.put("prevRequest", commandMap); - dto.put("resultList", tnCmtEventRepository.getByYyyyMm(sSearchDate)); + dto.put("resultList", resultList); resultVO.setResult(dto); diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/commonCode/repository/TnCmtEventRepository.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/commonCode/repository/TnCmtEventRepository.java index 7e29883..604ed2a 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/commonCode/repository/TnCmtEventRepository.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/commonCode/repository/TnCmtEventRepository.java @@ -83,7 +83,7 @@ public interface TnCmtEventRepository extends JpaRepository> getByYyyyMm( + List getByYyyyMm( @Param("sSearchDate") String sSearchDate );