From 31722f0c36cac27b15dfeb797e81f66a3207d71c Mon Sep 17 00:00:00 2001 From: myname Date: Tue, 18 Oct 2022 10:06:45 +0900 Subject: [PATCH] =?UTF-8?q?2022-10-18=2010:06=20=EC=A7=81=EA=B8=89?= =?UTF-8?q?=EA=B4=80=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/AdjReqMgrOffLineController.java | 49 ++- .../EgovCcmCmmnDetailCodeManageService.java | 4 + .../service/impl/CmmnDetailCodeManageDAO.java | 10 + ...govCcmCmmnDetailCodeManageServiceImpl.java | 10 + .../web/EgovCustomRankManageController.java | 2 +- .../EgovCmmnDetailCodeManage_SQL_Mysql.xml | 343 ++++++++++++++++++ .../advcAprvl/popup/advcAprvlReqPop.jsp | 48 ++- 7 files changed, 455 insertions(+), 11 deletions(-) diff --git a/src/main/java/kcc/kccadr/adjReqMgrOff/web/AdjReqMgrOffLineController.java b/src/main/java/kcc/kccadr/adjReqMgrOff/web/AdjReqMgrOffLineController.java index 6cf4225c..dc15e9d7 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrOff/web/AdjReqMgrOffLineController.java +++ b/src/main/java/kcc/kccadr/adjReqMgrOff/web/AdjReqMgrOffLineController.java @@ -39,7 +39,8 @@ import kcc.com.cmm.util.StringUtil; import kcc.com.utl.fcc.service.EgovStringUtil; import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineService; import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineVO; -import kcc.let.sym.mnu.mpm.service.MenuManageJTreeVO; +import kcc.let.sym.ccm.cde.service.CmmnDetailCodeVO; +import kcc.let.sym.ccm.cde.service.EgovCcmCmmnDetailCodeManageService; import kcc.let.utl.fcc.service.EgovCryptoUtil; @Controller @@ -72,6 +73,10 @@ public class AdjReqMgrOffLineController { @Resource(name = "egovCryptoUtil") EgovCryptoUtil egovCryptoUtil; + //tree code 관리 + @Resource(name = "CmmnDetailCodeManageService") + private EgovCcmCmmnDetailCodeManageService cmmnDetailCodeManageService; + /** * 오프라인 조정신청 정보 입력 화면 */ @@ -591,15 +596,50 @@ public class AdjReqMgrOffLineController { } - + //결재선 tree 리스트 정보 가져오기 @RequestMapping("/kccadr/adjReqMgOff/adjReqMgrOffAppReqPopAjax.do") - public void adjReqMgrOffAppReqPopAjax(@ModelAttribute("menuManageVO") MenuManageJTreeVO menuManageVO, ModelMap model, - HttpServletResponse response , HttpServletRequest request) throws Exception { + public void adjReqMgrOffAppReqPopAjax( + @ModelAttribute("searchVO") CmmnDetailCodeVO searchVO + , ModelMap model + , HttpServletResponse response + , HttpServletRequest request + ) throws Exception { ObjectMapper mapper = new ObjectMapper(); //response.setHeader("Content-Type", "text/html;charset=utf-8"); PrintWriter out = new PrintWriter(new OutputStreamWriter(response.getOutputStream(), "UTF-8")); + //System.out.println("aaaaaaaaaaabbbbbbb"); + //CmmnDetailCodeVO searchVO = new CmmnDetailCodeVO(); + //CmmnDetailCodeVO searchVO = new CmmnDetailCodeVO(); + //searchVO.setId("CC401"); + + //tree로 정보 가져오기(사용자 정보 없음) + //List resultList = cmmnDetailCodeManageService.selectCmmnDetailCodeListWithCodeDept(searchVO) ; + + //1depth로 사용자 정보 가져오기 + List resultList = null; + + CmmnDetailCodeVO topCmmnDetailCodeVO = new CmmnDetailCodeVO(); + topCmmnDetailCodeVO.setParent("#"); + topCmmnDetailCodeVO.setId("0"); + + if ("CC401".equals(searchVO.getId())) { + topCmmnDetailCodeVO.setText("직급별"); + resultList = cmmnDetailCodeManageService.selectCmmnDetailCodeListWithPerson(searchVO) ; + + }else if ("CC402".equals(searchVO.getId())) { + topCmmnDetailCodeVO.setText("부서별"); + resultList = cmmnDetailCodeManageService.selectCmmnDetailCodeListWithPersonDept(searchVO) ; + + } + + resultList.add(0, topCmmnDetailCodeVO); + mapper.writeValue(out, resultList); + out.flush(); + + + /* List resultList = new ArrayList(); MenuManageJTreeVO menuManageTopVO2 = new MenuManageJTreeVO(); @@ -625,6 +665,7 @@ public class AdjReqMgrOffLineController { System.out.println("resultList :: "+resultList); mapper.writeValue(out, resultList); out.flush(); + */ } diff --git a/src/main/java/kcc/let/sym/ccm/cde/service/EgovCcmCmmnDetailCodeManageService.java b/src/main/java/kcc/let/sym/ccm/cde/service/EgovCcmCmmnDetailCodeManageService.java index d18e8a63..a9dc6468 100644 --- a/src/main/java/kcc/let/sym/ccm/cde/service/EgovCcmCmmnDetailCodeManageService.java +++ b/src/main/java/kcc/let/sym/ccm/cde/service/EgovCcmCmmnDetailCodeManageService.java @@ -92,6 +92,10 @@ public interface EgovCcmCmmnDetailCodeManageService { List selectCmmnDetailCodeListWithCodeDept(CmmnDetailCodeVO searchVO) throws Exception; + List selectCmmnDetailCodeListWithPerson(CmmnDetailCodeVO searchVO) throws Exception; + + List selectCmmnDetailCodeListWithPersonDept(CmmnDetailCodeVO searchVO) throws Exception; + void updateCmmnDetailCodePk(CmmnDetailCodeVO cmmnDetailCodeVO) throws Exception; void updateCmmnDetailCodeDeptPk(CmmnDetailCodeVO cmmnDetailCodeVO) throws Exception; diff --git a/src/main/java/kcc/let/sym/ccm/cde/service/impl/CmmnDetailCodeManageDAO.java b/src/main/java/kcc/let/sym/ccm/cde/service/impl/CmmnDetailCodeManageDAO.java index 0c12a2e7..959f1f02 100644 --- a/src/main/java/kcc/let/sym/ccm/cde/service/impl/CmmnDetailCodeManageDAO.java +++ b/src/main/java/kcc/let/sym/ccm/cde/service/impl/CmmnDetailCodeManageDAO.java @@ -138,6 +138,16 @@ public class CmmnDetailCodeManageDAO extends EgovAbstractDAO { return (List) list("CmmnDetailCodeManageDAO.selectCmmnDetailCodeListWithCodeDept", searchVO); } + @SuppressWarnings("unchecked") + public List selectCmmnDetailCodeListWithPerson(CmmnDetailCodeVO searchVO) throws Exception{ + return (List) list("CmmnDetailCodeManageDAO.selectCmmnDetailCodeListWithPerson", searchVO); + } + + @SuppressWarnings("unchecked") + public List selectCmmnDetailCodeListWithPersonDept(CmmnDetailCodeVO searchVO) throws Exception{ + return (List) list("CmmnDetailCodeManageDAO.selectCmmnDetailCodeListWithPersonDept", searchVO); + } + public void updateCmmnDetailCodePk(CmmnDetailCodeVO cmmnDetailCodeVO) throws Exception{ update("CmmnDetailCodeManageDAO.updateCmmnDetailCodePk", cmmnDetailCodeVO); } diff --git a/src/main/java/kcc/let/sym/ccm/cde/service/impl/EgovCcmCmmnDetailCodeManageServiceImpl.java b/src/main/java/kcc/let/sym/ccm/cde/service/impl/EgovCcmCmmnDetailCodeManageServiceImpl.java index da43b989..e04753f2 100644 --- a/src/main/java/kcc/let/sym/ccm/cde/service/impl/EgovCcmCmmnDetailCodeManageServiceImpl.java +++ b/src/main/java/kcc/let/sym/ccm/cde/service/impl/EgovCcmCmmnDetailCodeManageServiceImpl.java @@ -148,6 +148,16 @@ public class EgovCcmCmmnDetailCodeManageServiceImpl extends EgovAbstractServiceI return cmmnDetailCodeManageDAO.selectCmmnDetailCodeListWithCodeDept(searchVO); } + @Override + public List selectCmmnDetailCodeListWithPerson(CmmnDetailCodeVO searchVO) throws Exception { + return cmmnDetailCodeManageDAO.selectCmmnDetailCodeListWithPerson(searchVO); + } + + @Override + public List selectCmmnDetailCodeListWithPersonDept(CmmnDetailCodeVO searchVO) throws Exception { + return cmmnDetailCodeManageDAO.selectCmmnDetailCodeListWithPersonDept(searchVO); + } + @Override public void updateCmmnDetailCodePk(CmmnDetailCodeVO cmmnDetailCodeVO) throws Exception { cmmnDetailCodeManageDAO.updateCmmnDetailCodePk(cmmnDetailCodeVO); diff --git a/src/main/java/kcc/let/uss/rnt/web/EgovCustomRankManageController.java b/src/main/java/kcc/let/uss/rnt/web/EgovCustomRankManageController.java index e2cfc8af..7042ca7d 100644 --- a/src/main/java/kcc/let/uss/rnt/web/EgovCustomRankManageController.java +++ b/src/main/java/kcc/let/uss/rnt/web/EgovCustomRankManageController.java @@ -239,7 +239,7 @@ public class EgovCustomRankManageController { response.setHeader("Content-Type", "text/html;charset=utf-8"); PrintWriter out = new PrintWriter(new OutputStreamWriter(response.getOutputStream(), "UTF-8")); - System.out.println("aaaaaaaaaaabbbbbbb"); + //System.out.println("aaaaaaaaaaabbbbbbb"); //CmmnDetailCodeVO searchVO = new CmmnDetailCodeVO(); searchVO.setId("CC402"); diff --git a/src/main/resources/egovframework/sqlmap/let/sym/ccm/cde/EgovCmmnDetailCodeManage_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/sym/ccm/cde/EgovCmmnDetailCodeManage_SQL_Mysql.xml index 09605ac0..962a2778 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/ccm/cde/EgovCmmnDetailCodeManage_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/ccm/cde/EgovCmmnDetailCodeManage_SQL_Mysql.xml @@ -424,6 +424,349 @@ ]]> + + + + UPDATE LETTCCMMNDETAILCODE SET CODE_NM = #codeNm# diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop.jsp index 088880e1..464f50be 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop.jsp @@ -41,7 +41,13 @@ function jstreeInit() { "data" : function (node) { console.log("node.id :: " + node.id); console.log("authorCode :: " + $('#authorCode').val()); - return {'id' : node.id, 'authorCode' : $('#authorCode').val() }; + //alert($("#authorCodeSelect option:selected").text()); + //authorCodeSelect + return { + 'id' : $("#authorCodeSelect option:selected").val() //node.id + , 'authorCode' : $('#authorCode').val() + //, 'codeNm' : $("#authorCodeSelect option:selected").text() + }; } } }, @@ -69,9 +75,12 @@ function jstreeInit() { ] */ }) .bind('loaded.jstree', function(e, data) { - $('#kccadr_sbmt').jstree('open_node' , $('#0') ) + $('#kccadr_sbmt').jstree('open_node' , $('#0') ); + + //$('#kccadr_sbmt').jstree('open_all' ); }) .on('select_node.jstree', function (e, data) { + if(!$('.organ_rightbox').is(":visible")){ $(".organ_rightbox").show(); } @@ -114,11 +123,12 @@ function jstreeInit() { error : function(request , status, error) { }, complete : function () { - deleteLodingBar(); + deleteLodingBar(); } }); }) .on('rename_node.jstree', function (e, data) { //메뉴명 변경 + var nodeId = data.node.id; var oldText = data.old; var newText = data.text; @@ -154,6 +164,7 @@ function jstreeInit() { } }) .on('delete_node.jstree', function (e, data) { + /* 메뉴 삭제 */ if(data.node.children.length != 0){ alert("하위 메뉴를 먼저 삭제 후 메뉴를 삭제해 주세요."); @@ -188,6 +199,7 @@ function jstreeInit() { }) .on('create_node.jstree', function(e, data) { + if (confirm("메뉴를 추가하시겠습니까?")){ var instance = data.instance; var menuNm = data.text; @@ -234,6 +246,7 @@ function jstreeInit() { } }) .on('move_node.jstree', function (e, data) { + /* 메뉴 위치 변경 */ var instance = data.instance; var menuNo = data.node.id; @@ -265,13 +278,35 @@ function jstreeInit() { } else { data.instance.refresh(); } - }) ; + }) + .on("refresh.jstree", function (e,data) { + + //alert("refresh.jstree"); + + + + $('#kccadr_sbmt').jstree('open_all' ); + }) + + ; } $( document ).ready(function() { - jstreeInit(); + $('#authorCodeSelect').on('change',function(){ + $("#kccadr_sbmt").jstree("refresh"); + }); + + /* + $('#authorCodeSelect').change(function(){ + alert("1"); + $("#kccadr_sbmt").jstree("refresh"); + alert("21"); + }); + */ + + jstreeInit(); }); //직원 상세 초기화 @@ -834,7 +869,8 @@ function addSbmtPerson(pram, type){