From fc474aec1d8cdb5eac62ecdeb00de553e23708e1 Mon Sep 17 00:00:00 2001 From: LJH Date: Fri, 11 Nov 2022 18:12:13 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EC=A0=84?= =?UTF-8?q?=EC=9E=90=EC=A1=B0=EC=A0=95=EC=8B=9C=EC=8A=A4=ED=85=9C=20?= =?UTF-8?q?=EA=B3=A0=EB=8F=84=ED=99=94=20=EC=BB=A4=EB=B0=8B=20=20-=20?= =?UTF-8?q?=EC=A1=B0=EC=A0=95=EB=B6=80=EC=9E=A5=20=EB=8C=80=EC=84=9D=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adjPgrMgr/apm/web/ApmController.java | 3 +- .../adjPgrMgr/cmm/service/PgrCmmVO.java | 12 ++++ .../adjPgrMgr/drt/web/DrtController.java | 56 ++++++++++++++++--- .../kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml | 35 +++++++++--- .../jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp | 6 +- .../jsp/kccadr/adjPgrMgr/drt/drtReg.jsp | 6 +- 6 files changed, 100 insertions(+), 18 deletions(-) diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java index 43fdcaf7..6074a3c1 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java @@ -281,11 +281,12 @@ public class ApmController { cmmVO.setLastIndex(paginationInfo.getLastRecordIndex()); cmmVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); + cmmVO.setReqOlCdPst("2"); + paginationInfo.setTotalRecordCount(cmmService.selectPgrCmmListCnt(cmmVO)); model.addAttribute("paginationInfo", paginationInfo); // reqOlCdPst 값이 있으면 과거사건 조회하지 않음 - cmmVO.setReqOlCdPst("2"); model.addAttribute("list", cmmService.selectPgrCmmList(cmmVO)); diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java index 28a78bab..0e070406 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java @@ -131,6 +131,8 @@ public class PgrCmmVO extends ComDefaultVO implements Serializable { private String assSeq0; private String assSeq1; private String assSeq2; + + private String assSeq2SelectYn; private String addUsrNm0; private String addUsrNm1; @@ -1154,6 +1156,16 @@ public class PgrCmmVO extends ComDefaultVO implements Serializable { public void setReqOlCdPst(String reqOlCdPst) { this.reqOlCdPst = reqOlCdPst; } + + public String getAssSeq2SelectYn() { + return assSeq2SelectYn; + } + + public void setAssSeq2SelectYn(String assSeq2SelectYn) { + this.assSeq2SelectYn = assSeq2SelectYn; + } + + diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/drt/web/DrtController.java b/src/main/java/kcc/kccadr/adjPgrMgr/drt/web/DrtController.java index b217395a..1e8f27ec 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/drt/web/DrtController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/drt/web/DrtController.java @@ -12,6 +12,7 @@ import org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; @@ -37,6 +38,7 @@ import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmVO; import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoService; import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoVO; import kcc.kccadr.adjPgrMgr.dnt.service.DntService; +import kcc.kccadr.adjPgrMgr.dnt.service.DntVO; import kcc.kccadr.adjPgrMgr.drt.service.AgntVO; import kcc.kccadr.adjPgrMgr.drt.service.AssVO; import kcc.kccadr.adjPgrMgr.drt.service.DrtService; @@ -112,6 +114,10 @@ public class DrtController { @Resource(name = "egovCryptoUtil") private EgovCryptoUtil egovCryptoUtil; + + //조정사건 이력관리 일련번호 + @Resource(name="adrHstryMgrSeqGnrService") + private EgovIdGnrService adrHstryMgrSeqGnrService; // 실서버 개발서버 구분 private static String islocal; // /pdf/out/ @@ -129,6 +135,9 @@ public class DrtController { @RequestMapping(value = "drtReg.do") public String drtReg(PgrCmmVO cmmVO, DrtVO drtVO, ModelMap model) throws Exception { + //조정부장 ass_seq select 여부 + cmmVO.setAssSeq2SelectYn("Y"); + // drtService.selectAssList(cmmVO); //수정용 List assList = drtService.selectAssRegList(drtVO); model.addAttribute("assList", assList); @@ -243,7 +252,6 @@ public class DrtController { drtVO.setFrstRegisterId(userId); drtVO.setLastUpdusrId(userId); - /* String statCd = KccadrConstants.ADR_KJOSU_APPR_COMP; // = "302050"; // 기일조서 결재완료 @@ -264,11 +272,21 @@ public class DrtController { , "" ); + ///이력관리를 위한 adr_hstry_mgr_detail - 2022-09-07 controller #1 + String s_adrHstryMgrSeq = adrHstryMgrSeqGnrService.getNextStringId(); + + DntVO dntVO = new DntVO(); + BeanUtils.copyProperties(drtVO, dntVO); //대석 등록 - dntService.updateDistribution2(drtVO + /*dntService.updateDistribution2(dntVO , "사용자>>나의사건관리>조정진행 상황>조정진행 상세>조정대리신청-수정" //String p_code_desc - CC199 - , "A450" //String p_stat_cd + , "A450" //String p_stat_cd + );*/ + dntService.updateDistribution(dntVO + , "사용자>>나의사건관리>조정진행 상황>조정진행 상세>조정대리신청-수정" //String p_code_desc - CC199 + , "A450" //String p_stat_cd + , s_adrHstryMgrSeq ); /* @@ -300,6 +318,9 @@ public class DrtController { @RequestMapping(value = "drtDetail.do") public String drtDetail(PgrCmmVO cmmVO, DrtVO drtVO, ModelMap model) throws Exception { + //조정부장 ass_seq select 여부 + cmmVO.setAssSeq2SelectYn("Y"); + List assList = drtService.selectAssList(drtVO); PgrCmmVO info = cmmService.selectPgrCmm(cmmVO); @@ -356,11 +377,30 @@ public class DrtController { , "" ); - //대석 등록 - dntService.updateDistribution2(drtVO - , "사용자>>나의사건관리>조정진행 상황>조정진행 상세>조정대리신청-수정" //String p_code_desc - CC199 - , "A450" //String p_stat_cd - ); +// //대석 등록 +// dntService.updateDistribution2(drtVO +// , "사용자>>나의사건관리>조정진행 상황>조정진행 상세>조정대리신청-수정" //String p_code_desc - CC199 +// , "A450" //String p_stat_cd +// ); + + + ///이력관리를 위한 adr_hstry_mgr_detail - 2022-09-07 controller #1 + String s_adrHstryMgrSeq = adrHstryMgrSeqGnrService.getNextStringId(); + + DntVO dntVO = new DntVO(); + BeanUtils.copyProperties(drtVO, dntVO); + + //대석 등록 + /*dntService.updateDistribution2(dntVO + , "사용자>>나의사건관리>조정진행 상황>조정진행 상세>조정대리신청-수정" //String p_code_desc - CC199 + , "A450" //String p_stat_cd + );*/ + dntService.updateDistribution(dntVO + , "사용자>>나의사건관리>조정진행 상황>조정진행 상세>조정대리신청-수정" //String p_code_desc - CC199 + , "A450" //String p_stat_cd + , s_adrHstryMgrSeq + ); + modelAndView.addObject("result", "success"); diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml index 947a7e4f..d7b646bf 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml @@ -153,10 +153,24 @@ , D.MEM_DEPT_SEQ AS memDeptSeq /* 조정부 */ , DM.MEM_DEPT_NM AS memDeptNm /* 조정부명 */ - , DMN.MEM_NAME AS memName /* 조정부장명 */ - , DMN.MEM_SEQ AS memSeq /* 조정부장 일련번호*/ - - + , ( SELECT AMM.MEM_NAME SEPARATOR + FROM ADR_ASS_MGR S1 + LEFT JOIN ADR_MEM_MGR AMM + ON S1.ADD_USR_ID = AMM.MEM_SEQ + WHERE S1.ADR_SEQ = M.ADR_SEQ + AND S1.ADR_SN = '1' + AND S1.ASS_USR_TY = '01' + LIMIT 1 + ) AS memName /* 조정부장명 */ + , ( SELECT AMM.MEM_SEQ SEPARATOR + FROM ADR_ASS_MGR S1 + LEFT JOIN ADR_MEM_MGR AMM + ON S1.ADD_USR_ID = AMM.MEM_SEQ + WHERE S1.ADR_SEQ = M.ADR_SEQ + AND S1.ADR_SN = '1' + AND S1.ASS_USR_TY = '01' + LIMIT 1 + ) AS memSeq /* 조정부장 일련번호*/ , ( SELECT GROUP_CONCAT ( AMM.MEM_NAME SEPARATOR ', ' ) FROM ADR_ASS_MGR S1 LEFT JOIN ADR_MEM_MGR AMM ON S1.ADD_USR_ID = AMM.MEM_SEQ @@ -183,9 +197,16 @@ AND S1.ASS_USR_TY = '02' GROUP BY S1.ADR_SEQ, ADR_SN ORDER BY S1.ADD_USR_ID ) AS assSeqes /* 조정위원들배석일련벉호 */ - - - + , ( SELECT NVL(S1.ASS_SEQ, '') + FROM ADR_ASS_MGR S1 + LEFT JOIN ADR_MEM_MGR AMM + ON S1.ADD_USR_ID = AMM.MEM_SEQ + WHERE S1.ADR_SEQ = M.ADR_SEQ + AND S1.ADR_SN = '1' + AND S1.ASS_USR_TY = '01' + limit 1 + ) AS assSeq2 + /* 조정부장일련번호 */ , D.ADR_ADM_ID AS adrAdmId /* 조정조사관ID */ , AU.USER_NM AS adrAdmNm /* 조정조사관명 */ , AU.OFFM_TELNO AS adrAdmOffmTel /* 조정조사관 내선번호 */ diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp index cdbc3417..1b8613f8 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp @@ -701,7 +701,11 @@ 조정부장 - +<%-- --%> +   + + + <%-- diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtReg.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtReg.jsp index 3db92c69..f9048be0 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtReg.jsp @@ -507,7 +507,11 @@ 조정부장 - +<%-- --%> +   + + + <%--