diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEInstrFeeAcmdtVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEInstrFeeAcmdtVO.java index 978cdca8..d0f98fbc 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEInstrFeeAcmdtVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEInstrFeeAcmdtVO.java @@ -94,6 +94,9 @@ public class VEInstrFeeAcmdtVO extends ComDefaultVO implements Serializable { private String scholArea;//학교지역 + private String feeInsttCd;//강사료지급주체 //01-한국저작권위원회,02-신청기관 + + public String getOnewayDstnc() { return onewayDstnc; } @@ -442,4 +445,10 @@ public class VEInstrFeeAcmdtVO extends ComDefaultVO implements Serializable { public void setInstrFeeCn(String instrFeeCn) { this.instrFeeCn = instrFeeCn; } + public String getFeeInsttCd() { + return feeInsttCd; + } + public void setFeeInsttCd(String feeInsttCd) { + this.feeInsttCd = feeInsttCd; + } } diff --git a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngAdultController.java b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngAdultController.java index 2c023720..8e490a5b 100644 --- a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngAdultController.java +++ b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngAdultController.java @@ -708,18 +708,21 @@ public class EduAsgnmCnfrmMngAdultController { int[] width = { 4000, 5000, 4000, 4000, 7000 , 4000, 4000, 4000, 4000, 4000 + , 4000 }; // 헤더 String[] header = { "교육희망일자", "시간", "온·오프라인", "지역", "기관(단체)명" , "기관구분", "신청자명", "핸드폰", "전화번호", "강사명", "강사료" + , "여비" }; // 컬럼명 String[] order = { "EduHopeDt", "StrtTm", "EduSlctCd", "EduSlctAreaCd", "InsttNm" , "InsttDivCd", "ChrgNm", "Clphone", "Phone", "InstrNm", "" + , "" }; // 호출 diff --git a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduRsltMng/web/EduRsltMngAdultController.java b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduRsltMng/web/EduRsltMngAdultController.java index aac47208..af268f2d 100644 --- a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduRsltMng/web/EduRsltMngAdultController.java +++ b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduRsltMng/web/EduRsltMngAdultController.java @@ -709,9 +709,22 @@ public class EduRsltMngAdultController { // 온라인 교육 if("10".equals(vEInstrFeeAcmdtVO.getEduSlctCd())){ vo.setChasiCnt(Integer.toString(vo.getChasi())+"차시 (온라인강의)"); + vo.setEduSlctAreaCd("온라인"); }else { vo.setChasiCnt(Integer.toString(vo.getChasi())+"차시"); } + vo.setChasiCnt(Integer.toString(vo.getChasi())); + + //강사료 지급 주체 + System.out.println("vEInstrFeeAcmdtVO.getFeeInsttCd()"); + System.out.println(vEInstrFeeAcmdtVO.getFeeInsttCd()); + System.out.println(vEInstrFeeAcmdtVO.getFeeInsttCd()); + if("01".equals(vo.getFeeInsttCd())){ + vo.setFeeInsttCd("한국저작권위원회"); + }else if("02".equals(vo.getFeeInsttCd())){ + vo.setFeeInsttCd("신청기관"); + } + vo.setInstrFeeOrd(vEInstrFeeAcmdtVO.getInstrFee().replaceAll("\\B(?=(\\d{3})+(?!\\d))", ",")); vo.setSpecialWorkAllow(vEInstrFeeAcmdtVO.getSpecialWorkAllow()); @@ -748,17 +761,17 @@ public class EduRsltMngAdultController { // 헤더 String[] header = { - "교육일자", "차시", "지역", "학교(기관)명" - , "강사이름", "강사료", "교통비" + "교육일자", "차시", "지역", "기관명" + , "강사이름", "강사료(지급주체)", "강사료", "교통비" ,"숙박비", "강사료 합계" }; // 컬럼명 String[] order = { // "EduHopeDt", "ChasiCnt", "ScholDivCd", "EduSlctAreaCd", "ScholInsttNm" - "EduHopeDt", "ChasiCnt", "EduSlctAreaCd", "ScholInsttNm" + "EduHopeDt", "ChasiCnt", "EduSlctAreaCd", "InsttNm" // , "InstrNm", "InstrFeeOrd", "OnewayDstnc", "SpecialWorkAllow", "DistanceAllow" , "TrafficFee", "FoodExpenses" - , "InstrNm", "InstrFeeOrd", "TrafficFee" + , "InstrNm", "FeeInsttCd", "InstrFeeOrd", "TrafficFee" , "AcmdtFee", "InstrFeeSum" }; 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 b7d15fca..6ed3bfe9 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 @@ -3521,6 +3521,8 @@ AND b.edu_chasi_ord = i.edu_chasi_ord GROUP BY i.edu_aplct_ord , i.edu_chasi_ord ),0) AS rowNo + + , a.fee_instt_cd AS feeInsttCd FROM ve_edu_aplct a , ve_edu_chasi b