diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java index cc511aa7..6ae93df7 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java @@ -346,6 +346,8 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable { private String eduStateCd; //기소유예 대상자 교육상태 + private String reqStateCd; //기소유예 대상자 의뢰상태 + private String trgtNm; //기소유예 대상자 private String vs_clphone; //기소유예 대상자 폰번호 @@ -2136,6 +2138,12 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable { public void setReqNmbr(String reqNmbr) { this.reqNmbr = reqNmbr; } + public String getReqStateCd() { + return reqStateCd; + } + public void setReqStateCd(String reqStateCd) { + this.reqStateCd = reqStateCd; + } } 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 2912f47d..66dc84e3 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 @@ -468,6 +468,7 @@ SELECT ROW_NUMBER() OVER(ORDER BY a.frst_regist_pnttm ASC) AS rowNo, vadi.APLCT_STATE_CD AS aplctStateCd, + vsit.req_STATE_CD as reqStateCd, vpap.TITLE AS title, vsit.CMPTNT_ATHRT AS cmptntAthrt, vsit.VNT_YEAR AS vntYear, diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctPrdMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctPrdMngDetail.jsp index 87337d3a..e93d6e54 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctPrdMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctPrdMngDetail.jsp @@ -706,7 +706,7 @@ 핸드폰 신청일 확정여부 - 교육상태 + 의뢰상태 승인처리 @@ -748,11 +748,11 @@ - + - - (취소-반려) - +<%-- --%> + +<%-- --%> diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/trgtDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/trgtDetail.jsp index 9074b8c9..f022dc59 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/trgtDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/trgtDetail.jsp @@ -294,7 +294,7 @@ 교육상태 - + 검사명 diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/trgtList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/trgtList.jsp index 15b88476..132995d6 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/trgtList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/trgtList.jsp @@ -803,8 +803,8 @@ -<%-- --%> - ${list.eduStateCdNm } + +<%-- ${list.eduStateCdNm } --%> <%-- --%> diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp index 86cb25cd..27cff900 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp @@ -675,12 +675,13 @@
- +
- + 신청일 
~
@@ -716,7 +717,7 @@ 핸드폰 신청일 확정여부 - 교육상태 + 의뢰상태 승인처리 @@ -760,11 +761,11 @@ - + - - (취소-반려) - +<%-- --%> + +<%-- --%> diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtDetail.jsp index 00ff62df..e3ab7e6a 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtDetail.jsp @@ -294,7 +294,7 @@ 교육상태 - + 검사명 diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp index 76e2fd2d..f48fc3ed 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp @@ -800,8 +800,8 @@ -<%-- --%> - ${list.eduStateCdNm } + +<%-- ${list.eduStateCdNm } --%> <%-- --%> diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctPrdMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctPrdMngDetail.jsp index 4f05ede4..c829cb44 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctPrdMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctPrdMngDetail.jsp @@ -706,7 +706,7 @@ 핸드폰 신청일 확정여부 - 교육상태 + 의뢰상태 승인처리 @@ -748,11 +748,11 @@ - + - - (취소-반려) - +<%-- --%> + +<%-- --%>