From fe1c0daf516d2e1c9b0ef4bac2408d33b39f8e03 Mon Sep 17 00:00:00 2001 From: myname Date: Tue, 1 Nov 2022 12:10:06 +0900 Subject: [PATCH] =?UTF-8?q?2022-11-01=2012:09=20=EB=8C=80=EA=B2=B0?= =?UTF-8?q?=EB=B0=8F=20=EA=B2=B0=EC=9E=AC=20=EA=B4=80=EB=A6=AC=20=EC=83=81?= =?UTF-8?q?=EC=84=B8=20=ED=8E=98=EC=9D=B4=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/AdrSbmtLineMgrUsrService.java | 6 + .../advcSbmt/service/AdrSbmtLineMgrUsrVO.java | 23 + .../service/impl/AdrSbmtLineMgrUsrDAO.java | 9 + .../impl/AdrSbmtLineMgrUsrServiceImpl.java | 8 + .../aprvl/web/AprvlMgr202210Controller.java | 39 + .../advcSbmt/AdrSbmtLineMgrUsr_SQL_Cubrid.xml | 509 +++++ .../iop/insteadOfPaymentManageDetail.jsp | 1810 ++++++++++------- 7 files changed, 1661 insertions(+), 743 deletions(-) diff --git a/src/main/java/kcc/kccadr/advcSbmt/service/AdrSbmtLineMgrUsrService.java b/src/main/java/kcc/kccadr/advcSbmt/service/AdrSbmtLineMgrUsrService.java index 244978f6..1479d251 100644 --- a/src/main/java/kcc/kccadr/advcSbmt/service/AdrSbmtLineMgrUsrService.java +++ b/src/main/java/kcc/kccadr/advcSbmt/service/AdrSbmtLineMgrUsrService.java @@ -47,4 +47,10 @@ public interface AdrSbmtLineMgrUsrService { //L-대결결재선 AdrSbmtLineMgrUsrVO selectSbstt(AdrSbmtLineMgrUsrVO vo) throws Exception; + + + //L-진행중결재선203040 + AdrSbmtLineMgrUsrVO selectIng(AdrSbmtLineMgrUsrVO vo) throws Exception; + //502030 + AdrSbmtLineMgrUsrVO selectIng502030(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 44d4017e..161b09c9 100644 --- a/src/main/java/kcc/kccadr/advcSbmt/service/AdrSbmtLineMgrUsrVO.java +++ b/src/main/java/kcc/kccadr/advcSbmt/service/AdrSbmtLineMgrUsrVO.java @@ -65,6 +65,11 @@ public class AdrSbmtLineMgrUsrVO extends ComDefaultVO implements Serializable { private String memName2; //'결재자2-조정부장이름', private String memName3; //'결재자3-조정부장이름', + private String sbsttTblNm1; //'대리결재자1-테이블명 info-내부관리자, mgr-조정위원', + private String sbsttTblNm2; //'대리결재자2-테이블명 info-내부관리자, mgr-조정위원', + private String sbsttTblNm3; //'대리결재자3-테이블명 info-내부관리자, mgr-조정위원', + + public String getRegisterId() { return registerId; } @@ -323,4 +328,22 @@ public class AdrSbmtLineMgrUsrVO extends ComDefaultVO implements Serializable { public void setMemName3(String memName3) { this.memName3 = memName3; } + public String getSbsttTblNm1() { + return sbsttTblNm1; + } + public void setSbsttTblNm1(String sbsttTblNm1) { + this.sbsttTblNm1 = sbsttTblNm1; + } + public String getSbsttTblNm2() { + return sbsttTblNm2; + } + public void setSbsttTblNm2(String sbsttTblNm2) { + this.sbsttTblNm2 = sbsttTblNm2; + } + public String getSbsttTblNm3() { + return sbsttTblNm3; + } + public void setSbsttTblNm3(String sbsttTblNm3) { + this.sbsttTblNm3 = sbsttTblNm3; + } } 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 fe684c29..7d0f679f 100644 --- a/src/main/java/kcc/kccadr/advcSbmt/service/impl/AdrSbmtLineMgrUsrDAO.java +++ b/src/main/java/kcc/kccadr/advcSbmt/service/impl/AdrSbmtLineMgrUsrDAO.java @@ -188,6 +188,15 @@ public class AdrSbmtLineMgrUsrDAO extends EgovAbstractDAO { public AdrSbmtLineMgrUsrVO selectSbstt(AdrSbmtLineMgrUsrVO VO) throws Exception { return (AdrSbmtLineMgrUsrVO) select("AdrSbmtLineMgrUsrDAO.selectSbstt", VO); } + + //L + public AdrSbmtLineMgrUsrVO selectIng(AdrSbmtLineMgrUsrVO VO) throws Exception { + return (AdrSbmtLineMgrUsrVO) select("AdrSbmtLineMgrUsrDAO.selectIng", VO); + } + + public AdrSbmtLineMgrUsrVO selectIng502030(AdrSbmtLineMgrUsrVO VO) throws Exception { + return (AdrSbmtLineMgrUsrVO) select("AdrSbmtLineMgrUsrDAO.selectIng502030", 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 2777d1ed..c4e7de9c 100644 --- a/src/main/java/kcc/kccadr/advcSbmt/service/impl/AdrSbmtLineMgrUsrServiceImpl.java +++ b/src/main/java/kcc/kccadr/advcSbmt/service/impl/AdrSbmtLineMgrUsrServiceImpl.java @@ -132,4 +132,12 @@ public class AdrSbmtLineMgrUsrServiceImpl implements AdrSbmtLineMgrUsrService { public AdrSbmtLineMgrUsrVO selectSbstt(AdrSbmtLineMgrUsrVO VO) throws Exception{ return adrSbmtLineMgrUsrDAO.selectSbstt(VO); } + + //List + public AdrSbmtLineMgrUsrVO selectIng(AdrSbmtLineMgrUsrVO VO) throws Exception{ + return adrSbmtLineMgrUsrDAO.selectIng(VO); + } + public AdrSbmtLineMgrUsrVO selectIng502030(AdrSbmtLineMgrUsrVO VO) throws Exception{ + return adrSbmtLineMgrUsrDAO.selectIng502030(VO); + } } diff --git a/src/main/java/kcc/kccadr/aprvl/web/AprvlMgr202210Controller.java b/src/main/java/kcc/kccadr/aprvl/web/AprvlMgr202210Controller.java index a89ee580..62753237 100644 --- a/src/main/java/kcc/kccadr/aprvl/web/AprvlMgr202210Controller.java +++ b/src/main/java/kcc/kccadr/aprvl/web/AprvlMgr202210Controller.java @@ -555,6 +555,45 @@ public class AprvlMgr202210Controller { } + //결재선 tree 진행중결재선 가져오기 + @RequestMapping("/kccadr/aprvlMgr202210/advcAprvlReqIngLoadAjax.do") + public ModelAndView advcAprvlReqIngLoadAjax( + 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.selectIng(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 기본결재선 가져오기 - 502030 : 조정부장 @RequestMapping("/kccadr/aprvlMgr202210/advcAprvlReqDefaultLoad502030Ajax.do") public ModelAndView advcAprvlReqDefaultLoad502030Ajax( 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 bf232175..8ee533ba 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 @@ -886,5 +886,514 @@ WHERE adr_seq =#adrSeq# AND adr_sn =#adrSn# AND sbmt_seq=#sbmtSeq# + + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iop/insteadOfPaymentManageDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iop/insteadOfPaymentManageDetail.jsp index e52e850e..26c38a2a 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iop/insteadOfPaymentManageDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iop/insteadOfPaymentManageDetail.jsp @@ -37,701 +37,987 @@ + + + + + +