From 762d39ff8b83fd4605d7bc61a5abf9b806264ee1 Mon Sep 17 00:00:00 2001 From: myname Date: Tue, 30 Jan 2024 15:57:34 +0900 Subject: [PATCH] =?UTF-8?q?2024-01-30=2015:37=20=EA=B8=B0=EC=86=8C=20?= =?UTF-8?q?=EC=9C=A0=EC=98=88=20=EA=B0=9C=EC=84=A0=20=EC=82=AC=ED=95=AD=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trgtMng/web/CndtnTrgtMngController.java | 54 ++++++--- .../jsp/oprtn/cndtnSspnIdtmt/trgtDetail.jsp | 107 ++++++++++++++++- .../jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp | 22 +++- .../oprtn/cndtnSspnIdtmt/trgtMngDetail.jsp | 108 +++++++++++++++++- .../jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp | 3 +- .../WEB-INF/jsp/web/my/myPageDashBoard.jsp | 2 +- .../exprnClsrmInfo/exprnClsrmAplctReg.jsp | 2 +- 7 files changed, 274 insertions(+), 24 deletions(-) diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java index 10fffa86..7c262c27 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java @@ -1175,15 +1175,12 @@ public class CndtnTrgtMngController { cndtnTrgtInfoMngVOList = cndtnTrgtInfoMngService.selectPagingList(cndtnTrgtInfoMngVO); } */ - List cndtnTrgtInfoMngVOList = this._getMergeSearchList(model, cndtnTrgtInfoMngVO); - - System.out.println("=========================================="); - //복호화 - cndtnTrgtInfoMngVOList = egovCryptoUtil.decryptCndtnTrgtMngVOList(cndtnTrgtInfoMngVOList); - + List cndtnTrgtInfoMngVOList = this._getMergeSearchList(model, cndtnTrgtInfoMngVO); + System.out.println("=========================================="); //복호화 + cndtnTrgtInfoMngVOList = egovCryptoUtil.decryptCndtnTrgtMngVOList(cndtnTrgtInfoMngVOList); model.addAttribute("list", cndtnTrgtInfoMngVOList); + - //병합 대상자 리스트 /* List cndtnTrgtInfoMergeVOList = new ArrayList(); @@ -1200,11 +1197,18 @@ public class CndtnTrgtMngController { List cndtnTrgtInfoMergeVOList = this._getMergeList(cndtnTrgtInfoMngVO); //복호화 - cndtnTrgtInfoMergeVOList = egovCryptoUtil.decryptCndtnTrgtMngVOList(cndtnTrgtInfoMergeVOList); - + cndtnTrgtInfoMergeVOList = egovCryptoUtil.decryptCndtnTrgtMngVOList(cndtnTrgtInfoMergeVOList); model.addAttribute("listMerge", cndtnTrgtInfoMergeVOList); + + //상위 병합 대상자 + List cndtnTrgtInfoTopMngVOList = this._getTopMergeList(cndtnTrgtInfoMngVO); + System.out.println("=========================================="); //복호화 + cndtnTrgtInfoMngVOList = egovCryptoUtil.decryptCndtnTrgtMngVOList(cndtnTrgtInfoTopMngVOList); + model.addAttribute("listTopMerge", cndtnTrgtInfoTopMngVOList); + + return "oprtn/cndtnSspnIdtmt/trgtDetail"; } @@ -1255,14 +1259,18 @@ public class CndtnTrgtMngController { //병합 대상자 리스트 - List cndtnTrgtInfoMergeVOList = this._getMergeList(cndtnTrgtInfoMngVO); - + List cndtnTrgtInfoMergeVOList = this._getMergeList(cndtnTrgtInfoMngVO); //복호화 - cndtnTrgtInfoMergeVOList = egovCryptoUtil.decryptCndtnTrgtMngVOList(cndtnTrgtInfoMergeVOList); - + cndtnTrgtInfoMergeVOList = egovCryptoUtil.decryptCndtnTrgtMngVOList(cndtnTrgtInfoMergeVOList); model.addAttribute("listMerge", cndtnTrgtInfoMergeVOList); + //상위 병합 대상자 + List cndtnTrgtInfoTopMngVOList = this._getTopMergeList(cndtnTrgtInfoMngVO); + System.out.println("=========================================="); //복호화 + cndtnTrgtInfoMngVOList = egovCryptoUtil.decryptCndtnTrgtMngVOList(cndtnTrgtInfoTopMngVOList); + model.addAttribute("listTopMerge", cndtnTrgtInfoTopMngVOList); + return "oprtn/cndtnSspnIdtmt/trgtMngDetail"; } @@ -2199,4 +2207,24 @@ public class CndtnTrgtMngController { return cndtnTrgtInfoMergeVOList; //model.addAttribute("listMerge", cndtnTrgtInfoMergeVOList); } + + //상위 병합 대상자 + private List _getTopMergeList( + CndtnTrgtMngVO p_cndtnTrgtInfoMngVO + )throws Exception{ + //병합 대상자 리스트 + List cndtnTrgtInfoMergeVOList = new ArrayList(); + { + p_cndtnTrgtInfoMngVO.setTrgtNm(""); + + p_cndtnTrgtInfoMngVO.setFirstIndex(0); + p_cndtnTrgtInfoMngVO.setRecordCountPerPage(100000); + p_cndtnTrgtInfoMngVO.setSearchQuery(" AND a.sspn_idtmt_trgt_ord =(SELECT prcs_aplct_prd_ord_cmplt FROM vea_sspn_idmt_trgt WHERE sspn_idtmt_trgt_ord='"+p_cndtnTrgtInfoMngVO.getSspnIdtmtTrgtOrd()+"') "); + cndtnTrgtInfoMergeVOList = cndtnTrgtInfoMngService.selectPagingList(p_cndtnTrgtInfoMngVO); + + } + + return cndtnTrgtInfoMergeVOList; + //model.addAttribute("listMerge", cndtnTrgtInfoMergeVOList); + } } diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtDetail.jsp index 7dc785ea..ded0e3ff 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtDetail.jsp @@ -352,8 +352,9 @@ +
-

