From aa7da3f72f1c0f15d71e310f5b801e722a9ac9d5 Mon Sep 17 00:00:00 2001 From: JIWOO Date: Mon, 27 Oct 2025 11:19:33 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EA=B5=90?= =?UTF-8?q?=EC=9C=A1=20=EC=B7=A8=EC=86=8C=EC=9A=94=EC=B2=AD=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC=20=EC=9E=91=EC=97=85=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/VEPrcsAplctPrdServiceImpl.java | 133 +++---- .../ve/edu/VEEdu_MIX_SQL_Postgresql.xml | 2 + .../sqlmap/ve/prcs/VEPrcs_SQL_Postgresql.xml | 17 +- .../cmdTrgt/cndtnEduPrcsAplctCfnMngDetail.jsp | 10 +- .../cndtnEduPrcsAplctCfnMngDetail.jsp | 10 +- .../prevent/cndtnEduPrcsAplctCfnMngDetail.jsp | 10 +- .../web/ve/aplct/cmdTrgt/eduAplctDetail.jsp | 5 +- .../ve/aplct/cmdTrgt/popup/eduCancelPop.jsp | 347 ++++++++++++++++++ .../aplct/cmdTrgt/sspnIdtmtEduAplctList.jsp | 8 +- .../web/ve/aplct/prevent/eduAplctDetail.jsp | 5 +- .../ve/aplct/prevent/popup/eduCancelPop.jsp | 347 ++++++++++++++++++ .../aplct/prevent/sspnIdtmtEduAplctList.jsp | 8 +- .../web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp | 5 +- .../aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp | 8 +- 14 files changed, 808 insertions(+), 107 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/popup/eduCancelPop.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/popup/eduCancelPop.jsp diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdServiceImpl.java index 9dd288e1..41b1f4fd 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdServiceImpl.java @@ -200,13 +200,11 @@ public class VEPrcsAplctPrdServiceImpl implements VEPrcsAplctPrdService { //ve_prcs_aplct_prd : 처리 없음 //ve_edu_aplct : 삭제 //vea_aplct_detail_info : 삭제 - //vea_sspn_idmt_trgt : update edu_state_cd=10,edu_aplct_ord is null + //vea_sspn_idmt_trgt : 처리 없음 VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); vEEduAplctVO.setEduAplctOrd(vEPrcsDetailVO.getEduAplctOrd()); - //vEPrcsAplctPrdDAO.delete(vEPrcsDetailVO); - vEEduAplctDAO.delete(vEEduAplctVO); vEPrcsMIXDAO.deleteAplctDetailInfo(vEPrcsDetailVO); vEPrcsMIXDAO.updateSspnIdmtTrgtCancelNew(vEPrcsDetailVO); @@ -214,75 +212,7 @@ public class VEPrcsAplctPrdServiceImpl implements VEPrcsAplctPrdService { }else if ("4".equals(vEPrcsDetailVO.getReqNo())) { //대상자 교육신청후 관리자가 반려 처리 //ve_prcs_aplct_prd : 처리 없음 - //ve_edu_aplct : update aprvl_cd=35 - //vea_aplct_detail_info : 처리 없음 - //vea_sspn_idmt_trgt : update edu_state_cd=30,req_state_cd=20 - - VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); - vEEduAplctVO.setEduAplctOrd(vEPrcsDetailVO.getEduAplctOrd()); - - //vEPrcsAplctPrdDAO.delete(vEPrcsDetailVO); - - //vEEduAplctDAO.delete(vEEduAplctVO); - vEEduAplctDAO.updateSspnIdmtTrgtCancelNew(vEPrcsDetailVO); - vEPrcsMIXDAO.updateAplctDetailInfo(vEPrcsDetailVO); - vEPrcsMIXDAO.updateSspnIdmtTrgtCancelNew(vEPrcsDetailVO); - - }else if ("6".equals(vEPrcsDetailVO.getReqNo())) { - //교육확정 - //ve_prcs_aplct_prd : 처리 없음(앞에서 처리) - //ve_edu_aplct : update aprvl_cd=60 - //vea_aplct_detail_info : 처리 없음 - //vea_sspn_idmt_trgt : update edu_state_cd=30,req_state_cd=20 - - VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); - vEEduAplctVO.setEduAplctOrd(vEPrcsDetailVO.getEduAplctOrd()); - - //vEPrcsAplctPrdDAO.delete(vEPrcsDetailVO); - - //vEEduAplctDAO.delete(vEEduAplctVO); - vEEduAplctDAO.updateSspnIdmtTrgtCancelNew(vEPrcsDetailVO); - //vEPrcsMIXDAO.updateAplctDetailInfo(vEPrcsDetailVO); - vEPrcsMIXDAO.updateSspnIdmtTrgtCancelNew(vEPrcsDetailVO); - - }else if ("6-1".equals(vEPrcsDetailVO.getReqNo())) { - //대상자 교육신청후 교육 취소 시 처리 - //ve_prcs_aplct_prd : 처리 없음 - //ve_edu_aplct : update aprvl_cd=35 - //vea_aplct_detail_info : 처리 없음 - //vea_sspn_idmt_trgt : update edu_state_cd=30,req_state_cd=20 - - VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); - vEEduAplctVO.setEduAplctOrd(vEPrcsDetailVO.getEduAplctOrd()); - - //vEPrcsAplctPrdDAO.delete(vEPrcsDetailVO); - - //vEEduAplctDAO.delete(vEEduAplctVO); - vEEduAplctDAO.updateSspnIdmtTrgtCancelNew(vEPrcsDetailVO); - //vEPrcsMIXDAO.deleteAplctDetailInfo(vEPrcsDetailVO); - vEPrcsMIXDAO.updateSspnIdmtTrgtCancelNew(vEPrcsDetailVO); - - }else if ("6-2".equals(vEPrcsDetailVO.getReqNo())) { - //대상자 교육 취소 신청 승인(취소 승인-교육종료) - //ve_prcs_aplct_prd : 처리 없음 - //ve_edu_aplct : update aprvl_cd=40 - //vea_aplct_detail_info : 처리 없음 - //vea_sspn_idmt_trgt : update edu_state_cd=60,req_state_cd=40 - - VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); - vEEduAplctVO.setEduAplctOrd(vEPrcsDetailVO.getEduAplctOrd()); - - //vEPrcsAplctPrdDAO.delete(vEPrcsDetailVO); - - //vEEduAplctDAO.delete(vEEduAplctVO); - vEEduAplctDAO.updateSspnIdmtTrgtCancelNew(vEPrcsDetailVO); - //vEPrcsMIXDAO.deleteAplctDetailInfo(vEPrcsDetailVO); - vEPrcsMIXDAO.updateSspnIdmtTrgtCancelNew(vEPrcsDetailVO); - - }else if ("6-3".equals(vEPrcsDetailVO.getReqNo())) { - //대상자 교육 취소 신청 반려(취소 반려-교육계속) - //ve_prcs_aplct_prd : 처리 없음 - //ve_edu_aplct : update aprvl_cd=60 + //ve_edu_aplct : aprvl_cd=30 //vea_aplct_detail_info : 처리 없음 //vea_sspn_idmt_trgt : 처리 없음 @@ -291,10 +221,65 @@ public class VEPrcsAplctPrdServiceImpl implements VEPrcsAplctPrdService { //vEPrcsAplctPrdDAO.delete(vEPrcsDetailVO); - //vEEduAplctDAO.delete(vEEduAplctVO); + vEEduAplctDAO.updateSspnIdmtTrgtCancelNew(vEPrcsDetailVO); + vEPrcsMIXDAO.updateSspnIdmtTrgtCancelNew(vEPrcsDetailVO); + + }else if ("6".equals(vEPrcsDetailVO.getReqNo())) { + //교육확정 + //ve_prcs_aplct_prd : 처리 없음(앞에서 처리) + //ve_edu_aplct : aprvl_cd=60 + //vea_aplct_detail_info : 처리 없음 + //vea_sspn_idmt_trgt : 처리 없음 + + VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); + vEEduAplctVO.setEduAplctOrd(vEPrcsDetailVO.getEduAplctOrd()); + + + vEEduAplctDAO.updateSspnIdmtTrgtCancelNew(vEPrcsDetailVO); + + }else if ("6-1".equals(vEPrcsDetailVO.getReqNo())) { + /* 251027 기준 - 6-1 미사용 중 */ + //대상자 교육신청후 교육 취소 요청시 처리 + //ve_prcs_aplct_prd : 처리 없음 + //ve_edu_aplct : 처리 없음 + //vea_aplct_detail_info : aplct_state_cd = 35 + //vea_sspn_idmt_trgt : 처리 없음 + + VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); + vEEduAplctVO.setEduAplctOrd(vEPrcsDetailVO.getEduAplctOrd()); + vEEduAplctDAO.updateSspnIdmtTrgtCancelNew(vEPrcsDetailVO); //vEPrcsMIXDAO.deleteAplctDetailInfo(vEPrcsDetailVO); - //vEPrcsMIXDAO.updateSspnIdmtTrgtCancelNew(vEPrcsDetailVO); + vEPrcsMIXDAO.updateSspnIdmtTrgtCancelNew(vEPrcsDetailVO); + + }else if ("6-2".equals(vEPrcsDetailVO.getReqNo())) { + //대상자 교육 취소 신청 승인(취소 승인-교육종료) + //ve_prcs_aplct_prd : 처리 없음 + //ve_edu_aplct : 처리 없음 + //vea_aplct_detail_info : aplct_state_cd 60(연기) + //vea_sspn_idmt_trgt : edu_state_cd=60(연기),req_state_cd=35(미완료) + + VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); + vEEduAplctVO.setEduAplctOrd(vEPrcsDetailVO.getEduAplctOrd()); + + //vEPrcsAplctPrdDAO.delete(vEPrcsDetailVO); + + //vEEduAplctDAO.delete(vEEduAplctVO); + //vEEduAplctDAO.updateSspnIdmtTrgtCancelNew(vEPrcsDetailVO); + vEPrcsMIXDAO.updateAplctDetailInfo(vEPrcsDetailVO); + vEPrcsMIXDAO.updateSspnIdmtTrgtCancelNew(vEPrcsDetailVO); + + }else if ("6-3".equals(vEPrcsDetailVO.getReqNo())) { + //대상자 교육 취소 신청 반려(취소 반려-교육계속) + //ve_prcs_aplct_prd : 처리 없음 + //ve_edu_aplct : 처리 없음 + //vea_aplct_detail_info : aplct_state_cd = null + //vea_sspn_idmt_trgt : 처리 없음 + + VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); + vEEduAplctVO.setEduAplctOrd(vEPrcsDetailVO.getEduAplctOrd()); + + vEPrcsMIXDAO.updateAplctDetailInfo(vEPrcsDetailVO); } return 1; diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Postgresql.xml index 206c7e9c..580d02ee 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Postgresql.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Postgresql.xml @@ -808,6 +808,8 @@ qe.QESTNR_ID AS qestnrId , /* 설문했으면 ID가 있음 */ vadi.APLCT_STATE_CD AS aplctStateCd, /* 이수 상태 */ + vadi.CNCL_CN AS cnclCn, /* 취소사유 */ + vadi.CNCL_ATCH_FILE_ID AS cnclAtchFileId, /* 취소요청파일 */ vsit.edu_state_cd AS eduStateCd, le.MBER_NM AS userNm, le.MBER_ID AS mberId, diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Postgresql.xml index 217fc8f0..79f863bb 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Postgresql.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Postgresql.xml @@ -595,7 +595,6 @@ /* 신청 후 취소 */ , user_id = NULL , edu_aplct_ord = NULL - , edu_state_cd = '10' , prcs_aplct_prd_ord_cmplt = NULL @@ -603,7 +602,6 @@ /* 신청 후 반려 */ , user_id = NULL , edu_aplct_ord = NULL - , prcs_aplct_prd_ord_cmplt = NULL @@ -622,6 +620,7 @@ /* 취소 신청 승은(교육중단) edu_state_cd=60,req_state_cd=40 */ , edu_state_cd = '60' + , req_state_cd = '35' /* , req_state_cd = '40' 의뢰상태는 교육의 취소, 확정과 관계없이 대상자의 의뢰 상태를 변경 하는것 이므로 여기서는 제외한다. */ WHERE @@ -642,12 +641,18 @@ - - + + + + /* 취소 신청 후 관리자 반려 aplct_state_cd=null */ + , aplct_state_cd = null + + + WHERE edu_aplct_ord = #eduAplctOrd# diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctCfnMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctCfnMngDetail.jsp index 8d3ad4bf..4e195f9d 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctCfnMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctCfnMngDetail.jsp @@ -845,16 +845,16 @@ - - + +

- ${list.aplctCn} + ${list.cnclCn}
- + @@ -862,7 +862,7 @@ 취소승인

- ${list.aplctCn} + ${list.cnclCn}
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp index 2ea0c479..5896fbc9 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp @@ -924,16 +924,16 @@ - - + +

- ${list.aplctCn} + ${list.cnclCn}
- + @@ -941,7 +941,7 @@ 취소승인

- ${list.aplctCn} + ${list.cnclCn}
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctCfnMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctCfnMngDetail.jsp index e10e3810..8fa0cc76 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctCfnMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctCfnMngDetail.jsp @@ -845,16 +845,16 @@ - - + +

- ${list.aplctCn} + ${list.cnclCn}
- + @@ -862,7 +862,7 @@ 취소승인

- ${list.aplctCn} + ${list.cnclCn}
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/eduAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/eduAplctDetail.jsp index a3441bd0..a3d41e13 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/eduAplctDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/eduAplctDetail.jsp @@ -565,6 +565,9 @@ + + - + @@ -608,7 +611,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/popup/eduCancelPop.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/popup/eduCancelPop.jsp new file mode 100644 index 00000000..290da886 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/popup/eduCancelPop.jsp @@ -0,0 +1,347 @@ +<%@ 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="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<% + /** + * @Class Name : eduCancelPop.jsp + * @Description : 교육취소요청 팝업 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.08.09 김봉호 최초 생성 + * @author 김봉호 + * @since 2021.08.21 + * @version 1.0 + * @see + * + */ +%> + + + " /> + " /> + " /> + " /> + + + + +
+
+

취소요청

+
+
+
+ + + + + + + + <%-- + + + --%> + + + + + +
첨부파일, 취소사유를 입력하는 표
+

첨부파일

+ 		+
+ + + + + +
+
+ + + + + + + + + + + + + + + + + +
첨부파일 리스트 : 파일명, 종류, 크기
파일 명종류크기
+

첨부하실 파일을 마우스끌어서 넣어주세요.

+
+
+ +
+
+

최대 3개

+

50MB제한

+
+
+
+

필수입력 항목*

+

취소사유

+ 		+ +
+
+ +
+
첨부파일
+
+
+ + + + + +
+
+ + + + + + + + + + + + + + + + + +
첨부파일 리스트 : 파일명, 종류, 크기
파일 명종류크기
+

첨부하실 파일을 마우스끌어서 넣어주세요.

+
+
+ +
+
+

최대 1개

+

50MB제한

+
+
+
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ + + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/sspnIdtmtEduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/sspnIdtmtEduAplctList.jsp index 1d92b0cd..35683d3b 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/sspnIdtmtEduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/sspnIdtmtEduAplctList.jsp @@ -124,9 +124,10 @@ $(document).ready(function(){ } - function fncGoDetail(prcsAplctPrdOrd){ + function fncGoDetail(prcsAplctPrdOrd, eduAplctOrd){ var viewForm = document.viewForm ; viewForm.prcsAplctPrdOrd.value = prcsAplctPrdOrd ; + viewForm.eduAplctOrd.value = eduAplctOrd ; viewForm.action = ""; viewForm.submit(); } @@ -425,6 +426,7 @@ $(document).ready(function(){
+
@@ -495,7 +497,7 @@ $(document).ready(function(){ - ');" onkeypress="if(event.keyCode == 13){fncGoDetail('');}" style="cursor:pointer;" tabindex="0"> + ', '');" onkeypress="if(event.keyCode == 13){fncGoDetail('', '');}" style="cursor:pointer;" tabindex="0"> @@ -639,7 +641,7 @@ $(document).ready(function(){ - + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/eduAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/eduAplctDetail.jsp index feb0cc9c..f76542d3 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/eduAplctDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/eduAplctDetail.jsp @@ -565,6 +565,9 @@ + + - + @@ -608,7 +611,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/popup/eduCancelPop.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/popup/eduCancelPop.jsp new file mode 100644 index 00000000..290da886 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/popup/eduCancelPop.jsp @@ -0,0 +1,347 @@ +<%@ 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="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<% + /** + * @Class Name : eduCancelPop.jsp + * @Description : 교육취소요청 팝업 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.08.09 김봉호 최초 생성 + * @author 김봉호 + * @since 2021.08.21 + * @version 1.0 + * @see + * + */ +%> + + + " /> + " /> + " /> + " /> + + + + +
+
+

취소요청

+
+
+
+ + + + + + + + <%-- + + + --%> + + + + + +
첨부파일, 취소사유를 입력하는 표
+

첨부파일

+ 		+
+ + + + + +
+
+ + + + + + + + + + + + + + + + + +
첨부파일 리스트 : 파일명, 종류, 크기
파일 명종류크기
+

첨부하실 파일을 마우스끌어서 넣어주세요.

+
+
+ +
+
+

최대 3개

+

50MB제한

+
+
+
+

필수입력 항목*

+

취소사유

+ 		+ +
+
+ +
+
첨부파일
+
+
+ + + + + +
+
+ + + + + + + + + + + + + + + + + +
첨부파일 리스트 : 파일명, 종류, 크기
파일 명종류크기
+

첨부하실 파일을 마우스끌어서 넣어주세요.

+
+
+ +
+
+

최대 1개

+

50MB제한

+
+
+
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ + + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/sspnIdtmtEduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/sspnIdtmtEduAplctList.jsp index bf67d969..6fa2b734 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/sspnIdtmtEduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/sspnIdtmtEduAplctList.jsp @@ -124,9 +124,10 @@ $(document).ready(function(){ } - function fncGoDetail(prcsAplctPrdOrd){ + function fncGoDetail(prcsAplctPrdOrd, eduAplctOrd){ var viewForm = document.viewForm ; viewForm.prcsAplctPrdOrd.value = prcsAplctPrdOrd ; + viewForm.eduAplctOrd.value = eduAplctOrd ; viewForm.action = ""; viewForm.submit(); } @@ -425,6 +426,7 @@ $(document).ready(function(){
+
@@ -495,7 +497,7 @@ $(document).ready(function(){ - ');" onkeypress="if(event.keyCode == 13){fncGoDetail('');}" style="cursor:pointer;" tabindex="0"> + ', '');" onkeypress="if(event.keyCode == 13){fncGoDetail('', '');}" style="cursor:pointer;" tabindex="0"> @@ -636,7 +638,7 @@ $(document).ready(function(){ - + 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 4b71ddf3..3087f1af 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 @@ -565,6 +565,9 @@ + + - + @@ -608,7 +611,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp index 95eca1c2..c51361d6 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp @@ -124,9 +124,10 @@ $(document).ready(function(){ } - function fncGoDetail(prcsAplctPrdOrd){ + function fncGoDetail(prcsAplctPrdOrd, eduAplctOrd){ var viewForm = document.viewForm ; viewForm.prcsAplctPrdOrd.value = prcsAplctPrdOrd ; + viewForm.eduAplctOrd.value = eduAplctOrd ; viewForm.action = ""; viewForm.submit(); } @@ -425,6 +426,7 @@ $(document).ready(function(){
+
@@ -495,7 +497,7 @@ $(document).ready(function(){ - ');" onkeypress="if(event.keyCode == 13){fncGoDetail('');}" style="cursor:pointer;" tabindex="0"> + ', '');" onkeypress="if(event.keyCode == 13){fncGoDetail('', '');}" style="cursor:pointer;" tabindex="0"> @@ -636,7 +638,7 @@ $(document).ready(function(){ - + From 5e9c5c513141f937b3d20136aaea74077b8a7552 Mon Sep 17 00:00:00 2001 From: ijunho Date: Mon, 27 Oct 2025 11:53:37 +0900 Subject: [PATCH 2/2] Merge branch 'master_tolag3' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 관리자 계정 생성 시 초기 비밀번호 교체 유도 --- src/main/java/kcc/com/cmm/LoginVO.java | 9 +++++++++ .../uat/uia/service/impl/EgovSessionMapping.java | 2 ++ .../kcc/let/uat/uia/web/EgovLoginController.java | 15 +++++++++++---- .../kcc/let/uss/umt/service/UserManageVO.java | 9 +++++++++ .../service/impl/EgovUserManageServiceImpl.java | 2 ++ .../let/uss/umt/web/EgovUserManageController.java | 9 +++++++++ .../egovframework/spring/com/context-security.xml | 2 +- .../let/uss/umt/EgovUserManage_SQL_Postgresql.xml | 7 +++++-- .../jsp/cmm/uss/umt/EgovUserSelectUpdt4Self.jsp | 4 ++++ 9 files changed, 52 insertions(+), 7 deletions(-) diff --git a/src/main/java/kcc/com/cmm/LoginVO.java b/src/main/java/kcc/com/cmm/LoginVO.java index 890c8b40..cbc0cde4 100644 --- a/src/main/java/kcc/com/cmm/LoginVO.java +++ b/src/main/java/kcc/com/cmm/LoginVO.java @@ -125,6 +125,8 @@ public class LoginVO implements Serializable{ private String mberCi; + private String joinType; + public String getId() { return id; } @@ -440,6 +442,13 @@ public class LoginVO implements Serializable{ public void setMberCi(String mberCi) { this.mberCi = mberCi; } + public String getJoinType() { + return joinType; + } + public void setJoinType(String joinType) { + this.joinType = joinType; + } + diff --git a/src/main/java/kcc/let/uat/uia/service/impl/EgovSessionMapping.java b/src/main/java/kcc/let/uat/uia/service/impl/EgovSessionMapping.java index 20f3a061..6b581dec 100644 --- a/src/main/java/kcc/let/uat/uia/service/impl/EgovSessionMapping.java +++ b/src/main/java/kcc/let/uat/uia/service/impl/EgovSessionMapping.java @@ -68,6 +68,7 @@ public class EgovSessionMapping extends EgovUsersByUsernameMapping { String strOrgnztNm = rs.getString("orgnzt_nm"); String strAuthority = rs.getString("authority"); String strMberSeq = rs.getString("mber_seq"); + String strJoinType = rs.getString("join_type"); HttpServletRequest request = ((ServletRequestAttributes) @@ -88,6 +89,7 @@ public class EgovSessionMapping extends EgovUsersByUsernameMapping { loginVO.setOrgnztNm(strOrgnztNm); loginVO.setAuthority(strAuthority); loginVO.setMembSeq(strMberSeq); + loginVO.setJoinType(strJoinType); request.getSession().setAttribute("LoginVO", loginVO); // LoginVO세션 생성 diff --git a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java index aa4b56e6..6637bf81 100644 --- a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java +++ b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java @@ -1849,11 +1849,18 @@ public class EgovLoginController { // 관리자 로그인 시 LoginVO user = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); - System.out.println("===========actionMain===========2"); - System.out.println(loginService.getUserAuth(user).getAuthority()); - System.out.println(user.getAuthority()); - if ("ROLE_ADMIN".equals(loginService.getUserAuth(user).getAuthority())) { // 수퍼관리자 경우 + String authStr = user.getAuthority(); + if( + "0".equals(user.getJoinType()) + && ("ROLE_ADMIN".equals(authStr) + || "ROLE_VISIT".equals(authStr) + || "ROLE_ADR_JRSDC".equals(authStr) + || "ROLE_ADR_KIPO".equals(authStr) + || "ROLE_ADR_PREV".equals(authStr)) + ) { //관리자 계정 생성 후 비밀번호를 한번도 변경하지 않은경우 비밀번호 변경 페이지로 이동 + return "redirect:/uss/umt/user/EgovUserSelectUpdtView4Self.do"; + } else if ("ROLE_ADMIN".equals(loginService.getUserAuth(user).getAuthority())) { // 수퍼관리자 경우 return "redirect:/cmm/main/mainPage.do"; } else if ("ROLE_USER_MANAGER".equals(user.getAuthority())) { return "redirect:/web/main/mainPage.do"; diff --git a/src/main/java/kcc/let/uss/umt/service/UserManageVO.java b/src/main/java/kcc/let/uss/umt/service/UserManageVO.java index f0c83250..3229a4b7 100644 --- a/src/main/java/kcc/let/uss/umt/service/UserManageVO.java +++ b/src/main/java/kcc/let/uss/umt/service/UserManageVO.java @@ -180,6 +180,8 @@ public class UserManageVO extends UserDefaultVO{ private String mberCi; + private String joinType; + public String getAuthorCode() { return authorCode; } @@ -723,6 +725,13 @@ public class UserManageVO extends UserDefaultVO{ public void setMberCi(String mberCi) { this.mberCi = mberCi; } + public String getJoinType() { + return joinType; + } + public void setJoinType(String joinType) { + this.joinType = joinType; + } + diff --git a/src/main/java/kcc/let/uss/umt/service/impl/EgovUserManageServiceImpl.java b/src/main/java/kcc/let/uss/umt/service/impl/EgovUserManageServiceImpl.java index 18fc3904..1fba2d71 100644 --- a/src/main/java/kcc/let/uss/umt/service/impl/EgovUserManageServiceImpl.java +++ b/src/main/java/kcc/let/uss/umt/service/impl/EgovUserManageServiceImpl.java @@ -131,6 +131,8 @@ public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implement //pass = EgovFileScrty.encryptPassword(userManageVO.getPassword(), userManageVO.getEmplyrId()); pass = EgovNewPasswordUtil.hashPassword(userManageVO.getPassword()); userManageVO.setPassword(pass); + //사용자가 비밀번호 변경해야함 + userManageVO.setJoinType("0"); }else { //관리자 이외 userManageVO.setPassword(pass); diff --git a/src/main/java/kcc/let/uss/umt/web/EgovUserManageController.java b/src/main/java/kcc/let/uss/umt/web/EgovUserManageController.java index b7d951f9..d486e5b1 100644 --- a/src/main/java/kcc/let/uss/umt/web/EgovUserManageController.java +++ b/src/main/java/kcc/let/uss/umt/web/EgovUserManageController.java @@ -57,6 +57,7 @@ import kcc.com.cmm.service.EgovFileMngService; import kcc.com.cmm.service.EgovFileMngUtil; import kcc.com.cmm.util.EgovDoubleSubmitHelper; import kcc.com.cmm.util.RedirectUrlMaker; +import kcc.com.cmm.util.StringUtil; import kcc.com.utl.fcc.service.EgovStringUtil; import kcc.let.org.service.LocVO; import kcc.let.org.service.OrgChartManageService; @@ -2482,6 +2483,14 @@ public class EgovUserManageController { p_model.addAttribute("userOneDepth", userOneDepth); p_model.addAttribute("userTwoDepth", userTwoDepth); p_model.addAttribute("orgHiddenList", orgHiddenList); + + // 계정 생성 후 비밀번호를 한번도 변경하지 않았으면 관련 메시지 노출 + if( + StringUtil.isNotEmpty(p_loginVO.getJoinType()) + && "0".equals(p_loginVO.getJoinType()) + ){ + p_model.addAttribute("message", "계정 생성 후 비밀번호를 변경하지 않았습니다. \\n비밀번호를 변경 해주시기 바랍니다."); + } }catch(Exception ex) { ex.printStackTrace(); } diff --git a/src/main/resources/egovframework/spring/com/context-security.xml b/src/main/resources/egovframework/spring/com/context-security.xml index 497cdb8a..f1501519 100644 --- a/src/main/resources/egovframework/spring/com/context-security.xml +++ b/src/main/resources/egovframework/spring/com/context-security.xml @@ -25,7 +25,7 @@ jdbcUsersByUsernameQuery="SELECT USER_ID, ESNTL_ID AS PASSWORD, 1 ENABLED, USER_NM, USER_ZIP, USER_ADRES, USER_EMAIL, USER_SE, '-' ORGNZT_ID, ESNTL_ID, '-' ORGNZT_NM, AUTHOR_CODE AS AUTHORITY - , '' AS mber_seq + , '' AS mber_seq, JOIN_TYPE AS JOIN_TYPE FROM COMVNUSERMASTER A INNER JOIN LETTNEMPLYRSCRTYESTBS B ON A.ESNTL_ID = B.SCRTY_DTRMN_TRGET_ID WHERE CONCAT(USER_SE, USER_ID) = ?" diff --git a/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Postgresql.xml index c09a453b..931b6d54 100644 --- a/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Postgresql.xml +++ b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Postgresql.xml @@ -218,7 +218,8 @@ ]]> - CRTFC_DN_VALUE ) + CRTFC_DN_VALUE, + JOIN_TYPE ) VALUES ( #uniqId# , #emplyrId# , @@ -256,7 +257,8 @@ #snsId# , #snsEmail# , - #subDn# ) + #subDn#, + #joinType# )