From 0c02c090abf445b13d636f20ab0ef6d3cf8330d6 Mon Sep 17 00:00:00 2001 From: hylee Date: Fri, 30 Jun 2023 14:29:24 +0900 Subject: [PATCH] =?UTF-8?q?feat=20:=20pms-#3222=20"[=EA=B0=95=EC=82=AC]=20?= =?UTF-8?q?[SFR-014-1]=20=EA=B0=95=EC=82=AC=EB=B3=84=20=EC=88=99=EB=B0=95?= =?UTF-8?q?=EC=8B=A0=EC=B2=AD=20=EA=B8=B0=EB=8A=A5=20=EA=B0=9C=EC=84=A0"?= =?UTF-8?q?=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 @@ + + + + + + + + +