From dee725243b3355c26eb1afd5921d82e204df59be Mon Sep 17 00:00:00 2001 From: myname Date: Fri, 28 Oct 2022 15:07:25 +0900 Subject: [PATCH] =?UTF-8?q?2022-10-28=2015:07=20=EA=B2=B0=EC=9E=AC?= =?UTF-8?q?=EC=84=A0=20=EC=B6=94=EA=B0=80,=20=EC=83=81=ED=83=9C=EA=B0=92?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accdnt/ai/service/AdjstIncidentVO.java | 19 + .../cmm/service/impl/PgrCmmServiceImpl.java | 13 +- .../web/AdjReqMgrOffLineController.java | 58 + .../advcAprvl/web/AdvcAprvlController.java | 33 + .../service/AdrSbmtLineMgrUsrService.java | 4 +- .../advcSbmt/service/AdrSbmtLineMgrUsrVO.java | 22 + .../service/impl/AdrSbmtLineMgrUsrDAO.java | 4 + .../impl/AdrSbmtLineMgrUsrServiceImpl.java | 3 + .../aprvl/web/AprvlMgr202210Controller.java | 141 +++ .../EgovCcmCmmnDetailCodeManageService.java | 7 + .../service/impl/CmmnDetailCodeManageDAO.java | 10 + ...govCcmCmmnDetailCodeManageServiceImpl.java | 10 + .../accdnt/ai/AdjustIncident_SQL_Mysql.xml | 32 + .../advcSbmt/AdrSbmtLineMgrUsr_SQL_Cubrid.xml | 322 ++++- .../EgovCmmnDetailCodeManage_SQL_Mysql.xml | 389 +++++- .../jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp | 28 +- .../jsp/kccadr/adjPgrMgr/apm/apmTab2.jsp | 28 +- .../jsp/kccadr/adjPgrMgr/chd/chdReg.jsp | 43 + .../jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp | 44 + .../iam/internalApprovManageDetail.jsp | 5 +- .../iam/internalApprovManageEndDetail.jsp | 12 +- .../advcAprvl/popup/advcAprvlReqPop.jsp | 1 + .../advcAprvl/popup/advcAprvlReqPop30.jsp | 1088 ++++++++++++++++ .../advcAprvl/popup/advcAprvlReqPop50.jsp | 1092 ++++++++++++++++ .../advcAprvl/popup/advcAprvlReqPop502030.jsp | 1110 +++++++++++++++++ .../advcAprvl/popup/advcSbsttAprvlReqPop.jsp | 7 +- .../kccadr/accdnt/ai/adjstIncidentList.jsp | 30 +- 27 files changed, 4523 insertions(+), 32 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop30.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop50.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop502030.jsp diff --git a/src/main/java/kcc/kccadr/accdnt/ai/service/AdjstIncidentVO.java b/src/main/java/kcc/kccadr/accdnt/ai/service/AdjstIncidentVO.java index d816e539..caab4e98 100644 --- a/src/main/java/kcc/kccadr/accdnt/ai/service/AdjstIncidentVO.java +++ b/src/main/java/kcc/kccadr/accdnt/ai/service/AdjstIncidentVO.java @@ -165,6 +165,9 @@ public class AdjstIncidentVO extends ComDefaultVO implements Serializable { private String rejectCn; private String adrOjctDe; + + private String codeNm; + private String code; public String getAdrSeq() { return adrSeq; @@ -870,6 +873,22 @@ public class AdjstIncidentVO extends ComDefaultVO implements Serializable { public void setAdrOjctDe(String adrOjctDe) { this.adrOjctDe = adrOjctDe; } + + public String getCodeNm() { + return codeNm; + } + + public void setCodeNm(String codeNm) { + this.codeNm = codeNm; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmServiceImpl.java b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmServiceImpl.java index e7cceefe..704f2b0f 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmServiceImpl.java @@ -214,12 +214,13 @@ public class PgrCmmServiceImpl implements PgrCmmService { , p_adrHstryMgrSeq //, String p_adrHstryMgrSeq , "I" //, String p_useCd I/U/UI/II/RE , "ADR_CLOSE_DOC" //, String p_tableName - , " WHERE 1=1 AND adr_seq='"+closeVO.getAdrSeq() - +" AND adr_sn='"+closeVO.getAdrSn() - +" AND close_doc_ty='"+closeVO.getCloseDocTy() - +" AND close_doc='"+closeVO.getCloseDoc() - +"' " //, String p_updateQuery - + , " WHERE 1=1 " + + " AND adr_seq='"+closeVO.getAdrSeq()+"'" + +" AND adr_sn='"+closeVO.getAdrSn()+"'" + +" AND close_doc_ty='"+closeVO.getCloseDocTy()+"'" + +" AND close_doc='"+closeVO.getCloseDoc()+"'" + +" " //, String p_updateQuery + ); //adr_hstry_mgr에 값 넣기 - 끝 } diff --git a/src/main/java/kcc/kccadr/adjReqMgrOff/web/AdjReqMgrOffLineController.java b/src/main/java/kcc/kccadr/adjReqMgrOff/web/AdjReqMgrOffLineController.java index fd99cb61..626ead67 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrOff/web/AdjReqMgrOffLineController.java +++ b/src/main/java/kcc/kccadr/adjReqMgrOff/web/AdjReqMgrOffLineController.java @@ -681,6 +681,64 @@ public class AdjReqMgrOffLineController { */ } + //결재선 tree 리스트 정보 가져오기 - 502030 + @RequestMapping("/kccadr/adjReqMgOff/adjReqMgrOffAppReqPop502030Ajax.do") + public void adjReqMgrOffAppReqPop502030Ajax( + @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")); + + //1depth로 사용자 정보 가져오기 + List resultList = null; + + CmmnDetailCodeVO topCmmnDetailCodeVO = new CmmnDetailCodeVO(); + topCmmnDetailCodeVO.setParent("#"); + topCmmnDetailCodeVO.setId("0"); + + if ("CC401".equals(searchVO.getId())) { + topCmmnDetailCodeVO.setText("직급별"); + resultList = cmmnDetailCodeManageService.selectCmmnDetailCodeListWithPerson502030(searchVO) ; + System.out.println("직급별"); + + //조정부장 복호화 할것. + for (int i=0;i selectPagingList(AdrSbmtLineMgrUsrVO vo) throws Exception; - //L-기본결재선 + //L-기본결재선203040 AdrSbmtLineMgrUsrVO selectDefault(AdrSbmtLineMgrUsrVO vo) throws Exception; + //502030 + AdrSbmtLineMgrUsrVO selectDefault502030(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 029ba23e..44d4017e 100644 --- a/src/main/java/kcc/kccadr/advcSbmt/service/AdrSbmtLineMgrUsrVO.java +++ b/src/main/java/kcc/kccadr/advcSbmt/service/AdrSbmtLineMgrUsrVO.java @@ -61,6 +61,10 @@ public class AdrSbmtLineMgrUsrVO extends ComDefaultVO implements Serializable { private String step; //'결재진행단계', + private String memName1; //'결재자1-조정부장이름', + private String memName2; //'결재자2-조정부장이름', + private String memName3; //'결재자3-조정부장이름', + public String getRegisterId() { return registerId; } @@ -301,4 +305,22 @@ public class AdrSbmtLineMgrUsrVO extends ComDefaultVO implements Serializable { public void setStep(String step) { this.step = step; } + public String getMemName1() { + return memName1; + } + public void setMemName1(String memName1) { + this.memName1 = memName1; + } + public String getMemName2() { + return memName2; + } + public void setMemName2(String memName2) { + this.memName2 = memName2; + } + public String getMemName3() { + return memName3; + } + public void setMemName3(String memName3) { + this.memName3 = memName3; + } } 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 2f2e60bb..fe684c29 100644 --- a/src/main/java/kcc/kccadr/advcSbmt/service/impl/AdrSbmtLineMgrUsrDAO.java +++ b/src/main/java/kcc/kccadr/advcSbmt/service/impl/AdrSbmtLineMgrUsrDAO.java @@ -181,6 +181,10 @@ public class AdrSbmtLineMgrUsrDAO extends EgovAbstractDAO { return (AdrSbmtLineMgrUsrVO) select("AdrSbmtLineMgrUsrDAO.selectDefault", VO); } + public AdrSbmtLineMgrUsrVO selectDefault502030(AdrSbmtLineMgrUsrVO VO) throws Exception { + return (AdrSbmtLineMgrUsrVO) select("AdrSbmtLineMgrUsrDAO.selectDefault502030", VO); + } + public AdrSbmtLineMgrUsrVO selectSbstt(AdrSbmtLineMgrUsrVO VO) throws Exception { return (AdrSbmtLineMgrUsrVO) select("AdrSbmtLineMgrUsrDAO.selectSbstt", VO); } 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 74930315..2777d1ed 100644 --- a/src/main/java/kcc/kccadr/advcSbmt/service/impl/AdrSbmtLineMgrUsrServiceImpl.java +++ b/src/main/java/kcc/kccadr/advcSbmt/service/impl/AdrSbmtLineMgrUsrServiceImpl.java @@ -125,6 +125,9 @@ public class AdrSbmtLineMgrUsrServiceImpl implements AdrSbmtLineMgrUsrService { public AdrSbmtLineMgrUsrVO selectDefault(AdrSbmtLineMgrUsrVO VO) throws Exception{ return adrSbmtLineMgrUsrDAO.selectDefault(VO); } + public AdrSbmtLineMgrUsrVO selectDefault502030(AdrSbmtLineMgrUsrVO VO) throws Exception{ + return adrSbmtLineMgrUsrDAO.selectDefault502030(VO); + } public AdrSbmtLineMgrUsrVO selectSbstt(AdrSbmtLineMgrUsrVO VO) throws Exception{ return adrSbmtLineMgrUsrDAO.selectSbstt(VO); diff --git a/src/main/java/kcc/kccadr/aprvl/web/AprvlMgr202210Controller.java b/src/main/java/kcc/kccadr/aprvl/web/AprvlMgr202210Controller.java index bd20bb80..a89ee580 100644 --- a/src/main/java/kcc/kccadr/aprvl/web/AprvlMgr202210Controller.java +++ b/src/main/java/kcc/kccadr/aprvl/web/AprvlMgr202210Controller.java @@ -162,6 +162,55 @@ public class AprvlMgr202210Controller { } + return modelAndView; + } + + /** + * 결재 상태 저장 1단계 + * 1.결재선 확인 + * 2.조정사건결재에 저장 + * 3.조정부 테이블에 저장 + * 4.마스터 상태값 변경 + * 5.결과 통보 + */ + @RequestMapping(value="/kccadr/aprvlMgr202210/aprvl/saveDefaultAprvl502030Step1Ajax.do") + public ModelAndView saveDefaultAprvl502030Step1Ajax( + 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.setSbmtTyCd("000000");//000000-공통으로 관리 한다. + + adrSbmtLineMgrUsrService.insert( + adrSbmtLineMgrUsrVO + , "관리자>>결재선>기본결재선등록" //String p_code_desc - CC199 + , "A001" //String p_stat_cd + , "" + ); + + + modelAndView.addObject("status", "success"); + }catch(Exception ex) { + modelAndView.addObject("status", "fail"); + modelAndView.addObject("message", "기본 결재선 생성 실패.-step0"); + + } + + return modelAndView; } @@ -506,6 +555,98 @@ public class AprvlMgr202210Controller { } + //결재선 tree 기본결재선 가져오기 - 502030 : 조정부장 + @RequestMapping("/kccadr/aprvlMgr202210/advcAprvlReqDefaultLoad502030Ajax.do") + public ModelAndView advcAprvlReqDefaultLoad502030Ajax( + 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.selectDefault502030(adrSbmtLineMgrUsrVO); + + //조정부장인 경우 이름 처리를 한다. + if ("".equals(resultData.getUserNm1()) || resultData.getUserNm1()==null) { + resultData.setUserNm1(egovCryptoUtil.decrypt(resultData.getMemName1())); + } + + + 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( + 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.selectDefault502030(adrSbmtLineMgrUsrVO); + + //조정부장인 경우 이름 처리를 한다. + if ("".equals(resultData.getUserNm1()) || resultData.getUserNm1()==null) { + resultData.setUserNm1(egovCryptoUtil.decrypt(resultData.getMemName1())); + } + + + 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 대결자 정보 가져오기 @RequestMapping("/kccadr/aprvlMgr202210/advcSbsttAprvlReqDefaultLoadAjax.do") public ModelAndView advcSbsttAprvlReqDefaultLoadAjax( 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 a9dc6468..85712c7c 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,9 +92,16 @@ public interface EgovCcmCmmnDetailCodeManageService { List selectCmmnDetailCodeListWithCodeDept(CmmnDetailCodeVO searchVO) throws Exception; + //직급별 tree 생성을 위한 리스트들 + //203040 List selectCmmnDetailCodeListWithPerson(CmmnDetailCodeVO searchVO) throws Exception; + //502030 : 50-조정부장 + List selectCmmnDetailCodeListWithPerson502030(CmmnDetailCodeVO searchVO) throws Exception; + //부서별 tree 생성을 위한 리스트들 List selectCmmnDetailCodeListWithPersonDept(CmmnDetailCodeVO searchVO) throws Exception; + //502030 : 50-조정부장 + List selectCmmnDetailCodeListWithPerson502030Dept(CmmnDetailCodeVO searchVO) throws Exception; void updateCmmnDetailCodePk(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 959f1f02..51a6a357 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 @@ -143,11 +143,21 @@ public class CmmnDetailCodeManageDAO extends EgovAbstractDAO { return (List) list("CmmnDetailCodeManageDAO.selectCmmnDetailCodeListWithPerson", searchVO); } + @SuppressWarnings("unchecked") + public List selectCmmnDetailCodeListWithPerson502030(CmmnDetailCodeVO searchVO) throws Exception{ + return (List) list("CmmnDetailCodeManageDAO.selectCmmnDetailCodeListWithPerson502030", searchVO); + } + @SuppressWarnings("unchecked") public List selectCmmnDetailCodeListWithPersonDept(CmmnDetailCodeVO searchVO) throws Exception{ return (List) list("CmmnDetailCodeManageDAO.selectCmmnDetailCodeListWithPersonDept", searchVO); } + @SuppressWarnings("unchecked") + public List selectCmmnDetailCodeListWithPerson502030Dept(CmmnDetailCodeVO searchVO) throws Exception{ + return (List) list("CmmnDetailCodeManageDAO.selectCmmnDetailCodeListWithPerson502030Dept", 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 e04753f2..e4514f62 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 @@ -152,12 +152,22 @@ public class EgovCcmCmmnDetailCodeManageServiceImpl extends EgovAbstractServiceI public List selectCmmnDetailCodeListWithPerson(CmmnDetailCodeVO searchVO) throws Exception { return cmmnDetailCodeManageDAO.selectCmmnDetailCodeListWithPerson(searchVO); } + + @Override + public List selectCmmnDetailCodeListWithPerson502030(CmmnDetailCodeVO searchVO) throws Exception { + return cmmnDetailCodeManageDAO.selectCmmnDetailCodeListWithPerson502030(searchVO); + } @Override public List selectCmmnDetailCodeListWithPersonDept(CmmnDetailCodeVO searchVO) throws Exception { return cmmnDetailCodeManageDAO.selectCmmnDetailCodeListWithPersonDept(searchVO); } + @Override + public List selectCmmnDetailCodeListWithPerson502030Dept(CmmnDetailCodeVO searchVO) throws Exception { + return cmmnDetailCodeManageDAO.selectCmmnDetailCodeListWithPerson502030Dept(searchVO); + } + @Override public void updateCmmnDetailCodePk(CmmnDetailCodeVO cmmnDetailCodeVO) throws Exception { cmmnDetailCodeManageDAO.updateCmmnDetailCodePk(cmmnDetailCodeVO); diff --git a/src/main/resources/egovframework/sqlmap/kccadr/accdnt/ai/AdjustIncident_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/accdnt/ai/AdjustIncident_SQL_Mysql.xml index f0234d51..a46af110 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/accdnt/ai/AdjustIncident_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/accdnt/ai/AdjustIncident_SQL_Mysql.xml @@ -206,6 +206,9 @@ ,DTL.APP_YN AS appYn ,DEPT.MEM_DEPT_NM AS memDeptNm ,USR.USER_NM AS adrAdmNm + + , advc.codeNm + , advc.code FROM ( SELECT ADR_SEQ @@ -264,6 +267,35 @@ ) rppl ON RS.ADR_SEQ = rppl.ADR_SEQ + LEFT OUTER JOIN ( + SELECT bb.adr_seq + , cc.code_nm codeNm + , cc.code + FROM ( + /* 이력중에 코드값이 있는 최근 값을 필터링한다. */ + SELECT b.adr_seq, MAX(adr_hstry_mgr_seq) adr_hstry_mgr_seq + FROM ADR_MGR_MASTER a + , adr_hstry_mgr b + , lettccmmndetailcode c + WHERE a.adr_seq=b.adr_seq + AND b.menu_id=c.code + AND length(b.menu_id)=6 + AND c.code_id='CC013' + GROUP BY b.adr_seq + + )aa + , adr_hstry_mgr bb + , lettccmmndetailcode cc + WHERE 1=1 + AND aa.adr_seq=bb.adr_seq + AND aa.adr_hstry_mgr_seq=bb.adr_hstry_mgr_seq + AND cc.code_id='CC013' + AND bb.menu_id=cc.code + ) advc + ON RS.ADR_SEQ = advc.ADR_SEQ + + + WHERE 1=1 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 8e50c590..bf232175 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 @@ -361,10 +361,10 @@ IF(MAX(sbmt_line_cnt)>=6,'A',NULL) AS sbmtYn6 , NULL AS sbmtDe6 , NOW() AS frstRegistPnttm , - 'USRCNFRM_00000002060' AS frstRegisterId , + #frstRegisterId# AS frstRegisterId , NULL AS lastUpdtPnttm , NULL AS lastUpdusrId - FROM ( SELECT 'ADR_0000000000003231' adr_seq , + FROM ( SELECT #adrSeq# adr_seq , '1' adr_sn , cc.* , CONCAT( IF(num=1, IF(sbmt_grade_cd1='10', IFNULL(usr_101050, bb.sbmt_id) , bb.sbmt_id),'' ) , IF(num=2, IF(sbmt_grade_cd2='10', IFNULL(usr_101050, bb.sbmt_id) , bb.sbmt_id),'' ) , IF(num=3, IF(sbmt_grade_cd3='10', IFNULL(usr_101050, bb.sbmt_id) , bb.sbmt_id),'' ) , IF(num=4, IF(sbmt_grade_cd4='10', IFNULL(usr_101050, bb.sbmt_id) , bb.sbmt_id),'' ) , IF(num=5, IF(sbmt_grade_cd5='10', IFNULL(usr_101050, bb.sbmt_id) , bb.sbmt_id),'' ) , IF(num=6, IF(sbmt_grade_cd6='10', IFNULL(usr_101050, bb.sbmt_id) , bb.sbmt_id),'' ) ) sbmt_id @@ -445,8 +445,8 @@ adr_mem_dept_mgr b , adr_mem_dept_map c , adr_mem_mgr d - WHERE a.adr_seq ='ADR_0000000000003231' - AND a.adr_sn ='1' + WHERE a.adr_seq =#adrSeq# + AND a.adr_sn =#adrSn# AND a.mem_dept_seq=b.mem_dept_seq AND b.mem_dept_seq=c.mem_dept_seq AND c.mem_grade ='01' @@ -494,14 +494,14 @@ , ( SELECT IFNULL(MAX(sbmt_seq),0)+1 sbmt_seq FROM adr_sbmt_mgr - WHERE adr_seq='ADR_0000000000003231' + WHERE adr_seq=#adrSeq# AND adr_sn ='1' ) dd LEFT OUTER JOIN ( SELECT MAX(last_updusr_id) usr_101050 FROM adr_hstry a - WHERE adr_seq='ADR_0000000000003231' + WHERE adr_seq=#adrSeq# AND stat_cd='101050' ) ee @@ -552,6 +552,316 @@ + + + - + + + + + UPDATE LETTCCMMNDETAILCODE SET CODE_NM = #codeNm# diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp index d6e5c11a..b78cdedc 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp @@ -302,9 +302,32 @@ $(document).ready(function(){ pop.sbmtTyCd.value=param; //commonPopWindowopenForm("/kccadr/adjReqMgOff/popup/adjReqMgrOffAppReqPop.do", '1000', '700', "entInfoPop", $('#pop')); - commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop.do", '1000', '700', "entInfoPop", $('#pop')); + if (param=='201010'){ //20, 30, 40 + commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop.do", '1000', '700', "entInfoPop", $('#pop')); + //commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop502030.do", '1000', '700', "entInfoPop502030", $('#pop')); + + }else if (param=='202010'){ //30 + commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop30.do", '1000', '700', "entInfoPop30", $('#pop')); + + }else if (param=='204010' + || param=='205010' + || param=='302010' + || param=='303010' + || param=='304010' + || param=='305010' + || param=='306010' + || param=='307010' + ){ //50 + //204010, 307010, 305010, 304010, 303010, 306010, 302010, 205010 + commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop50.do", '1000', '700', "entInfoPop50", $('#pop')); + + }else if (param=='309010'){ //50, 20, 30 + commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop502030.do", '1000', '700', "entInfoPop502030", $('#pop')); + + } } + /* 워크플로우 */ $(function(){ $(".work_flow_wrap .btn_open").click(function(){ @@ -459,6 +482,7 @@ $(document).ready(function(){ + @@ -677,6 +701,7 @@ $(document).ready(function(){ || info.statCd== KccadrConstants.ADR_CLOSE_RETN }"> + @@ -704,6 +729,7 @@ $(document).ready(function(){ + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab2.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab2.jsp index 126479b2..1fef5ad5 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab2.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab2.jsp @@ -186,11 +186,33 @@ function fncCancelDo(p_a, p_b){ - + - + @@ -239,7 +261,7 @@ function fncCancelDo(p_a, p_b){

- 되돌리기 + 되돌리기${list.menuId} diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/chd/chdReg.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/chd/chdReg.jsp index 7b448977..9aff40ee 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/chd/chdReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/chd/chdReg.jsp @@ -186,6 +186,38 @@ }); } + //결재선 팝업 - 고도화 + function fnc_aprvl_pop(param){ + var pop = document.pop; + pop.sbmtTyCd.value=param; + + //commonPopWindowopenForm("/kccadr/adjReqMgOff/popup/adjReqMgrOffAppReqPop.do", '1000', '700', "entInfoPop", $('#pop')); + + if (param=='201010'){ //20, 30, 40 + commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop.do", '1000', '700', "entInfoPop", $('#pop')); + //commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop502030.do", '1000', '700', "entInfoPop502030", $('#pop')); + + }else if (param=='202010'){ //30 + commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop30.do", '1000', '700', "entInfoPop30", $('#pop')); + + }else if (param=='204010' + || param=='205010' + || param=='302010' + || param=='303010' + || param=='304010' + || param=='305010' + || param=='306010' + || param=='307010' + ){ //50 + //204010, 307010, 305010, 304010, 303010, 306010, 302010, 205010 + commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop50.do", '1000', '700', "entInfoPop50", $('#pop')); + + }else if (param=='309010'){ //50, 20, 30 + commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop502030.do", '1000', '700', "entInfoPop502030", $('#pop')); + + } + } + //기일통지서제출 일자 업데이트 처리해주기 function updtDntSbmt(){ @@ -261,6 +293,16 @@ + +

+ " /> + " /> + " /> + + + + +
" /> @@ -439,6 +481,7 @@ + <%-- 기일변경 통지서 등록화면이라서 송달정보 입력은 주석처리했음 20220126 --%> diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp index 15e4dca5..bbc1daec 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp @@ -224,6 +224,38 @@ }); } + //결재선 팝업 - 고도화 + function fnc_aprvl_pop(param){ + var pop = document.pop; + pop.sbmtTyCd.value=param; + + //commonPopWindowopenForm("/kccadr/adjReqMgOff/popup/adjReqMgrOffAppReqPop.do", '1000', '700', "entInfoPop", $('#pop')); + + if (param=='201010'){ //20, 30, 40 + commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop.do", '1000', '700', "entInfoPop", $('#pop')); + //commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop502030.do", '1000', '700', "entInfoPop502030", $('#pop')); + + }else if (param=='202010'){ //30 + commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop30.do", '1000', '700', "entInfoPop30", $('#pop')); + + }else if (param=='204010' + || param=='205010' + || param=='302010' + || param=='303010' + || param=='304010' + || param=='305010' + || param=='306010' + || param=='307010' + ){ //50 + //204010, 307010, 305010, 304010, 303010, 306010, 302010, 205010 + commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop50.do", '1000', '700', "entInfoPop50", $('#pop')); + + }else if (param=='309010'){ //50, 20, 30 + commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop502030.do", '1000', '700', "entInfoPop502030", $('#pop')); + + } + } + function fncPrint() { var form = document.listForm; @@ -339,6 +371,17 @@ + + + " /> + " /> + " /> + + + + +
+
" /> @@ -612,6 +655,7 @@ || info.statCd== KccadrConstants.ADR_APP_ADD || info.statCd== KccadrConstants.ADR_APP_CHG_APPR}"> + 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 782ee823..95d29f36 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 @@ -1019,7 +1019,7 @@
<%-- 대결버튼은 현재 결재자 이거나 최고관리자인 경우만 나타나게 --%> - + @@ -1060,7 +1060,8 @@
<%-- 최고관리자의 경우 결재, 반려 버튼 미노출 --%> + }"> + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageEndDetail.jsp index 050bea92..4090b8ea 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageEndDetail.jsp @@ -725,6 +725,16 @@ }); } + + function fnc_sbstt_aprvl_pop(param){ + //commonPopWindowopenForm("/kccadr/adjReqMgOff/popup/adjReqMgrOffAppReqPop.do", '1000', '700', "entInfoPop", $('#pop')); + var detailForm = document.detailForm; + commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcSbsttAprvlReqPop.do", '1000', '700', "sbsttInfoPop", $('#detailForm')); + + //var detailForm = document.detailForm; + //commonPopWindowopenForm("/kccadr/adjPgrMgr/apm/popup/adrDetailPop.do", "840", "800", "adrDetailPop", $('#detailForm')); + + } + + + + +○○○ 결재 요청 + + + + + + + + + + + + + + + + "/> + "/> + "/> + + + + + + +
+
+
+ +
+ +
+
+
+ + +
+ +
+
+
    + +
  • +
    부서장
    +
    +
    + +
    +
    +
    +
    결재자
    +
    + 결재자1 +
    + + +
    +
    +
    +
    +
    +
    • + +
