diff --git a/src/main/java/kcc/kccadr/advcSbmt/service/AdrSbmtLineMgrUsrVO.java b/src/main/java/kcc/kccadr/advcSbmt/service/AdrSbmtLineMgrUsrVO.java index 328cacbd..e7b30b18 100644 --- a/src/main/java/kcc/kccadr/advcSbmt/service/AdrSbmtLineMgrUsrVO.java +++ b/src/main/java/kcc/kccadr/advcSbmt/service/AdrSbmtLineMgrUsrVO.java @@ -64,6 +64,10 @@ public class AdrSbmtLineMgrUsrVO extends ComDefaultVO implements Serializable { private String memName1; //'결재자1-조정부장이름', private String memName2; //'결재자2-조정부장이름', private String memName3; //'결재자3-조정부장이름', + + private String tblNm1; //'결재자1-테이블명 info-내부관리자, mgr-조정위원', + private String tblNm2; //'결재자2-테이블명 info-내부관리자, mgr-조정위원', + private String tblNm3; //'결재자3-테이블명 info-내부관리자, mgr-조정위원', private String sbsttTblNm1; //'대리결재자1-테이블명 info-내부관리자, mgr-조정위원', private String sbsttTblNm2; //'대리결재자2-테이블명 info-내부관리자, mgr-조정위원', @@ -384,4 +388,22 @@ public class AdrSbmtLineMgrUsrVO extends ComDefaultVO implements Serializable { public void setWhereQuery(String whereQuery) { this.whereQuery = whereQuery; } + public String getTblNm1() { + return tblNm1; + } + public void setTblNm1(String tblNm1) { + this.tblNm1 = tblNm1; + } + public String getTblNm2() { + return tblNm2; + } + public void setTblNm2(String tblNm2) { + this.tblNm2 = tblNm2; + } + public String getTblNm3() { + return tblNm3; + } + public void setTblNm3(String tblNm3) { + this.tblNm3 = tblNm3; + } } diff --git a/src/main/java/kcc/kccadr/aprvl/web/AprvlMgr202210Controller.java b/src/main/java/kcc/kccadr/aprvl/web/AprvlMgr202210Controller.java index 754a7b82..0a51289c 100644 --- a/src/main/java/kcc/kccadr/aprvl/web/AprvlMgr202210Controller.java +++ b/src/main/java/kcc/kccadr/aprvl/web/AprvlMgr202210Controller.java @@ -760,6 +760,22 @@ public class AprvlMgr202210Controller { LoginVO loginVO = checkLoginUtil.getLoginVO(); adrSbmtLineMgrUsrVO.setRegisterId(loginVO.getUniqId()); resultData = adrSbmtLineMgrUsrService.selectIng(adrSbmtLineMgrUsrVO); + + System.out.println("resultData.getUserNm1()"); + System.out.println(resultData.getTblNm1()); + System.out.println(resultData.getUserNm1()); + + //조정부장인 경우 이름 처리를 한다. - 결재자 이름 변경 + if ("mgr".equals(resultData.getTblNm1())) resultData.setUserNm1(egovCryptoUtil.decrypt(resultData.getUserNm1())); + if ("mgr".equals(resultData.getTblNm2())) resultData.setUserNm2(egovCryptoUtil.decrypt(resultData.getUserNm2())); + if ("mgr".equals(resultData.getTblNm3())) resultData.setUserNm3(egovCryptoUtil.decrypt(resultData.getUserNm3())); + + if ("mgr".equals(resultData.getSbsttTblNm1())) resultData.setSbsttUserNm1(egovCryptoUtil.decrypt(resultData.getSbsttUserNm1())); + if ("mgr".equals(resultData.getSbsttTblNm2())) resultData.setSbsttUserNm2(egovCryptoUtil.decrypt(resultData.getSbsttUserNm2())); + if ("mgr".equals(resultData.getSbsttTblNm3())) resultData.setSbsttUserNm3(egovCryptoUtil.decrypt(resultData.getSbsttUserNm3())); + + System.out.println(resultData.getUserNm1()); + modelAndView.addObject("result", "success"); modelAndView.addObject("resultData", resultData); }catch(Exception ex) { @@ -821,6 +837,45 @@ public class AprvlMgr202210Controller { } + //결재선 tree 진행중결재선 가져오기 :502030 - + @RequestMapping("/kccadr/aprvlMgr202210/advcAprvlReqIngLoad502030Ajax.do") + public ModelAndView advcAprvlReqIngLoad502030Ajax( + AdrSbmtLineMgrUsrVO adrSbmtLineMgrUsrVO + , ModelMap model + , HttpServletResponse response + , HttpServletRequest request + ) throws Exception { + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + /* + ObjectMapper mapper = new ObjectMapper(); + //response.setHeader("Content-Type", "text/html;charset=utf-8"); + PrintWriter out = new PrintWriter(new OutputStreamWriter(response.getOutputStream(), "UTF-8")); + */ + + //1depth로 사용자 정보 가져오기 + AdrSbmtLineMgrUsrVO resultData = null; + try { + //로그인 정보 획득 - ssoLoginVO 사용 + LoginVO loginVO = checkLoginUtil.getLoginVO(); + adrSbmtLineMgrUsrVO.setRegisterId(loginVO.getUniqId()); + resultData = adrSbmtLineMgrUsrService.selectIng502030(adrSbmtLineMgrUsrVO); + modelAndView.addObject("result", "success"); + modelAndView.addObject("resultData", resultData); + }catch(Exception ex) { + modelAndView.addObject("result", "fail"); + modelAndView.addObject("message", "결재선 생성 실패.-step0"); + } + + + //mapper.writeValue(out, resultList); + //out.flush(); + + return modelAndView; + + } + //결재선 tree 기본결재선 가져오기 - 30 : 부서장 @RequestMapping("/kccadr/aprvlMgr202210/advcAprvlReqDefaultLoad30Ajax.do") public ModelAndView advcAprvlReqDefaultLoad30Ajax( diff --git a/src/main/resources/egovframework/sqlmap/kccadr/advcSbmt/AdrSbmtLineMgrUsr_SQL_Cubrid.xml b/src/main/resources/egovframework/sqlmap/kccadr/advcSbmt/AdrSbmtLineMgrUsr_SQL_Cubrid.xml index 6caffd92..3f30d7e2 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/advcSbmt/AdrSbmtLineMgrUsr_SQL_Cubrid.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/advcSbmt/AdrSbmtLineMgrUsr_SQL_Cubrid.xml @@ -1340,311 +1340,241 @@ diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iop/insteadOfPaymentManageDetail50.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iop/insteadOfPaymentManageDetail50.jsp index 0b7af99e..999e23a2 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iop/insteadOfPaymentManageDetail50.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iop/insteadOfPaymentManageDetail50.jsp @@ -892,8 +892,8 @@ function fn_save_aprvl() { if(""==smbtForm.sbmtId1.value - || ""==smbtForm.sbmtId2.value - || ""==smbtForm.sbmtId3.value +// || ""==smbtForm.sbmtId2.value +// || ""==smbtForm.sbmtId3.value ){ alert("결재자는 필수 값입니다"); return; } @@ -903,13 +903,13 @@ function fn_save_aprvl() { $('#sbsttSbmtId1').val(''); } - if(""==$('#confront2').text()){ - $('#sbsttSbmtId2').val(''); - } +// if(""==$('#confront2').text()){ +// $('#sbsttSbmtId2').val(''); +// } - if(""==$('#confront3').text()){ - $('#sbsttSbmtId3').val(''); - } +// if(""==$('#confront3').text()){ +// $('#sbsttSbmtId3').val(''); +// } if(!confirm("저장하시겠습니까?")) return; @@ -990,7 +990,7 @@ function fn_load_default() { var smbtForm = document.smbtForm; var url = ""; - url = ""; + url = ""; //502030 var params = $(smbtForm).serialize(); $.ajax({ @@ -1018,19 +1018,19 @@ function setSbmtPerson(pram){ //결재 진행 정보 $('#sbmtYn1').val(pram.sbmtYn1); //Y/N/A - $('#sbmtYn2').val(pram.sbmtYn2); - $('#sbmtYn3').val(pram.sbmtYn3); + //$('#sbmtYn2').val(pram.sbmtYn2); + //$('#sbmtYn3').val(pram.sbmtYn3); //원 결재자 정보 $('#sbmtPerson1').text(pram.userNm1); $('#sbmtId1').val(pram.sbmtId1); - $('#sbmtPerson2').text(pram.userNm2); - $('#sbmtId2').val(pram.sbmtId2); + //$('#sbmtPerson2').text(pram.userNm2); + //$('#sbmtId2').val(pram.sbmtId2); - $('#sbmtPerson3').text(pram.userNm3); - $('#sbmtId3').val(pram.sbmtId3); + //$('#sbmtPerson3').text(pram.userNm3); + //$('#sbmtId3').val(pram.sbmtId3); //대결자 정보 if (pram.sbsttUserNm1!='' && pram.sbsttUserNm1!=null){ @@ -1040,6 +1040,7 @@ function setSbmtPerson(pram){ $('#sbsttSbmtId1').val(pram.sbsttSbmtId1); } + /* if (pram.sbsttUserNm2!='' && pram.sbsttUserNm2!=null){ proxyPay($("#proxyPay2"), '2'); @@ -1053,17 +1054,20 @@ function setSbmtPerson(pram){ $('#confront3').text(pram.sbsttUserNm3); $('#sbsttSbmtId3').val(pram.sbsttSbmtId3); } + */ //결재진행상태에 맞게 button 숨기기 if (pram.sbmtYn1!='A') { $('#liPay1 button').hide(); //$('#liPay1').css('backgroundColor', '#dddddd'); } + /* if (pram.sbmtYn2!='A') $('#liPay2 button').hide(); if (pram.sbmtYn3!='A') { $('#liPay3 button').hide(); $('div.btn_layout04 button.btnType06').hide(); } + */ } @@ -1322,7 +1326,7 @@ function setSbmtPerson(pram){ diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iop/insteadOfPaymentManageDetail502030.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iop/insteadOfPaymentManageDetail502030.jsp index ed9d2dd3..f93f467f 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iop/insteadOfPaymentManageDetail502030.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iop/insteadOfPaymentManageDetail502030.jsp @@ -37,701 +37,1036 @@ + + + + + +