From cdfcc2ffff3eca20b027f1d2029015bfdd811b31 Mon Sep 17 00:00:00 2001 From: hylee Date: Tue, 27 Jun 2023 18:41:34 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20pms=20-=20#3222=20-=EA=B0=95=EC=82=AC?= =?UTF-8?q?=EB=B3=84=20=EC=88=99=EB=B0=95=EC=8B=A0=EC=B2=AD=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EA=B0=9C=EC=84=A0=20=EC=A2=85=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asgnmInfo/service/VEAcmdtAplctService.java | 2 ++ .../asgnmInfo/service/impl/VEAcmdtAplctDAO.java | 4 ++++ .../service/impl/VEAcmdtAplctServiceImpl.java | 5 +++++ .../asgnmInfo/web/VEAsgnmController.java | 13 +++++++++++-- .../sqlmap/ve/asgnm/VEAcmdtAplct_SQL_Cubrid.xml | 17 +++++++++++++++++ .../sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Cubrid.xml | 3 ++- 6 files changed, 41 insertions(+), 3 deletions(-) diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEAcmdtAplctService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEAcmdtAplctService.java index 50dbcaf6..700a5624 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEAcmdtAplctService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEAcmdtAplctService.java @@ -13,6 +13,8 @@ public interface VEAcmdtAplctService { //R : VEInstrFeeAcmdtVO selectDetailByUser(VEInstrFeeAcmdtVO paramVO) throws Exception; + VEInstrFeeAcmdtVO selectDetailByUser_r2(VEInstrFeeAcmdtVO paramVO) throws Exception; + VEInstrFeeAcmdtVO selectDcmdtAplctYesterday(VEInstrFeeAcmdtVO paramVO) throws Exception; diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAcmdtAplctDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAcmdtAplctDAO.java index a502a0dc..84faf663 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAcmdtAplctDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAcmdtAplctDAO.java @@ -39,6 +39,10 @@ public class VEAcmdtAplctDAO extends EgovAbstractDAO { return (VEInstrFeeAcmdtVO) select("VEAcmdtAplctDAO.selectDetailByUser", paramVO); } + public VEInstrFeeAcmdtVO selectDetailByUser_r2(VEInstrFeeAcmdtVO paramVO) throws Exception { + return (VEInstrFeeAcmdtVO) select("VEAcmdtAplctDAO.selectDetailByUser_r2", paramVO); + } + public VEInstrFeeAcmdtVO selectDcmdtAplctYesterday(VEInstrFeeAcmdtVO paramVO) throws Exception { return (VEInstrFeeAcmdtVO) select("VEAcmdtAplctDAO.selectDcmdtAplctYesterday", paramVO); } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAcmdtAplctServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAcmdtAplctServiceImpl.java index 4c97c298..f96a16e5 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAcmdtAplctServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAcmdtAplctServiceImpl.java @@ -37,6 +37,11 @@ public class VEAcmdtAplctServiceImpl implements VEAcmdtAplctService { return vEAcmdtAplctDAO.selectDetailByUser(paramVO); } + //R + public VEInstrFeeAcmdtVO selectDetailByUser_r2(VEInstrFeeAcmdtVO paramVO) throws Exception { + return vEAcmdtAplctDAO.selectDetailByUser_r2(paramVO); + } + @Override public VEInstrFeeAcmdtVO selectDcmdtAplctYesterday(VEInstrFeeAcmdtVO paramVO) throws Exception { return vEAcmdtAplctDAO.selectDcmdtAplctYesterday(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 988eee64..15958bb4 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 @@ -6,6 +6,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.ModelAttribute; @@ -14,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.support.RedirectAttributes; +import com.dreamsecurity.magicline.util.Log; + import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kcc.com.cmm.EgovMessageSource; import kcc.com.cmm.LoginVO; @@ -449,10 +452,16 @@ public class VEAsgnmController { acmdtAplct.setEduAplctOrd(vEInstrAsgnmVO.getEduAplctOrd()); acmdtAplct.setEduChasiOrd(vEInstrAsgnmVO.getEduChasiOrd()); acmdtAplct.setInstrDiv("10"); - acmdtAplct = vEAcmdtAplctService.selectDetailByUser(acmdtAplct); + + //=== 20230627 이호영 + //=== 숙박신청 차시 제거 + //=== 교육 key로만 select해서 진행 +// acmdtAplct = vEAcmdtAplctService.selectDetailByUser(acmdtAplct); + acmdtAplct = vEAcmdtAplctService.selectDetailByUser_r2(acmdtAplct); String acmdtAplctCheck = "N"; - if(acmdtAplct.getAcmdtAplctOrd() != null) { +// if(StringUtils.isNotEmpty(acmdtAplct.getAcmdtAplctOrd())) { + if(acmdtAplct != null) { acmdtAplctCheck="Y"; } model.addAttribute("acmdtAplctCheck", acmdtAplctCheck); 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 4223905b..445f6957 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,6 +159,23 @@ + + +