병합 대상자

+

하위 병합 대상자

@@ -447,14 +448,114 @@ - + + + + +
+

상위 중복자

+
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<%-- ');" style="cursor:pointer;"> --%> + +<%-- + + + + + + + + + +<%-- --%> + + + + + + + + + +
의뢰일사건번호관할청생년월일성명성별의뢰번호의뢰상태교육상태주소검사명삭제
');" style="cursor:pointer;"> --%> +<%-- --%> + + + + +<%-- --%> + + + + + + + + + + + + + + + + + + + + +<%-- ${fn:length(fullAddr)> 5 ? fn:substring(fullAddr, 0, 5).concat('...') : ''} --%> + + + + +
+
+
-

병합 대상자 검색

+

하위 병합 대상자 검색

diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp index 33171bc9..80b020f7 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp @@ -606,7 +606,14 @@ - + + style="cursor:pointer;" + + + style="cursor:pointer;background-color:lightgray;" + + > ');" style="cursor:pointer;"> + + + + ');" style="cursor:pointer;"> + + + + + 병합처리 + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngDetail.jsp index c6dc2521..9960239e 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngDetail.jsp @@ -351,8 +351,10 @@ + +
-

병합 대상자

+

하위 병합 대상자

@@ -446,14 +448,114 @@ - + + + + +
+

상위 중복자

+
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<%-- ');" style="cursor:pointer;"> --%> + +<%-- + + + + + + + + + +<%-- --%> + + + + + + + + + +
의뢰일사건번호관할청생년월일성명성별의뢰번호의뢰상태교육상태주소검사명삭제
');" style="cursor:pointer;"> --%> +<%-- --%> + + + + +<%-- --%> + + + + + + + + + + + + + + + + + + + + +<%-- ${fn:length(fullAddr)> 5 ? fn:substring(fullAddr, 0, 5).concat('...') : ''} --%> + + + + +
+
+
-

병합 대상자 검색

+

하위 병합 대상자 검색

diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp index 49753ed0..75963a48 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp @@ -582,8 +582,7 @@ 병합처리 - - + diff --git a/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp b/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp index 47d9db22..831e47b3 100644 --- a/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp @@ -150,7 +150,7 @@

운영확정 ${exprnMap['exprnIng']}건

-

교육종료 ${exprnMap['exprnEnd']}건

+

운영종료 ${exprnMap['exprnEnd']}건

 diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctReg.jsp index 78e0e9dd..7c7b3549 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctReg.jsp @@ -954,7 +954,7 @@ - + 권