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 22087b97..beb29e2f 100644
--- a/src/main/java/kcc/let/utl/fcc/service/VisitEduTransUtil.java
+++ b/src/main/java/kcc/let/utl/fcc/service/VisitEduTransUtil.java
@@ -22,7 +22,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import kcc.ve.cmm.VeConstants;
+import kcc.ve.cmm.VeInstrFeeMng;
import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrAsgnmVO;
+import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrFeeAcmdtVO;
+import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrFeeService;
/**
* 숫자 데이터 처리 관련 유틸리티
* @author 공통서비스개발팀 이삼섭
@@ -45,7 +48,9 @@ public class VisitEduTransUtil {
private static final Logger LOGGER = LoggerFactory.getLogger(VisitEduTransUtil.class);
- public static List transData4feeSum(List p_vEInstrAsgnmVOList){
+ public static List transData4feeSum(
+ List p_vEInstrAsgnmVOList
+ , VEInstrFeeService vEInstrFeeService){
p_vEInstrAsgnmVOList.stream().forEach(t-> {
@@ -76,6 +81,15 @@ public class VisitEduTransUtil {
//지급기관이 신청기관이면 비용이 0로 처리한다.
if (!"02".equals(t.getFeeInsttCd())) {
i_feeSum4Dp = VisitEduTransUtil._calcInstrFee(t.getDivCd(), t.getLrnTm());
+
+ VeInstrFeeMng veInstrFeeMng = new VeInstrFeeMng();
+ VEInstrFeeAcmdtVO vEInstrFeeAcmdtVO = veInstrFeeMng.VeInstrFeeMng4Adult(vEInstrFeeService, t.getEduAplctOrd(), t.getEduChasiOrd());
+ if (i_feeSum4Dp<=0) {
+ i_feeSum4Dp = vEInstrFeeAcmdtVO.getInstrFeeSum();
+
+ //instrFee.setInstrFee(Integer.toString(vEInstrFeeAcmdtVO.getInstrFeeSum()));
+ //instrFee.setInstrFeeSum(vEInstrFeeAcmdtVO.getInstrFeeSum());
+ }
}
}
diff --git a/src/main/java/kcc/ve/instr/adultVisitEdu/asgnmInfo/web/VEAdultAsgnmController.java b/src/main/java/kcc/ve/instr/adultVisitEdu/asgnmInfo/web/VEAdultAsgnmController.java
index c4d13f7b..94261367 100644
--- a/src/main/java/kcc/ve/instr/adultVisitEdu/asgnmInfo/web/VEAdultAsgnmController.java
+++ b/src/main/java/kcc/ve/instr/adultVisitEdu/asgnmInfo/web/VEAdultAsgnmController.java
@@ -33,6 +33,7 @@ import kcc.let.utl.fcc.service.EgovCryptoUtil4VO;
import kcc.let.utl.fcc.service.ITNotiUtil;
import kcc.let.utl.fcc.service.VisitEduTransUtil;
import kcc.ve.cmm.VeConstants;
+import kcc.ve.cmm.VeInstrFeeMng;
import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEAcmdtAplctService;
import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEAsgnmMIXService;
import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrAsgnmVO;
@@ -164,7 +165,8 @@ public class VEAdultAsgnmController {
//fee 계산하기
//feeSum4Dp
- vEInstrAsgnmVOList = VisitEduTransUtil.transData4feeSum(vEInstrAsgnmVOList);
+ vEInstrAsgnmVOList = VisitEduTransUtil.transData4feeSum(vEInstrAsgnmVOList, vEInstrFeeService);
+ //VEInstrFeeService vEInstrFeeService
//대상 리스트, 페이징 정보 전달
@@ -362,7 +364,8 @@ public class VEAdultAsgnmController {
//fee 계산하기
//feeSum4Dp
- vEInstrAsgnmVOList = VisitEduTransUtil.transData4feeSum(vEInstrAsgnmVOList);
+ vEInstrAsgnmVOList = VisitEduTransUtil.transData4feeSum(vEInstrAsgnmVOList, vEInstrFeeService);
+ //vEInstrFeeService
//대상 리스트, 페이징 정보 전달
@@ -534,10 +537,20 @@ public class VEAdultAsgnmController {
vEInstrFeeAcmdtVO = vEInstrFeeService.selectDetail(vEInstrFeeAcmdtVO);
//강사료 제외 합계
int instrFeeSum = Integer.parseInt(vEInstrFeeAcmdtVO.getInstrFee())
- + Integer.parseInt(vEInstrFeeAcmdtVO.getBsnsTripFee())
- + Integer.parseInt(vEInstrFeeAcmdtVO.getSpareFee());
-
+ + Integer.parseInt(vEInstrFeeAcmdtVO.getTrafficFee());
+
vEInstrFeeAcmdtVO.setInstrFeeSum(instrFeeSum);
+
+ // 강사료 계산 선 계산 결과 추가 - 2024-03-06
+ {
+ VeInstrFeeMng veInstrFeeMng = new VeInstrFeeMng();
+ VEInstrFeeAcmdtVO tvEInstrFeeAcmdtVO = veInstrFeeMng.VeInstrFeeMng4Adult(vEInstrFeeService, vEInstrAsgnmVO.getEduAplctOrd(), vEInstrAsgnmVO.getEduChasiOrd());
+ if (instrFeeSum<=0) {
+ vEInstrFeeAcmdtVO.setInstrFee(Integer.toString(tvEInstrFeeAcmdtVO.getInstrFeeSum()));
+ vEInstrFeeAcmdtVO.setInstrFeeSum(tvEInstrFeeAcmdtVO.getInstrFeeSum());
+ }
+ }
+
model.addAttribute("instrFee", vEInstrFeeAcmdtVO);
//강의계획서 정보 가져오기
diff --git a/src/main/java/kcc/ve/instr/adultVisitEdu/endInfo/web/VEAdultEduEndController.java b/src/main/java/kcc/ve/instr/adultVisitEdu/endInfo/web/VEAdultEduEndController.java
index 9ad09877..553bcfe9 100644
--- a/src/main/java/kcc/ve/instr/adultVisitEdu/endInfo/web/VEAdultEduEndController.java
+++ b/src/main/java/kcc/ve/instr/adultVisitEdu/endInfo/web/VEAdultEduEndController.java
@@ -44,6 +44,7 @@ import kcc.let.utl.fcc.service.EgovCryptoUtil;
import kcc.let.utl.fcc.service.EgovCryptoUtil4VO;
import kcc.let.utl.fcc.service.VisitEduTransUtil;
import kcc.ve.cmm.VeConstants;
+import kcc.ve.cmm.VeInstrFeeMng;
import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEAcmdtAplctService;
import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEAsgnmMIXService;
import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrAsgnmVO;
@@ -201,7 +202,7 @@ public class VEAdultEduEndController {
//fee 계산하기
//feeSum4Dp
- vEInstrAsgnmVOList = VisitEduTransUtil.transData4feeSum(vEInstrAsgnmVOList);
+ vEInstrAsgnmVOList = VisitEduTransUtil.transData4feeSum(vEInstrAsgnmVOList, vEInstrFeeService);
//대상 리스트, 페이징 정보 전달
@@ -334,11 +335,19 @@ public class VEAdultEduEndController {
//강사료 제외 합계
int instrFeeSum = Integer.parseInt(instrFee.getInstrFee())
- + Integer.parseInt(instrFee.getBsnsTripFee())
- + Integer.parseInt(instrFee.getSpareFee());
+ + Integer.parseInt(instrFee.getTrafficFee());
instrFee.setInstrFeeSum(instrFeeSum);
-
+ // 강사료 계산 선 계산 결과 추가 - 2024-03-06
+ {
+ VeInstrFeeMng veInstrFeeMng = new VeInstrFeeMng();
+ VEInstrFeeAcmdtVO vEInstrFeeAcmdtVO = veInstrFeeMng.VeInstrFeeMng4Adult(vEInstrFeeService, vEInstrAsgnmVO.getEduAplctOrd(), vEInstrAsgnmVO.getEduChasiOrd());
+ if (instrFeeSum<=0) {
+ instrFee.setInstrFee(Integer.toString(vEInstrFeeAcmdtVO.getInstrFeeSum()));
+ instrFee.setInstrFeeSum(vEInstrFeeAcmdtVO.getInstrFeeSum());
+ }
+ }
+
//사용자 교육신청 과정 리스트
VEPrcsDetailVO vEPrcsDetailVO = new VEPrcsDetailVO();
vEPrcsDetailVO.setUseYn("Y");
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 392595b0..d15a6df6 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
@@ -664,7 +664,7 @@ public class VEAsgnmController {
//fee 계산하기
//feeSum4Dp
- vEInstrAsgnmVOList = VisitEduTransUtil.transData4feeSum(vEInstrAsgnmVOList);
+ vEInstrAsgnmVOList = VisitEduTransUtil.transData4feeSum(vEInstrAsgnmVOList, vEInstrFeeService);
//대상 리스트, 페이징 정보 전달
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 874a0b38..c21558cb 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
@@ -220,7 +220,7 @@ public class VEEduEndController {
//fee 계산하기
//feeSum4Dp
- vEInstrAsgnmVOList = VisitEduTransUtil.transData4feeSum(vEInstrAsgnmVOList);
+ vEInstrAsgnmVOList = VisitEduTransUtil.transData4feeSum(vEInstrAsgnmVOList, vEInstrFeeService);
//대상 리스트, 페이징 정보 전달
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 effb3e10..843ba4bb 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
@@ -760,8 +760,8 @@
, a.end_tm AS endTm
, a.lrn_tm AS lrnTm
, b.edu_cn AS eduCn
- , a.trgt AS trgt
- , a.prsnl AS prsnl
+ , NVL(a.trgt,b.EDU_TRGT) AS trgt
+ , NVL(a.prsnl,b.edu_prsnl) AS prsnl
, b.aprvl_cd AS asgnmAprvlCd
, b.user_id AS userId
, (SELECT user_nm FROM COMVNUSERMASTER WHERE USER_ID = b.user_id) AS userNm
@@ -930,8 +930,8 @@
, a.end_tm AS endTm
, a.lrn_tm AS lrnTm
, b.edu_cn AS eduCn
- , a.trgt AS trgt
- , a.prsnl AS prsnl
+ , NVL(a.trgt,b.EDU_TRGT) AS trgt
+ , NVL(a.prsnl,b.edu_prsnl) AS prsnl
, a.lrn_tm AS lrnTm
, b.user_id AS userId
, b.schol_instt_nm AS scholInsttNm
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 c4ce390c..b6f6d82b 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
@@ -1351,7 +1351,7 @@
AND (
- A.SCHOL_INSTT_NM LIKE '%' || #searchKeyword# '%' OR
+ A.SCHOL_INSTT_NM LIKE '%' || #searchKeyword# || '%' OR
A.INSTT_NM LIKE '%' || #searchKeyword# || '%'
)
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/popup/instrCostPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/popup/instrCostPopup.jsp
index 22884ec1..d4eaaea1 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/popup/instrCostPopup.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/popup/instrCostPopup.jsp
@@ -228,7 +228,7 @@
-
+
|
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmDetail.jsp
index aded92d4..9d53099f 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmDetail.jsp
@@ -354,10 +354,10 @@
|
- 출장비(b)
+ 교통비(b)
|
-
+
|
@@ -368,38 +368,39 @@
|
- 출장비(b)
+ 교통비(b)
|
- |
+ |
|
- 여비(c)
- |
-
-
- |
-
- 총액(a)+(b)+(c)
+ 총액(a)+(b)
|
|
-
-
|
- 여비(c)
+
|
- |
+
+
+ |
|
- 총액(a)+(b)+(c)
+ 총액(a)+(b)
|
|
+
+
+ |
+
+ |
+ |
+
<%--
|
강의계획서
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/endInfo/instrEduEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/endInfo/instrEduEndDetail.jsp
index b875a47e..2ec58574 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/endInfo/instrEduEndDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/endInfo/instrEduEndDetail.jsp
@@ -177,7 +177,8 @@ $( document ).ready(function() {
교육일시
|
- ${fn:substring(info.eduHopeDt,0,4)}년 ${fn:substring(info.eduHopeDt,4,6)}월 ${fn:substring(info.eduHopeDt,6,8)}일
+<%-- ${fn:substring(info.eduHopeDt,0,4)}년 ${fn:substring(info.eduHopeDt,4,6)}월 ${fn:substring(info.eduHopeDt,6,8)}일 --%>
+ ${info.eduHopeDt}
|
차시
@@ -385,10 +386,10 @@ $( document ).ready(function() {
|
- 출장비(b)
+ 교통비(b)
|
-
+
|
@@ -399,38 +400,40 @@ $( document ).ready(function() {
|
- 출장비(b)
+ 교통비(b)
|
- |
+ |
|
- 여비(c)
- |
-
-
- |
-
- 총액(a)+(b)+(c)
+ 총액(a)+(b)
|
- |
-
-
+
|
- 여비(c)
+
|
- |
+
+
+ |
+
|
- 총액(a)+(b)+(c)
+ 총액(a)+(b)
|
|
+
+
+ |
+
+ |
+ |
+
|
|