tolag3/koipa_edu_2025-1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2024-03-06 12:09 성인강사 강사료 수정

Browse Source
This commit is contained in:
myname 2024-03-06 12:09:47 +09:00
parent 66d8b7465d
commit 2cb7cb126e
10 changed files with 92 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/kcc/let/utl/fcc/service/VisitEduTransUtil.java
View File

@ -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<VEInstrAsgnmVO> transData4feeSum(List<VEInstrAsgnmVO> p_vEInstrAsgnmVOList){
public static List<VEInstrAsgnmVO> transData4feeSum(
List<VEInstrAsgnmVO> 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());
}
}
}

21
src/main/java/kcc/ve/instr/adultVisitEdu/asgnmInfo/web/VEAdultAsgnmController.java
View File

@ -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);
//강의계획서 정보 가져오기

15
src/main/java/kcc/ve/instr/adultVisitEdu/endInfo/web/VEAdultEduEndController.java
View File

@ -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,10 +335,18 @@ 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();

2
src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java
View File

@ -664,7 +664,7 @@ public class VEAsgnmController {
//fee 계산하기
//feeSum4Dp
vEInstrAsgnmVOList = VisitEduTransUtil.transData4feeSum(vEInstrAsgnmVOList);
vEInstrAsgnmVOList = VisitEduTransUtil.transData4feeSum(vEInstrAsgnmVOList, vEInstrFeeService);
//대상 리스트, 페이징 정보 전달

2
src/main/java/kcc/ve/instr/tngrVisitEdu/endInfo/web/VEEduEndController.java
View File

@ -220,7 +220,7 @@ public class VEEduEndController {
//fee 계산하기
//feeSum4Dp
vEInstrAsgnmVOList = VisitEduTransUtil.transData4feeSum(vEInstrAsgnmVOList);
vEInstrAsgnmVOList = VisitEduTransUtil.transData4feeSum(vEInstrAsgnmVOList, vEInstrFeeService);
//대상 리스트, 페이징 정보 전달

8
src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml
View File

@ -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

2
src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml
View File

@ -1351,7 +1351,7 @@
<isEmpty property="searchCondition">
<isNotEmpty property="searchKeyword">
AND (
A.SCHOL_INSTT_NM LIKE '%' || #searchKeyword# '%' OR
A.SCHOL_INSTT_NM LIKE '%' || #searchKeyword# || '%' OR
A.INSTT_NM LIKE '%' || #searchKeyword# || '%'
)
</isNotEmpty>

2
src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/popup/instrCostPopup.jsp
View File

@ -228,7 +228,7 @@
</p>
</th>
<td><!-- 강사료 합계 - 세금 합계 -->
<fmt:formatNumber value="${info.totalSum}" pattern="#,###"/>
<fmt:formatNumber value="${info.instrFeeSum}" pattern="#,###"/>
</td>
</tr>
<tr>

33
src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmDetail.jsp
View File

@ -354,10 +354,10 @@
<fmt:formatNumber value="${instrFee.instrFee}" pattern="#,###"/>
</td>
<th scope="row">
<p>출장비(b)</p>
<p>교통비(b)</p>
</th>
<td>
<fmt:formatNumber value="${instrFee.bsnsTripFee}" pattern="#,###"/>
<fmt:formatNumber value="${instrFee.trafficFee}" pattern="#,###"/>
</td>
</tr>
<tr class="trLength2">
@ -368,38 +368,39 @@
</tr>
<tr class="trLength2">
<th scope="row">
<p>출장비(b)</p>
<p>교통비(b)</p>
</th>
<td colspan="3"><fmt:formatNumber value="${instrFee.bsnsTripFee}" pattern="#,###"/></td>
<td colspan="3"><fmt:formatNumber value="${instrFee.trafficFee}" pattern="#,###"/></td>
</tr>
<tr class="trLength4">
<th scope="row">
<p>여비(c)</p>
</th>
<td>
<fmt:formatNumber value="${instrFee.spareFee}" pattern="#,###"/>
</td>
<th scope="row">
<p>총액(a)+(b)+(c)</p>
<p>총액(a)+(b)</p>
</th>
<td>
<fmt:formatNumber value="${instrFee.instrFeeSum}" pattern="#,###"/>
</td>
</tr>
<tr class="trLength2">
<th scope="row">
<p>여비(c)</p>
<p></p>
</th>
<td colspan="3"><fmt:formatNumber value="${instrFee.spareFee}" pattern="#,###"/></td>
<td>
</td>
</tr>
<tr class="trLength2">
<th scope="row">
<p>총액(a)+(b)+(c)</p>
<p>총액(a)+(b)</p>
</th>
<td colspan="3"><fmt:formatNumber value="${instrFee.instrFeeSum}" pattern="#,###"/></td>
</tr>
<tr class="trLength2">
<th scope="row">
<p></p>
</th>
<td colspan="3"></td>
</tr>
<%-- <tr>
<th scope="row">
<p>강의계획서</p>

37
src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/endInfo/instrEduEndDetail.jsp
View File

@ -177,7 +177,8 @@ $( document ).ready(function() {
<p>교육일시</p>
</th>
<td>
${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}
</td>
<th scope="row">
<p>차시</p>
@ -385,10 +386,10 @@ $( document ).ready(function() {
<fmt:formatNumber value="${instrFee.instrFee}" pattern="#,###"/>
</td>
<th scope="row">
<p>출장비(b)</p>
<p>교통비(b)</p>
</th>
<td>
<fmt:formatNumber value="${instrFee.bsnsTripFee}" pattern="#,###"/>
<fmt:formatNumber value="${instrFee.trafficFee}" pattern="#,###"/>
</td>
</tr>
<tr class="trLength2">
@ -399,38 +400,40 @@ $( document ).ready(function() {
</tr>
<tr class="trLength2">
<th scope="row">
<p>출장비(b)</p>
<p>교통비(b)</p>
</th>
<td colspan="3"><fmt:formatNumber value="${instrFee.bsnsTripFee}" pattern="#,###"/></td>
<td colspan="3"><fmt:formatNumber value="${instrFee.trafficFee}" pattern="#,###"/></td>
</tr>
<tr class="trLength4">
<th scope="row">
<p>여비(c)</p>
</th>
<td>
<fmt:formatNumber value="${instrFee.spareFee}" pattern="#,###"/>
</td>
<th scope="row">
<p>총액(a)+(b)+(c)</p>
<p>총액(a)+(b)</p>
</th>
<td>
<fmt:formatNumber value="${instrFee.instrFeeSum}" pattern="#,###"/>
</td>
</tr>
<tr class="trLength2">
<th scope="row">
<p>여비(c)</p>
<p></p>
</th>
<td colspan="3"><fmt:formatNumber value="${instrFee.spareFee}" pattern="#,###"/></td>
<td>
</td>
</tr>
<tr class="trLength2">
<th scope="row">
<p>총액(a)+(b)+(c)</p>
<p>총액(a)+(b)</p>
</th>
<td colspan="3"><fmt:formatNumber value="${instrFee.instrFeeSum}" pattern="#,###"/></td>
</tr>
<tr class="trLength2">
<th scope="row">
<p></p>
</th>
<td colspan="3"></td>
</tr>
<c:if test="${not empty fileList}">
<tr>
<th scope="row">