From c9ea180686aea2d59c173426686180fa9e397092 Mon Sep 17 00:00:00 2001 From: thkim Date: Fri, 5 Jan 2024 18:01:30 +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=EC=8B=AC=EC=9D=98=EC=9C=84?= =?UTF-8?q?=EC=9B=90=ED=9A=8C=20=EC=B2=AB=20=EB=B2=88=EC=A7=B8=20=EA=B1=B0?= =?UTF-8?q?=20=EC=84=A0=ED=83=9D=20=EC=8B=9C,=20=ED=95=98=EC=9C=84=20?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=EB=B6=88=EB=9F=AC=EC=98=A4=EB=8A=94=20API?= =?UTF-8?q?=20=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 관리자 단에서 '위원회 관리' > '위원회 일정 관리'에 '등록' 버튼을 누른 후 '위원회 일정 등록' 페이지에서 심의위원회 첫 번째 거 선택 시, 하위 목록 불러오는 API 추가 --- .../src/pages/admin/committee/Schedules/Edit.jsx | 8 +++++++- .../impl/EgovIndvdlSchdulManageServiceImpl.java | 13 +++---------- .../admin/config/repository/TnCmtOrgRepository.java | 1 + 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/committee/Schedules/Edit.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/committee/Schedules/Edit.jsx index cfe4a97..49aadda 100644 --- a/egovframe-template-simple-react-contribution/src/pages/admin/committee/Schedules/Edit.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/admin/committee/Schedules/Edit.jsx @@ -89,7 +89,13 @@ function SchedulesEdit(props) { requestOptions, function (resp) { let rawScheduleDetail = resp; - console.log( 'kimtheho kimtheho kimtheho kimtheho kimtheho kimtheho kimtheho kimtheho' + rawScheduleDetail ); + } + ); + + EgovNet.requestFetch("/schedule/api/org-api/depth/list?paramCodeGroup=5", + requestOptions, + function (resp) { + let rawScheduleDetail = resp; } ); 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 d1fc5d8..dab4a98 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 @@ -173,19 +173,12 @@ public class EgovIndvdlSchdulManageServiceImpl extends EgovAbstractServiceImpl i public ResultVO ScheduleApiOrgApiDepthList(ResultVO resultVO, Integer paramCodeGroup) throws Exception { Map resultMap = new HashMap(); - List listCodes = tcCodeItemRepository.findByGrpCdAndUseYnOrderByGrpOrder("EVT_TYPE", "Y").stream() - .map(lc -> lc.getItemNm()) - .collect(Collectors.toList()); - List listSubOrg = tnCmtOrgRepository.findByUseYnAndUpCmtSeqOrderByCmtOrder("Y", 3).stream() - .map(lc -> lc.getCmtNm()) - .collect(Collectors.toList()); - List listTopOrg = tnCmtOrgRepository.findByUseYnAndUpCmtSeqOrderByCmtOrder("Y", 2).stream() + + List list = tnCmtOrgRepository.findByUseYnAndUpCmtSeqOrderByCmtOrder("Y", paramCodeGroup).stream() .map(lc -> lc.getCmtNm()) .collect(Collectors.toList()); - resultMap.put("listCodes", listCodes); - resultMap.put("listSubOrg", listSubOrg); - resultMap.put("listTopOrg", listTopOrg); + resultMap.put("list", list); resultVO.setResult(resultMap); return resultVO; diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/repository/TnCmtOrgRepository.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/repository/TnCmtOrgRepository.java index 1963219..d0facc6 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/repository/TnCmtOrgRepository.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/repository/TnCmtOrgRepository.java @@ -8,4 +8,5 @@ import java.util.List; public interface TnCmtOrgRepository extends JpaRepository { List findByUseYnAndUpCmtSeqOrderByCmtOrder(String useYn, Integer upCmtSeq); + }