이지우 - 시정명령 대상자 테이블 변경

src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java

@@ -103,12 +103,16 @@ public interface VEEduMIXService {
 	
 	void updateEduStateCd(VEEduAplctVO vEEduAplctVO);
 	
+	void updateCmdEduStateCd(VEEduAplctVO vEEduAplctVO);
+	
 	void updateAplctEmail(VEEduAplctVO vEEduAplctVO);
 
 	List<VEEduAplctVO> selectTrgtList(VEEduAplctVO paramVO);
 	
 	List<VEEduAplctVO> selectTrgtList4Cmplt(VEEduAplctVO paramVO);
 	
+	List<VEEduAplctVO> selectCmdTrgtList4Cmplt(VEEduAplctVO paramVO);
+	
 	//저작권 체험교실 이력 과정 목록
 	List<VEEduAplctVO> selectExprnHstryPagingList(VEEduAplctVO paramVO) throws Exception;
 	

src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java

@@ -256,9 +256,17 @@ public class VEEduMIXDAO extends EgovAbstractDAO {
 		return (List<VEEduAplctVO>) list("VEEduMIXDAO.selectTrgtList4Cmplt", paramVO);
 	}
 	
+	public List<VEEduAplctVO> selectCmdTrgtList4Cmplt(VEEduAplctVO paramVO) {
+		return (List<VEEduAplctVO>) list("VEEduMIXDAO.selectCmdTrgtList4Cmplt", paramVO);
+	}
+	
 	public void updateEduStateCd(VEEduAplctVO paramVO) {
 		update("VEEduMIXDAO.updateEduStateCd", paramVO);
 	}
+	
+	public void updateCmdEduStateCd(VEEduAplctVO paramVO) {
+		update("VEEduMIXDAO.updateCmdEduStateCd", paramVO);
+	}
 
 	public void updateAplctEmail(VEEduAplctVO paramVO) {
 		update("VEEduMIXDAO.updateAplctEmail", paramVO);

src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java

@@ -223,10 +223,20 @@ public class VEEduMIXServiceImpl implements VEEduMIXService {
 		return vEEduMIXDAO.selectTrgtList4Cmplt(paramVO);
 	}
 	
+	public List<VEEduAplctVO> selectCmdTrgtList4Cmplt(VEEduAplctVO paramVO) {
+		return vEEduMIXDAO.selectCmdTrgtList4Cmplt(paramVO);
+	}
+	
 	@Override
 	public void updateEduStateCd(VEEduAplctVO paramVO) {
 		vEEduMIXDAO.updateEduStateCd(paramVO);
 		
+	}
+	
+	@Override
+	public void updateCmdEduStateCd(VEEduAplctVO paramVO) {
+		vEEduMIXDAO.updateCmdEduStateCd(paramVO);
+		
 	}	
 	
 	@Override

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

@@ -191,6 +191,7 @@ public class VEPrcsAplctPrdServiceImpl implements VEPrcsAplctPrdService {
 		
 		
 		String s_reqNo	=	vEPrcsDetailVO.getReqNo();
+		String lctrDivCd = vEPrcsDetailVO.getLctrDivCd(); //60-기소유예 70-시정명령 80-예방교육
 		
 		if ("2-1".equals(s_reqNo)			//사용자 신청 후 취소
 				|| "3-1".equals(s_reqNo) 	//관리자 승인 후 취소
@@ -207,7 +208,12 @@ public class VEPrcsAplctPrdServiceImpl implements VEPrcsAplctPrdService {
 			
 			vEEduAplctDAO.delete(vEEduAplctVO);
 			vEPrcsMIXDAO.deleteAplctDetailInfo(vEPrcsDetailVO);									
-			vEPrcsMIXDAO.updateSspnIdmtTrgtCancelNew(vEPrcsDetailVO);
+			vEPrcsMIXDAO.updateAplctDetailInfo(vEPrcsDetailVO);				
+			if("60".equals(lctrDivCd)) {
+				vEPrcsMIXDAO.updateSspnIdmtTrgtCancelNew(vEPrcsDetailVO);
+			}else if("70".equals(lctrDivCd)) {
+				vEPrcsMIXDAO.updateCmdIdmtTrgtCancelNew(vEPrcsDetailVO);
+			}
 
 		}else if ("4".equals(vEPrcsDetailVO.getReqNo())) {
 			//대상자 교육신청후 관리자가 반려 처리 
@@ -222,7 +228,12 @@ public class VEPrcsAplctPrdServiceImpl implements VEPrcsAplctPrdService {
 			//vEPrcsAplctPrdDAO.delete(vEPrcsDetailVO);
 
 			vEEduAplctDAO.updateSspnIdmtTrgtCancelNew(vEPrcsDetailVO);
-			vEPrcsMIXDAO.updateSspnIdmtTrgtCancelNew(vEPrcsDetailVO);
+			vEPrcsMIXDAO.updateAplctDetailInfo(vEPrcsDetailVO);				
+			if("60".equals(lctrDivCd)) {
+				vEPrcsMIXDAO.updateSspnIdmtTrgtCancelNew(vEPrcsDetailVO);
+			}else if("70".equals(lctrDivCd)) {
+				vEPrcsMIXDAO.updateCmdIdmtTrgtCancelNew(vEPrcsDetailVO);
+			}
 
 		}else if ("6".equals(vEPrcsDetailVO.getReqNo())) {
 			//교육확정 
@@ -250,7 +261,12 @@ public class VEPrcsAplctPrdServiceImpl implements VEPrcsAplctPrdService {
 			
 			vEEduAplctDAO.updateSspnIdmtTrgtCancelNew(vEPrcsDetailVO);
 			//vEPrcsMIXDAO.deleteAplctDetailInfo(vEPrcsDetailVO);						
-			vEPrcsMIXDAO.updateSspnIdmtTrgtCancelNew(vEPrcsDetailVO);
+			vEPrcsMIXDAO.updateAplctDetailInfo(vEPrcsDetailVO);				
+			if("60".equals(lctrDivCd)) {
+				vEPrcsMIXDAO.updateSspnIdmtTrgtCancelNew(vEPrcsDetailVO);
+			}else if("70".equals(lctrDivCd)) {
+				vEPrcsMIXDAO.updateCmdIdmtTrgtCancelNew(vEPrcsDetailVO);
+			}
 
 		}else if ("6-2".equals(vEPrcsDetailVO.getReqNo())) {
 			//대상자 교육 취소 신청 승인(취소 승인-교육종료) 
@@ -266,8 +282,12 @@ public class VEPrcsAplctPrdServiceImpl implements VEPrcsAplctPrdService {
 
 			//vEEduAplctDAO.delete(vEEduAplctVO);			
 			//vEEduAplctDAO.updateSspnIdmtTrgtCancelNew(vEPrcsDetailVO);
-			vEPrcsMIXDAO.updateAplctDetailInfo(vEPrcsDetailVO);						
+			vEPrcsMIXDAO.updateAplctDetailInfo(vEPrcsDetailVO);				
-			vEPrcsMIXDAO.updateSspnIdmtTrgtCancelNew(vEPrcsDetailVO);
+			if("60".equals(lctrDivCd)) {
+				vEPrcsMIXDAO.updateSspnIdmtTrgtCancelNew(vEPrcsDetailVO);
+			}else if("70".equals(lctrDivCd)) {
+				vEPrcsMIXDAO.updateCmdIdmtTrgtCancelNew(vEPrcsDetailVO);
+			}
 			
 		}else if ("6-3".equals(vEPrcsDetailVO.getReqNo())) {
 			//대상자 교육 취소 신청 반려(취소 반려-교육계속) 

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

@@ -71,4 +71,8 @@ public class VEPrcsMIXDAO extends EgovAbstractDAO {
 	public int updateSspnIdmtTrgtCancelNew(VEPrcsDetailVO paramVO) throws Exception {
 		return update("VEPrcsDAO.updateSspnIdmtTrgtCancelNew", paramVO);
 	}
+	
+	public int updateCmdIdmtTrgtCancelNew(VEPrcsDetailVO paramVO) throws Exception {
+		return update("VEPrcsDAO.updateCmdIdmtTrgtCancelNew", paramVO);
+	}
 }

src/main/java/kcc/ve/oprtn/cmdTrgt/web/CmdPrcsInfoMngController.java

@@ -1319,7 +1319,7 @@ public class CmdPrcsInfoMngController {
 			
 			
 			paramVO.setSiteId(LCTR_DIV_CD);	//설문정보를 위해서 설문지의 대상값을 넣는다.	VE0011	10-청소년, 20-성인,30-체험, 40-외부, 50-기반, 60-기소, 70-시정명령
-			List<VEEduAplctVO> vEPrcsDetailVOList = vEEduMIXService.selectTrgtList4Cmplt(paramVO);
+			List<VEEduAplctVO> vEPrcsDetailVOList = vEEduMIXService.selectCmdTrgtList4Cmplt(paramVO);
 			vEPrcsDetailVOList = egovCryptoUtil.decryptVeEduAplctList(vEPrcsDetailVOList);
 			
 			
@@ -1483,7 +1483,7 @@ public class CmdPrcsInfoMngController {
 				
 			
 			// 기소유예 대상자 상태값 udpate
-			vEEduMIXService.updateEduStateCd(vEEduAplctVO);
+			vEEduMIXService.updateCmdEduStateCd(vEEduAplctVO);
 			
 
 			// 알림 영역

src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Postgresql.xml

@@ -986,6 +986,209 @@
 			
 			
 			 
+		ORDER BY a.frst_regist_pnttm ASC
+			
+	</select>	
+	
+	<select id="VEEduMIXDAO.selectCmdTrgtList4Cmplt" parameterClass="VEEduAplctVO" resultClass="VEEduAplctVO">
+		/*	VEEduMIXDAO.selectCmdTrgtList4Cmplt	*/
+		SELECT			
+			ROW_NUMBER() OVER(
+			ORDER BY a.frst_regist_pnttm ASC) AS rowNo,	
+			vpap.TITLE AS title,
+			
+			vsit.CMPTNT_ATHRT AS cmptntAthrt,
+			vsit.VNT_YEAR AS vntYear,
+			vsit.VNT_NMBR AS vntNmbr,
+			vsit.PRSCTR_NM AS prsctrNm,
+			vsit.req_nmbr AS reqNmbr,	
+			
+			CASE
+				WHEN vsit.sex = 'M' THEN '남성'
+				WHEN vsit.sex = 'F' THEN '여성'
+				ELSE ''
+			END trgtSex ,
+			
+			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,
+			<include refid="VEEduMIXDAO.select_column_name"/>,			
+			vsit.trgt_nm AS trgtNm,
+			vsit.cmd_trgt_info_ord AS cmdTrgtInfoOrd,
+			vsit.clphone AS vs_clphone,
+			vsit.d_birth AS dBirth ,
+
+		
+			CASE
+				WHEN to_char(NOW(),
+				'YYYY.MM.DD') > COALESCE(vpap.edu_ddln_pnttm,
+				vpap.edu_strt_pnttm) THEN 1
+				ELSE 0
+			END AS qestRsltExists,
+			/* 설문지 정보 */
+			I.qustnr_tmplat_id AS qustnrTmplatId ,
+			COALESCE(qustnr01.QESTNR_ID_10,
+			i.qestnr_id_10) AS qestnrId10 ,
+			COALESCE(qustnr01.QESTNR_ID_20,
+			i.qestnr_id_20) AS qestnrId20 ,
+			COALESCE(qustnr01.QESTNR_ID_30,
+			i.qestnr_id_30) AS qestnrId30 ,
+			/* 답변 정보 */
+			qustnr01.QESTNR_ID_10_CNT AS qestnrId10Cnt ,
+			qustnr01.QESTNR_ID_20_CNT AS qestnrId20Cnt ,
+			qustnr01.QESTNR_ID_30_CNT AS qestnrId30Cnt
+
+
+		FROM 
+			<include refid="VEEduMIXDAO.table_name"/> a
+		JOIN ve_prcs_aplct_prd vpap ON
+			a.PRCS_ORD = vpap.PRCS_APLCT_PRD_ORD
+		LEFT JOIN VEA_APLCT_DETAIL_INFO  vadi ON
+			a.EDU_APLCT_ORD  = vadi.EDU_APLCT_ORD 
+			/* AND vpap.PRCS_APLCT_PRD_ORD  = vadi.PRCS_APLCT_PRD_ORD */ 
+		JOIN LETTNGNRLMBER le ON
+		/*
+			a.USER_ID = le.MBER_ID
+			*/
+			a.USER_ID = le.esntl_id
+		LEFT JOIN LETTNQESTNRINFO qe ON
+			a.USER_ID = qe.FRST_REGISTER_ID 
+		LEFT JOIN vea_cmd_trgt_info vsit 
+			ON (
+			/*
+			a.user_id = vsit.user_id
+			AND a.edu_aplct_ord=vsit.edu_aplct_ord
+			*/
+			/*
+			신청할때 대상자 정보를 rnds_ord에 넣는다.
+			*/
+			a.rnds_ord=vsit.cmd_trgt_info_ord
+			)
+			
+			
+					
+		LEFT OUTER JOIN (
+			SELECT
+				aa.EDU_APLCT_ORD ,
+				aa.prcs_ord,
+				aa.QUSTNR_TMPLAT_ID ,
+				aa.user_id ,
+				
+				MAX(CASE WHEN bb.site_id_cd = '10' THEN aa.QESTNR_ID ELSE NULL END) AS QESTNR_ID_10,
+				MAX(CASE WHEN bb.site_id_cd = '20' THEN aa.QESTNR_ID ELSE NULL END) AS QESTNR_ID_20,
+				MAX(CASE WHEN bb.site_id_cd = '30' THEN aa.QESTNR_ID ELSE NULL END) AS QESTNR_ID_30,
+				
+				SUM(CASE WHEN bb.site_id_cd = '10' THEN 1 ELSE 0 END) AS QESTNR_ID_10_CNT,
+				SUM(CASE WHEN bb.site_id_cd = '20' THEN 1 ELSE 0 END) AS QESTNR_ID_20_CNT,
+				SUM(CASE WHEN bb.site_id_cd = '30' THEN 1 ELSE 0 END) AS QESTNR_ID_30_CNT				
+				
+			FROM
+				(
+				SELECT
+					a.EDU_APLCT_ORD ,
+					a.prcs_ord,
+					b.QUSTNR_TMPLAT_ID ,
+					b.QESTNR_ID ,
+					a.user_id
+				FROM
+					ve_edu_aplct a ,
+					LETTNQESTNRRSLTDETAIL b
+				WHERE
+					1 = 1 /*
+		           AND b.respond_id = a.user_id */
+					AND a.edu_aplct_ord = b.edu_aplct_ord
+					AND (b.EDU_CHASI_ORD IS NULL or b.EDU_CHASI_ORD = '') 
+					)aa ,
+				lettnqestnrinfo bb
+			WHERE
+				/*
+				aa.qustnr_tmplat_id = bb.qustnr_tmplat_id
+				*/
+				1=1
+				AND aa.qestnr_id = bb.qestnr_id
+			GROUP BY
+				aa.EDU_APLCT_ORD ,
+				aa.prcs_ord,
+				aa.QUSTNR_TMPLAT_ID ,
+				aa.user_id ) qustnr01 ON
+			( a.edu_aplct_ord = qustnr01.edu_Aplct_Ord
+				AND a.PRCS_ORD = qustnr01.prcs_Ord )
+		LEFT OUTER JOIN (/* 현재 진행가능한 설문 정보(기본, 선생님, 강사) 여러개가 있는 경우는 최근 등록된 설문 정보를 가져온다.*/
+			SELECT
+				a.QUSTNR_TMPLAT_ID ,
+				a.SITE_ID ,
+				
+				a.QESTNR_ID as QESTNR_ID_10 ,
+				null as QESTNR_ID_20 ,
+				null as QESTNR_ID_30 ,
+				a.qustnr_bgnde ,
+				a.qustnr_endde
+				
+				/*
+				MAX(CASE WHEN a.site_id_cd = '10' THEN a.QESTNR_ID ELSE NULL END) AS QESTNR_ID_10,
+				MAX(CASE WHEN a.site_id_cd = '20' THEN a.QESTNR_ID ELSE NULL END) AS QESTNR_ID_20,
+				MAX(CASE WHEN a.site_id_cd = '30' THEN a.QESTNR_ID ELSE NULL END) AS QESTNR_ID_30
+				*/				
+				
+			FROM
+				LETTNQESTNRINFO a
+			WHERE
+				a.SITE_ID = #siteId#
+				AND a.SITE_ID_CD IN ('10', '20', '30')
+					
+					/*
+					
+					AND TO_CHAR(NOW(), 'YYYY.MM.DD') BETWEEN COALESCE(a.qustnr_bgnde, '2000.01.01') AND COALESCE(a.qustnr_endde, '9999.12.31')
+					
+				GROUP BY
+					a.QUSTNR_TMPLAT_ID ,
+					a.SITE_ID
+					*/
+					 
+					) I ON
+			(vpap.edu_strt_pnttm between coalesce(I.qustnr_bgnde, '20000101') and coalesce(I.qustnr_endde,'99991231'))			
+			
+			
+		
+		WHERE
+			1=1
+			<isNotEmpty property="prcsOrd">
+				AND a.prcs_ord=#prcsOrd#
+			</isNotEmpty>
+			<isNotEmpty property="sbmtYn">
+				AND a.sbmt_yn=#sbmtYn#
+			</isNotEmpty>
+			
+			<isNotEmpty property="searchSelStatus">
+				AND a.aprvl_cd = #searchSelStatus#
+			</isNotEmpty>
+			
+			<isNotEmpty property="searchQuery">
+				$searchQuery$
+			</isNotEmpty>
+			
+			<isNotEmpty property="searchSmbtStartDt">
+				AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#searchSmbtStartDt#, '.' , '')
+			</isNotEmpty>
+	
+			<isNotEmpty property="searchSmbtEndDt">
+				AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') <![CDATA[ <= ]]> REPLACE(#searchSmbtEndDt#, '.' , '')
+			</isNotEmpty>
+			
+			AND a.use_yn = 'Y'
+			
+			/* 승인(20), 취소요청(35), 취소승인(40), 확정(60)된 사람만 보여줌  old */
+			AND a.aprvl_cd IN ('20', '35', '40', '60')
+			
+			/* 요청(10), 승인(20), 반려(30), 확정(60) 이건 교육확정된 것 이므로 확정된 사람기준으로 보여줌 */
+			AND a.aprvl_cd IN ('60')
+			
+			
+			 
 		ORDER BY a.frst_regist_pnttm ASC
 			
 	</select>	
@@ -8750,6 +8953,31 @@ VALUES
 			sspn_idtmt_trgt_ord = #sspnIdtmtTrgtOrd#
 	
 	</update>
+	
+	<update id="VEEduMIXDAO.updateCmdEduStateCd" parameterClass="VEEduAplctVO">
+	/*	VEEduMIXDAO.updateEduStateCd	*/
+		
+		UPDATE
+			vea_cmd_trgt_info
+		SET
+			edu_state_cd = #eduStateCd#
+			/*	교육코드가 10(미이수),60(연기) 이면 미완료 처리(교육이력을 남기기위해 의뢰와 구분용..의뢰는 교육 경험이 없는 경우, 미완료는 교육 이수에 실패한 경우)	*/
+			<isEqual property="eduStateCd" compareValue="10">
+				, req_state_cd = '35'
+			</isEqual>
+			<isEqual property="eduStateCd" compareValue="60">
+				, req_state_cd = '35'
+			</isEqual>
+			
+			/*	교육코드가 20(이수) 이면 완료 처리	*/
+			<isEqual property="eduStateCd" compareValue="20">
+				, req_state_cd = '30'
+			</isEqual>
+			
+		WHERE
+			cmd_trgt_info_ord = #cmdTrgtInfoOrd#
+	
+	</update>
 
 	<update id="VEEduMIXDAO.updateAplctEmail" parameterClass="VEEduAplctVO">
 	/*	VEEduMIXDAO.AplctEmail	*/

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

@@ -1598,6 +1598,7 @@
 			
 			, b.aplct_state_cd		AS	aplctStateCd
 			
+			, c.lctr_div_cd			AS	lctrDivCd
 		FROM ve_prcs_aplct_prd a
 			, ve_edu_aplct c
 						

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

@@ -634,6 +634,51 @@
 			sspn_idtmt_trgt_ord 		= #sspnIdtmtTrgtOrd#
 	</update>	
 
+	
+	<!-- 대상자 취소시 대상자 테이블 정보 수정 -->
+	<update id="VEPrcsDAO.updateCmdIdmtTrgtCancelNew" parameterClass="VEPrcsDetailVO">
+		/* VEPrcsDAO.updateCmdIdmtTrgtCancelNew */
+		UPDATE 
+			vea_cmd_trgt_info 
+		SET
+			 LAST_UPDT_PNTTM = NOW()
+			,LAST_UPDUSR_ID	= #lastUpdusrId#
+						
+			<isEqual property="reqNo" compareValue="2-1">
+				/*	신청 후 취소	*/
+				, user_id					= NULL			   
+				, edu_aplct_ord				= NULL			   
+				, prcs_aplct_prd_ord_cmplt	= NULL				
+			</isEqual>
+
+			<isEqual property="reqNo" compareValue="4">
+				/*	신청 후 반려	*/				
+				, user_id					= NULL
+				, edu_aplct_ord				= NULL			   											   
+				, prcs_aplct_prd_ord_cmplt	= NULL				
+			</isEqual>
+						
+			<isEqual property="reqNo" compareValue="6">
+				/*	확정 후 취소 요청		edu_state_cd=30,req_state_cd=20	*/							   
+				/*	, edu_state_cd				= '30'	*/   
+				/*	, req_state_cd				= '20'	의뢰상태는 교육의 취소, 확정과 관계없이 대상자의 의뢰 상태를 변경 하는것 이므로 여기서는 제외한다.		*/								
+			</isEqual>
+			
+			<isEqual property="reqNo" compareValue="6-1">
+				/*	확정 후 취소 요청		edu_state_cd=30,req_state_cd=20	*/							   
+				/*	, edu_state_cd				= '30'	*/   
+				/*	, req_state_cd				= '20'	의뢰상태는 교육의 취소, 확정과 관계없이 대상자의 의뢰 상태를 변경 하는것 이므로 여기서는 제외한다.		*/								
+			</isEqual>
+			
+			<isEqual property="reqNo" compareValue="6-2">
+				/*	취소 신청 승은(교육중단)		edu_state_cd=60,req_state_cd=40	*/							   
+				, edu_state_cd				= '60'   
+				, req_state_cd				= '35'   
+				/*	, req_state_cd				= '40'	의뢰상태는 교육의 취소, 확정과 관계없이 대상자의 의뢰 상태를 변경 하는것 이므로 여기서는 제외한다.		*/								
+			</isEqual>																	
+		WHERE
+			cmd_trgt_info_ord 		= #sspnIdtmtTrgtOrd#
+	</update>
 	<!-- 대상자 취소시 대상자 테이블 정보 수정 -->
 	<update id="VEPrcsDAO.updateAplctDetailInfo" parameterClass="VEPrcsDetailVO">
 		/* VEPrcsDAO.updateAplctDetailInfo */