diff --git a/src/main/java/kcc/kccadr/advcAprvl/web/AdvcAprvlController.java b/src/main/java/kcc/kccadr/advcAprvl/web/AdvcAprvlController.java index 59fd395b..b3aaa2a7 100644 --- a/src/main/java/kcc/kccadr/advcAprvl/web/AdvcAprvlController.java +++ b/src/main/java/kcc/kccadr/advcAprvl/web/AdvcAprvlController.java @@ -18,6 +18,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import kcc.com.cmm.service.EgovCmmUseService; import kcc.com.cmm.service.EgovFileMngService; import kcc.com.cmm.service.EgovFileMngUtil; +import kcc.kccadr.adjPgrMgr.iam.service.InternalApprovManageVO; import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineService; import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineVO; import kcc.kccadr.advcSbmt.service.AdrSbmtLineMgrUsrVO; @@ -118,8 +119,16 @@ public class AdvcAprvlController { * date : 2022.09.23 */ @RequestMapping("/kccadr/advcAprvl/popup/advcSbsttAprvlReqPop.do") - public String advcSbsttAprvlReqPop(@ModelAttribute("adjReqMgrOffLineVO") AdjReqMgrOffLineVO adjReqMgrOffLineVO, ModelMap model) throws Exception { + public String advcSbsttAprvlReqPop( + @ModelAttribute("adjReqMgrOffLineVO") AdjReqMgrOffLineVO adjReqMgrOffLineVO + , @ModelAttribute("internalApprovManageVO") InternalApprovManageVO internalApprovManageVO + + , ModelMap model + ) throws Exception { System.out.println("========================================"); + System.out.println("========================================"+internalApprovManageVO.getSbmtSeq()); + System.out.println("========================================"+internalApprovManageVO.getAdrSn()); + return "kccadr/advcAprvl/popup/advcSbsttAprvlReqPop"; } diff --git a/src/main/java/kcc/kccadr/advcSbmt/service/AdrSbmtLineMgrUsrService.java b/src/main/java/kcc/kccadr/advcSbmt/service/AdrSbmtLineMgrUsrService.java index c73321b6..3efec48e 100644 --- a/src/main/java/kcc/kccadr/advcSbmt/service/AdrSbmtLineMgrUsrService.java +++ b/src/main/java/kcc/kccadr/advcSbmt/service/AdrSbmtLineMgrUsrService.java @@ -42,4 +42,7 @@ public interface AdrSbmtLineMgrUsrService { //L-기본결재선 AdrSbmtLineMgrUsrVO selectDefault(AdrSbmtLineMgrUsrVO vo) throws Exception; + + //L-대결결재선 + AdrSbmtLineMgrUsrVO selectSbstt(AdrSbmtLineMgrUsrVO vo) throws Exception; } diff --git a/src/main/java/kcc/kccadr/advcSbmt/service/AdrSbmtLineMgrUsrVO.java b/src/main/java/kcc/kccadr/advcSbmt/service/AdrSbmtLineMgrUsrVO.java index 8ea12c8f..029ba23e 100644 --- a/src/main/java/kcc/kccadr/advcSbmt/service/AdrSbmtLineMgrUsrVO.java +++ b/src/main/java/kcc/kccadr/advcSbmt/service/AdrSbmtLineMgrUsrVO.java @@ -59,6 +59,7 @@ public class AdrSbmtLineMgrUsrVO extends ComDefaultVO implements Serializable { private String sbsttUserNm5; //'대리결재자1-이름', private String sbsttUserNm6; //'대리결재자1-이름', + private String step; //'결재진행단계', public String getRegisterId() { return registerId; @@ -294,4 +295,10 @@ public class AdrSbmtLineMgrUsrVO extends ComDefaultVO implements Serializable { public void setSbsttUserNm6(String sbsttUserNm6) { this.sbsttUserNm6 = sbsttUserNm6; } + public String getStep() { + return step; + } + public void setStep(String step) { + this.step = step; + } } diff --git a/src/main/java/kcc/kccadr/advcSbmt/service/impl/AdrSbmtLineMgrUsrDAO.java b/src/main/java/kcc/kccadr/advcSbmt/service/impl/AdrSbmtLineMgrUsrDAO.java index 9f3766ae..2f2e60bb 100644 --- a/src/main/java/kcc/kccadr/advcSbmt/service/impl/AdrSbmtLineMgrUsrDAO.java +++ b/src/main/java/kcc/kccadr/advcSbmt/service/impl/AdrSbmtLineMgrUsrDAO.java @@ -180,6 +180,10 @@ public class AdrSbmtLineMgrUsrDAO extends EgovAbstractDAO { public AdrSbmtLineMgrUsrVO selectDefault(AdrSbmtLineMgrUsrVO VO) throws Exception { return (AdrSbmtLineMgrUsrVO) select("AdrSbmtLineMgrUsrDAO.selectDefault", VO); } + + public AdrSbmtLineMgrUsrVO selectSbstt(AdrSbmtLineMgrUsrVO VO) throws Exception { + return (AdrSbmtLineMgrUsrVO) select("AdrSbmtLineMgrUsrDAO.selectSbstt", VO); + } /** * L - Page diff --git a/src/main/java/kcc/kccadr/advcSbmt/service/impl/AdrSbmtLineMgrUsrServiceImpl.java b/src/main/java/kcc/kccadr/advcSbmt/service/impl/AdrSbmtLineMgrUsrServiceImpl.java index def33e79..74930315 100644 --- a/src/main/java/kcc/kccadr/advcSbmt/service/impl/AdrSbmtLineMgrUsrServiceImpl.java +++ b/src/main/java/kcc/kccadr/advcSbmt/service/impl/AdrSbmtLineMgrUsrServiceImpl.java @@ -125,4 +125,8 @@ public class AdrSbmtLineMgrUsrServiceImpl implements AdrSbmtLineMgrUsrService { public AdrSbmtLineMgrUsrVO selectDefault(AdrSbmtLineMgrUsrVO VO) throws Exception{ return adrSbmtLineMgrUsrDAO.selectDefault(VO); } + + public AdrSbmtLineMgrUsrVO selectSbstt(AdrSbmtLineMgrUsrVO VO) throws Exception{ + return adrSbmtLineMgrUsrDAO.selectSbstt(VO); + } } diff --git a/src/main/java/kcc/kccadr/aprvl/service/AprvlMgrService.java b/src/main/java/kcc/kccadr/aprvl/service/AprvlMgrService.java index 135b6062..184de5c7 100644 --- a/src/main/java/kcc/kccadr/aprvl/service/AprvlMgrService.java +++ b/src/main/java/kcc/kccadr/aprvl/service/AprvlMgrService.java @@ -53,7 +53,12 @@ public interface AprvlMgrService { AprvlMgrVO selectDetail(AprvlMgrVO aprvlMgrVO) throws Exception; - int update(AprvlMgrVO aprvlMgrVO) throws Exception; + int update(AprvlMgrVO aprvlMgrVO + , String p_code_desc + , String p_stat_cd + , String p_adrHstryMgrSeq + , AdrSbmtLineMgrUsrVO adrSbmtLineMgrUsrVO + ) throws Exception; int delete(AprvlMgrVO aprvlMgrVO) throws Exception; diff --git a/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java b/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java index 140fb413..1ee1dfea 100644 --- a/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java +++ b/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java @@ -311,8 +311,49 @@ public class AprvlMgrServiceImpl extends EgovAbstractServiceImpl implements Apr return aprvlMgrDAO.selectDetail(aprvlMgrVO); } - public int update(AprvlMgrVO aprvlMgrVO) throws Exception{ - return aprvlMgrDAO.update(aprvlMgrVO); + public int update(AprvlMgrVO aprvlMgrVO //결재자 변경용 데이터 + , String p_code_desc + , String p_stat_cd + , String p_adrHstryMgrSeq + , AdrSbmtLineMgrUsrVO adrSbmtLineMgrUsrVO //대결 이력저장용 데이터 + + ) throws Exception{ + + //결재선 데이터 변경 + int i_ret = aprvlMgrDAO.update(aprvlMgrVO); + + + //결재 이력 데이터 저장 + //저장 + String sbmtSbsttSeq = idgenService.getNextStringId(); + adrSbmtLineMgrUsrVO.setSbmtSbsttSeq(sbmtSbsttSeq); + adrSbmtMgrHstryService.insert(adrSbmtLineMgrUsrVO + , "관리자>>결재선>대결등록" //String p_code_desc - CC199 + , "A002" //String p_stat_cd + , "" + ); + //AdrSbmtLineMgrUsrVO + + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + //adr_hstry_mgr에 값 넣기 - 시작 + adrHstryMgrDAO.insert4Func(aprvlMgrVO.getAdrSeq() + //, "상태코드수정" + , p_code_desc + //, adjReqMgrVO.getStatCd() + , p_stat_cd + + , aprvlMgrVO.getFrstRegisterId() + , aprvlMgrVO.getLastUpdusrId() + + , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq + , "UI" //, String p_useCd I/U/UI/II/RE + , "adr_sbmt_mgr" //, String p_tableName + , "" //, String p_updateQuery + + ); + //adr_hstry_mgr에 값 넣기 - 끝 + + return i_ret; } public int delete(AprvlMgrVO aprvlMgrVO) throws Exception{ diff --git a/src/main/java/kcc/kccadr/aprvl/web/AprvlMgr202210Controller.java b/src/main/java/kcc/kccadr/aprvl/web/AprvlMgr202210Controller.java index 4f76176e..bd20bb80 100644 --- a/src/main/java/kcc/kccadr/aprvl/web/AprvlMgr202210Controller.java +++ b/src/main/java/kcc/kccadr/aprvl/web/AprvlMgr202210Controller.java @@ -165,6 +165,81 @@ public class AprvlMgr202210Controller { return modelAndView; } + /**대결자 저장 + * 결재 상태 저장 1단계 + * 1.결재선 확인 + * 2.조정사건결재에 저장 + * 3.조정부 테이블에 저장 + * 4.마스터 상태값 변경 + * 5.결과 통보 + */ + @RequestMapping(value="/kccadr/aprvlMgr202210/aprvl/saveSbsttAprvlStep1Ajax.do") + public ModelAndView saveSbsttAprvlStep1Ajax( + HttpServletRequest request + , AdrSbmtLineMgrUsrVO adrSbmtLineMgrUsrVO + ) throws Exception { + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + + //System.out.println("adjstReqStatusTabStatusStep1Ajax"); + + try { + + //로그인 정보 획득 - ssoLoginVO 사용 + LoginVO loginVO = checkLoginUtil.getLoginVO(); + + //step1.기본 결재선 저장 + adrSbmtLineMgrUsrVO.setRegisterId(loginVO.getUniqId()); //사용 대상자 + adrSbmtLineMgrUsrVO.setFrstRegisterId(loginVO.getUniqId()); //등록자 + adrSbmtLineMgrUsrVO.setLastUpdusrId(loginVO.getUniqId()); //등록자 + adrSbmtLineMgrUsrVO.setSbmtIdSbstt(adrSbmtLineMgrUsrVO.getSbsttSbmtId1()); + adrSbmtLineMgrUsrVO.setSbmtIdBef(adrSbmtLineMgrUsrVO.getSbmtId1()); + //adrSbmtLineMgrUsrVO.setSbmtTyCd("000000");//000000-공통으로 관리 한다. + + AprvlMgrVO aprvlMgrVO = new AprvlMgrVO(); + + aprvlMgrVO.setAdrSeq(adrSbmtLineMgrUsrVO.getAdrSeq()); + aprvlMgrVO.setAdrSn(adrSbmtLineMgrUsrVO.getAdrSn()); + aprvlMgrVO.setSbmtSeq(adrSbmtLineMgrUsrVO.getSbmtSeq()); + + //하기는 대결자 조건에 따라서 분기 처리로 값 저장 + if ("3".equals(adrSbmtLineMgrUsrVO.getStep())) { + aprvlMgrVO.setSbmtId3(adrSbmtLineMgrUsrVO.getSbsttSbmtId1()); + adrSbmtLineMgrUsrVO.setAgntSbmtId("ID3"); + + }else if ("2".equals(adrSbmtLineMgrUsrVO.getStep())) { + aprvlMgrVO.setSbmtId2(adrSbmtLineMgrUsrVO.getSbsttSbmtId1()); + adrSbmtLineMgrUsrVO.setAgntSbmtId("ID2"); + + }else { + aprvlMgrVO.setSbmtId1(adrSbmtLineMgrUsrVO.getSbsttSbmtId1()); + adrSbmtLineMgrUsrVO.setAgntSbmtId("ID1"); + + } + + + //실제로 대결 변경 전용의 update이다 + aprvlMgrService.update( + aprvlMgrVO + , "관리자>>내부결재목록>결재요청>P>대결" //String p_code_desc - CC199 + , "A003" //String p_stat_cd + , "" + , adrSbmtLineMgrUsrVO + ); + + + modelAndView.addObject("status", "success"); + }catch(Exception ex) { + modelAndView.addObject("status", "fail"); + modelAndView.addObject("message", "기본 결재선 생성 실패.-step0"); + + } + + + return modelAndView; + } + /** * 결재 상태 저장 1단계 * 1.결재선 확인 @@ -430,4 +505,43 @@ public class AprvlMgr202210Controller { return modelAndView; } + + //결재선 tree 대결자 정보 가져오기 + @RequestMapping("/kccadr/aprvlMgr202210/advcSbsttAprvlReqDefaultLoadAjax.do") + public ModelAndView advcSbsttAprvlReqDefaultLoadAjax( + 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.selectSbstt(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; + + } } 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 8695e873..8e50c590 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 @@ -550,5 +550,31 @@ ORDER BY aaaaaa.ord LIMIT 1 - + + + + diff --git a/src/main/resources/egovframework/sqlmap/kccadr/aprvl/AprvlMgr_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/aprvl/AprvlMgr_SQL_Mysql.xml index 0f61f660..75905319 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/aprvl/AprvlMgr_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/aprvl/AprvlMgr_SQL_Mysql.xml @@ -534,7 +534,69 @@ + UPDATE + SET + last_updt_pnttm = NOW() + , last_updusr_id = #lastUpdusrId# + + , sbmt_ty = #sbmtTy# + + + , sbmt_mem_ty = #sbmtMemTy# + + + , sbmt_step_cnt = #sbmtStepCnt# + + + , sbmt_id1 = #sbmtId1# + + + , sbmt_yn1 = #sbmtYn1# + + + , sbmt_de1 = #sbmtDe1# + + + , sbmt_id2 = #sbmtId2# + + , sbmt_yn2 = #sbmtYn2# + + , sbmt_de2 = #sbmtDe2# + + + , sbmt_id3 = #sbmtId3# + + , sbmt_yn3 = #sbmtYn3# + + , sbmt_de3 = #sbmtDe3# + + + , sbmt_id4 = #sbmtId4# + + , sbmt_yn4 = #sbmtYn4# + + , sbmt_de4 = #sbmtDe4# + + + , sbmt_id5 = #sbmtId5# + + , sbmt_yn5 = #sbmtYn5# + + , sbmt_de5 = #sbmtDe5# + + + , sbmt_id6 = #sbmtId6# + + , sbmt_yn6 = #sbmtYn6# + + , sbmt_de6 = #sbmtDe6# + + + + WHERE adr_seq = #adrSeq# + AND adr_sn = #adrSn# + AND sbmt_seq = #sbmtSeq# diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp index 75fc7b70..782ee823 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp @@ -806,6 +806,7 @@ + @@ -1017,7 +1018,11 @@
- + <%-- 대결버튼은 현재 결재자 이거나 최고관리자인 경우만 나타나게 --%> + + + + <%-- 취하종결 상세보기 --%> <%-- - "/> - "/> - "/> + "/> + "/> + "/> + "/> @@ -1021,11 +1024,13 @@ function setSbmtPerson(pram){
결재자
- 결재자1 + 결재자1 +
@@ -1038,11 +1043,13 @@ function setSbmtPerson(pram){
대결자
- 결재자1 + +
@@ -1095,7 +1102,7 @@ function setSbmtPerson(pram){
- +
diff --git a/src/main/webapp/WEB-INF/jsp/sym/mnu/mpm/EgovMenuAuthoritySelectJtree.jsp b/src/main/webapp/WEB-INF/jsp/sym/mnu/mpm/EgovMenuAuthoritySelectJtree.jsp index e5eccd0e..d4e6ada2 100644 --- a/src/main/webapp/WEB-INF/jsp/sym/mnu/mpm/EgovMenuAuthoritySelectJtree.jsp +++ b/src/main/webapp/WEB-INF/jsp/sym/mnu/mpm/EgovMenuAuthoritySelectJtree.jsp @@ -46,10 +46,12 @@ function jstreeInit() { "check_callback" : true, "themes" : { "stripes" : true }, "data" : { - "url" : "", + //"url" : "", + "url" : "", "dataType" : "json", "data" : function (node) { - return {'id' : node.id, 'authorCode' : $('#authorCode').val() }; + //return {'id' : node.id, 'authorCode' : $('#authorCode').val() }; + return {'id' : "CC401", 'authorCode' : $('#authorCode').val() }; } } },