From 0c02c090abf445b13d636f20ab0ef6d3cf8330d6 Mon Sep 17 00:00:00 2001 From: hylee Date: Fri, 30 Jun 2023 14:29:24 +0900 Subject: [PATCH 1/3] =?UTF-8?q?feat=20:=20pms-#3222=20"[=EA=B0=95=EC=82=AC?= =?UTF-8?q?]=20[SFR-014-1]=20=EA=B0=95=EC=82=AC=EB=B3=84=20=EC=88=99?= =?UTF-8?q?=EB=B0=95=EC=8B=A0=EC=B2=AD=20=EA=B8=B0=EB=8A=A5=20=EA=B0=9C?= =?UTF-8?q?=EC=84=A0"=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asgnmInfo/service/VEAsgnmMIXService.java | 3 ++ .../asgnmInfo/service/impl/VEAsgnmMIXDAO.java | 5 +++ .../service/impl/VEAsgnmMIXServiceImpl.java | 4 +++ .../asgnmInfo/web/VEAsgnmController.java | 33 +++++++++++++++++-- .../ve/asgnm/VEAcmdtAplct_SQL_Cubrid.xml | 20 ++++++----- .../ve/asgnm/VEAsgnm_MIX_SQL_Cubrid.xml | 23 +++++++++++++ 6 files changed, 77 insertions(+), 11 deletions(-) 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/resources/egovframework/sqlmap/ve/asgnm/VEAcmdtAplct_SQL_Cubrid.xml b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAcmdtAplct_SQL_Cubrid.xml index 445f6957..76bee03b 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 @@ -162,15 +162,17 @@ + + + + + + + + + From 96e09425ae9e5d61f29d69f0167d29549b8af055 Mon Sep 17 00:00:00 2001 From: jiwoo Date: Fri, 30 Jun 2023 15:41:10 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=9E=90=20>=20=EC=B2=AD=EC=86=8C=EB=85=84=EA=B5=90?= =?UTF-8?q?=EC=9C=A1=20>=20=EA=B5=90=EC=9C=A1=EC=8B=A0=EC=B2=AD=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20>=20=EC=8B=A0=EC=B2=AD=EC=84=9C=20=EC=9D=BC?= =?UTF-8?q?=EA=B4=84=EC=B6=9C=EB=A0=A5=20=EB=88=84=EB=9D=BD=20=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=B6=94=EA=B0=80=20=EB=B0=8F=20=EB=B9=88=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/EduAplctMngTngrController.java | 1 + .../popup/eduAplctMngDetailPopup.jsp | 59 +++++++++++++------ 2 files changed, 42 insertions(+), 18 deletions(-) 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/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/eduAplctMngDetailPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/eduAplctMngDetailPopup.jsp index 6c30bc89..ff0129c3 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/eduAplctMngDetailPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/eduAplctMngDetailPopup.jsp @@ -37,22 +37,15 @@ /* Page Url Hide */ @page { size: auto; /* auto is the initial value */ - margin: 0; /* this affects the margin in the printer settings */ + margin: 0; /* this affects the margin in the printer settings */ } @media print { - .cont_tit { - page-break-before: always; - } - - .page_break { - page-break-before: always; - height: 40px; - } - - .print_mark { - page-break-before: auto; - } + html, body {height:auto;margin: 0 !important;padding: 0 !important;overflow: hidden;page-break-after: avoid;} + .cont_tit {page-break-before: always;} + .page_break {page-break-inside:avoid; page-break-after:auto} + .print_mark {page-break-before: auto;} + form{display: none;} } @@ -155,7 +148,15 @@

교육장소

- + + +

+ checked disabled="disabled"> 집체교육 +

+

+ checked disabled="disabled"> 방송실교육 +

+ @@ -183,7 +184,7 @@ - + 신청취소 @@ -192,12 +193,24 @@ 교육신청 + + 대기 + - 교육확정 + 교육승인 교육반려 + + 교육확정 + + + 수정요청(대기) + + + 수정완료(대기) + - @@ -214,9 +227,9 @@ +

+
- -

교육차시 정보

@@ -235,6 +248,7 @@ 시간 구분 대상 + 배정강사 인원 @@ -264,6 +278,15 @@ + + + + - + + +
(${fn:split(list.userId,'_')[1]*1}) + + From 325f16bafb29b63e7f3d39ae16d200330a7fe39f Mon Sep 17 00:00:00 2001 From: hylee Date: Fri, 30 Jun 2023 17:44:49 +0900 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20pms-#3221=20"[=EA=B4=80=EB=A6=AC?= =?UTF-8?q?=EC=9E=90]=20=EC=B2=AD=EC=86=8C=EB=85=84=EC=B0=BE=EC=95=84?= =?UTF-8?q?=EA=B0=80=EB=8A=94=20=EC=A0=80=EC=9E=91=EA=B6=8C=20=EA=B5=90?= =?UTF-8?q?=EC=9C=A1=20>=20=EA=B0=95=EC=9D=98=EC=A1=B0=EC=82=AC=20?= =?UTF-8?q?=EC=9A=94=EC=B2=AD=20=EB=AA=A9=EB=A1=9D=20>=20=EA=B0=95?= =?UTF-8?q?=EC=9D=98=EC=A1=B0=EC=82=AC=20=EC=A7=84=ED=96=89=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D(=EC=83=81=EC=84=B8)=20=EC=88=98=EC=A0=95=20=EC=82=AC?= =?UTF-8?q?=ED=95=AD"=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/OprtnLctrRsrchTngrContoller.java | 22 +++++++- .../ve/asgnm/VEAcmdtAplct_SQL_Cubrid.xml | 1 - .../ve/lctr/VELctrRsrchMng_SQL_Cubrid.xml | 3 + .../oprtn/tngrVisitEdu/lctrRsrchMngDetail.jsp | 55 ++++++++++++++++--- .../oprtn/tngrVisitEdu/lctrRsrchMngList.jsp | 16 +++--- 5 files changed, 78 insertions(+), 19 deletions(-) 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/resources/egovframework/sqlmap/ve/asgnm/VEAcmdtAplct_SQL_Cubrid.xml b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAcmdtAplct_SQL_Cubrid.xml index 76bee03b..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,7 +159,6 @@ -