diff --git a/src/main/java/kcc/let/my/web/MyPageController.java b/src/main/java/kcc/let/my/web/MyPageController.java index 50abed76..da5fe7d7 100644 --- a/src/main/java/kcc/let/my/web/MyPageController.java +++ b/src/main/java/kcc/let/my/web/MyPageController.java @@ -16,8 +16,10 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.support.RedirectAttributes; +import egovframework.rte.fdl.idgnr.EgovIdGnrService; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kcc.com.cmm.LoginVO; import kcc.com.utl.user.service.CheckLoginUtil; @@ -25,6 +27,8 @@ import kcc.let.cop.bbs.service.BoardMasterVO; import kcc.let.cop.bbs.service.BoardVO; import kcc.let.uat.uia.service.SsoLoginVO; import kcc.let.utl.fcc.service.EgovCryptoUtil; +import kcc.ve.aplct.fndtnEnhanceTrn.service.FndtnEnhanceTrnService; +import kcc.ve.cmm.VeConstants; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsAplctPrdService; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsService; @@ -69,7 +73,13 @@ public class MyPageController { @Resource(name = "vEPrcsAplctPrdService") private VEPrcsAplctPrdService vEPrcsAplctPrdService; - private String p_lctr_div_cd = "60"; + //qna순번 + @Resource(name="prcsAplctPrdQnaOrdGnrService") + private EgovIdGnrService prcsAplctPrdQnaOrdGnrService; + + //온라인콘텐츠과정 관리 + @Resource(name = "fndtnEnhanceTrnService") + private FndtnEnhanceTrnService fndtnEnhanceTrnService; @RequestMapping(value = { "/web/my/myPageDashBoard.do" }) public String selectFaqListWeb(HttpServletRequest request, @ModelAttribute("vEEduAplctVO") VEPrcsDetailVO vEPrcsDetailVO, @@ -85,35 +95,15 @@ public class MyPageController { } vEPrcsDetailVO.setUserId(loginVO.getUniqId()); - //1.pageing step1 //5개만 select을 위한 설정 vEPrcsDetailVO.setPageUnit(5); PaginationInfo paginationInfo = this.setPagingStep1(vEPrcsDetailVO); - - //로그인 처리==================================== - - //1.pageing step1 - - //임시로 페이징 처리를 안하기 위해서 RecordCountPerPage 수를 10000 으로 셋팅함 - //paginationInfo.setRecordCountPerPage(10000); - //2. pageing step2 vEPrcsDetailVO = this.setPagingStep2(vEPrcsDetailVO, paginationInfo); - //기반강화 조회 - vEPrcsDetailVO.setLctrDivCd(p_lctr_div_cd); //강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부 - - - /* - if(StringUtil.isEmpty(vEPrcsDetailVO.getPrcsDiv())) { - vEPrcsDetailVO.setPrcsDiv("10");// 과정구분 VE0015 10-산업종사자, 20-대학생, 30-공무원, 40-일반인, 50-청소년, 60-학부모 - } - */ - vEPrcsDetailVO.setSiteId(p_lctr_div_cd); //설문정보를 위해서 설문지의 대상값을 넣는다. VE0011 10-청소년, 20-성인,30-체험, 40-외부, 50-기반, 60-기소 List vEPrcsDetailVOList = vEPrcsAplctPrdService.findByAprvlQustnrAllList(vEPrcsDetailVO); - //List vEPrcsDetailVOList = vEPrcsAplctPrdService.findByAprvlList(vEPrcsDetailVO); // 현재 날짜를 가져옵니다. LocalDate currentDate = LocalDate.now(); @@ -128,16 +118,6 @@ public class MyPageController { //대상 리스트, 페이징 정보 전달 model.addAttribute("list", vEPrcsDetailVOList); model.addAttribute("countMap", countMap); - - - - // Q&A 영역 -// vEPrcsDetailVO.setQnaRegist(loginVO.getUniqId()); -// List vEPrcsDetailQnaVOList = fndtnEnhanceTrnService.selectVeEduQna(vEPrcsDetailVO); -// model.addAttribute("qnaList", vEPrcsDetailQnaVOList); - - -// return "/web/ve/aplct/sspnIdtmt/main"; return "web/my/myPageDashBoard"; } @@ -148,8 +128,16 @@ public class MyPageController { , @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO , ModelMap model ) throws Exception { + + //로그인 처리==================================== + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + + if (loginVO == null || ssoLoginVO == null) { + //이전 url 처리(beforeSiteUrl)_이준호_220228추가 + return checkLoginUtil.getUserLoginPage(model, request); //로그인 정보가 없으면 로그인 페이지로 이동한다. + } - LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); // 권한에 따른 로그인 정보 가져오기 //1.pageing step1 PaginationInfo paginationInfo = this.setPagingStep1(vEPrcsDetailVO); //2. pageing step2 @@ -210,6 +198,69 @@ public class MyPageController { return "web/my/myQnaMngDetail"; } + + @RequestMapping(value = { "/web/my/myQnaMngRegist.do" }) + public String myQnaMngRegist( + HttpServletRequest request + , ModelMap model + ) throws Exception { + + //로그인 처리==================================== + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + + if (loginVO == null || ssoLoginVO == null) { + //이전 url 처리(beforeSiteUrl)_이준호_220228추가 + return checkLoginUtil.getUserLoginPage(model, request); //로그인 정보가 없으면 로그인 페이지로 이동한다. + } + + return "web/my/myQnaMngRegist"; + } + + @RequestMapping("/web/my/myQnaMngRegistAjax.do") + public ModelAndView myQnaMngRegistAjax( + @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 로그인 정보 가져오기 + + + vEPrcsDetailVO.setFrstRegisterId(loginVO.getUniqId()); //esntl_id + vEPrcsDetailVO.setQnaRegist(loginVO.getUniqId()); //esntl_id + vEPrcsDetailVO.setPrcsAplctPrdQnaOrd(prcsAplctPrdQnaOrdGnrService.getNextStringId()); + vEPrcsDetailVO.setQnaRegist(loginVO.getUniqId()); + + String msg = "등록되었습니다"; + try { + fndtnEnhanceTrnService.insertVeEduQna(vEPrcsDetailVO); + } catch (Exception e) { + // TODO: handle exception + e.printStackTrace(); + msg = "등록에 실패하였습니다. 관리자에게 문의해주세요"; + } + + modelAndView.addObject("msg", msg); + modelAndView.addObject("result", "success"); + + return modelAndView; + + } diff --git a/src/main/java/kcc/ve/aplct/cmdTrgt/service/impl/CmdTrgtServiceImpl.java b/src/main/java/kcc/ve/aplct/cmdTrgt/service/impl/CmdTrgtServiceImpl.java index e35affe5..bed395f4 100644 --- a/src/main/java/kcc/ve/aplct/cmdTrgt/service/impl/CmdTrgtServiceImpl.java +++ b/src/main/java/kcc/ve/aplct/cmdTrgt/service/impl/CmdTrgtServiceImpl.java @@ -136,6 +136,7 @@ public class CmdTrgtServiceImpl implements CmdTrgtService { String id=""; String next=""; //? String smsYn = ""; //휴대폰 인증 번호 발송 여부 + String reqStateCd = ""; //의뢰상태 try { result=""; // @@ -170,6 +171,9 @@ public class CmdTrgtServiceImpl implements CmdTrgtService { }else { //대상자 있음 id = cndtnTrgtMngVOList.get(0).getCmdTrgtInfoOrd(); + //의뢰 상태가 의뢰취소(40)라면 스텝4에서 fail 처리 + reqStateCd = cndtnTrgtMngVOList.get(0).getReqStateCd(); + //step2.대상이 완료 상태인지 확인 cndtnTrgtMngVOList = cmdTrgtMngDAO.checkSspnIdtmtStep2(cmdTrgtMngVO); @@ -201,13 +205,20 @@ public class CmdTrgtServiceImpl implements CmdTrgtService { msg = "이미 신청한 교육이 있습니다."; next = ""; //? }else {//신청한 과정이 없다. - result = "success"; - msg = ""; - //id = cndtnTrgtMngVOList.get(0).getSspnIdtmtTrgtOrd(); - //id = ""; - next = "Y"; - smsYn = "Y"; - //next = Integer.toString(cndtnTrgtMngVOList.size()); //대상자 수 + + if("40".equals(reqStateCd)) { + result = "fail"; + msg = "의뢰 취소 상태로 과정대상자가 아닙니다. 관리자에게 문의 바랍니다."; + next = "Y"; //? + }else { + result = "success"; + msg = ""; + //id = cndtnTrgtMngVOList.get(0).getSspnIdtmtTrgtOrd(); + //id = ""; + next = "Y"; + smsYn = "Y"; + //next = Integer.toString(cndtnTrgtMngVOList.size()); //대상자 수 + } } } diff --git a/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java b/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java index 1d5b1f6f..951ab964 100644 --- a/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java +++ b/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java @@ -137,6 +137,7 @@ public class SspnIdtmtServiceImpl implements SspnIdtmtService { String id=""; String next=""; //? String smsYn = ""; //휴대폰 인증 번호 발송 여부 + String reqStateCd = ""; //의뢰상태 try { result=""; // @@ -171,8 +172,11 @@ public class SspnIdtmtServiceImpl implements SspnIdtmtService { }else { //대상자 있음 id = cndtnTrgtMngVOList.get(0).getSspnIdtmtTrgtOrd(); + //의뢰 상태가 의뢰취소(40)라면 스텝4에서 fail 처리 + reqStateCd = cndtnTrgtMngVOList.get(0).getReqStateCd(); + //step2.대상이 완료 상태인지 확인 - cndtnTrgtMngVOList = cndtnTrgtInfoMngDAO.checkSspnIdtmtStep2(cndtnTrgtInfoMngVO); + cndtnTrgtMngVOList = cndtnTrgtInfoMngDAO.checkSspnIdtmtStep2(cndtnTrgtInfoMngVO); int i_cnt = 0; @@ -202,13 +206,20 @@ public class SspnIdtmtServiceImpl implements SspnIdtmtService { msg = "이미 신청한 교육이 있습니다."; next = ""; //? }else {//신청한 과정이 없다. - result = "success"; - msg = ""; - //id = cndtnTrgtMngVOList.get(0).getSspnIdtmtTrgtOrd(); - //id = ""; - next = "Y"; - smsYn = "Y"; - //next = Integer.toString(cndtnTrgtMngVOList.size()); //대상자 수 + + if("40".equals(reqStateCd)) { + result = "fail"; + msg = "의뢰 취소 상태로 과정대상자가 아닙니다. 관리자에게 문의 바랍니다."; + next = "Y"; //? + }else { + result = "success"; + msg = ""; + //id = cndtnTrgtMngVOList.get(0).getSspnIdtmtTrgtOrd(); + //id = ""; + next = "Y"; + smsYn = "Y"; + //next = Integer.toString(cndtnTrgtMngVOList.size()); //대상자 수 + } } } 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 872f3a3b..6b901bc2 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 @@ -103,12 +103,16 @@ public interface VEEduMIXService { void updateEduStateCd(VEEduAplctVO vEEduAplctVO); + void updateCmdEduStateCd(VEEduAplctVO vEEduAplctVO); + void updateAplctEmail(VEEduAplctVO vEEduAplctVO); List selectTrgtList(VEEduAplctVO paramVO); List selectTrgtList4Cmplt(VEEduAplctVO paramVO); + List selectCmdTrgtList4Cmplt(VEEduAplctVO paramVO); + //저작권 체험교실 이력 과정 목록 List selectExprnHstryPagingList(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 ff0445a7..321e7c3b 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 @@ -256,9 +256,17 @@ public class VEEduMIXDAO extends EgovAbstractDAO { return (List) list("VEEduMIXDAO.selectTrgtList4Cmplt", paramVO); } + public List selectCmdTrgtList4Cmplt(VEEduAplctVO paramVO) { + return (List) 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); 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 f634f524..6c5a4a22 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 @@ -223,10 +223,20 @@ public class VEEduMIXServiceImpl implements VEEduMIXService { return vEEduMIXDAO.selectTrgtList4Cmplt(paramVO); } + public List 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 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 1b67c846..461086fa 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 @@ -52,6 +52,7 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { private String eduAplctOrd; //교육신청순번 private List eduAplctOrdList; //교육신청순번 private List sspnIdtmtTrgtOrdList; + private List cmdTrgtInfoOrdList; private String eduChasiOrd; //교육차시순번 private String cnt; @@ -1120,5 +1121,11 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { public void setDdlnCdNm(String ddlnCdNm) { this.ddlnCdNm = ddlnCdNm; } + public List getCmdTrgtInfoOrdList() { + return cmdTrgtInfoOrdList; + } + public void setCmdTrgtInfoOrdList(List cmdTrgtInfoOrdList) { + this.cmdTrgtInfoOrdList = cmdTrgtInfoOrdList; + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdServiceImpl.java index e84c6b19..01487922 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdServiceImpl.java +++ b/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.updateSspnIdmtTrgtCancelNew(vEPrcsDetailVO); + vEPrcsMIXDAO.updateAplctDetailInfo(vEPrcsDetailVO); + if("60".equals(lctrDivCd)) { + vEPrcsMIXDAO.updateSspnIdmtTrgtCancelNew(vEPrcsDetailVO); + }else if("70".equals(lctrDivCd)) { + vEPrcsMIXDAO.updateCmdIdmtTrgtCancelNew(vEPrcsDetailVO); + } }else if ("6-3".equals(vEPrcsDetailVO.getReqNo())) { //대상자 교육 취소 신청 반려(취소 반려-교육계속) diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsMIXDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsMIXDAO.java index c90b9d88..666503d3 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsMIXDAO.java +++ b/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); + } } diff --git a/src/main/java/kcc/ve/oprtn/cmdTrgt/trgtMng/service/CmdTrgtMngVO.java b/src/main/java/kcc/ve/oprtn/cmdTrgt/trgtMng/service/CmdTrgtMngVO.java index 7db6bcca..77d77e09 100644 --- a/src/main/java/kcc/ve/oprtn/cmdTrgt/trgtMng/service/CmdTrgtMngVO.java +++ b/src/main/java/kcc/ve/oprtn/cmdTrgt/trgtMng/service/CmdTrgtMngVO.java @@ -47,6 +47,7 @@ public class CmdTrgtMngVO extends ComDefaultVO implements Serializable { private List searchSelStatusList; private List sspnIdtmtTrgtOrdList; + private List cmdTrgtInfoOrdList; private String eduAplctOrd; //신청한 교육 순번 private String rmrks; //비고 @@ -362,5 +363,11 @@ public class CmdTrgtMngVO extends ComDefaultVO implements Serializable { public void setSexNm(String sexNm) { this.sexNm = sexNm; } + public List getCmdTrgtInfoOrdList() { + return cmdTrgtInfoOrdList; + } + public void setCmdTrgtInfoOrdList(List cmdTrgtInfoOrdList) { + this.cmdTrgtInfoOrdList = cmdTrgtInfoOrdList; + } } 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 bd6d3ef9..58a434cc 100644 --- a/src/main/java/kcc/ve/oprtn/cmdTrgt/web/CmdPrcsInfoMngController.java +++ b/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 vEPrcsDetailVOList = vEEduMIXService.selectTrgtList4Cmplt(paramVO); + List vEPrcsDetailVOList = vEEduMIXService.selectCmdTrgtList4Cmplt(paramVO); vEPrcsDetailVOList = egovCryptoUtil.decryptVeEduAplctList(vEPrcsDetailVOList); @@ -1483,7 +1483,7 @@ public class CmdPrcsInfoMngController { // 기소유예 대상자 상태값 udpate - vEEduMIXService.updateEduStateCd(vEEduAplctVO); + vEEduMIXService.updateCmdEduStateCd(vEEduAplctVO); // 알림 영역 @@ -2567,7 +2567,7 @@ public class CmdPrcsInfoMngController { //VEPrcsDetailVO info = vEPrcsAplctPrdService.findByCnclInfo(vEPrcsDetailVO); System.out.println("====================="); - System.out.println("===================== :: "+ vEPrcsDetailVO.getSspnIdtmtTrgtOrdList().toString()); + System.out.println("===================== :: "+ vEPrcsDetailVO.getCmdTrgtInfoOrdList().toString()); //파일 정보 가져오기 // FileVO fileVO = new FileVO(); diff --git a/src/main/java/kcc/ve/oprtn/cmdTrgtInfo/trgtMng/web/CmdTrgtMngController.java b/src/main/java/kcc/ve/oprtn/cmdTrgtInfo/trgtMng/web/CmdTrgtMngController.java index 11cd2653..9e7d0202 100644 --- a/src/main/java/kcc/ve/oprtn/cmdTrgtInfo/trgtMng/web/CmdTrgtMngController.java +++ b/src/main/java/kcc/ve/oprtn/cmdTrgtInfo/trgtMng/web/CmdTrgtMngController.java @@ -299,11 +299,11 @@ public class CmdTrgtMngController { // 대괄호 제거 List resultList = new ArrayList<>(); - for (String list : cndtnTrgtMngVO.getSspnIdtmtTrgtOrdList()) { + for (String list : cndtnTrgtMngVO.getCmdTrgtInfoOrdList()) { resultList.add(list.replace("[","").replace("]","")); // 내부 리스트의 모든 요소를 resultList에 추가 } - cndtnTrgtMngVO.setSspnIdtmtTrgtOrdList(resultList); + cndtnTrgtMngVO.setCmdTrgtInfoOrdList(resultList); try { cmdTrgtInfoMngService.updateEduStateCdAndReqStateCdAjax(cndtnTrgtMngVO); diff --git a/src/main/resources/egovframework/sqlmap/ve/cmd/cmdTrgtInfoMng_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/ve/cmd/cmdTrgtInfoMng_SQL_Postgresql.xml index e9a6b1c2..db90589d 100644 --- a/src/main/resources/egovframework/sqlmap/ve/cmd/cmdTrgtInfoMng_SQL_Postgresql.xml +++ b/src/main/resources/egovframework/sqlmap/ve/cmd/cmdTrgtInfoMng_SQL_Postgresql.xml @@ -756,6 +756,7 @@ a.cmd_trgt_info_ord AS cmdTrgtInfoOrd , a.req_nmbr AS reqNmbr , a.prsctr_nm AS prsctrNm + , a.req_state_cd AS reqStateCd FROM a WHERE @@ -937,7 +938,7 @@ , LAST_UPDUSR_ID = #lastUpdusrId# - , rmrks = rmrks || #rmrks# + , rmrks = COALESCE(rmrks, '') || #rmrks# WHERE cmd_trgt_info_ord IN diff --git a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Postgresql.xml index 01872086..ee9bd8a3 100644 --- a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Postgresql.xml +++ b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Postgresql.xml @@ -756,6 +756,7 @@ a.sspn_idtmt_trgt_ord AS sspnIdtmtTrgtOrd , a.req_nmbr AS reqNmbr , a.prsctr_nm AS prsctrNm + , a.req_state_cd AS reqStateCd FROM a WHERE @@ -938,7 +939,7 @@ , LAST_UPDUSR_ID = #lastUpdusrId# - , rmrks = rmrks || #rmrks# + , rmrks = COALESCE(rmrks, '') || #rmrks# WHERE SSPN_IDTMT_TRGT_ORD IN 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 ce0d3d76..06bfc8b2 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 @@ -986,6 +986,209 @@ + ORDER BY a.frst_regist_pnttm ASC + + + + @@ -8750,6 +8953,31 @@ VALUES sspn_idtmt_trgt_ord = #sspnIdtmtTrgtOrd# + + + /* VEEduMIXDAO.updateEduStateCd */ + + UPDATE + vea_cmd_trgt_info + SET + edu_state_cd = #eduStateCd# + /* 교육코드가 10(미이수),60(연기) 이면 미완료 처리(교육이력을 남기기위해 의뢰와 구분용..의뢰는 교육 경험이 없는 경우, 미완료는 교육 이수에 실패한 경우) */ + + , req_state_cd = '35' + + + , req_state_cd = '35' + + + /* 교육코드가 20(이수) 이면 완료 처리 */ + + , req_state_cd = '30' + + + WHERE + cmd_trgt_info_ord = #cmdTrgtInfoOrd# + + /* VEEduMIXDAO.AplctEmail */ diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml index f2923334..a461776a 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml @@ -1469,8 +1469,8 @@ where - a.lctr_div_cd = #lctrDivCd# - and a.user_id = #userId# + a.user_id = #userId# AND a.edu_aplct_ord=#eduAplctOrd# @@ -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 @@ -1796,8 +1797,8 @@ )aa , lettnqestnrinfo bb - WHERE aa.qustnr_tmplat_id=bb.qustnr_tmplat_id - AND aa.qestnr_id=bb.qestnr_id + WHERE aa.qestnr_id=bb.qestnr_id GROUP BY aa.EDU_APLCT_ORD , diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Postgresql.xml index f65cfa32..5539dc5f 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Postgresql.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Postgresql.xml @@ -634,6 +634,51 @@ sspn_idtmt_trgt_ord = #sspnIdtmtTrgtOrd# + + + + /* VEPrcsDAO.updateCmdIdmtTrgtCancelNew */ + UPDATE + vea_cmd_trgt_info + SET + LAST_UPDT_PNTTM = NOW() + ,LAST_UPDUSR_ID = #lastUpdusrId# + + + /* 신청 후 취소 */ + , user_id = NULL + , edu_aplct_ord = NULL + , prcs_aplct_prd_ord_cmplt = NULL + + + + /* 신청 후 반려 */ + , user_id = NULL + , edu_aplct_ord = NULL + , prcs_aplct_prd_ord_cmplt = NULL + + + + /* 확정 후 취소 요청 edu_state_cd=30,req_state_cd=20 */ + /* , edu_state_cd = '30' */ + /* , req_state_cd = '20' 의뢰상태는 교육의 취소, 확정과 관계없이 대상자의 의뢰 상태를 변경 하는것 이므로 여기서는 제외한다. */ + + + + /* 확정 후 취소 요청 edu_state_cd=30,req_state_cd=20 */ + /* , edu_state_cd = '30' */ + /* , req_state_cd = '20' 의뢰상태는 교육의 취소, 확정과 관계없이 대상자의 의뢰 상태를 변경 하는것 이므로 여기서는 제외한다. */ + + + + /* 취소 신청 승은(교육중단) edu_state_cd=60,req_state_cd=40 */ + , edu_state_cd = '60' + , req_state_cd = '35' + /* , req_state_cd = '40' 의뢰상태는 교육의 취소, 확정과 관계없이 대상자의 의뢰 상태를 변경 하는것 이므로 여기서는 제외한다. */ + + WHERE + cmd_trgt_info_ord = #sspnIdtmtTrgtOrd# + /* VEPrcsDAO.updateAplctDetailInfo */ diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/popup/cnclStatusPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/popup/cnclStatusPopup.jsp new file mode 100644 index 00000000..36fb905b --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/popup/cnclStatusPopup.jsp @@ -0,0 +1,142 @@ + +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<% + /** + * @Class Name : instrAsgnmPopup.jsp + * @Description : 강사배치 팝업 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.08.09 김봉호 최초 생성 + * @author 안주영 + * @since 2022.1.8 + * @version 1.0 + * @see + * + */ +%> + + + + +<%-- --%> + + + 강사배치 팝업 + + + + +
+
+ + + + " /> + " /> + " /> + + +
+
+
+

비공개 메모(의뢰취소 담당자 이름 기입)

+
+ +
+ + + + + + + + + + + +

메모(100자)

 + +
+
+ + +
+
+
+
+ + + +
+
+
+
+
+
+ + +
+
+ + + 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 5c205cc3..c1d99b44 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/trgtList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/trgtList.jsp @@ -285,13 +285,13 @@ // 교육상태가 대기/ 연기 인지 확인 // 그 외에 값이면 loop 나온 뒤 경고 alert 실행 후 function 종료 - if($(this).data('eduinfo') != 10 + /* if($(this).data('eduinfo') != 10 && $(this).data('eduinfo') != 50 && $(this).data('eduinfo') != '' ){ chk = true; return; - } + } */ }); if(chk){ diff --git a/src/main/webapp/WEB-INF/jsp/web/my/myNotifyMngList.jsp b/src/main/webapp/WEB-INF/jsp/web/my/myNotifyMngList.jsp index 85aa7c44..3480b6ec 100644 --- a/src/main/webapp/WEB-INF/jsp/web/my/myNotifyMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/my/myNotifyMngList.jsp @@ -9,7 +9,7 @@ <%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> <%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> -교육신청 목록 > 성인 찾아가는 저작권 교육 > 한국지식재산보호원 저작권 교육 시스템 +교육신청 목록 > 한국지식재산보호원 저작권 교육 시스템 + +
+
+
+

교육문의

+
+ +
+ +
    +
  • 교육에 대해 궁금한 점이 있으시면 문의 남겨주시기 바랍니다.
    • +
  • 답변은 ‘마이페이지 > 나의 교육문의’에서 확인하실 수 있습니다.
    • +
+
+ +
+ + + + + + + + + + + + + + + +
강의구분 + +
문의내용 + +
+
+ +
+
+
+
+ +
+
+
+
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctList.jsp index d999e33e..08612513 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctList.jsp @@ -8,7 +8,7 @@ <%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> <%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> -교육신청 목록 > 성인 찾아가는 저작권 교육 > 한국지식재산보호원 저작권 교육 시스템 +교육신청 목록 > 한국지식재산보호원 저작권 교육 시스템 diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/eduAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/eduAplctDetail.jsp index d3e2ad75..7ce15b97 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/eduAplctDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/eduAplctDetail.jsp @@ -481,7 +481,8 @@

기소유예

저작권 침해사범 중 검찰청으로부터 교육조건부 기소유예 처분을 받아 교육 의뢰된 자 -

문의사항 : 상단 교육문의 활용

 + <%--

문의사항 : 상단 교육문의 활용

 --%> +

문의사항 : 상단 교육문의 활용

 @@ -533,12 +534,13 @@ - + <%-- 교육장소 - + 관련URL - + --%> + 관련URL diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/eduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/eduAplctList.jsp index 92e7361c..7f894fbc 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/eduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/eduAplctList.jsp @@ -9,7 +9,7 @@ <%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> <%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> -교육신청 목록 > 성인 찾아가는 저작권 교육 > 한국지식재산보호원 저작권 교육 시스템 +교육신청 목록 > 한국지식재산보호원 저작권 교육 시스템