2024-03-14 11:22 기소 유예 수정 사항 적용

src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsAplctPrdService.java

@@ -55,6 +55,13 @@ public interface VEPrcsAplctPrdService {
 	
 	VEPrcsDetailVO selectDetailByOrd(VEPrcsDetailVO vEPrcsDetailVO) throws Exception;
 	
+	//신청정보-기소유예/기반강화
+	VEPrcsDetailVO selectAplctInfo(VEPrcsDetailVO vEPrcsDetailVO) throws Exception;
+	
+	//사용자 취소 신청 처리
+	int updateStatusChange4User(VEPrcsDetailVO vEPrcsDetailVO) throws Exception;
+	
+	
 	void updateOneColumn(VEPrcsDetailVO vEPrcsDetailVO) throws Exception;
 
 	VEPrcsDetailVO findByCnclInfo(VEPrcsDetailVO vEPrcsDetailVO);
@@ -65,6 +72,9 @@ public interface VEPrcsAplctPrdService {
 
 	void updateEtc(VEPrcsDetailVO vEPrcsDetailVO);
 	
+	//vea_aplct_detail_info 테이블의 sspn_idtmt_trgt_ord 값을 update 한다.
+	void updateSspnIdtmtTrgt(VEPrcsDetailVO vEPrcsDetailVO);
+
 	List<VEPrcsDetailVO> selectSchduleManagerList(VEPrcsDetailVO vEPrcsDetailVO);
 
 	Map<String, Object> findAllSspnldtmtDashboardCnt(VEPrcsDetailVO vEPrcsDetailVO);

src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java

@@ -221,6 +221,22 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable {
      */
     private String color;
 	
+    /*
+    private String	ddlnCd;				//교육과정상태	-	VEA004
+    private String	aprvlCd;			//교육신청상태	-	VE0003
+    private String	aplctStateCd;		//신청진행상태	-	VEA003
+    
+    private String	reqStateCd;			//의뢰상태		-	VEA005
+    private String	eduStateCd;			//교육상태		-	VEA002
+    private String	eduAplctOrd;		//교육신청순번
+    private String	prcsAplctPrdOrd;	//교육과정순번
+    private String 	sspnIdtmtTrgtOrd;	//기소대상자순번
+    */    
+    private String	reqStateCd;			//의뢰상태		-	VEA005
+    
+    private String	reqNo;				//요청번호		-	excel 참고
+    
+    
 	public String getEduPrcsOrd() {
 		return eduPrcsOrd;
 	}
@@ -1061,6 +1077,18 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable {
 	public void setColor(String color) {
 		this.color = color;
 	}
+	public String getReqStateCd() {
+		return reqStateCd;
+	}
+	public void setReqStateCd(String reqStateCd) {
+		this.reqStateCd = reqStateCd;
+	}
+	public String getReqNo() {
+		return reqNo;
+	}
+	public void setReqNo(String reqNo) {
+		this.reqNo = reqNo;
+	}
 	
 	
 }

src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdDAO.java

@@ -125,6 +125,10 @@ public class VEPrcsAplctPrdDAO extends EgovAbstractDAO {
 		return (VEPrcsDetailVO) select("VEPrcsAplctPrdDAO.selectDetailByOrd", vEPrcsDetailVO);
 	}
 
+	public VEPrcsDetailVO selectAplctInfo(VEPrcsDetailVO vEPrcsDetailVO) throws Exception {
+		return (VEPrcsDetailVO) select("VEPrcsAplctPrdDAO.selectAplctInfo", vEPrcsDetailVO);
+	}
+	
 	public VEPrcsDetailVO findByCnclInfo(VEPrcsDetailVO paramVO) {
 		return (VEPrcsDetailVO) select("VEPrcsAplctPrdDAO.findByCnclInfo", paramVO);
 	}
@@ -141,6 +145,10 @@ public class VEPrcsAplctPrdDAO extends EgovAbstractDAO {
 		update("VEPrcsAplctPrdDAO.updateEtc", vEPrcsDetailVO);
 	}
 	
+	public void updateSspnIdtmtTrgt(VEPrcsDetailVO vEPrcsDetailVO) {
+		update("VEPrcsAplctPrdDAO.updateSspnIdtmtTrgt", vEPrcsDetailVO);
+	}	
+
 	public List<VEPrcsDetailVO> selectSchduleManagerList(VEPrcsDetailVO vEPrcsDetailVO) {
 		return (List<VEPrcsDetailVO>) list("VEPrcsAplctPrdDAO.selectSchduleManagerList", vEPrcsDetailVO);
 	}

src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdServiceImpl.java

@@ -126,6 +126,10 @@ public class VEPrcsAplctPrdServiceImpl implements VEPrcsAplctPrdService {
 		return vEPrcsAplctPrdDAO.selectDetailByOrd(vEPrcsDetailVO);
 	}
 
+	public VEPrcsDetailVO selectAplctInfo(VEPrcsDetailVO vEPrcsDetailVO) throws Exception {
+		return vEPrcsAplctPrdDAO.selectAplctInfo(vEPrcsDetailVO);
+	}	
+	
 	public void updateOneColumn(VEPrcsDetailVO vEPrcsDetailVO) throws Exception {
 		vEPrcsAplctPrdDAO.update(vEPrcsDetailVO);
 	}
@@ -149,6 +153,11 @@ public class VEPrcsAplctPrdServiceImpl implements VEPrcsAplctPrdService {
 		vEPrcsAplctPrdDAO.updateEtc(vEPrcsDetailVO);
 	}
 
+	@Override
+	public void updateSspnIdtmtTrgt(VEPrcsDetailVO vEPrcsDetailVO) {
+		vEPrcsAplctPrdDAO.updateSspnIdtmtTrgt(vEPrcsDetailVO);
+	}	
+	
 	@Override
 	public List<VEPrcsDetailVO> selectSchduleManagerList(VEPrcsDetailVO vEPrcsDetailVO) {
 		return vEPrcsAplctPrdDAO.selectSchduleManagerList(vEPrcsDetailVO);
@@ -163,4 +172,11 @@ public class VEPrcsAplctPrdServiceImpl implements VEPrcsAplctPrdService {
 	public int memoUpdate(VEPrcsDetailVO vEPrcsDetailVO) throws Exception {
 		return vEPrcsAplctPrdDAO.memoUpdate(vEPrcsDetailVO);
 	}
+
+	@Override
+	public int updateStatusChange4User(VEPrcsDetailVO vEPrcsDetailVO) throws Exception {
+		return 1;
+		//return vEPrcsAplctPrdDAO.updateStatusChange4User(vEPrcsDetailVO);
+	}
+	
 }

src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java

@@ -1982,6 +1982,14 @@ public class CndtnPrcsInfoMngController {
         
 		//로그인 처리==================================== 
 		
+		
+		//사전처리 작업	시작====================================
+		//vea_aplct_detail_info 테이블에 대상자 순번 값을 넣어서 신청자가 어떤 대상자인지 매핑시킨다.
+		vEPrcsAplctPrdService.updateSspnIdtmtTrgt(vEPrcsDetailVO);
+		//사전처리 작업	끝====================================
+		
+		
+		
     	//1.pageing step1
     	PaginationInfo paginationInfo = this.setPagingStep1(vEPrcsDetailVO);
     	

src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml

@@ -167,6 +167,31 @@
 	    
 	</update>
 
+	<update id="VEPrcsAplctPrdDAO.updateSspnIdtmtTrgt" parameterClass="VEPrcsDetailVO">
+		/* VEPrcsAplctPrdDAO.updateSspnIdtmtTrgt */
+		
+		UPDATE /*+ bypass_ujvc */
+			(
+				SELECT a0.SSPN_IDTMT_TRGT_ORD
+					, b0.SSPN_IDTMT_TRGT_ORD	AS NEW_SSPN_IDTMT_TRGT_ORD
+					
+				FROM vea_aplct_detail_info a0
+					,(
+								SELECT b.USER_ID, b.EDU_APLCT_ORD , c.SSPN_IDTMT_TRGT_ORD 
+								FROM vea_aplct_detail_info a
+									, ve_edu_aplct b
+									, vea_sspn_idmt_trgt c
+								WHERE a.sspn_idtmt_trgt_ord IS NULL
+									AND a.EDU_APLCT_ORD =b.EDU_APLCT_ORD
+									AND b.EDU_APLCT_ORD =c.EDU_APLCT_ORD 	
+					)b0
+				WHERE a0.EDU_APLCT_ORD =b0.EDU_APLCT_ORD	
+				AND b0.SSPN_IDTMT_TRGT_ORD IS NOT NULL
+				)aa0
+		SET aa0.SSPN_IDTMT_TRGT_ORD = aa0.NEW_SSPN_IDTMT_TRGT_ORD
+	    
+	</update>
+		
 	<!-- 강사 정보 R -->
 	<select id="VEPrcsAplctPrdDAO.selectDetail" parameterClass="VEPrcsDetailVO" resultClass="VEPrcsDetailVO">
 		/*	VEPrcsAplctPrdDAO.selectDetail	*/
@@ -1538,6 +1563,33 @@
 		LIMIT 1
 	</select>	
 
+	<select id="VEPrcsAplctPrdDAO.selectAplctInfo" parameterClass="VEPrcsDetailVO" resultClass="VEPrcsDetailVO">
+		/*	VEPrcsAplctPrdDAO.selectAplctInfo	*/
+		
+		SELECT 
+			a.DDLN_CD 				AS	ddlnCd
+			, b.aplct_state_cd		AS	aplctStateCd
+			, c.APRVL_CD 			AS	aprvlCd
+			, d.REQ_STATE_CD 		AS	reqStateCd
+			, d.EDU_STATE_CD 		AS	eduStateCd
+			, d.EDU_APLCT_ORD 		AS	eduAplctOrd	
+			, a.PRCS_APLCT_PRD_ORD	AS	prcsAplctPrdOrd
+			, d.sspn_idtmt_trgt_ord	AS	sspnIdtmtTrgtOrd
+			
+		FROM ve_prcs_aplct_prd a
+			, vea_aplct_detail_info b
+			, ve_edu_aplct c
+			LEFT OUTER JOIN vea_sspn_idmt_trgt d 
+			on(c.EDU_APLCT_ORD=d.EDU_APLCT_ORD)
+			
+		WHERE 1=1
+			AND a.PRCS_APLCT_PRD_ORD =b.PRCS_APLCT_PRD_ORD 
+			AND b.EDU_APLCT_ORD =c.EDU_APLCT_ORD 
+			AND c.edu_aplct_ord=#eduAplctOrd#
+			AND a.prcs_aplct_prd_ord=#prcsAplctPrdOrd#		
+		
+	</select>	
+	
 	<select id="VEPrcsAplctPrdDAO.findByCnclInfo" parameterClass="VEPrcsDetailVO" resultClass="VEPrcsDetailVO">
 		/*	VEPrcsAplctPrdDAO.findByCnclInfo	*/
 		SELECT

src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngReg.jsp

@@ -100,6 +100,11 @@
 
 	function fncSave(){
 
+		if ($('#prcsCn').val().length>1000){
+			alert("상세교육과정은 1000자 까지만 저장가능합니다.");
+			return;
+		}
+		
 		var data = new FormData(document.getElementById("createForm"));
 		if(confirm("저장하시겠습니까?")){
 			var url = "${pageContext.request.contextPath}/kccadr/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctMngRegAjax.do";
@@ -201,7 +206,7 @@
 					<tr>
 						<th scope="row">과정명</th>
 						<td>
-							<input type="text" style="width:100%;" name="prcsNm"/>
+							<input type="text" style="width:100%;" name="prcsNm" maxLength="30"/>
 						</td>
 					</tr>
 					<tr>

src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp

@@ -516,11 +516,13 @@ $(document).ready(function(){
 						 ve_edu_aplct 
 						 	aprvl_cd	-	교육신청에 대한 상태
 							10	요청
+							100	찜하기
 							120	선정완료
 							140	선정취소
 							20	승인
 							230	대기
 							30	반려
+							35	취소요청
 							40	취소
 							60	교육확정
 							70	수정요청