2024-04-04 10:03 기소유예 정보 화면 수정, 청소년 찾교 거리계산 스크립트 오류 수정

src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java

@@ -49,6 +49,8 @@ public interface CndtnTrgtMngService {
 
 	CndtnTrgtMngVO findByEduAplctOrdAndMberId(CndtnTrgtMngVO cndtnTrgtInfoMngVO);
 	
+	List<CndtnTrgtMngVO> selectListRelated(CndtnTrgtMngVO cndtnTrgtInfoMngVO);
+	
 	
 /*	//C
 	void insert(VEPrcsDetailVO paramVO) throws Exception;

src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java

@@ -61,8 +61,37 @@ public class CndtnTrgtMngVO extends ComDefaultVO implements Serializable {
 	
 	private String chkYn;			// 기소유예 대상자 휴대폰 인증번호 체크 여부
 	
+	private String title;
+	private String eduStrtPnttm;
+	private String aprvlCd;
+	private String aplctStateCd;
+	private String cnclCn;
 	
 
+	public String getTitle() {
+		return title;
+	}
+	public void setTitle(String title) {
+		this.title = title;
+	}
+	public String getEduStrtPnttm() {
+		return eduStrtPnttm;
+	}
+	public void setEduStrtPnttm(String eduStrtPnttm) {
+		this.eduStrtPnttm = eduStrtPnttm;
+	}
+	public String getAprvlCd() {
+		return aprvlCd;
+	}
+	public void setAprvlCd(String aprvlCd) {
+		this.aprvlCd = aprvlCd;
+	}
+	public String getAplctStateCd() {
+		return aplctStateCd;
+	}
+	public void setAplctStateCd(String aplctStateCd) {
+		this.aplctStateCd = aplctStateCd;
+	}
 	public String getSspnIdtmtTrgtOrd() {
 		return sspnIdtmtTrgtOrd;
 	}
@@ -304,5 +333,11 @@ public class CndtnTrgtMngVO extends ComDefaultVO implements Serializable {
 	public void setCmptntAthrtNm(String cmptntAthrtNm) {
 		this.cmptntAthrtNm = cmptntAthrtNm;
 	}
+	public String getCnclCn() {
+		return cnclCn;
+	}
+	public void setCnclCn(String cnclCn) {
+		this.cnclCn = cnclCn;
+	}
 	
 }

src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngDAO.java

@@ -190,4 +190,8 @@ public class CndtnTrgtMngDAO extends EgovAbstractDAO {
 		return (CndtnTrgtMngVO) select("cndtnTrgtInfoMngDAO.findByEduAplctOrdAndMberId", cndtnTrgtInfoMngVO);
 	}
 	
+	public List<CndtnTrgtMngVO> selectListRelated(CndtnTrgtMngVO cndtnTrgtInfoMngVO) {
+		return (List<CndtnTrgtMngVO>) list("cndtnTrgtInfoMngDAO.selectListRelated", cndtnTrgtInfoMngVO);
+	}
+	
 }

src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngServiceImpl.java

@@ -130,6 +130,9 @@ public class CndtnTrgtMngServiceImpl implements CndtnTrgtMngService {
 	public CndtnTrgtMngVO findByEduAplctOrdAndMberId(CndtnTrgtMngVO cndtnTrgtInfoMngVO) {
 		return cndtnTrgtInfoMngDAO.findByEduAplctOrdAndMberId(cndtnTrgtInfoMngVO);
 	}
-	
+
-	
+	@Override
+	public List<CndtnTrgtMngVO> selectListRelated(CndtnTrgtMngVO cndtnTrgtInfoMngVO) {
+		return cndtnTrgtInfoMngDAO.selectListRelated(cndtnTrgtInfoMngVO);
+	}	
 }

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

@@ -2132,6 +2132,11 @@ public class CndtnPrcsInfoMngController {
 		model.addAttribute("info", cndtnTrgtInfoVO);
 		
 		
+		List<CndtnTrgtMngVO> cndtnTrgtMngVOList = cndtnTrgtInfoMngService.selectListRelated(cndtnTrgtInfoMngVO);		
+		model.addAttribute("cndtnTrgtMngVOList", cndtnTrgtMngVOList);
+		
+		
+		
 		return "/oprtn/cndtnSspnIdtmt/popup/detailPopup";
 	}
 

src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml

@@ -747,4 +747,35 @@
 				LAST_UPDUSR_ID	= #lastUpdusrId#
 		WHERE stng_cd = #stngCd#
 	</update>
+	
+			<!-- 기소유예 대상자 연관 교육 내용 -->
+	<select id="cndtnTrgtInfoMngDAO.selectListRelated" parameterClass="CndtnPrcsInfoMngVO" resultClass="CndtnPrcsInfoMngVO">
+		/* cndtnTrgtInfoMngDAO.selectListRelated 		*/
+		SELECT a.SSPN_IDTMT_TRGT_ORD 	AS	sspnIdtmtTrgtOrd
+			, b.prcs_ord				AS	prcsOrd
+			, b.USER_ID 				AS	userId
+			, b.EDU_APLCT_ORD 			AS	eduAplctOrd
+			, c.APLCT_STATE_CD 			AS	aplctStateCd
+			, b.APRVL_CD 				AS	aprvlCd
+			, c.CNCL_CN					AS	cnclCn
+			, c.CNCL_ATCH_FILE_ID 		AS	cnclAtchFileId
+			, d.TITLE 					AS	title
+			, d.edu_strt_pnttm 			AS	eduStrtPnttm
+			
+		FROM VEA_SSPN_IDMT_TRGT a
+			, ve_edu_aplct b
+			, VEA_APLCT_DETAIL_INFO c
+			, ve_prcs_aplct_prd d
+			
+		WHERE 1=1
+			AND b.RNDS_ORD =a.SSPN_IDTMT_TRGT_ORD 
+			AND b.EDU_APLCT_ORD = c.EDU_APLCT_ORD
+			AND b.PRCS_ORD = d.PRCS_APLCT_PRD_ORD
+			AND a.SSPN_IDTMT_TRGT_ORD IN (
+											SELECT a.SSPN_IDTMT_TRGT_ORD
+											FROM VEA_SSPN_IDMT_TRGT a
+											WHERE a.SSPN_IDTMT_TRGT_ORD =#sspnIdtmtTrgtOrd#
+												or a.PRCS_APLCT_PRD_ORD_CMPLT =#sspnIdtmtTrgtOrd#
+											)
+	</select>	
 </sqlMap>

src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/detailPopup.jsp

@@ -203,6 +203,68 @@
 					</tbody>
 				</table>
 				</div>
+				
+				
+			<div class="tb_tit01">
+				<p>교육이력정보</p>	<!-- ${listPrcsAplct } -->
+			</div>
+			<div class="tb_type01">
+				<table>
+					<colgroup>
+						<col style="width: 10%">
+						<col style="width: auto;">
+						<col style="width: 180px;">						
+						<col style="width: 180px;">
+						<col style="width: 180px;">
+					</colgroup>
+					<thead>
+					<tr>						
+						<th>번호</th>
+						<th>교육명</th>
+						<th>교육일</th>
+						<th>확정여부</th>
+						<th>교육상태</th>												
+					</tr>
+					</thead>					
+					<tbody>
+						<c:choose>
+							<c:when test="${!empty cndtnTrgtMngVOList}">
+								<c:forEach var="list" items="${cndtnTrgtMngVOList}" varStatus="status">
+									<tr>
+										<td>
+											<c:out value="${status.count}"/>
+										</td>
+										<td>
+											<c:out value="${list.title}"/>
+										</td>
+										<td>
+											<c:out value="${list.eduStrtPnttm}"/>
+										</td>
+										<td>
+											<ve:code codeId="VE0003" code="${list.aprvlCd}"/>
+										</td>
+										<td>
+											<ve:code codeId="VEA003" code="${list.aplctStateCd}"/>
+											<!-- 취소요청 내용이 있고 미이수, 이수인 상태 -->
+											<c:if test="${not empty list.cnclCn and (list.aplctStateCd eq 10 or list.aplctStateCd eq 20)}">
+												(취소-반려)
+											</c:if>
+										</td>
+								</c:forEach>
+							</c:when>
+							<c:otherwise>
+								<tr>
+									<td colspan="5">교육정보가 없습니다.</td>
+								</tr>
+							</c:otherwise>
+						</c:choose>
+						
+				
+					</tbody>					
+				</table>
+			</div>				
+				
+				
 			</div>
 				
 	</div>

src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrAsgnmDstncPopupCount.jsp

@@ -542,6 +542,8 @@
 														+ "message:"
 														+ request.responseText
 														+ "\n" + "error:" + error);
+												alert(request.responseText);
+												alert("["+p_schol_addr+"] 해당 주소를 제외하고 다시 실행해주세요!!!");
 											}
 										});
 								//JSON TYPE EDIT [E]