From 9fa9958e7f331459fe078ba3290ee9bd32acad4d Mon Sep 17 00:00:00 2001
From: thkim <thkim@dbnt.co.kr>
Date: Mon, 8 Jan 2024 13:58:54 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20'=EC=9C=84=EC=9B=90=ED=9A=8C=20?=
 =?UTF-8?q?=EC=9D=BC=EC=A0=95=20=EB=93=B1=EB=A1=9D'=20=ED=8E=98=EC=9D=B4?=
 =?UTF-8?q?=EC=A7=80=EC=97=90=EC=84=9C=20'=EA=B5=AC=EB=B6=84'=EC=9D=84=20?=
 =?UTF-8?q?=EC=84=9C=EB=B2=84=EB=A1=9C=20=EB=B6=80=ED=84=B0=20=EB=AA=A9?=
 =?UTF-8?q?=EB=A1=9D=20=EB=B0=9B=EB=8F=84=EB=A1=9D=20=EA=B8=B0=EB=8A=A5=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

    관리자 단에서 '위원회 관리' > '위원회 일정 관리'에 '등록' 버튼을 누른 후 '위원회 일정 등록' 페이지에서 '구분'을 서버로 부터 목록 받도록 기능 추가
---
 .../EgovIndvdlSchdulManageServiceImpl.java    | 39 +++++++++++++++----
 .../resources/application-local.properties    |  3 +-
 2 files changed, 33 insertions(+), 9 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 dab4a98..73fa0bd 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
@@ -151,14 +151,31 @@ public class EgovIndvdlSchdulManageServiceImpl extends EgovAbstractServiceImpl i
 
 		Map<String, Object> resultMap = new HashMap<String, Object>();
 
-		List<String> listCodes = tcCodeItemRepository.findByGrpCdAndUseYnOrderByGrpOrder("EVT_TYPE", "Y").stream()
-				.map(lc -> lc.getItemNm())
+		List<Map<String, Object>> listCodes = tcCodeItemRepository.findByGrpCdAndUseYnOrderByGrpOrder("EVT_TYPE", "Y")
+				.stream()
+				.map(item -> {
+					Map<String, Object> codeMap = new HashMap<>();
+					codeMap.put("id", item.getItemCd());
+					codeMap.put("name", item.getItemNm());
+					return codeMap;
+				})
+
 				.collect(Collectors.toList());
-		List<String> listSubOrg = tnCmtOrgRepository.findByUseYnAndUpCmtSeqOrderByCmtOrder("Y", 3).stream()
-				.map(lc -> lc.getCmtNm())
+		List<Map<String, Object>> listSubOrg = tnCmtOrgRepository.findByUseYnAndUpCmtSeqOrderByCmtOrder("Y", 3).stream()
+				.map(item -> {
+					Map<String, Object> codeMap = new HashMap<>();
+					codeMap.put("id", item.getCmtSeq());
+					codeMap.put("name", item.getCmtNm());
+					return codeMap;
+				})
 				.collect(Collectors.toList());
-		List<String> listTopOrg = tnCmtOrgRepository.findByUseYnAndUpCmtSeqOrderByCmtOrder("Y", 2).stream()
-				.map(lc -> lc.getCmtNm())
+		List<Map<String, Object>> listTopOrg = tnCmtOrgRepository.findByUseYnAndUpCmtSeqOrderByCmtOrder("Y", 2).stream()
+				.map(item -> {
+					Map<String, Object> codeMap = new HashMap<>();
+					codeMap.put("id", item.getCmtSeq());
+					codeMap.put("name", item.getCmtNm());
+					return codeMap;
+				})
 				.collect(Collectors.toList());
 
 		resultMap.put("listCodes", listCodes);
@@ -174,8 +191,14 @@ public class EgovIndvdlSchdulManageServiceImpl extends EgovAbstractServiceImpl i
 		Map<String, Object> resultMap = new HashMap<String, Object>();
 
 
-		List<String> list = tnCmtOrgRepository.findByUseYnAndUpCmtSeqOrderByCmtOrder("Y", paramCodeGroup).stream()
-				.map(lc -> lc.getCmtNm())
+		List<Map<String, Object>> list = tnCmtOrgRepository.findByUseYnAndUpCmtSeqOrderByCmtOrder("Y", paramCodeGroup)
+				.stream()
+				.map(item -> {
+					Map<String, Object> codeMap = new HashMap<>();
+					codeMap.put("id", item.getCmtSeq());
+					codeMap.put("name", item.getCmtNm());
+					return codeMap;
+				})
 				.collect(Collectors.toList());
 
 		resultMap.put("list", list);
diff --git a/kcsc-back-end/src/main/resources/application-local.properties b/kcsc-back-end/src/main/resources/application-local.properties
index b72c80a..0047e09 100644
--- a/kcsc-back-end/src/main/resources/application-local.properties
+++ b/kcsc-back-end/src/main/resources/application-local.properties
@@ -13,7 +13,8 @@ spring.datasource.hikari.maximum-pool-size=4
 #spring.datasource.username=kcsc
 #spring.datasource.password=dbnt0928!
 spring.datasource.driverClassName=net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-spring.datasource.url=jdbc:log4jdbc:postgresql://127.0.0.1:5432/kcsc
+#spring.datasource.url=jdbc:log4jdbc:postgresql://127.0.0.1:5432/kcsc
+spring.datasource.url=jdbc:log4jdbc:postgresql://118.219.150.34:50503/kcsc
 spring.datasource.username=dbnt0031
 spring.datasource.password=dbnt0928!