From 08a57ff8278d926ac4137a77655a024a4baaaa8d Mon Sep 17 00:00:00 2001 From: myname Date: Fri, 23 Feb 2024 11:18:40 +0900 Subject: [PATCH] =?UTF-8?q?2024-02-23=2011:18=20=EA=B8=B0=EC=86=8C?= =?UTF-8?q?=EC=9C=A0=EC=98=88=20=EA=B8=B4=EA=B8=89=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../utl/fcc/service/VisitEduTransUtil.java | 6 +- .../asgnmInfo/service/VEInstrAsgnmVO.java | 9 ++- .../endInfo/web/VEEduEndController.java | 11 ++++ .../ve/asgnm/VEAcmdtAplct_SQL_Tibero.xml | 2 +- .../ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml | 2 + .../ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml | 2 +- .../sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml | 4 ++ .../jsp/oprtn/tngrVisitEdu/eduAplctMngReg.jsp | 18 +++--- .../jsp/oprtn/tngrVisitEdu/eduAplctReg.jsp | 15 ++--- .../asgnmInfo/instrAsgnmDetail.jsp | 60 +++++++++++++++---- .../endInfo/instrEduEndDetail.jsp | 23 ++++++- 11 files changed, 115 insertions(+), 37 deletions(-) diff --git a/src/main/java/kcc/let/utl/fcc/service/VisitEduTransUtil.java b/src/main/java/kcc/let/utl/fcc/service/VisitEduTransUtil.java index 9b536cf8..22087b97 100644 --- a/src/main/java/kcc/let/utl/fcc/service/VisitEduTransUtil.java +++ b/src/main/java/kcc/let/utl/fcc/service/VisitEduTransUtil.java @@ -56,14 +56,16 @@ public class VisitEduTransUtil { int i_distanceAllow = 0; int i_trafficFee = 0; int i_acmdtFee = 0; + int i_foodExpenses = 0; try { i_instrFee = Integer.parseInt(t.getInstrFee()); }catch(Exception ex) { i_instrFee = 0; System.out.println(ex.toString()); } try { i_specialWorkAllow = Integer.parseInt(t.getSpecialWorkAllow()); }catch(Exception ex) { i_specialWorkAllow = 0; System.out.println(ex.toString()); } try { i_distanceAllow = Integer.parseInt(t.getDistanceAllow()); }catch(Exception ex) { i_distanceAllow = 0; System.out.println(ex.toString()); } try { i_trafficFee = Integer.parseInt(t.getTrafficFee()); }catch(Exception ex) { i_trafficFee = 0; System.out.println(ex.toString()); } - try { i_acmdtFee = Integer.parseInt(t.getAcmdtFee()); }catch(Exception ex) { i_acmdtFee = 0; System.out.println(ex.toString()); } + try { i_acmdtFee = Integer.parseInt(t.getAcmdtFee()); }catch(Exception ex) { i_acmdtFee = 0; System.out.println(ex.toString()); } + try { i_foodExpenses = Integer.parseInt(t.getFoodExpenses()); }catch(Exception ex) { i_foodExpenses = 0; System.out.println(ex.toString()); } - i_feeSum4Dp = i_instrFee + i_specialWorkAllow + i_distanceAllow + i_trafficFee + i_acmdtFee; + i_feeSum4Dp = i_instrFee + i_specialWorkAllow + i_distanceAllow + i_trafficFee + i_acmdtFee + i_foodExpenses; try { diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEInstrAsgnmVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEInstrAsgnmVO.java index 619b469f..442eeb97 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEInstrAsgnmVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEInstrAsgnmVO.java @@ -96,9 +96,10 @@ public class VEInstrAsgnmVO extends ComDefaultVO implements Serializable { private String distanceAllow; //장거리 교육수당 private String trafficFee; //교통비 private String acmdtFee; //숙박비 + private String foodExpenses; //식비 private String instrFeeSbmtYn; //강사료 테이블 제출여부 private String acmdtSbmtYn; //숙박제출여부 - private String acmdtAprvlCd; //숙박확정코드 + private String acmdtAprvlCd; //숙박확정코드 private String hstryCnt; //배정내역수 @@ -859,5 +860,11 @@ public class VEInstrAsgnmVO extends ComDefaultVO implements Serializable { public void setEduPlaceCd(String eduPlaceCd) { this.eduPlaceCd = eduPlaceCd; } + public String getFoodExpenses() { + return foodExpenses; + } + public void setFoodExpenses(String foodExpenses) { + this.foodExpenses = foodExpenses; + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/endInfo/web/VEEduEndController.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/endInfo/web/VEEduEndController.java index b7e8e41c..874a0b38 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/endInfo/web/VEEduEndController.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/endInfo/web/VEEduEndController.java @@ -405,6 +405,17 @@ public class VEEduEndController { model.addAttribute("chasiList", vEEduChasiVOList); } + { + //동반강사 리스트 + VEEduChasiVO vEEduChasiVO = new VEEduChasiVO(); + vEEduChasiVO.setEduAplctOrd(vEInstrAsgnmVO.getEduAplctOrd()); + vEEduChasiVO.setEduChasiOrd(vEInstrAsgnmVO.getEduChasiOrd()); + List vEEduChasiCompanionVOList = vEEduMIXService.selectChasiCompanionList(vEEduChasiVO); + + vEEduChasiCompanionVOList = egovCryptoUtil.decryptVEEduChasiVOList(vEEduChasiCompanionVOList); + + model.addAttribute("vEEduChasiCompanionVOList", vEEduChasiCompanionVOList); + } return "/web/ve/instr/tngrVisitEdu/endInfo/instrEduEndDetail"; } diff --git a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAcmdtAplct_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAcmdtAplct_SQL_Tibero.xml index 1f7806a9..295e9b89 100644 --- a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAcmdtAplct_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAcmdtAplct_SQL_Tibero.xml @@ -298,7 +298,7 @@ WHERE 1 =1 AND a.edu_aplct_ord =b.edu_aplct_ord /* - AND b.edu_hope_dt = TO_CHAR(ADDDATE(TO_DATE(#yesterdayAcmdt#, 'YYYYMMDD'), -1),'YYYYMMDD') + AND b.edu_hope_dt = TO_CHAR(ADDDATE(TO_DATE(yesterdayAcmdt, 'YYYYMMDD'), -1),'YYYYMMDD') */ AND b.edu_hope_dt = TO_CHAR(TO_DATE(#yesterdayAcmdt#, 'YYYY.MM.DD') -1,'YYYY.MM.DD') AND f.user_id = #frstRegisterId# diff --git a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml index a09c73a9..43dc8572 100644 --- a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml @@ -652,6 +652,7 @@ ,specialWorkAllow ,distanceAllow ,trafficFee + ,foodExpenses ,insttNm ,cnt ,notiCnt @@ -679,6 +680,7 @@ , e.special_work_allow AS specialWorkAllow , e.distance_allow AS distanceAllow , e.traffic_fee AS trafficFee + , e.food_expenses AS foodExpenses , (select count(1) from ve_edu_rslt_rprt where edu_aplct_ord = a.edu_aplct_ord and edu_chasi_ord = b.edu_chasi_ord and sbmt_yn = 'Y') as cnt , (SELECT COUNT(1) FROM ve_new_noti e WHERE a.edu_chasi_ord = e.tbl_uniq_ord AND e.menu_no = #menuNo# AND e.frst_register_id = #userId# ) AS notiCnt FROM ve_edu_chasi_instr_asgnm a diff --git a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml index f50f3722..0de8c1c5 100644 --- a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml @@ -381,7 +381,7 @@ FROM vea_sspn_idmt_trgt WHERE - req_nmbr LIKE #reqNmbrTemp#||'%' ; + req_nmbr LIKE #reqNmbrTemp#||'-%' ; diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml index d203d04c..dfa5327d 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml @@ -5477,6 +5477,7 @@ , aa0.lrn_tm AS lrnTm , aa0.trgt AS trgt , bb0.edu_place AS eduPlace + , bb0.edu_place_cd AS eduPlaceCd , ee0.instr_nm AS instrNm FROM @@ -5507,6 +5508,9 @@ AND ee0.user_id=dd0.user_id AND ee0.sbmt_yn='Y' AND ee0.use_yn='Y' + + AND aa0.EDU_chasi_ORD != #eduChasiOrd# + ORDER BY strt_tm asc diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngReg.jsp index 179a1b4e..6a064049 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngReg.jsp @@ -497,16 +497,14 @@ $( document ).ready(function(){

필수입력 항목*

교육장소

- - -

- checked> - -

-

- checked> - -

+ + + + +