From 18a209df6351346b69eb6b0d921d83a471d3f40f Mon Sep 17 00:00:00 2001 From: myname Date: Wed, 31 Jan 2024 18:17:11 +0900 Subject: [PATCH] =?UTF-8?q?2024-01-31=2018:16=20=EA=B5=90=EC=9C=A1?= =?UTF-8?q?=EB=B0=B0=EC=B9=98=ED=99=95=EC=A0=95=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?=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 --- .../tngrVisitEdu/asgnmInfo/service/VEEduExcelVO.java | 7 +++++++ .../web/EduAsgnmCnfrmMngTngrController.java | 11 +++++++++-- .../sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml | 3 +++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEEduExcelVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEEduExcelVO.java index 1d00aad0..7e0c7fc9 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEEduExcelVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEEduExcelVO.java @@ -91,6 +91,7 @@ public class VEEduExcelVO { private String specialWorkAllow; //특수근무수당(도서벽지수당) private String distanceAllow; //거리수당 private String trafficFee; //교통비 + private String foodExpenses; //식비 private String allowance; //수당 private String instrFeeSum; //강사료 합계 @@ -527,6 +528,12 @@ public class VEEduExcelVO { public void setTrafficFee(String trafficFee) { this.trafficFee = trafficFee; } + public String getFoodExpenses() { + return foodExpenses; + } + public void setFoodExpenses(String foodExpenses) { + this.foodExpenses = foodExpenses; + } public String getAcmdtFee() { return acmdtFee; } diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngTngrController.java index cefe5b57..8dac599b 100644 --- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngTngrController.java +++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngTngrController.java @@ -224,6 +224,13 @@ public class EduAsgnmCnfrmMngTngrController { + System.out.println("vEEduAplctVO.getOrderByQuery()"); + System.out.println(vEEduAplctVO.getOrderByQuery()); + + if ("".equals(vEEduAplctVO.getOrderByQuery()) || vEEduAplctVO.getOrderByQuery()==null) { + vEEduAplctVO.setOrderByQuery("CC.EDU_HOPE_DT desc"); + } + List vEEduAplctVOList = vEEduMIXService.selectPagingList(vEEduAplctVO); //이름 복호화 VEEduAplctVO vo = new VEEduAplctVO(); @@ -944,7 +951,7 @@ public class EduAsgnmCnfrmMngTngrController { , "차시", "총인원", "교육내용", "담당자" , "연락처", "휴대전화", "E-mail", "주소" , "배정일", "강사명", "구분", "강사연락처", "강사 e-mail", "거주지" - , "강사료", "도서벽지 수당(a)", "장거리 교육수당(b)" + , "강사료", "식비", "도서벽지 수당(a)", "장거리 교육수당(b)" , "km 편도","km 왕복", "km 교통비(c)" , "숙박신청", "숙박비용(d)" , "수당(a+b)", "여비(c+d)", "총 지급액", "온라인 교육 여부" @@ -957,7 +964,7 @@ public class EduAsgnmCnfrmMngTngrController { , "Chasi", "EduPrsnl", "EduCnString", "ChrgNm" , "Phone", "Clphone", "Email", "Addr" , "AsgnmAprvlPnttm", "InstrNm", "InstrDiv", "InstrPhone", "InstrEmail", "InstrRsdne" - , "InstrFee", "SpecialWorkAllow", "DistanceAllow" + , "InstrFee", "FoodExpenses", "SpecialWorkAllow", "DistanceAllow" , "KmOneWay", "KmRoundTrip", "TrafficFee" , "AcmdtAprvlCd", "AcmdtFee" , "Allowance", "SpareFee", "InstrFeeSum", "EduSlctCd" 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 e04b9007..5e91cc09 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 @@ -5682,9 +5682,12 @@ , NVL(f.SPECIAL_WORK_ALLOW, '0') AS specialWorkAllow , NVL(f.DISTANCE_ALLOW, '0') AS distanceAllow , NVL(f.TRAFFIC_FEE, '0') AS trafficFee + , NVL(f.FOOD_EXPENSES, '0') AS foodExpenses + , NVL(f.BSNS_TRIP_FEE, '0') AS bsnsTripFee , NVL(f.SPARE_FEE, '0') AS spareFee , NVL(g.ACMDT_FEE, '0') AS acmdtFee + , NVL(g.APRVL_CD, 'N') AS acmdtAprvlCd , NVL(f.INCOME_TAX, '0') AS incomeTax , NVL(f.LOCAL_INCOME_TAX, '0') AS localIncomeTax