diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java index b0c03a60..2bbc304e 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java @@ -49,6 +49,8 @@ public interface CndtnTrgtMngService { CndtnTrgtMngVO findByEduAplctOrdAndMberId(CndtnTrgtMngVO cndtnTrgtInfoMngVO); + List selectListRelated(CndtnTrgtMngVO cndtnTrgtInfoMngVO); + /* //C void insert(VEPrcsDetailVO paramVO) throws Exception; diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java index 94b33ec4..da09cf41 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java +++ b/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; + } } diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngDAO.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngDAO.java index 8408a554..36bb0d01 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngDAO.java +++ b/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 selectListRelated(CndtnTrgtMngVO cndtnTrgtInfoMngVO) { + return (List) list("cndtnTrgtInfoMngDAO.selectListRelated", cndtnTrgtInfoMngVO); + } + } diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngServiceImpl.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngServiceImpl.java index 8cf2f34a..bd05a321 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngServiceImpl.java +++ b/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 selectListRelated(CndtnTrgtMngVO cndtnTrgtInfoMngVO) { + return cndtnTrgtInfoMngDAO.selectListRelated(cndtnTrgtInfoMngVO); + } } diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java index 7e1a549c..086b62bc 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java @@ -2132,6 +2132,11 @@ public class CndtnPrcsInfoMngController { model.addAttribute("info", cndtnTrgtInfoVO); + List cndtnTrgtMngVOList = cndtnTrgtInfoMngService.selectListRelated(cndtnTrgtInfoMngVO); + model.addAttribute("cndtnTrgtMngVOList", cndtnTrgtMngVOList); + + + return "/oprtn/cndtnSspnIdtmt/popup/detailPopup"; } diff --git a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml index 8729ec5f..e631fbd7 100644 --- a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml @@ -747,4 +747,35 @@ LAST_UPDUSR_ID = #lastUpdusrId# WHERE stng_cd = #stngCd# + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/detailPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/detailPopup.jsp index 297cf349..8672993a 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/detailPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/detailPopup.jsp @@ -203,6 +203,68 @@ + + +
+

교육이력정보

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
번호교육명교육일확정여부교육상태
+ + + + + + + + + + + + (취소-반려) + +
교육정보가 없습니다.
+
+ + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrAsgnmDstncPopupCount.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrAsgnmDstncPopupCount.jsp index 49187456..88091c28 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrAsgnmDstncPopupCount.jsp +++ b/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]