From 10c12f38b5eeee3eea7e24f1e3f4de91e63c0d7f Mon Sep 17 00:00:00 2001 From: LJH Date: Tue, 27 Sep 2022 09:56:02 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EC=A0=84?= =?UTF-8?q?=EC=9E=90=EC=A1=B0=EC=A0=95=EC=8B=9C=EC=8A=A4=ED=85=9C=20?= =?UTF-8?q?=EA=B3=A0=EB=8F=84=ED=99=94=20=EC=BB=A4=EB=B0=8B=20=20-=20?= =?UTF-8?q?=EA=B0=81=20=ED=86=B5=EC=A7=80=EC=84=9C=20=EB=93=B1=EB=A1=9D,?= =?UTF-8?q?=20=EC=83=81=EC=84=B8=ED=99=94=EB=A9=B4=20textarea=20=EC=84=B8?= =?UTF-8?q?=EB=A1=9C=EA=B8=B8=EC=9D=B4=20=ED=81=AC=EA=B2=8C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/EgovCustomRankManageServiceImpl.java | 25 ++++++++++++++++++- .../cmm/uss/rnt/EgovDepartmentManageTree.jsp | 8 +++--- .../jsp/kccadr/adjPgrMgr/arm/armDetail.jsp | 2 +- .../kccadr/adjPgrMgr/arm/armDetailNotice.jsp | 2 +- .../jsp/kccadr/adjPgrMgr/arm/armReg.jsp | 2 +- .../jsp/kccadr/adjPgrMgr/cfrm/cfrmReg.jsp | 2 +- .../jsp/kccadr/adjPgrMgr/chd/chdDetail.jsp | 2 +- .../jsp/kccadr/adjPgrMgr/chd/chdReg.jsp | 2 +- .../jsp/kccadr/adjPgrMgr/crt/crtDetail.jsp | 2 +- .../kccadr/adjPgrMgr/crt/crtDetailNotice.jsp | 2 +- .../jsp/kccadr/adjPgrMgr/crt/crtReg.jsp | 2 +- .../jsp/kccadr/adjPgrMgr/dnt/dntAddReg.jsp | 2 +- .../jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp | 2 +- .../jsp/kccadr/adjPgrMgr/dnt/dntReg.jsp | 2 +- .../kccadr/adjPgrMgr/drtCtr/drtCtrDetail.jsp | 2 +- .../jsp/kccadr/adjPgrMgr/drtCtr/drtCtrReg.jsp | 2 +- .../jsp/kccadr/adjPgrMgr/ent/entCreate.jsp | 2 +- .../jsp/kccadr/adjPgrMgr/ent/entDetail.jsp | 2 +- .../kccadr/adjPgrMgr/ent/entDetailNotice.jsp | 2 +- .../jsp/kccadr/adjPgrMgr/ent/entReg.jsp | 2 +- .../jsp/kccadr/adjPgrMgr/oad/oadDetail.jsp | 6 ++--- .../kccadr/adjPgrMgr/oad/oadDetailNotice.jsp | 6 ++--- .../jsp/kccadr/adjPgrMgr/oad/oadReg.jsp | 6 ++--- .../jsp/web/kccadr/certDoc/armDetail.jsp | 2 +- .../jsp/web/kccadr/certDoc/crtDetail.jsp | 2 +- .../jsp/web/kccadr/certDoc/drtCtrDetail.jsp | 2 +- .../jsp/web/kccadr/certDoc/drtDetail.jsp | 2 +- .../jsp/web/kccadr/certDoc/entDetail.jsp | 2 +- .../jsp/web/kccadr/certDoc/oadDetail.jsp | 6 ++--- 29 files changed, 64 insertions(+), 39 deletions(-) diff --git a/src/main/java/kcc/let/uss/rnt/service/impl/EgovCustomRankManageServiceImpl.java b/src/main/java/kcc/let/uss/rnt/service/impl/EgovCustomRankManageServiceImpl.java index a7eb1a5a..c6cbcbe4 100644 --- a/src/main/java/kcc/let/uss/rnt/service/impl/EgovCustomRankManageServiceImpl.java +++ b/src/main/java/kcc/let/uss/rnt/service/impl/EgovCustomRankManageServiceImpl.java @@ -65,7 +65,30 @@ public class EgovCustomRankManageServiceImpl extends EgovAbstractServiceImpl im @Override public RestResponse egovRankDataLoad(String codeId) { try { - List rankListVO = egovCustomRankManageDAO.egovRankDataLoad(codeId); + + List rankListVO = new ArrayList(); + if("tmpCode".equals(codeId)) { + for(int i = 1 ; i < 6 ; i ++) { + EgovCustomRankManageVO tmpVO = new EgovCustomRankManageVO(); + tmpVO.setCode(String.valueOf(i)); + tmpVO.setCodeNm("위원장"); + if(i == 2) { + tmpVO.setCodeNm("부서장"); + } + if(i == 3) { + tmpVO.setCodeNm("조정조서관"); + } + if(i == 4) { + tmpVO.setCodeNm("팀장"); + } + tmpVO.setCodeId(codeId); + + rankListVO.add(tmpVO); + } + }else { + rankListVO = egovCustomRankManageDAO.egovRankDataLoad(codeId); + } + return new RestResponse(HttpStatus.OK, rankListVO, "성공", LocalDateTime.now()); } catch (Exception e) { diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/rnt/EgovDepartmentManageTree.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/rnt/EgovDepartmentManageTree.jsp index e549923d..f2a86163 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/uss/rnt/EgovDepartmentManageTree.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/rnt/EgovDepartmentManageTree.jsp @@ -48,7 +48,7 @@ var dataList = []; var data = {}; - data.id = 'C0050'; + data.id = 'tmpCode'; data.text = '직급관리'; data.parent = '#'; data.state = {opened : true}; @@ -69,6 +69,8 @@ // jsTree function function fn_jsTree(resultData){ + console.log('resultData : ', resultData); + $("#rank_organization").jstree({ "core" : { "check_callback" : true @@ -201,7 +203,7 @@ type : "POST" , url : "" , data : JSON.stringify({ - codeId : "C0050" + codeId : "tmpCode" }) , dataType : 'json' , async : false @@ -209,7 +211,7 @@ , contentType : "application/json" , cache : false , success : function(returnData) { - if (data.status == "OK") { + if (returnData.status == "OK") { // 초기데이터 생성 후 jsTree 만듬 var resultData = fn_makeList(returnData); fn_jsTree(resultData); diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetail.jsp index fe27300c..99bb15d4 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetail.jsp @@ -306,7 +306,7 @@ 조정조항 - + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetailNotice.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetailNotice.jsp index 7ffd3684..cdb4337f 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetailNotice.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetailNotice.jsp @@ -313,7 +313,7 @@ 조정조항 - + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armReg.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armReg.jsp index 42d6e595..fefd9f57 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armReg.jsp @@ -252,7 +252,7 @@ 조정조항 - + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cfrm/cfrmReg.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cfrm/cfrmReg.jsp index e239d012..92e80158 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cfrm/cfrmReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cfrm/cfrmReg.jsp @@ -193,7 +193,7 @@ 확정 증명 내용 - + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/chd/chdDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/chd/chdDetail.jsp index 43d15a59..a2a09731 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/chd/chdDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/chd/chdDetail.jsp @@ -366,7 +366,7 @@ 주소 - +