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

2024-04-11 15:34 교육배치확정관리 엑셀 다운로드 수정

Browse Source
This commit is contained in:
myname 2024-04-11 15:35:41 +09:00
parent 0f9626b125
commit a6b0fb2e4e
3 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/kcc/ve/cmm/VeInstrFeeMng.java
View File

@ -135,13 +135,14 @@ public class VeInstrFeeMng {
vEInstrFeeAcmdtVO.setTrafficFee(Integer.toString(trafficFee)); vEInstrFeeAcmdtVO.setTrafficFee(Integer.toString(trafficFee));
} }
vEInstrFeeAcmdtVO.setLikeCheckYn("N"); vEInstrFeeAcmdtVO.setLikeCheckYn("N");
//식비지급
vEInstrFeeAcmdtVO.setFoodExpenses("7000");
}else { }else {
vEInstrFeeAcmdtVO.setDistanceAllow("0"); vEInstrFeeAcmdtVO.setDistanceAllow("0");
vEInstrFeeAcmdtVO.setLikeCheckYn("Y"); vEInstrFeeAcmdtVO.setLikeCheckYn("Y");
}
//식비지급 //식비지급
vEInstrFeeAcmdtVO.setFoodExpenses("7000"); vEInstrFeeAcmdtVO.setFoodExpenses("0");
}
// 수당 합계 // 수당 합계
int sum = + Integer.parseInt(vEInstrFeeAcmdtVO.getSpecialWorkAllow()) int sum = + Integer.parseInt(vEInstrFeeAcmdtVO.getSpecialWorkAllow())
@ -151,7 +152,8 @@ public class VeInstrFeeMng {
// 여비 합계 // 여비 합계
sum = Integer.parseInt(vEInstrFeeAcmdtVO.getTrafficFee()) sum = Integer.parseInt(vEInstrFeeAcmdtVO.getTrafficFee())
+ Integer.parseInt(vEInstrFeeAcmdtVO.getAcmdtFee()); + Integer.parseInt(vEInstrFeeAcmdtVO.getAcmdtFee());
vEInstrFeeAcmdtVO.setSpareFee(String.format("%,d", sum)); //vEInstrFeeAcmdtVO.setSpareFee(String.format("%,d", sum));
vEInstrFeeAcmdtVO.setSpareFee(Integer.toString(sum));
@ -208,21 +210,20 @@ public class VeInstrFeeMng {
VEInstrFeeAcmdtVO vEInstrFeeAcmdtVO = vEInstrFeeService.selectDetail(infoVO); VEInstrFeeAcmdtVO vEInstrFeeAcmdtVO = vEInstrFeeService.selectDetail(infoVO);
//if(vEInstrFeeAcmdtVO.getInstrFeeOrd() == null) { if(vEInstrFeeAcmdtVO.getInstrFeeOrd() == null) {
if(true) { //if(true) {
List<VEInstrFeeAcmdtVO> selectChasiList = vEInstrFeeService.selectChasiList(vEInstrFeeAcmdtVO); List<VEInstrFeeAcmdtVO> selectChasiList = vEInstrFeeService.selectChasiList(vEInstrFeeAcmdtVO);
System.out.println("@@ "+selectChasiList.get(0).getTotCnt()); System.out.println("@@ "+selectChasiList.get(0).getTotCnt());
boolean check = true; boolean check = false;
System.out.println(" 조회 차시 정보 "+vEInstrFeeAcmdtVO.getEduChasiOrd()); System.out.println(" 조회 차시 정보 "+vEInstrFeeAcmdtVO.getEduChasiOrd());
System.out.println(" 첫번쨰 차시 정보 "+selectChasiList.get(0).getEduChasiOrd()); System.out.println(" 첫번쨰 차시 정보 "+selectChasiList.get(0).getEduChasiOrd());
/*
if(selectChasiList.get(0).getEduChasiOrd().equals(vEInstrFeeAcmdtVO.getEduChasiOrd())) { if(selectChasiList.get(0).getEduChasiOrd().equals(vEInstrFeeAcmdtVO.getEduChasiOrd())) {
check = true; check = true;
} }
*/
/* /*
* 강사료 계산 정리 * 강사료 계산 정리
@ -336,18 +337,24 @@ public class VeInstrFeeMng {
} }
vEInstrFeeAcmdtVO.setLikeCheckYn("N"); vEInstrFeeAcmdtVO.setLikeCheckYn("N");
//식비지급
vEInstrFeeAcmdtVO.setFoodExpenses("7000");
}else { }else {
vEInstrFeeAcmdtVO.setDistanceAllow("0"); vEInstrFeeAcmdtVO.setDistanceAllow("0");
vEInstrFeeAcmdtVO.setLikeCheckYn("Y"); vEInstrFeeAcmdtVO.setLikeCheckYn("Y");
//식비지급
vEInstrFeeAcmdtVO.setFoodExpenses("0");
} }
//식비지급 //식비지급
//vEInstrFeeAcmdtVO.setFoodExpenses("7000"); //vEInstrFeeAcmdtVO.setFoodExpenses("7000");
/*
if ("1".equals(p_rankNo)) { if ("1".equals(p_rankNo)) {
if (p_foodExpenses == null) { if (p_foodExpenses == null) {
vEInstrFeeAcmdtVO.setFoodExpenses("7000"); vEInstrFeeAcmdtVO.setFoodExpenses("7000");
} }
} }
*/
// 수당 합계(a+b) // 수당 합계(a+b)
@ -358,7 +365,8 @@ public class VeInstrFeeMng {
// 여비 합계(c+d) // 여비 합계(c+d)
sum = Integer.parseInt(vEInstrFeeAcmdtVO.getTrafficFee()) sum = Integer.parseInt(vEInstrFeeAcmdtVO.getTrafficFee())
+ Integer.parseInt(vEInstrFeeAcmdtVO.getAcmdtFee()); + Integer.parseInt(vEInstrFeeAcmdtVO.getAcmdtFee());
vEInstrFeeAcmdtVO.setSpareFee(String.format("%,d", sum)); //vEInstrFeeAcmdtVO.setSpareFee(String.format("%,d", sum));
vEInstrFeeAcmdtVO.setSpareFee(Integer.toString(sum));
System.out.println("Integer.parseInt(vEInstrFeeAcmdtVO.getSpecialWorkAllow())"); System.out.println("Integer.parseInt(vEInstrFeeAcmdtVO.getSpecialWorkAllow())");
System.out.println(Integer.parseInt(vEInstrFeeAcmdtVO.getSpecialWorkAllow())); System.out.println(Integer.parseInt(vEInstrFeeAcmdtVO.getSpecialWorkAllow()));

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

@ -4154,13 +4154,14 @@
AND AA.insttNm LIKE '%'||#searchKeyword#||'%' AND AA.insttNm LIKE '%'||#searchKeyword#||'%'
</isEqual> </isEqual>
</isNotEmpty> </isNotEmpty>
ORDER BY 1 ORDER BY
<isEmpty property="orderByQuery"> <isEmpty property="orderByQuery">
, eduAplctOrd desc, eduChasiOrd AA.eduHopeDt DESC,
AA.strtTm ASC
</isEmpty> </isEmpty>
<isNotEmpty property="orderByQuery"> <isNotEmpty property="orderByQuery">
, $orderByQuery$ $orderByQuery$
</isNotEmpty> </isNotEmpty>
<isNotEqual property="pageIndex" compareValue="0"> <isNotEqual property="pageIndex" compareValue="0">
/* /*

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

@ -314,7 +314,7 @@
<input type="text" numberOnly id="foodExpenses" name="foodExpenses" value="<fmt:formatNumber value="0" pattern="#,###"/>"/> <input type="text" numberOnly id="foodExpenses" name="foodExpenses" value="<fmt:formatNumber value="0" pattern="#,###"/>"/>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<input type="text" numberOnly id="foodExpenses" name="foodExpenses" value="<fmt:formatNumber value="7000" pattern="#,###"/>"/> <input type="text" numberOnly id="foodExpenses" name="foodExpenses" value="<fmt:formatNumber value="${info.foodExpenses}" pattern="#,###"/>"/>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>