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 resultMap = new HashMap(); - List listCodes = tcCodeItemRepository.findByGrpCdAndUseYnOrderByGrpOrder("EVT_TYPE", "Y").stream() - .map(lc -> lc.getItemNm()) + List> listCodes = tcCodeItemRepository.findByGrpCdAndUseYnOrderByGrpOrder("EVT_TYPE", "Y") + .stream() + .map(item -> { + Map codeMap = new HashMap<>(); + codeMap.put("id", item.getItemCd()); + codeMap.put("name", item.getItemNm()); + return codeMap; + }) + .collect(Collectors.toList()); - List listSubOrg = tnCmtOrgRepository.findByUseYnAndUpCmtSeqOrderByCmtOrder("Y", 3).stream() - .map(lc -> lc.getCmtNm()) + List> listSubOrg = tnCmtOrgRepository.findByUseYnAndUpCmtSeqOrderByCmtOrder("Y", 3).stream() + .map(item -> { + Map codeMap = new HashMap<>(); + codeMap.put("id", item.getCmtSeq()); + codeMap.put("name", item.getCmtNm()); + return codeMap; + }) .collect(Collectors.toList()); - List listTopOrg = tnCmtOrgRepository.findByUseYnAndUpCmtSeqOrderByCmtOrder("Y", 2).stream() - .map(lc -> lc.getCmtNm()) + List> listTopOrg = tnCmtOrgRepository.findByUseYnAndUpCmtSeqOrderByCmtOrder("Y", 2).stream() + .map(item -> { + Map 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 resultMap = new HashMap(); - List list = tnCmtOrgRepository.findByUseYnAndUpCmtSeqOrderByCmtOrder("Y", paramCodeGroup).stream() - .map(lc -> lc.getCmtNm()) + List> list = tnCmtOrgRepository.findByUseYnAndUpCmtSeqOrderByCmtOrder("Y", paramCodeGroup) + .stream() + .map(item -> { + Map 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!