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

2024-02-23 11:18 기소유예 긴급 수정

Browse Source
This commit is contained in:
myname 2024-02-23 11:18:40 +09:00
parent 6c35226bfc
commit 08a57ff827
11 changed files with 115 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,14 +56,16 @@ public class VisitEduTransUtil {
int i_distanceAllow = 0;
int i_trafficFee = 0;
int i_acmdtFee = 0;
int i_foodExpenses = 0;
try { i_instrFee = Integer.parseInt(t.getInstrFee()); }catch(Exception ex) { i_instrFee = 0; System.out.println(ex.toString()); }
try { i_specialWorkAllow = Integer.parseInt(t.getSpecialWorkAllow()); }catch(Exception ex) { i_specialWorkAllow = 0; System.out.println(ex.toString()); }
try { i_distanceAllow = Integer.parseInt(t.getDistanceAllow()); }catch(Exception ex) { i_distanceAllow = 0; System.out.println(ex.toString()); }
try { i_trafficFee = Integer.parseInt(t.getTrafficFee()); }catch(Exception ex) { i_trafficFee = 0; System.out.println(ex.toString()); }
try { i_acmdtFee = Integer.parseInt(t.getAcmdtFee()); }catch(Exception ex) { i_acmdtFee = 0; System.out.println(ex.toString()); }
try { i_foodExpenses = Integer.parseInt(t.getFoodExpenses()); }catch(Exception ex) { i_foodExpenses = 0; System.out.println(ex.toString()); }
i_feeSum4Dp = i_instrFee + i_specialWorkAllow + i_distanceAllow + i_trafficFee + i_acmdtFee;
i_feeSum4Dp = i_instrFee + i_specialWorkAllow + i_distanceAllow + i_trafficFee + i_acmdtFee + i_foodExpenses;
try {

7
src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEInstrAsgnmVO.java
View File

@ -96,6 +96,7 @@ public class VEInstrAsgnmVO extends ComDefaultVO implements Serializable {
private String distanceAllow; //장거리 교육수당
private String trafficFee; //교통비
private String acmdtFee; //숙박비
private String foodExpenses; //식비
private String instrFeeSbmtYn; //강사료 테이블 제출여부
private String acmdtSbmtYn; //숙박제출여부
private String acmdtAprvlCd; //숙박확정코드
@ -859,5 +860,11 @@ public class VEInstrAsgnmVO extends ComDefaultVO implements Serializable {
public void setEduPlaceCd(String eduPlaceCd) {
this.eduPlaceCd = eduPlaceCd;
}
public String getFoodExpenses() {
return foodExpenses;
}
public void setFoodExpenses(String foodExpenses) {
this.foodExpenses = foodExpenses;
}
}

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

@ -405,6 +405,17 @@ public class VEEduEndController {
model.addAttribute("chasiList", vEEduChasiVOList);
}
{
//동반강사 리스트
VEEduChasiVO vEEduChasiVO = new VEEduChasiVO();
vEEduChasiVO.setEduAplctOrd(vEInstrAsgnmVO.getEduAplctOrd());
vEEduChasiVO.setEduChasiOrd(vEInstrAsgnmVO.getEduChasiOrd());
List<VEEduChasiVO> vEEduChasiCompanionVOList = vEEduMIXService.selectChasiCompanionList(vEEduChasiVO);
vEEduChasiCompanionVOList = egovCryptoUtil.decryptVEEduChasiVOList(vEEduChasiCompanionVOList);
model.addAttribute("vEEduChasiCompanionVOList", vEEduChasiCompanionVOList);
}
return "/web/ve/instr/tngrVisitEdu/endInfo/instrEduEndDetail";
}

2
src/main/resources/egovframework/sqlmap/ve/asgnm/VEAcmdtAplct_SQL_Tibero.xml
View File

@ -298,7 +298,7 @@
WHERE 1 =1
AND a.edu_aplct_ord =b.edu_aplct_ord
/*
AND b.edu_hope_dt = TO_CHAR(ADDDATE(TO_DATE(#yesterdayAcmdt#, 'YYYYMMDD'), -1),'YYYYMMDD')
AND b.edu_hope_dt = TO_CHAR(ADDDATE(TO_DATE(yesterdayAcmdt, 'YYYYMMDD'), -1),'YYYYMMDD')
*/
AND b.edu_hope_dt = TO_CHAR(TO_DATE(#yesterdayAcmdt#, 'YYYY.MM.DD') -1,'YYYY.MM.DD')
AND f.user_id = #frstRegisterId#

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

@ -652,6 +652,7 @@
,specialWorkAllow
,distanceAllow
,trafficFee
,foodExpenses
,insttNm
,cnt
,notiCnt
@ -679,6 +680,7 @@
, e.special_work_allow AS specialWorkAllow
, e.distance_allow AS distanceAllow
, e.traffic_fee AS trafficFee
, e.food_expenses AS foodExpenses
, (select count(1) from ve_edu_rslt_rprt where edu_aplct_ord = a.edu_aplct_ord and edu_chasi_ord = b.edu_chasi_ord and sbmt_yn = 'Y') as cnt
, (SELECT COUNT(1) FROM ve_new_noti e WHERE a.edu_chasi_ord = e.tbl_uniq_ord AND e.menu_no = #menuNo# AND e.frst_register_id = #userId# ) AS notiCnt
FROM ve_edu_chasi_instr_asgnm a

2
src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml
View File

@ -381,7 +381,7 @@
FROM
vea_sspn_idmt_trgt
WHERE
req_nmbr LIKE #reqNmbrTemp#||'%' ;
req_nmbr LIKE #reqNmbrTemp#||'-%' ;
</select>

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

@ -5477,6 +5477,7 @@
, aa0.lrn_tm AS lrnTm
, aa0.trgt AS trgt
, bb0.edu_place AS eduPlace
, bb0.edu_place_cd AS eduPlaceCd
, ee0.instr_nm AS instrNm
FROM
@ -5507,6 +5508,9 @@
AND ee0.user_id=dd0.user_id
AND ee0.sbmt_yn='Y'
AND ee0.use_yn='Y'
AND aa0.EDU_chasi_ORD != #eduChasiOrd#
ORDER BY strt_tm asc
</select>

16
src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngReg.jsp
View File

@ -498,15 +498,13 @@ $( document ).ready(function(){
<p>교육장소</p>
</th>
<td>
<input type="text" value="${info.eduPlace}" name="eduPlace" id="eduPlace" size="25">
<p style="padding-left:10%;">
<input type="checkbox" name="corpsEdu" id="corpsEdu" value="Y" <c:if test="${info.corpsEdu eq 'Y'}">checked</c:if>>
<label for="corpsEdu">집체교육</label>
</p>
<p style="padding-left:20px;">
<input type="checkbox" name="broadroomEdu" id="broadroomEdu" value="Y" <c:if test="${info.broadroomEdu eq 'Y'}">checked</c:if>>
<label for="broadroomEdu">방송실교육</label>
</p>
<kc:radio codeId="VEA010" id="eduPlaceCd" name="eduPlaceCd"
selectedValue="${empty info.eduPlaceCd ? '01' : info.eduPlaceCd}"
onChange="eduPlaceChg();"
/>
<label for="eduPlace" class="label">교육장소 입력</label>
<input type="text" value="${info.eduPlace}" name="eduPlace" id="eduPlace" size="25" readonly>
</td>
</tr>
<!--

15
src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctReg.jsp
View File

@ -522,15 +522,12 @@ $(document).ready(function(){
<p>교육장소</p>
</th>
<td>
<input type="text" value="${info.eduPlace}" name="eduPlace" id="eduPlace" size="25">
<p style="padding-left:10%;">
<input type="checkbox" name="corpsEdu" id="corpsEdu" value="Y" <c:if test="${info.corpsEdu eq 'Y'}">checked</c:if>>
<label for="corpsEdu">집체교육</label>
</p>
<p style="padding-left:20px;">
<input type="checkbox" name="broadroomEdu" id="broadroomEdu" value="Y" <c:if test="${info.broadroomEdu eq 'Y'}">checked</c:if>>
<label for="broadroomEdu">방송국교육</label>
</p>
<kc:radio codeId="VEA010" id="eduPlaceCd" name="eduPlaceCd"
selectedValue="${empty info.eduPlaceCd ? '01' : info.eduPlaceCd}"
onChange="eduPlaceChg();"
/>
<input type="text" value="${info.eduPlace}" name="eduPlace" id="eduPlace" size="25" readonly>
</td>
</tr>
<tr>

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

@ -34,8 +34,11 @@
var trafficFee = Number('<c:out value="${instrFee.trafficFee}" />');
var acmdtFee = Number('<c:out value="${acmdtAplct.acmdtFee}" />');
var allFee = instrFee + specialWorkAllow + distanceAllow + trafficFee + acmdtFee;
$(".allFee").text(allFee + "(* 세전금액)");
//식비추가
var foodExpenses = Number('<c:out value="${instrFee.foodExpenses}" />');
var allFee = instrFee + specialWorkAllow + distanceAllow + trafficFee + acmdtFee + foodExpenses;
//$(".allFee").text(allFee + "(* 세전금액)");
});
@ -589,7 +592,7 @@
<td>
<fmt:formatNumber value="${instrFee.instrFee}" pattern="#,###"/>
</td>
<th scope="row" rowspan="2">
<th scope="row" rowspan="3">
<p>수당<br>(b)</p>
</th>
<th>
@ -604,7 +607,7 @@
<p>강사료(a)</p>
</th>
<td colspan="4">
<c:out value="${instrFee.instrFee}"/>
<fmt:formatNumber value="${instrFee.instrFee}" pattern="#,###"/>
</td>
</tr>
<tr class="trLength2">
@ -614,7 +617,7 @@
<td colspan="4" class="rsdneDiv"></td>
</tr>
<tr class="trLength2">
<th scope="row" rowspan="2">
<th scope="row" rowspan="3">
<p>수당<br>(b)</p>
</th>
<th>
@ -644,11 +647,24 @@
<fmt:formatNumber value="${instrFee.distanceAllow}" pattern="#,###"/>
</td>
</tr>
<tr class="trLength4">
<th scope="row">
<p></p>
</th>
<td ></td>
<th scope="row">
<p>식비</p>
</th>
<td>
<fmt:formatNumber value="${instrFee.foodExpenses}" pattern="#,###"/>
</td>
</tr>
<tr class="trLength4">
<th scope="row">
<p>왕복거리(km)</p>
</th>
<td>
<fmt:formatNumber value="${instrFee.onewayDstnc*2}" pattern="#,###"/>km
</td>
<th scope="row" rowspan="2">
<p>여비<br>(c)</p>
@ -664,7 +680,9 @@
<th scope="row">
<p>왕복거리(km)</p>
</th>
<td colspan="4">80</td>
<td colspan="4">
<fmt:formatNumber value="${instrFee.onewayDstnc*2}" pattern="#,###"/>km
</td>
</tr>
<tr class="trLength2">
<th scope="row">
@ -698,13 +716,17 @@
<th>
<p>교통비</p>
</th>
<td colspan="3"><c:out value="${instrFee.trafficFee}" /></td>
<td colspan="3">
<fmt:formatNumber value="${instrFee.trafficFee}" pattern="#,###"/>
</td>
</tr>
<tr class="trLength2">
<th scope="row">
<p>숙박비</p>
</th>
<td colspan="3"><c:out value="${acmdtAplct.acmdtFee}" /></td>
<td colspan="3">
<fmt:formatNumber value="${acmdtAplct.acmdtFee}" pattern="#,###"/>
</td>
</tr>
<tr class="trLength4">
<th scope="row">
@ -729,14 +751,25 @@
<p>숙박비</p>
</th>
<td>
<c:out value="${acmdtAplct.acmdtFee}" />
<fmt:formatNumber value="${acmdtAplct.acmdtFee}" pattern="#,###"/>
</td>
</tr>
<tr>
<th scope="row">
<p>총지급액(a)+(b)+(c)</p>
</th>
<td colspan="4" class="allFee"></td>
<td colspan="4" class="allFee">
<fmt:formatNumber value="${instrFee.instrFee
+ instrFee.specialWorkAllow
+ instrFee.distanceAllow
+ instrFee.trafficFee
+ acmdtAplct.acmdtFee
+ instrFee.foodExpenses
}" pattern="#,###"/>
</td>
</tr>
</tbody>
</table>
@ -792,7 +825,12 @@
<c:out value='${list.scholInsttNm}'/>
</td>
<td>
<c:out value='${list.eduPlace}'/>
<c:if test="${list.eduPlaceCd eq '99'}">
${list.eduPlace}
</c:if>
<c:if test="${list.eduPlaceCd ne '99'}">
<ve:code codeId="VEA010" code="${list.eduPlaceCd}"/>
</c:if>
</td>
<td>
<c:out value='${list.trgt}'/>

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

@ -322,7 +322,7 @@ $( document ).ready(function() {
<td>
<fmt:formatNumber value="${instrFee.instrFee}" pattern="#,###"/>
</td>
<th scope="row" rowspan="2">
<th scope="row" rowspan="3">
<p>수당(b)</p>
</th>
<th scope="row">
@ -377,11 +377,24 @@ $( document ).ready(function() {
<fmt:formatNumber value="${instrFee.distanceAllow}" pattern="#,###"/>
</td>
</tr>
<tr class="trLength4">
<th scope="row">
<p></p>
</th>
<td ></td>
<th scope="row">
<p>식비</p>
</th>
<td>
<fmt:formatNumber value="${instrFee.foodExpenses}" pattern="#,###"/>
</td>
</tr>
<tr class="trLength4">
<th scope="row">
<p>왕복거리(km)</p>
</th>
<td>
<fmt:formatNumber value="${instrFee.onewayDstnc*2}" pattern="#,###"/>km
</td>
<th scope="row" rowspan="2">
<p>여비(c)</p>
@ -398,6 +411,7 @@ $( document ).ready(function() {
<p>왕복거리(km)</p>
</th>
<td colspan="4">
<fmt:formatNumber value="${instrFee.onewayDstnc*2}" pattern="#,###"/>km
</td>
</tr>
<tr class="trLength2">
@ -678,7 +692,12 @@ $( document ).ready(function() {
<c:out value='${list.scholInsttNm}'/>
</td>
<td>
<c:out value='${list.eduPlace}'/>
<c:if test="${list.eduPlaceCd eq '99'}">
${list.eduPlace}
</c:if>
<c:if test="${list.eduPlaceCd ne '99'}">
<ve:code codeId="VEA010" code="${list.eduPlaceCd}"/>
</c:if>
</td>
<td>
<c:out value='${list.trgt}'/>