diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEAsgnmMIXService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEAsgnmMIXService.java index d8206590..e4f0daae 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEAsgnmMIXService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEAsgnmMIXService.java @@ -27,6 +27,8 @@ public interface VEAsgnmMIXService { //배정 강사 확정 리스트 List selectAsgnmPagingList(VEInstrAsgnmVO paramVO) throws Exception; + VEInstrAsgnmVO findByAcmdtCnfrm(VEInstrAsgnmVO vEInstrAsgnmVO) throws Exception; + //R VEInstrAsgnmVO selectAsgnmRqstDetail(VEInstrAsgnmVO paramVO) throws Exception; @@ -117,4 +119,5 @@ public interface VEAsgnmMIXService { //배정 최대값 제한 산술식을 위한 해당 교육 차시에 속한 달의 강사 교육접수차시 가져오기 //R VEInstrAsgnmVO selectTtlMntChasiSumDetail(VEInstrAsgnmVO paramVO) throws Exception; + } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAsgnmMIXDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAsgnmMIXDAO.java index a0892474..999a680c 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAsgnmMIXDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAsgnmMIXDAO.java @@ -58,6 +58,11 @@ public class VEAsgnmMIXDAO extends EgovAbstractDAO { return tlist; } + public VEInstrAsgnmVO findByAcmdtCnfrm(VEInstrAsgnmVO paramVO) throws Exception { + VEInstrAsgnmVO tlist = (VEInstrAsgnmVO) select("VEAsgnmMIXDAO.findByAcmdtCnfrm", paramVO); + return tlist; + } + public VEInstrAsgnmVO selectAsgnmRqstDetail(VEInstrAsgnmVO paramVO) throws Exception { return (VEInstrAsgnmVO) select("VEAsgnmMIXDAO.selectAsgnmRqstDetail", paramVO); } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAsgnmMIXServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAsgnmMIXServiceImpl.java index 1617b1ac..a326080a 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAsgnmMIXServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAsgnmMIXServiceImpl.java @@ -49,6 +49,10 @@ public class VEAsgnmMIXServiceImpl implements VEAsgnmMIXService { return vEAsgnmMIXDAO.selectAsgnmPagingList(paramVO); } + public VEInstrAsgnmVO findByAcmdtCnfrm(VEInstrAsgnmVO paramVO) throws Exception{ + return vEAsgnmMIXDAO.findByAcmdtCnfrm(paramVO); + } + //R public VEInstrAsgnmVO selectAsgnmRqstDetail(VEInstrAsgnmVO paramVO) throws Exception { return vEAsgnmMIXDAO.selectAsgnmRqstDetail(paramVO); diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java index 94708e84..d2b425f2 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java @@ -260,6 +260,28 @@ public class VEAsgnmController { List vEInstrAsgnmVOList = vEAsgnmMIXService.selectAsgnmPagingList(vEInstrAsgnmVO); + vEInstrAsgnmVOList.stream().forEach(t-> { + try { + VEInstrAsgnmVO acmdtCnfrmVO = vEAsgnmMIXService.findByAcmdtCnfrm(t); + + + if(acmdtCnfrmVO != null) + { + if(StringUtils.isNotEmpty(acmdtCnfrmVO.getAcmdtSbmtYn())) + t.setAcmdtSbmtYn(acmdtCnfrmVO.getAcmdtSbmtYn()); + if(StringUtils.isNotEmpty(acmdtCnfrmVO.getAcmdtSbmtYn())) + t.setAcmdtAprvlCd(acmdtCnfrmVO.getAcmdtSbmtYn()); + if(StringUtils.isNotEmpty(acmdtCnfrmVO.getAcmdtSbmtYn())) + t.setAcmdtFee(acmdtCnfrmVO.getAcmdtSbmtYn()); + } + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + }); + + System.out.println("=========================================== "); //6.pageing step3 paginationInfo = this.setPagingStep3(vEInstrAsgnmVOList, paginationInfo); model.addAttribute("paginationInfo", paginationInfo); @@ -448,9 +470,11 @@ public class VEAsgnmController { //숙박 VEInstrFeeAcmdtVO acmdtAplct = new VEInstrFeeAcmdtVO(); acmdtAplct.setFrstRegisterId(loginVO.getUniqId()); - acmdtAplct.setEduAplctOrd(vEInstrAsgnmVO.getEduAplctOrd()); - acmdtAplct.setEduChasiOrd(vEInstrAsgnmVO.getEduChasiOrd()); + +// acmdtAplct.setEduAplctOrd(vEInstrAsgnmVO.getEduAplctOrd()); +// acmdtAplct.setEduChasiOrd(vEInstrAsgnmVO.getEduChasiOrd()); acmdtAplct.setInstrDiv("10"); + acmdtAplct.setEduHopeDt(vEInstrAsgnmVOInfo.getEduHopeDt()); //=== 20230627 이호영 //=== 숙박신청 차시 제거 @@ -458,6 +482,11 @@ public class VEAsgnmController { // acmdtAplct = vEAcmdtAplctService.selectDetailByUser(acmdtAplct); acmdtAplct = vEAcmdtAplctService.selectDetailByUser_r2(acmdtAplct); + + + + System.out.println("=========================================== "); + String acmdtAplctCheck = "N"; // if(StringUtils.isNotEmpty(acmdtAplct.getAcmdtAplctOrd())) { if(acmdtAplct != null) { diff --git a/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/lctrRsrch/web/OprtnLctrRsrchTngrContoller.java b/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/lctrRsrch/web/OprtnLctrRsrchTngrContoller.java index af11215a..77916b64 100644 --- a/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/lctrRsrch/web/OprtnLctrRsrchTngrContoller.java +++ b/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/lctrRsrch/web/OprtnLctrRsrchTngrContoller.java @@ -342,8 +342,6 @@ public class OprtnLctrRsrchTngrContoller { //로그인 처리==================================== - System.out.println(vELctrDetailVO.getStngYrMnt()); - System.out.println(vELctrDetailVO.getRsrchInstrDiv()); //1.pageing step1 PaginationInfo paginationInfo = new PaginationInfo(); @@ -352,8 +350,28 @@ public class OprtnLctrRsrchTngrContoller { //2. pageing step2 vELctrDetailVO = vEPagingUtil.setPagingStep2_VELctrDetailVO(vELctrDetailVO, paginationInfo); + + System.out.println("vELctrDetailVO.getOrderByQuery() :: "+ vELctrDetailVO.getOrderByQuery()); + + // 공통으로 사용하는 setPagingStep2_VELctrDetailVO 메소드에서 + // vELctrDetailVO.getSearchSortCnd() 이 없으면 prcs_ord로 강제 입력하는데 + // prcs_ord값은 detail 쿼리에 없는 값이라 다시 초기화 함 + System.out.println(vELctrDetailVO.getSearchSortCnd()); + System.out.println(vELctrDetailVO.getSearchSortOrd()); + if("prcs_ord".equals(vELctrDetailVO.getSearchSortCnd())) { + vELctrDetailVO.setSearchSortCnd(""); + vELctrDetailVO.setSearchSortOrd(""); + } + + + + if(StringUtils.isNotEmpty(vELctrDetailVO.getSearchSortCnd())) { + vELctrDetailVO.setOrderByQuery(vELctrDetailVO.getSearchSortCnd()+" "+vELctrDetailVO.getSearchSortOrd()); + } + List selectVELctrDetailVOList = vELctrRsrchMngService.selectPagingListLctr(vELctrDetailVO); + System.out.println("============"); //3.pageing step3 paginationInfo = vEPagingUtil.setPagingStep3_VELctrDetailVO(selectVELctrDetailVOList, paginationInfo); diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java index 1f6863c4..9f3b7b3a 100644 --- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java +++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java @@ -402,6 +402,7 @@ public class EduAplctMngTngrController { List vEEduChasiVOList = vVEEduChasiService.selectList(vEEduChasiVO); model.addAttribute("chasiList", vEEduChasiVOList); + model.addAttribute("cryptoUtil",egovCryptoUtil); return "oprtn/tngrVisitEdu/popup/eduAplctMngDetailPopup"; } diff --git a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAcmdtAplct_SQL_Cubrid.xml b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAcmdtAplct_SQL_Cubrid.xml index 445f6957..273ca3bb 100644 --- a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAcmdtAplct_SQL_Cubrid.xml +++ b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAcmdtAplct_SQL_Cubrid.xml @@ -159,18 +159,19 @@ - + + + + + + + + + diff --git a/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrRsrchMng_SQL_Cubrid.xml b/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrRsrchMng_SQL_Cubrid.xml index 6cb1883f..3d888bed 100644 --- a/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrRsrchMng_SQL_Cubrid.xml +++ b/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrRsrchMng_SQL_Cubrid.xml @@ -345,7 +345,10 @@ ORDER BY 1=1 + + + , dddd.rsdne asc diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/lctrRsrchMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/lctrRsrchMngDetail.jsp index 2b3c9fa8..198c16e2 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/lctrRsrchMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/lctrRsrchMngDetail.jsp @@ -30,6 +30,40 @@