diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/VELctrAreaService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/VELctrAreaService.java index 965ade53..10563f7b 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/VELctrAreaService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/VELctrAreaService.java @@ -24,10 +24,15 @@ public interface VELctrAreaService { //D int deleteAll(VELctrDetailVO paramVO) throws Exception; + int deleteStngAll(VELctrDetailVO paramVO) throws Exception; + //L List selectList(VELctrDetailVO paramVO) throws Exception; //Page List List selectPagingList(VELctrDetailVO paramVO) throws Exception; + //조사년월에 강사가 선택한 강의지역 리스트로 변경. 2023-07-25 + List selectPagingListNew(VELctrDetailVO paramVO) throws Exception; + } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/VELctrRsrchSbmtService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/VELctrRsrchSbmtService.java index 8218bd75..be42a7a4 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/VELctrRsrchSbmtService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/VELctrRsrchSbmtService.java @@ -9,6 +9,9 @@ public interface VELctrRsrchSbmtService { //R VELctrDetailVO selectDetail(VELctrDetailVO paramVO) throws Exception; + + //강의설정순번 없이 강의조사제출 정보가 있는지 찾는다로 수정. 2023-07-25 + VELctrDetailVO selectDetailNew(VELctrDetailVO paramVO) throws Exception; //U int update(VELctrDetailVO paramVO) throws Exception; diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/impl/VELctrAreaDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/impl/VELctrAreaDAO.java index 1b24b39b..06ebfbef 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/impl/VELctrAreaDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/impl/VELctrAreaDAO.java @@ -63,6 +63,10 @@ public class VELctrAreaDAO extends EgovAbstractDAO { return delete("VELctrAreaDAO.deleteAll", paramVO); } + public int deleteStngAll(VELctrDetailVO paramVO) throws Exception { + return delete("VELctrAreaDAO.deleteStngAll", paramVO); + } + /** * * 삭제 - D , 해당 유저의 강의에 대한 지역을 모두 삭제 @@ -89,6 +93,11 @@ public class VELctrAreaDAO extends EgovAbstractDAO { public List selectPagingList(VELctrDetailVO paramVO) throws Exception { List tlist = (List) list("VELctrAreaDAO.selectPagingList", paramVO); return tlist; + } + + public List selectPagingListNew(VELctrDetailVO paramVO) throws Exception { + List tlist = (List) list("VELctrAreaDAO.selectPagingListNew", paramVO); + return tlist; } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/impl/VELctrAreaServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/impl/VELctrAreaServiceImpl.java index f7588752..42c8d7cb 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/impl/VELctrAreaServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/impl/VELctrAreaServiceImpl.java @@ -49,6 +49,10 @@ public class VELctrAreaServiceImpl implements VELctrAreaService { return vELctrAreaDAO.deleteAll(paramVO); } + public int deleteStngAll(VELctrDetailVO paramVO) throws Exception{ + return vELctrAreaDAO.deleteStngAll(paramVO); + } + //D public int deleteLctrOrdArea(VELctrDetailVO paramVO) throws Exception{ return vELctrAreaDAO.deleteLctrOrdArea(paramVO); @@ -64,4 +68,7 @@ public class VELctrAreaServiceImpl implements VELctrAreaService { return vELctrAreaDAO.selectPagingList(paramVO); } + public List selectPagingListNew(VELctrDetailVO paramVO) throws Exception{ + return vELctrAreaDAO.selectPagingListNew(paramVO); + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/impl/VELctrRsrchSbmtDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/impl/VELctrRsrchSbmtDAO.java index 11c17a9d..1d92398c 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/impl/VELctrRsrchSbmtDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/impl/VELctrRsrchSbmtDAO.java @@ -29,6 +29,10 @@ public class VELctrRsrchSbmtDAO extends EgovAbstractDAO { return (VELctrDetailVO) select("VELctrRsrchSbmtDAO.selectDetail", paramVO); } + public VELctrDetailVO selectDetailNew(VELctrDetailVO paramVO) throws Exception { + return (VELctrDetailVO) select("VELctrRsrchSbmtDAO.selectDetailNew", paramVO); + } + /** * 수정 - U * @param VELctrDetailVO diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/impl/VELctrRsrchSbmtServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/impl/VELctrRsrchSbmtServiceImpl.java index c49aca14..80824349 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/impl/VELctrRsrchSbmtServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/impl/VELctrRsrchSbmtServiceImpl.java @@ -28,6 +28,10 @@ public class VELctrRsrchSbmtServiceImpl implements VELctrRsrchSbmtService { return vELctrRsrchSbmtDAO.selectDetail(paramVO); } + public VELctrDetailVO selectDetailNew(VELctrDetailVO paramVO) throws Exception { + return vELctrRsrchSbmtDAO.selectDetailNew(paramVO); + } + //U public int update(VELctrDetailVO paramVO) throws Exception{ diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/web/lctrTngrInfoStngController.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/web/lctrTngrInfoStngController.java index af0d9b72..a827609e 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/web/lctrTngrInfoStngController.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/web/lctrTngrInfoStngController.java @@ -140,6 +140,179 @@ public class lctrTngrInfoStngController { model.addAttribute("info", vELctrDetailVO); + /* + // 선호대상 공통코드 조회 + List prfrnTrgtList = cmmUseService.selectCmmCodeDetail("VE0006"); + model.addAttribute("prfrnTrgtList", prfrnTrgtList); + */ + + //1.강의 조사를 요청한 설정 년월 리스트 - + //조사년월 select box + List selectStngYrMntList = vELctrRsrchMngService.selectList(vELctrDetailVO); + model.addAttribute("selectStngYrMntList", selectStngYrMntList); + + //2.오늘이 선택해서 들어온 강의조사의 기간 여부 체크 + //날짜 표시 및 제출 버튼 노출 에 사용 + VELctrDetailVO vELctrRsrchDetailVO = new VELctrDetailVO(); + vELctrDetailVO.setSelectPagingListQuery(" AND TO_CHAR(SYSDATETIME,'yyyymmdd') BETWEEN rsrch_strt_dt and rsrch_end_dt " + + " AND rsrch_instr_div='"+vELctrDetailVO.getRsrchInstrDiv()+"' " + + " AND stng_yr_mnt='"+vELctrDetailVO.getStngYrMnt()+"' "); + //vELctrRsrchDetailVO = vELctrRsrchMngService.selectDetail(vELctrDetailVO); + vELctrRsrchDetailVO = vELctrRsrchMngService.selectDetailWithQuery(vELctrDetailVO); + model.addAttribute("vELctrRsrchDetailVO", vELctrRsrchDetailVO); + + + //3.강의지역 조회 + //1depth 강의 지역 정보 + VERsdncVO vERsdncVO = new VERsdncVO(); + List rsdncStep1VOList = vERsdncMIXService.selectRsdncStep1List(vERsdncVO); + model.addAttribute("rsdncStep1VOList", rsdncStep1VOList); + + /* + if(vELctrRsrchDetailVO==null) { //현재 조사중이 아닌 조사년월값이다. - 데이터 보여줌 + //현재의 선택값을 보여준다. + //2depth 강의 지역 정보 & 선택 여부 + vERsdncVO.setUserId(vELctrDetailVO.getUserId()); + vERsdncVO.setSiteNm(vELctrDetailVO.getStngYrMnt()); + List rsdncStep2VOList = vERsdncMIXService.selectRsdncStep2List(vERsdncVO); + model.addAttribute("rsdncStep2VOList", rsdncStep2VOList); + + + }else { //제출한 정보를 보여준다. + //2depth 강의 지역 정보 & 선택 여부 + vERsdncVO.setUserId(vELctrDetailVO.getUserId()); + vERsdncVO.setSiteNm(vELctrDetailVO.getStngYrMnt()); + List rsdncStep2VOList = vERsdncMIXService.selectRsdncStep2ListNew(vERsdncVO); + model.addAttribute("rsdncStep2VOList", rsdncStep2VOList); + + } + */ + + //2depth 강의 지역 정보 & 선택 여부 + vERsdncVO.setUserId(vELctrDetailVO.getUserId()); + vERsdncVO.setSiteNm(vELctrDetailVO.getStngYrMnt()); + List rsdncStep2VOList = vERsdncMIXService.selectRsdncStep2ListNew(vERsdncVO); + model.addAttribute("rsdncStep2VOList", rsdncStep2VOList); + + + //4.해당 강의 조사에 대한 강사의 작성한 정보가 있는지 확인 할것 + vELctrDetailVO = vELctrRsrchSbmtService.selectDetailNew(vELctrDetailVO); + + + //4.있으면 해당 값을 가져오기 + if (vELctrDetailVO !=null) { + //제출 정보 + model.addAttribute("vELctrDetailVOSbmt", vELctrDetailVO); + + System.out.println("selectStngYrMntList.get(0).getStngMnt()= != null"); + System.out.println(selectStngYrMntList.get(0).getStngYrMnt()); + + + //vELctrDetailVO.setStngYrMnt(selectStngYrMntList.get(0).getStngYrMnt()); + + //강사상세 + /* + VEInstrDetailVO vEInstrDetailVODetail = new VEInstrDetailVO(); + //vEInstrDetailVODetail.setInstrDiv(vELctrDetailVO.getInstrDiv()); + vEInstrDetailVODetail.setInstrDiv(vELctrDetailVO.getInstrDiv()); + vEInstrDetailVODetail.setUserId(vELctrDetailVO.getUserId()); + vEInstrDetailVODetail.setUseYn("Y"); + vEInstrDetailVODetail = vEInstrDetailService.selectDetail(vEInstrDetailVODetail); + model.addAttribute("vEInstrDetailVODetail", vEInstrDetailVODetail); + */ + + + //강의설정테이블 + VELctrDetailVO lctrStngInfo = vELctrMIXService.selectDetail(vELctrDetailVO); + + if (lctrStngInfo!=null) { + //강의 설정 + model.addAttribute("lctrStngInfo", lctrStngInfo); + + //강의지역 조회 + vELctrDetailVO.setRecordCountPerPage(1000); + vELctrDetailVO.setFirstIndex(0); + List vELctrAreaList = vELctrAreaService.selectPagingListNew(vELctrDetailVO); + model.addAttribute("vELctrAreaList", vELctrAreaList); + } + + }else { + //제출 정보 + model.addAttribute("vELctrDetailVOSbmt", vELctrDetailVO); + + System.out.println("selectStngYrMntList.get(0).getStngMnt()== null"); + System.out.println(selectStngYrMntList.get(0).getStngYrMnt()); + + //없으면 현재 값을 가져오기 + vELctrDetailVO = new VELctrDetailVO(); + vELctrDetailVO.setInstrDiv(vEInstrDetailVO.getInstrDiv()); //강사구분 10-청소년 20-성인대상 + vELctrDetailVO.setUserId(vEInstrDetailVO.getUserId()); + vELctrDetailVO.setUserId(loginVO.getUniqId()); + vELctrDetailVO.setStngYrMnt(selectStngYrMntList.get(0).getStngYrMnt()); + + //강사상세 + /* + VEInstrDetailVO vEInstrDetailVODetail = new VEInstrDetailVO(); + //vEInstrDetailVODetail.setInstrDiv(vELctrDetailVO.getInstrDiv()); + vEInstrDetailVODetail.setInstrDiv(vELctrDetailVO.getInstrDiv()); + vEInstrDetailVODetail.setUserId(vELctrDetailVO.getUserId()); + vEInstrDetailVODetail.setUseYn("Y"); + vEInstrDetailVODetail = vEInstrDetailService.selectDetail(vEInstrDetailVODetail); + model.addAttribute("vEInstrDetailVODetail", vEInstrDetailVODetail); + */ + + //해당 월에 기 설정된 값이 없으면 데이터를 가져오지 않는다. + /* + //강의설정테이블-사용중인 + vELctrDetailVO.setUseYn("Y"); + VELctrDetailVO lctrStngInfo = vELctrMIXService.selectDetail(vELctrDetailVO); + + if (lctrStngInfo!=null) { + //강의 설정 + model.addAttribute("lctrStngInfo", lctrStngInfo); + + //강의지역 조회 + vELctrDetailVO.setRecordCountPerPage(1000); + vELctrDetailVO.setFirstIndex(0); + List vELctrAreaList = vELctrAreaService.selectPagingList(vELctrDetailVO); + model.addAttribute("vELctrAreaList", vELctrAreaList); + } + */ + } + + + return "/web/ve/instr/tngrVisitEdu/lctrInfo/lctrStngReg"; + } + + /** + * 1.성인대상 강사 강의설정 등록화면 + */ + @RequestMapping("lctrStngReg_bak.do") + public String instrPrflReg_bak( + @ModelAttribute("vELctrDetailVO") VELctrDetailVO vELctrDetailVO + ,@ModelAttribute("vEInstrDetailVO") VEInstrDetailVO vEInstrDetailVO + , ModelMap model + , HttpServletRequest request + ) throws Exception { + + //로그인 처리==================================== + //로그인 정보 가져오기 + + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + + if (loginVO == null || ssoLoginVO == null) { + return checkLoginUtil.getUserLoginPage(model); //로그인 정보가 없으면 로그인 페이지로 이동한다. + } + //로그인 처리==================================== + + //청소년대상 강사 정보 가져오기 + vELctrDetailVO.setInstrDiv(vEInstrDetailVO.getInstrDiv()); //강사구분 10-청소년 20-성인대상 + vELctrDetailVO.setUserId(vEInstrDetailVO.getUserId()); + vELctrDetailVO.setUserId(loginVO.getUniqId()); + + model.addAttribute("info", vELctrDetailVO); + //강의지역 조회 VERsdncVO vERsdncVO = new VERsdncVO(); diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/rsdncInfo/service/VERsdncMIXService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/rsdncInfo/service/VERsdncMIXService.java index cbb3887a..72f89f17 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/rsdncInfo/service/VERsdncMIXService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/rsdncInfo/service/VERsdncMIXService.java @@ -9,8 +9,15 @@ public interface VERsdncMIXService { List selectRsdncStep1List(VERsdncVO paramVO) throws Exception; + //강사의 모든 강의 조사 선택 강의 지역 정보로 사용했음 List selectRsdncStep2List(VERsdncVO paramVO) throws Exception; + //강사의 해당 년월의 강의 조사 선택 강의 지역 정보로 사용하도록 수정 - 2023.07.25 + List selectRsdncStep2ListNew(VERsdncVO paramVO) throws Exception; + + //강사의 강의 지역 정보를 사용중인 정보고 가져오기 - 2023.07.26 + List selectRsdncStep2ListNewAdmin(VERsdncVO paramVO) throws Exception; + List selectRsdncStep3List(VERsdncVO paramVO) throws Exception; } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/rsdncInfo/service/impl/VERsdncMIXDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/rsdncInfo/service/impl/VERsdncMIXDAO.java index 9bd9eddc..659cee5c 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/rsdncInfo/service/impl/VERsdncMIXDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/rsdncInfo/service/impl/VERsdncMIXDAO.java @@ -26,6 +26,16 @@ public class VERsdncMIXDAO extends EgovAbstractDAO { return tlist; } + public List selectRsdncStep2ListNew(VERsdncVO paramVO) throws Exception { + List tlist = (List) list("VERsdncMIXDAO.selectRsdncStep2ListNew", paramVO); + return tlist; + } + + public List selectRsdncStep2ListNewAdmin(VERsdncVO paramVO) throws Exception { + List tlist = (List) list("VERsdncMIXDAO.selectRsdncStep2ListNewAdmin", paramVO); + return tlist; + } + public List selectRsdncStep3List(VERsdncVO paramVO) throws Exception { List tlist = (List) list("VERsdncMIXDAO.selectRsdncStep3List", paramVO); return tlist; diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/rsdncInfo/service/impl/VERsdncMIXServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/rsdncInfo/service/impl/VERsdncMIXServiceImpl.java index 2ac58b96..64f45439 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/rsdncInfo/service/impl/VERsdncMIXServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/rsdncInfo/service/impl/VERsdncMIXServiceImpl.java @@ -30,6 +30,14 @@ public class VERsdncMIXServiceImpl implements VERsdncMIXService { public List selectRsdncStep2List(VERsdncVO paramVO) throws Exception{ return vERsdncMIXDAO.selectRsdncStep2List(paramVO); } + + public List selectRsdncStep2ListNew(VERsdncVO paramVO) throws Exception{ + return vERsdncMIXDAO.selectRsdncStep2ListNew(paramVO); + } + + public List selectRsdncStep2ListNewAdmin(VERsdncVO paramVO) throws Exception{ + return vERsdncMIXDAO.selectRsdncStep2ListNewAdmin(paramVO); + } public List selectRsdncStep3List(VERsdncVO paramVO) throws Exception{ return vERsdncMIXDAO.selectRsdncStep3List(paramVO); diff --git a/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java b/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java index a6ebc1d9..f4271238 100644 --- a/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java +++ b/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java @@ -1780,7 +1780,8 @@ public class OprtnInstrTngrPrflContoller { List rsdncStep1VOList = vERsdncMIXService.selectRsdncStep1List(vERsdncVO); model.addAttribute("rsdncStep1VOList", rsdncStep1VOList); - List rsdncStep2VOList = vERsdncMIXService.selectRsdncStep2List(vERsdncVO); + //List rsdncStep2VOList = vERsdncMIXService.selectRsdncStep2List(vERsdncVO); + List rsdncStep2VOList = vERsdncMIXService.selectRsdncStep2ListNew(vERsdncVO); model.addAttribute("rsdncStep2VOList", rsdncStep2VOList); // 선호대상 공통코드 조회 @@ -1835,7 +1836,7 @@ public class OprtnInstrTngrPrflContoller { //강의지역 조회 vELctrDetailVO.setRecordCountPerPage(1000); vELctrDetailVO.setFirstIndex(0); - List vELctrAreaList = vELctrAreaService.selectPagingList(vELctrDetailVO); + List vELctrAreaList = vELctrAreaService.selectPagingListNew(vELctrDetailVO); model.addAttribute("vELctrAreaList", vELctrAreaList); } @@ -1863,14 +1864,26 @@ public class OprtnInstrTngrPrflContoller { //로그인 처리==================================== //강의지역 조회 + //depth1 VERsdncVO vERsdncVO = new VERsdncVO(); System.out.println("List rsdncStep1VOList = vERsdncMIXService.selectRsdncStep1List(vERsdncVO);"); List rsdncStep1VOList = vERsdncMIXService.selectRsdncStep1List(vERsdncVO); model.addAttribute("rsdncStep1VOList", rsdncStep1VOList); + //depth2 System.out.println("List rsdncStep2VOList = vERsdncMIXService.selectRsdncStep2List(vERsdncVO);"); - vERsdncVO.setUserId(vELctrDetailVO.getUserId()); - List rsdncStep2VOList = vERsdncMIXService.selectRsdncStep2List(vERsdncVO); + System.out.println("List rsdncStep2VOList = vERsdncMIXService.selectRsdncStep2ListNewAdmin(vERsdncVO);=2"); + vERsdncVO.setUserId(vELctrDetailVO.getUserId()); + //List rsdncStep2VOList = vERsdncMIXService.selectRsdncStep2List(vERsdncVO); + + System.out.println("vERsdncVO.getUserId()"); + System.out.println(vERsdncVO.getUserId()); + + if ("".equals(vERsdncVO.getUserId()) || vERsdncVO.getUserId()==null) { + vERsdncVO.setUserId(vELctrDetailVO.getUserId()); + } + + List rsdncStep2VOList = vERsdncMIXService.selectRsdncStep2ListNewAdmin(vERsdncVO); model.addAttribute("rsdncStep2VOList", rsdncStep2VOList); //강의설정테이블 @@ -1926,7 +1939,8 @@ public class OprtnInstrTngrPrflContoller { model.addAttribute("rsdncStep1VOList", rsdncStep1VOList); vERsdncVO.setUserId(vELctrDetailVO.getUserId()); - List rsdncStep2VOList = vERsdncMIXService.selectRsdncStep2List(vERsdncVO); + vERsdncVO.setSiteNm(vELctrDetailVO.getStngYrMnt()); + List rsdncStep2VOList = vERsdncMIXService.selectRsdncStep2ListNew(vERsdncVO); model.addAttribute("rsdncStep2VOList", rsdncStep2VOList); // 선호대상 공통코드 조회 @@ -1975,7 +1989,7 @@ public class OprtnInstrTngrPrflContoller { //강의지역 조회 vELctrDetailVO.setRecordCountPerPage(1000); vELctrDetailVO.setFirstIndex(0); - List vELctrAreaList = vELctrAreaService.selectPagingList(vELctrDetailVO); + List vELctrAreaList = vELctrAreaService.selectPagingListNew(vELctrDetailVO); model.addAttribute("vELctrAreaList", vELctrAreaList); } @@ -2144,7 +2158,11 @@ public class OprtnInstrTngrPrflContoller { } //강의지역테이블 새로 Insert - vELctrAreaService.deleteAll(vELctrDetailVO); + //기존 지역을 삭제하지 않는다.since.2023.07.26 + //vELctrAreaService.deleteAll(vELctrDetailVO); + //해당 조사년월에 대한 지역만 삭제한다. + vELctrAreaService.deleteStngAll(vELctrDetailVO); + if(StringUtil.isNotEmpty(vELctrDetailVO.getAreaCd())) { String[] areaCdArr = vELctrDetailVO.getAreaCd().split(","); for(String areaCd : areaCdArr) { diff --git a/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrArea_SQL_Cubrid.xml b/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrArea_SQL_Cubrid.xml index af78f3ad..34044bc8 100644 --- a/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrArea_SQL_Cubrid.xml +++ b/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrArea_SQL_Cubrid.xml @@ -121,7 +121,24 @@ instr_div = #instrDiv# AND user_id = #userId# - + + + + DELETE FROM + + WHERE + instr_div = #instrDiv# + AND user_id = #userId# + AND lctr_stng_ord=( + SELECT lctr_stng_ord + FROM ve_lctr_rsrch_sbmt a + WHERE a.rsrch_instr_div =#instrDiv# + AND a.stng_yr_mnt =#stngYrMnt# + AND a.user_id =#userId# + AND a.instr_div =#instrDiv# + ) + + DELETE FROM @@ -192,4 +209,53 @@ + + diff --git a/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrRsrchSbmt_SQL_Cubrid.xml b/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrRsrchSbmt_SQL_Cubrid.xml index 5b51f01b..951e035b 100644 --- a/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrRsrchSbmt_SQL_Cubrid.xml +++ b/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrRsrchSbmt_SQL_Cubrid.xml @@ -85,11 +85,12 @@ - + + + + UPDATE diff --git a/src/main/resources/egovframework/sqlmap/ve/rsdnc/VERsdnc_MIX_SQL_Cubrid.xml b/src/main/resources/egovframework/sqlmap/ve/rsdnc/VERsdnc_MIX_SQL_Cubrid.xml index afd506d4..8179c762 100644 --- a/src/main/resources/egovframework/sqlmap/ve/rsdnc/VERsdnc_MIX_SQL_Cubrid.xml +++ b/src/main/resources/egovframework/sqlmap/ve/rsdnc/VERsdnc_MIX_SQL_Cubrid.xml @@ -121,6 +121,148 @@ + + + + + + + + --%> diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndRslt.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndRslt.jsp index c53e4535..114cb54c 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndRslt.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndRslt.jsp @@ -626,6 +626,10 @@

결과보고 정보

+ ※ 업로드 가능한 용량은 전체 파일을 합산한 기준으로 500MB 제한이 있습니다. +
    용량을 초과할 경우, 오류 발생으로 인해 업로드가 되지 않으니 유의하시기 바랍니다. +