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 6ae93df7..2f13d16d 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 @@ -343,6 +343,8 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable { private String unfthYn; //불성실여부 private String sspnIdtmtTrgtOrd; //기소유예 대상자 + + private String cmdTrgtInfoOrd; //시정명령 대상자 private String eduStateCd; //기소유예 대상자 교육상태 @@ -2144,6 +2146,12 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable { public void setReqStateCd(String reqStateCd) { this.reqStateCd = reqStateCd; } + public String getCmdTrgtInfoOrd() { + return cmdTrgtInfoOrd; + } + public void setCmdTrgtInfoOrd(String cmdTrgtInfoOrd) { + this.cmdTrgtInfoOrd = cmdTrgtInfoOrd; + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java index 988a2494..8ee092ad 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java @@ -119,6 +119,8 @@ public interface VEEduMIXService { List selectCndtnList(VEEduAplctVO paramVO); + List selectCndtnCmdList(VEEduAplctVO paramVO); + List selectAdultRsltRprtList(VEEduAplctVO paramVO) throws Exception; List selectExprnAtchFileDownList(VEEduAplctVO paramVO) throws Exception; diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java index 22496043..ff0445a7 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java @@ -287,6 +287,10 @@ public class VEEduMIXDAO extends EgovAbstractDAO { return (List) list("VEEduMIXDAO.selectCndtnList", paramVO); } + public List selectCndtnCmdList(VEEduAplctVO paramVO) { + return (List) list("VEEduMIXDAO.selectCndtnCmdList", paramVO); + } + public List selectAdultRsltRprtList(VEEduAplctVO paramVO) { @SuppressWarnings("unchecked") List tlist = (List) list("VEEduMIXDAO.selectAdultRsltRprtList", paramVO); diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java index 9d9e6555..abd474e1 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java @@ -255,6 +255,11 @@ public class VEEduMIXServiceImpl implements VEEduMIXService { return vEEduMIXDAO.selectCndtnList(paramVO); } + @Override + public List selectCndtnCmdList(VEEduAplctVO paramVO) { + return vEEduMIXDAO.selectCndtnCmdList(paramVO); + } + @Override public List selectAdultRsltRprtList(VEEduAplctVO paramVO) throws Exception{ return vEEduMIXDAO.selectAdultRsltRprtList(paramVO); diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java index 98be81e5..3bad16fd 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java @@ -142,6 +142,7 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { private String trgtNm; private String eduStateCd; private String sspnIdtmtTrgtOrd; + private String cmdTrgtInfoOrd; private String cnclAtchFileId; private String cnclCn; @@ -1105,5 +1106,11 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { } public void setQustnrTm(String qustnrTm) { this.qustnrTm = qustnrTm; + } + public String getCmdTrgtInfoOrd() { + return cmdTrgtInfoOrd; + } + public void setCmdTrgtInfoOrd(String cmdTrgtInfoOrd) { + this.cmdTrgtInfoOrd = cmdTrgtInfoOrd; } } diff --git a/src/main/java/kcc/ve/oprtn/cmdTrgt/web/CmdPrcsInfoMngController.java b/src/main/java/kcc/ve/oprtn/cmdTrgt/web/CmdPrcsInfoMngController.java index c2a12d6e..f169e92b 100644 --- a/src/main/java/kcc/ve/oprtn/cmdTrgt/web/CmdPrcsInfoMngController.java +++ b/src/main/java/kcc/ve/oprtn/cmdTrgt/web/CmdPrcsInfoMngController.java @@ -54,8 +54,8 @@ import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsCntntVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsOnlnCntntService; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsService; -import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.CndtnTrgtMngService; -import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.CndtnTrgtMngVO; +import kcc.ve.oprtn.cmdTrgt.trgtMng.service.CmdTrgtMngService; +import kcc.ve.oprtn.cmdTrgt.trgtMng.service.CmdTrgtMngVO; import kcc.ve.oprtn.fndtnEnhanceTrn.prcsAplctPrdMng.service.ExcelVO; /** @@ -98,8 +98,12 @@ public class CmdPrcsInfoMngController { //과정 관리 - @Resource(name = "cndtnTrgtInfoMngService") - private CndtnTrgtMngService cndtnTrgtInfoMngService; + //@Resource(name = "cndtnTrgtInfoMngService") + //private CndtnTrgtMngService cndtnTrgtInfoMngService; + //@Resource(name = "cndtnTrgtInfoMngService") + //private CndtnTrgtMngService cndtnTrgtInfoMngService; + @Resource(name = "cmdTrgtInfoMngService") + private CmdTrgtMngService cmdTrgtInfoMngService; //교육과정순번 @Resource(name="prcsGnrService") @@ -166,7 +170,9 @@ public class CmdPrcsInfoMngController { @Resource(name = "checkFileUtil") private CheckFileUtil checkFileUtil; - + //교육신청순번 + @Resource(name="eduAplctGnrService") + private EgovIdGnrService eduAplctGnrService; /** * 기반강화연수 과정 관리 목록 화면 @@ -807,7 +813,7 @@ public class CmdPrcsInfoMngController { // List vEPrcsDetailVOList = vEEduMIXService.selectList(paramVO); - List vEPrcsDetailVOList = vEEduMIXService.selectCndtnList(paramVO); + List vEPrcsDetailVOList = vEEduMIXService.selectCndtnCmdList(paramVO); vEPrcsDetailVOList = egovCryptoUtil.decryptVeEduAplctList(vEPrcsDetailVOList); //대상 리스트, 페이징 정보 전달 @@ -2165,8 +2171,8 @@ public class CmdPrcsInfoMngController { @RequestMapping("/kccadr/oprtn/cmdTrgt/popup/cndtnApplyAsgnmPopup.do") public String fndthApplyAsgnmPopup( // @ModelAttribute("vEInstrDetailVO") VEInstrDetailVO vEInstrDetailVO - //@ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO - @ModelAttribute("cndtnTrgtInfoMngVO") CndtnTrgtMngVO cndtnTrgtInfoMngVO + @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO + , @ModelAttribute("cndtnTrgtInfoMngVO") CmdTrgtMngVO cndtnTrgtInfoMngVO , ModelMap model , RedirectAttributes redirectAttributes @@ -2221,10 +2227,10 @@ public class CmdPrcsInfoMngController { cndtnTrgtInfoMngVO.setSearchQuery(selectCondition); // List cndtnTrgtInfoMngVOList = cndtnTrgtInfoMngService.selectPagingList(cndtnTrgtInfoMngVO); - List cndtnTrgtInfoMngVOList = null; + List cndtnTrgtInfoMngVOList = null; try { - cndtnTrgtInfoMngVOList = cndtnTrgtInfoMngService.selectPagingList(cndtnTrgtInfoMngVO); + cndtnTrgtInfoMngVOList = cmdTrgtInfoMngService.selectPagingList(cndtnTrgtInfoMngVO); } catch (Exception e) { e.printStackTrace(); // TODO: handle exception @@ -2237,7 +2243,7 @@ public class CmdPrcsInfoMngController { //복호화 - cndtnTrgtInfoMngVOList = egovCryptoUtil.decryptCndtnTrgtMngVOList(cndtnTrgtInfoMngVOList); + cndtnTrgtInfoMngVOList = egovCryptoUtil.decryptCmdTrgtMngVOList(cndtnTrgtInfoMngVOList); //대상 리스트, 페이징 정보 전달 model.addAttribute("list", cndtnTrgtInfoMngVOList); @@ -2245,6 +2251,113 @@ public class CmdPrcsInfoMngController { return "/oprtn/cmdTrgt/popup/cndtnApplyAsgnmPopup"; } + /** + * 기반강화연수과정 신청기간 등록 + */ + @RequestMapping("/kccadr/oprtn/cmdTrgt/popup/eduRegAjax.do") + public ModelAndView fndthEduPrcsAplctPrdMngRegAjax( + @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO + , ModelMap model + + + + +// ㄴㅇㄹㄴㅇㄹㄴㅇㄹ + , HttpServletRequest request + ) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + //로그인 처리==================================== + //로그인 정보 가져오기 + + + + + /* + String s_oprtnLoginCheckNInfo = checkLoginUtil.oprtnCheckNInfo(model); + if (!"".equals(s_oprtnLoginCheckNInfo)) { + modelAndView.addObject("result", "loginFail"); + return modelAndView; + } + + //로그인 처리==================================== + * + */ + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + //SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + + + + VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); + String s_eduAplctOrd = eduAplctGnrService.getNextStringId(); + vEEduAplctVO.setEduAplctOrd(s_eduAplctOrd); + + vEEduAplctVO.setLctrDivCd(LCTR_DIV_CD); // 기소유예 + vEEduAplctVO.setAprvlCd("10"); // 승인코드 VE0003 10 - 요청, 20 - 승인, 30 - 반려 +// sbmt_pnttm 제출일시 + vEEduAplctVO.setSbmtYn("Y"); // 제출여부 + vEEduAplctVO.setFrstRegisterId(loginVO.getUniqId()); +// frst_regist_pnttm + vEEduAplctVO.setUserId(loginVO.getUniqId()); + vEEduAplctVO.setPrcsOrd(vEPrcsDetailVO.getPrcsAplctPrdOrd()); + vEEduAplctVO.setTrgtNm(vEPrcsDetailVO.getTrgtNm()); + vEEduAplctVO.setdBirth(vEPrcsDetailVO.getdBirth()); + vEEduAplctVO.setPhone(egovCryptoUtil.encrypt(vEPrcsDetailVO.getPhone())); + vEEduAplctVO.setEmail(vEPrcsDetailVO.getEmail()); + + String result = ""; + try { + //암호화 + vEEduAplctVO = egovCryptoUtil.encryptVEEduAplctVOInfo(vEEduAplctVO); + vEEduAplctVO.setRndsOrd(vEPrcsDetailVO.getCmdTrgtInfoOrd()); //2024-02-07 추가 신청서 정보에 대상자 정보를 넣어야 추후 구분이 가능해서 추가함 + sspnIdtmtService.insertVeEduAplct(vEEduAplctVO); + + + CmdTrgtMngVO cndtnTrgtMngVO = new CmdTrgtMngVO(); + + cndtnTrgtMngVO.setUserId(loginVO.getUniqId()); + cndtnTrgtMngVO.setCmdTrgtInfoOrd(vEPrcsDetailVO.getCmdTrgtInfoOrd()); + cndtnTrgtMngVO.setEduStateCd("25"); // 신청 + + cndtnTrgtMngVO.setEduAplctOrd(s_eduAplctOrd); //동일한 대상자가 어떤 신청서와 맞는지 매칭에 필요함 + + //cndtnTrgtMngVO.setPrcsAplctPrdOrdCmplt(vEPrcsDetailVO.getPrcsAplctPrdOrd()); // 교육 번호 +// , edu_state_cd = #eduStateCd# +// , prcs_aplct_prd_ord_cmplt = #prcsAplctPrdOrdCmplt# + + + cmdTrgtInfoMngService.updateUserId(cndtnTrgtMngVO); + + //알림 교육신청 + try { + iTNotiUtil.insertNotifyNew_60( + LCTR_DIV_CD, //"60", + loginVO.getUniqId(), + VeConstants.NOTI_STATUS_10, + vEPrcsDetailVO.getPrcsAplctPrdOrd(), + "", + "1", + "1" + ); + }catch(Exception ex) { + ex.printStackTrace(); + } + + result = "success"; + } catch (Exception e) { + // TODO: handle exception + } + + + + modelAndView.addObject("result", result); + + return modelAndView; + + } + /** * @methodName : cnclPopup * @author : 이호영 @@ -2297,7 +2410,7 @@ public class CmdPrcsInfoMngController { @RequestMapping("/kccadr/oprtn/cmdTrgt/popup/detailPopup.do") public String detailPopup( // @ModelAttribute("vEInstrDetailVO") VEInstrDetailVO vEInstrDetailVO - @ModelAttribute("vEPrcsDetailVO") CndtnTrgtMngVO cndtnTrgtInfoMngVO + @ModelAttribute("vEPrcsDetailVO") CmdTrgtMngVO cndtnTrgtInfoMngVO , ModelMap model , HttpServletRequest request ) throws Exception { @@ -2307,15 +2420,15 @@ public class CmdPrcsInfoMngController { //로그인 처리==================================== - CndtnTrgtMngVO cndtnTrgtInfoVO = cndtnTrgtInfoMngService.findByEduAplctOrdAndMberId(cndtnTrgtInfoMngVO); + CmdTrgtMngVO cndtnTrgtInfoVO = cmdTrgtInfoMngService.findByEduAplctOrdAndMberId(cndtnTrgtInfoMngVO); //복호화 - cndtnTrgtInfoVO = egovCryptoUtil.decryptCndtnTrgtMngVOInfo(cndtnTrgtInfoVO); + cndtnTrgtInfoVO = egovCryptoUtil.decryptCmdTrgtMngVOInfo(cndtnTrgtInfoVO); model.addAttribute("info", cndtnTrgtInfoVO); //이력정보 - List cndtnTrgtMngVOList = cndtnTrgtInfoMngService.selectListRelated(cndtnTrgtInfoMngVO); + List cndtnTrgtMngVOList = cmdTrgtInfoMngService.selectListRelated(cndtnTrgtInfoMngVO); model.addAttribute("cndtnTrgtMngVOList", cndtnTrgtMngVOList); @@ -3013,7 +3126,7 @@ public class CmdPrcsInfoMngController { //CndtnTrgtInfoMngVO //페이징을 위한 처리 step1 - 페이징 기본 정보 설정 private PaginationInfo setCndtnPagingStep1( - CndtnTrgtMngVO p_cndtnTrgtInfoMngVO + CmdTrgtMngVO p_cndtnTrgtInfoMngVO )throws Exception{ // pageing step1 PaginationInfo paginationInfo = new PaginationInfo(); @@ -3026,8 +3139,8 @@ public class CmdPrcsInfoMngController { //페이징을 위한 처리 step2 - 게시물 리스트 수량 설정 및 검색 조건 초기화 - private CndtnTrgtMngVO setCndtnPagingStep2( - CndtnTrgtMngVO p_cndtnTrgtInfoMngVO + private CmdTrgtMngVO setCndtnPagingStep2( + CmdTrgtMngVO p_cndtnTrgtInfoMngVO , PaginationInfo p_paginationInfo )throws Exception{ // pageing step2 @@ -3046,7 +3159,7 @@ public class CmdPrcsInfoMngController { //페이징을 위한 처리 step3 - 전체 게시물 수량 설정하기 private PaginationInfo setCndtnPagingStep3( - List p_cndtnTrgtInfoMngVOList + List p_cndtnTrgtInfoMngVOList , PaginationInfo p_paginationInfo )throws Exception{ // pageing step3 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 66dc84e3..748104eb 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 @@ -463,6 +463,7 @@ + + + + + + + + " /> + + + + + + + + + " /> + + + + + +
+
+ +
+
+
+

대상자검색

+
+<%-- +<%-- selectedText="${vEEduAplctVO.rsdne}" defaultValue='' --%> +<%-- defaultText='전체' --%> +<%-- /> --%> +
+ + +
+
+
+
+

대상자 목록

+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + style="cursor:pointer;" + + + style="cursor:pointer;background-color:lightgray;" + + > + + + + + + + + + + + + + + + + <%-- --%> + + + + + + + + + + + + + + + + + +
의뢰일사건번호관할청생년월일성명성별의뢰번호의뢰상태교육상태주소검사명선택
');" style="cursor:pointer;"> + + <%-- --%> + + ');" style="cursor:pointer;"> + 형제 + ');" style="cursor:pointer;"> + + ');" style="cursor:pointer;"> + + ');" style="cursor:pointer;"> + + ');" style="cursor:pointer;"> + + ');" style="cursor:pointer;"> + + ');" style="cursor:pointer;"> + + + (${list.reqStateCd }) + + + 병합처리 + + + (${list.eduStateCd }) + + ${fullAddr} + <%-- ${fn:length(fullAddr)> 50 ? fn:substring(fullAddr, 0, 50).concat('...') : ''} --%> + + + + + + +
+
+ +
+ +
+ + +
+
+
+
+ +
+
+
+
+
+
+ + + + + + +
+ + + + + + +
+ + + + + + 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 ca0c543b..ce0b247f 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp @@ -786,7 +786,7 @@ - 신청자가 없습니다. + 신청자가 없습니다. diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/cndtnApplyAsgnmPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/cndtnApplyAsgnmPopup.jsp index b6119bdd..26197a42 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/cndtnApplyAsgnmPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/cndtnApplyAsgnmPopup.jsp @@ -224,7 +224,7 @@ - + (${list.eduStateCd }) <%-- --%> @@ -326,6 +326,10 @@ } } + + function fncGoList(){ + window.opener.reload(); + } 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 b4bb7655..280e4ead 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctPrdMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctPrdMngDetail.jsp @@ -775,7 +775,7 @@ - 신청자가 없습니다. + 신청자가 없습니다.