From d320a5972e0762c24d1123d71ad9f24238bd84cf Mon Sep 17 00:00:00 2001 From: myname Date: Tue, 23 Jan 2024 12:14:22 +0900 Subject: [PATCH] =?UTF-8?q?2024-01-23=2012:13=20=EA=B8=B0=EC=86=8C?= =?UTF-8?q?=EC=9C=A0=EC=98=88=20=EB=8C=80=EC=83=81=EC=9E=90=20=EA=B2=80?= =?UTF-8?q?=EC=83=89=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SspnIdtmtServiceImpl.java | 3 +- .../sspnIdtmt/web/SspnIdtmtController.java | 6 ++- .../web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp | 42 +++++++++++++++++++ .../web/ve/aplct/sspnIdtmt/eduAplctList.jsp | 2 +- .../aplct/sspnIdtmt/popup/eduAplctPopList.jsp | 33 ++++++++------- .../endInfo/instrEduEndDetail.jsp | 17 ++++---- 6 files changed, 76 insertions(+), 27 deletions(-) diff --git a/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java b/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java index fbb9cf69..a7e80fc5 100644 --- a/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java +++ b/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java @@ -112,7 +112,7 @@ public class SspnIdtmtServiceImpl implements SspnIdtmtService { // // // step0.해당 계정으로 신청한 정보가 있는지 확인 하고, 있다면 동일한 정보로 신청했는지 확인 할것. CndtnTrgtMngVO cndtnTrgtMngVO = cndtnTrgtInfoMngDAO.checkSspnIdtmtNewStep0(cndtnTrgtInfoMngVO); - + /* if ("F".equals(cndtnTrgtMngVO.getResultCd())) { //해당 계정으로 신청한 정보중에 다른 개인정보(이름, 생년월일, 성별)를 사용해서 신청한 내용이 있다. result="fail"; @@ -124,6 +124,7 @@ public class SspnIdtmtServiceImpl implements SspnIdtmtService { return modelAndView; } + */ // step1.신청 가능한 대상이 있는지 찾는다. diff --git a/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java b/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java index 88500ec5..d0e04ad8 100644 --- a/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java +++ b/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java @@ -754,14 +754,16 @@ public class SspnIdtmtController { LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 - System.out.println(cndtnTrgtInfoMngVO.getUserId()); + //System.out.println(cndtnTrgtInfoMngVO.getUserId()); cndtnTrgtInfoMngVO.setUserId(loginVO.getUniqId()); - System.out.println(cndtnTrgtInfoMngVO.getUserId()); + //System.out.println(cndtnTrgtInfoMngVO.getUserId()); + /* System.out.println(cndtnTrgtInfoMngVO.getSex()); //System.out.println(cndtnTrgtInfoMngVO.getDBirth()); System.out.println(cndtnTrgtInfoMngVO.getdBirth()); System.out.println(cndtnTrgtInfoMngVO.getTrgtNm()); + */ cndtnTrgtInfoMngVO = egovCryptoUtil.encryptCndtnTrgtMngVOInfo(cndtnTrgtInfoMngVO); diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp index f29fc676..a2840f2e 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp @@ -235,6 +235,43 @@ $('#trgtNm').val(''); $('#dBirth').val(''); } + + //기소유예 신청 + function fncAplctPopup( + p_prcsAplctPrdOrd + , id //aplctOrd + , chId //chasiOrd + , p_site_id_cd //10,20,30 + , p_action //select, insert + , p_qustnrTmplatId //select, insert + , p_qestnrId //select, insert + , p_qustnrRespondId //select, insert + ) { + + paramObj = { + "prcsAplctPrdOrd": p_prcsAplctPrdOrd + ,"eduAplctOrd" : id + ,"eduChasiOrd" : chId + ,"siteIdCd" : p_site_id_cd + ,"siteId" : "60" //설문정보를 위해서 설문지의 대상값을 넣는다. VE0011 10-청소년, 20-성인,30-체험, 40-외부, 50-기반, 60-기소 + + ,"action" : p_action + + ,"qustnrTmplatId" : p_qustnrTmplatId + ,"qestnrId" : p_qestnrId + ,"qustnrRespondId" : p_qustnrRespondId + }; + + commonPopLayeropen( + //"${pageContext.request.contextPath}/web/ve/aplct/cpyrgExprnClsrm/scholInfo/popup/qustnrPopList.do" + "${pageContext.request.contextPath}/web/ve/aplct/sspnIdtmt/popup/eduAplctPopList.do" + , 800 + , 700 + , paramObj + , "Y" + , "AplctPopup" + ); + }
@@ -247,6 +284,7 @@ +
@@ -361,6 +399,10 @@
+
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp index 27345160..fffbb696 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp @@ -525,7 +525,7 @@ $(document).ready(function(){ return Math.ceil((parseInt(date.substring(6,8))+fd.getDay())/7); } - //설문 팝업 + //기소유예 신청 function fncAplctPopup( p_prcsAplctPrdOrd , id //aplctOrd diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPopList.jsp index f45cc55b..4cd28a5a 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPopList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPopList.jsp @@ -228,7 +228,7 @@ $(document).ready(function(){
-
+
@@ -274,18 +274,21 @@ $(document).ready(function(){
-
-
-
-
-
-
- -
-
+ + + +
교육대상자 확인 : 성명, 주민번호앞자리, 성별 등의 정보입력
@@ -302,11 +305,9 @@ $(document).ready(function(){ - - - +
검사명 선택
- +


diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/endInfo/instrEduEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/endInfo/instrEduEndDetail.jsp index a73502cd..d878f3aa 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/endInfo/instrEduEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/endInfo/instrEduEndDetail.jsp @@ -34,12 +34,15 @@ $( document ).ready(function() { }); - + function _goPage(){ + history.back(); + } + function linkPage(pageNo){ - var listForm = document.listForm ; - listForm.pageIndex.value = pageNo ; - listForm.action = ""; - listForm.submit(); + var list2Form = document.list2Form ; + list2Form.pageIndex.value = pageNo ; + list2Form.action = ""; + list2Form.submit(); } function eduRsltRprtRegPop(){ @@ -105,7 +108,7 @@ $( document ).ready(function() {
- + " /> " /> " /> @@ -762,7 +765,7 @@ $( document ).ready(function() {
- +