+
+
+
+ + + +
+
+
+ + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop50.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop50.jsp new file mode 100644 index 00000000..a3c20d79 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop50.jsp @@ -0,0 +1,1092 @@ + +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> + + + + + + + + + +○○○ 결재 요청 + + + +
+ + + + + + + + + + + + "/> + "/> + "/> + + + + + +
+
+
+
+ +
+ +
+
+
+ + +
+ +
+
+
    + +
  • +
    조정부장
    +
    +
    + +
    +
    +
    +
    결재자
    +
    + 결재자1 +
    + + +
    +
    +
    +
    +
    +
    • + +
+
+
+
+ + + + + +
+
+
+ + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop502030.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop502030.jsp new file mode 100644 index 00000000..acc511b4 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop502030.jsp @@ -0,0 +1,1110 @@ + +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> + + + + + + + + + +○○○ 결재 요청 + + + +
+ + + + + + + + + + + + "/> + "/> + "/> + + + + + +
+
+
+
+ +
+ +
+
+
+ + +
+ +
+
+
    +
  • +
    조정부장
    +
    +
    + +
    +
    +
    +
    결재자
    +
    + 결재자1 +
    + + +
    +
    +
    +
    +
    +
    • +
  • +
    팀장
    +
    +
    + +
    +
    +
    +
    결재자
    +
    + 결재자2 +
    + + +
    +
    +
    +
    +
    +
    • +
  • +
    부서장
    +
    +
    + +
    +
    +
    +
    결재자
    +
    + 결재자3 +
    + + +
    +
    +
    +
    +
    +
    • + + + +
+
+
+
+ + + +
+
+
+ + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcSbsttAprvlReqPop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcSbsttAprvlReqPop.jsp index 8cd0af0c..60577c12 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcSbsttAprvlReqPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcSbsttAprvlReqPop.jsp @@ -42,7 +42,8 @@ function jstreeInit() { "check_callback" : true, "themes" : { "stripes" : true }, "data" : { - "url" : "", + //"url" : "", + "url" : "", "dataType" : "json", "data" : function (node) { console.log("node.id :: " + node.id); @@ -900,8 +901,8 @@ function fn_save_menuInfo() { dataType:'json', success : function(returnData, status) { if (returnData.status == "success") { - //alert("대결자가 지정되었습니다."); - alert("결투가 신청되었습니다."); + alert("대결자가 지정되었습니다."); + //alert("결투가 신청되었습니다."); top.window.opener.parent.location.reload(); fncGoClose(); diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentList.jsp index 2cc4b070..4fd81722 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentList.jsp @@ -184,14 +184,14 @@ - - - + + - - - - + + + + + @@ -305,7 +305,21 @@ -

+

+ + + + ${list.codeNm} + + + + + + + + + +