xit-app
/
fims-java-all
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

컬럼명 변경 반영(FFNLG_AMT -> FFNLG_CRDN_AMT)

Browse Source
main
이범준 1 year ago
parent 4de07f4b63
commit fecd7dc060
11 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File

4
src/main/java/cokr/xit/fims/crdn/Crdn.java
Unescape Escape View File

@ -193,9 +193,9 @@ public class Crdn extends AbstractEntity {
private String ovtimePrttnYn;
/**
* 과태료 금액
* 과태료 단속 금액
*/
private Integer ffnlgAmt;
private Integer ffnlgCrdnAmt;
/**
* 과태료 감경 율

6
src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java
Unescape Escape View File

@ -156,7 +156,7 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService
//금액 계산
int[] basicAmt = crdnStngBean.getBasicAmt(crdn);
crdn.setFfnlgAmt(basicAmt[0]);
crdn.setFfnlgCrdnAmt(basicAmt[0]);
crdn.setLevyAmt(basicAmt[0]);
crdn.setAdvntceLevyAmt(basicAmt[1]);
@ -269,11 +269,11 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService
if(chgAmtSe.equals("0") || chgAmtSe.equals("1")) {
int[] basicAmt = crdnStngBean.getBasicAmt(crdn);
crdn.setFfnlgAmt(basicAmt[0]);
crdn.setFfnlgCrdnAmt(basicAmt[0]);
crdn.setLevyAmt(basicAmt[0]);
crdn.setAdvntceLevyAmt(basicAmt[1]);
} else if(chgAmtSe.equals("2")) {
crdn.setFfnlgAmt(10000);
crdn.setFfnlgCrdnAmt(10000);
crdn.setLevyAmt(10000);
crdn.setAdvntceLevyAmt(8000);
}

36
src/main/java/cokr/xit/fims/crdn/service/bean/CrdnStngBean.java
Unescape Escape View File

@ -116,14 +116,14 @@ public class CrdnStngBean extends AbstractComponent {
query.setDtlAmtDcsnCd("02");
}
int ffnlgAmt = Integer.parseInt(ifEmpty(globalStngMapper.selectBasicAmt(query), () -> "0"));
int ffnlgCrdnAmt = Integer.parseInt(ifEmpty(globalStngMapper.selectBasicAmt(query), () -> "0"));
if(ffnlgAmt > 0 && crdn.getOvtimeYn().equals("Y")) {
ffnlgAmt += 10000;
if(ffnlgCrdnAmt > 0 && crdn.getOvtimeYn().equals("Y")) {
ffnlgCrdnAmt += 10000;
}
amt[0] = ffnlgAmt;
amt[1] = (int)(ffnlgAmt * 0.8);
amt[0] = ffnlgCrdnAmt;
amt[1] = (int)(ffnlgCrdnAmt * 0.8);
} else if(taskSeCd.equals("BPV")) {
@ -138,24 +138,24 @@ public class CrdnStngBean extends AbstractComponent {
query.setAmtDcsnCd("03");
}
int ffnlgAmt = Integer.parseInt(ifEmpty(globalStngMapper.selectBasicAmt(query), () -> "0"));
amt[0] = ffnlgAmt;
amt[1] = ffnlgAmt;
int ffnlgCrdnAmt = Integer.parseInt(ifEmpty(globalStngMapper.selectBasicAmt(query), () -> "0"));
amt[0] = ffnlgCrdnAmt;
amt[1] = ffnlgCrdnAmt;
} else if(taskSeCd.equals("DPV")) {
query.setAmtDcsnCdGroupId("FIM006");
query.setAmtDcsnCd(crdn.getVltnCd());
int ffnlgAmt = Integer.parseInt(ifEmpty(globalStngMapper.selectBasicAmt(query), () -> "0"));
amt[0] = ffnlgAmt;
amt[1] = (int)(ffnlgAmt * 0.8);
int ffnlgCrdnAmt = Integer.parseInt(ifEmpty(globalStngMapper.selectBasicAmt(query), () -> "0"));
amt[0] = ffnlgCrdnAmt;
amt[1] = (int)(ffnlgCrdnAmt * 0.8);
} else if(taskSeCd.equals("ECA")) {
int ffnlgAmt = Integer.parseInt(ifEmpty(globalStngMapper.selectBasicAmt(query), () -> "0"));
amt[0] = ffnlgAmt;
amt[1] = (int)(ffnlgAmt * 0.8);
int ffnlgCrdnAmt = Integer.parseInt(ifEmpty(globalStngMapper.selectBasicAmt(query), () -> "0"));
amt[0] = ffnlgCrdnAmt;
amt[1] = (int)(ffnlgCrdnAmt * 0.8);
} else if(taskSeCd.equals("TPV")) {
@ -183,13 +183,13 @@ public class CrdnStngBean extends AbstractComponent {
}
;
int ffnlgAmt = Integer.parseInt(ifEmpty(globalStngMapper.selectBasicAmt(query), () -> "0"));
amt[0] = ffnlgAmt;
int ffnlgCrdnAmt = Integer.parseInt(ifEmpty(globalStngMapper.selectBasicAmt(query), () -> "0"));
amt[0] = ffnlgCrdnAmt;
boolean isPenaltyAmt = (crdn.getFfnlgCarmdlCd().equals("13") || crdn.getFfnlgCarmdlCd().equals("14")); //과징금
if(isPenaltyAmt) {
amt[1] = (ffnlgAmt);
amt[1] = (ffnlgCrdnAmt);
} else {
amt[1] = (int)(ffnlgAmt * 0.8);
amt[1] = (int)(ffnlgCrdnAmt * 0.8);
}
}

6
src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java
Unescape Escape View File

@ -390,10 +390,10 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv
nonQueryRequest.put("changeAmountYn","N");
} else {
int[] basicAmt = crdnStngBean.getBasicAmt(crdn);
int ffnlgAmt = crdnInfo.number("FFNLG_AMT").intValue();
if(ffnlgAmt != basicAmt[0]){
int ffnlgCrdnAmt = crdnInfo.number("FFNLG_CRDN_AMT").intValue();
if(ffnlgCrdnAmt != basicAmt[0]){
nonQueryRequest.put("changeAmountYn","Y");
crdn.setFfnlgAmt(basicAmt[0]);
crdn.setFfnlgCrdnAmt(basicAmt[0]);
crdn.setLevyAmt(basicAmt[0]);
crdn.setAdvntceLevyAmt(basicAmt[1]);
crdn.setFfnlgRductRt("0");

4
src/main/resources/sql/mapper/fims/crdn/crdn-info-mapper.xml
Unescape Escape View File

@ -38,7 +38,7 @@
<result property="parkngPsbltyRsltCd" column="PARKNG_PSBLTY_RSLT_CD" /> <!-- 주차 가능 결과 코드 -->
<result property="vltnNmtm" column="VLTN_NMTM" /> <!-- 위반 횟수 -->
<result property="ovtimeYn" column="OVTIME_YN" /> <!-- 시간외 여부 -->
<result property="ffnlgAmt" column="FFNLG_AMT" /> <!-- 과태료 금액 -->
<result property="ffnlgCrdnAmt" column="FFNLG_CRDN_AMT" /> <!-- 과태료 단속 금액 -->
<result property="ffnlgRductRt" column="FFNLG_RDUCT_RT" /> <!-- 과태료 감경 율 -->
<result property="levyAmt" column="LEVY_AMT" /> <!-- 부과 금액 -->
<result property="advntceBgngYmd" column="ADVNTCE_BGNG_YMD" /> <!-- 사전통지 시작 일자 -->
@ -95,7 +95,7 @@ SELECT C.CRDN_ID <!-- 단속 ID -->
, C.CRDN_STTS_CHG_DT <!-- 단속 상태 변경 일시 -->
, C.LINK_TBL_NM <!-- 연계 테이블 명 -->
, C.LINK_ID <!-- 연계 ID -->
, C.FFNLG_AMT <!-- 과태료 금액 -->
, C.FFNLG_CRDN_AMT <!-- 과태료 단속 금액 -->
, C.CRDN_YMD <!-- 단속 일자 -->
, C.CRDN_TM <!-- 단속 시간 -->
, C.VLTN_ID <!-- 위반 ID -->

4
src/main/resources/sql/mapper/fims/crdn/crdn-inst-mapper.xml
Unescape Escape View File

@ -32,7 +32,7 @@ INSERT INTO TB_CRDN (
, VIN <!-- 차대번호 -->
, VHCL_NM <!-- 차량 명 -->
, VHCL_COLOR <!-- 차량 색상 -->
, FFNLG_AMT <!-- 과태료 금액 -->
, FFNLG_CRDN_AMT <!-- 과태료 단속 금액 -->
, FFNLG_RDUCT_RT <!-- 과태료 감경 율 -->
, LEVY_AMT <!-- 부과 금액 -->
, ADVNTCE_BGNG_YMD <!-- 사전통지 시작 일자 -->
@ -81,7 +81,7 @@ INSERT INTO TB_CRDN (
, #{vin} <!-- 차대번호 -->
, #{vhclNm} <!-- 차량 명 -->
, #{vhclColor} <!-- 차량 색상 -->
, #{ffnlgAmt} <!-- 과태료 금액 -->
, #{ffnlgCrdnAmt} <!-- 과태료 금액 -->
, #{ffnlgRductRt} <!-- 과태료 감경 율 -->
, #{levyAmt} <!-- 부과 금액 -->
, #{advntceBgngYmd} <!-- 사전통지 시작 일자 -->

10
src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml
Unescape Escape View File

@ -29,7 +29,7 @@ SELECT C.CRDN_ID <!-- 단속 ID -->
, C.VIN <!-- 차대번호 -->
, C.VHCL_NM <!-- 차량 명 -->
, C.VHCL_COLOR <!-- 차량 색상 -->
, C.FFNLG_AMT <!-- 과태료 금액 -->
, C.FFNLG_CRDN_AMT <!-- 과태료 단속 금액 -->
, C.FFNLG_RDUCT_RT <!-- 과태료 감경 율 -->
, C.LEVY_AMT <!-- 부과 금액 -->
, C.ADVNTCE_BGNG_YMD <!-- 사전통지 시작 일자 -->
@ -173,7 +173,7 @@ SELECT C.CRDN_ID <!-- 단속 ID -->
, C.CRDN_PLC
, C.ATCH_FILE_CNT <!-- 사진건수 -->
, C.CRDN_STTS_CD <!-- 단속 상태 코드 -->
, C.FFNLG_AMT <!-- 원금액 -->
, C.FFNLG_CRDN_AMT <!-- 원금액 -->
<!-- 감경금액 -->
, C.CRDN_INPT_SE_CD <!-- 자료출처 -->
FROM TB_CRDN C
@ -207,7 +207,7 @@ SELECT C.CRDN_ID <!-- 단속 ID -->
<when test="by == 'crdnPlc'">C.CRDN_PLC</when>
<when test="by == 'atchFileCnt'">C.ATCH_FILE_CNT</when>
<when test="by == 'crdnSttsCd'">C.CRDN_STTS_CD</when>
<when test="by == 'ffnlgAmt'">C.FFNLG_AMT</when>
<when test="by == 'ffnlgCrdnAmt'">C.FFNLG_CRDN_AMT</when>
<when test="by == 'crdnInptSeCd'">C.CRDN_INPT_SE_CD</when>
</choose>
<include refid="dynamicSearch.center" />#{term}<include refid="dynamicSearch.end" />
@ -276,7 +276,7 @@ SELECT GROUP_CONCAT(C.CRDN_ID) AS CRDN_ID_LIST <!-- 단속 ID -->
<when test="by == 'crdnStdgNm'">C.CRDN_STDG_NM</when>
<when test="by == 'crdnPlc'">C.CRDN_PLC</when>
<when test="by == 'crdnSttsCd'">C.CRDN_STTS_CD</when>
<when test="by == 'ffnlgAmt'">C.FFNLG_AMT</when>
<when test="by == 'ffnlgCrdnAmt'">C.FFNLG_CRDN_AMT</when>
<when test="by == 'rtpyrNm'">P.RTPYR_NM</when>
</choose>
<include refid="dynamicSearch.center" />#{term}<include refid="dynamicSearch.end" />
@ -320,7 +320,7 @@ SELECT C.CRDN_ID <!-- 단속 ID -->
, C.CRDN_STDG_NM <!-- 단속 법정동 명 -->
, C.CRDN_PLC <!-- 단속장소 -->
, C.CRDN_STTS_CD <!-- 처리상태 -->
, C.FFNLG_AMT <!-- 금액 -->
, C.FFNLG_CRDN_AMT <!-- 금액 -->
, P.RTPYR_NM <!-- 성명 -->
, P.RTPYR_NO <!-- 주민번호 -->
FROM TB_CRDN C

4
src/main/resources/sql/mapper/fims/crdn/crdn-updt-mapper.xml
Unescape Escape View File

@ -26,7 +26,7 @@
, VHCL_NM = #{vhclNm} <!-- 차량 명 -->
, VHCL_COLOR = #{vhclColor} <!-- 차량 색상 -->
, ETC_CN = #{etcCn} <!-- 기타 내용 -->
, FFNLG_AMT = #{ffnlgAmt} <!-- 과태료 금액 -->
, FFNLG_CRDN_AMT = #{ffnlgCrdnAmt} <!-- 과태료 단속 금액 -->
, LEVY_AMT = #{levyAmt} <!-- 부과 금액 -->
, FFNLG_RDUCT_RT = #{ffnlgRductRt} <!-- 과태료 감경 율 -->
, ADVNTCE_LEVY_AMT = #{advntceLevyAmt} <!-- 사전통지 부과 금액 -->
@ -96,7 +96,7 @@
UPDATE TB_CRDN
SET MDFCN_DT = <include refid="utility.now" /> /* 수정일시 */
, MDFR = #{modifiedBy} /* 수정자 */
, FFNLG_AMT = #{ffnlgAmt}
, FFNLG_CRDN_AMT = #{ffnlgCrdnAmt}
, LEVY_AMT = #{levyAmt}
, ADVNTCE_LEVY_AMT = #{advntceLevyAmt}
WHERE CRDN_ID = #{crdnId} /* 단속 ID */

8
src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml
Unescape Escape View File

@ -93,7 +93,7 @@ SELECT C.CRDN_ID <!-- 단속 ID -->
, C.VIN <!-- 차대번호 -->
, C.VHCL_NM <!-- 차량 명 -->
, C.VHCL_COLOR <!-- 차량 색상 -->
, C.FFNLG_AMT <!-- 과태료 금액 -->
, C.FFNLG_CRDN_AMT <!-- 과태료 단속 금액 -->
, C.FFNLG_RDUCT_RT <!-- 과태료 감경 율 -->
, C.LEVY_AMT <!-- 부과 금액 -->
, C.ADVNTCE_BGNG_YMD <!-- 사전통지 시작 일자 -->
@ -348,7 +348,7 @@ SELECT C.CRDN_ID <!-- 단속 ID -->
, VHCL_COLOR = #{crdn.vhclColor} /* 차량 색상 */
, ETC_CN = #{crdn.etcCn} /* 기타 내용 */
<if test='changeAmountYn == "Y"'>
, FFNLG_AMT = #{crdn.ffnlgAmt} /* 과태료 금액 */
, FFNLG_CRDN_AMT = #{crdn.ffnlgCrdnAmt} /* 과태료 금액 */
, LEVY_AMT = #{crdn.levyAmt} /* 부과 금액 */
, FFNLG_RDUCT_RT = #{crdn.ffnlgRductRt} /* 과태료 감경 율 */
, ADVNTCE_LEVY_AMT = #{crdn.advntceLevyAmt} /* 사전통지 부과 금액 */
@ -436,7 +436,7 @@ INSERT
, VIN
, VHCL_NM
, VHCL_COLOR
, FFNLG_AMT
, FFNLG_CRDN_AMT
, FFNLG_RDUCT_RT
, LEVY_AMT
, ADVNTCE_LEVY_AMT
@ -472,7 +472,7 @@ SELECT #{newCrdnId}
, VIN
, VHCL_NM
, VHCL_COLOR
, FFNLG_AMT
, FFNLG_CRDN_AMT
, FFNLG_RDUCT_RT
, LEVY_AMT
, ADVNTCE_LEVY_AMT

12
src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp
Unescape Escape View File

@ -187,7 +187,7 @@
style="min-width: 80px;">사진매수</th>
<th onclick="searchFromGridTitle('CRDN_STTS_CD',this.innerText,'codeValue','FIM010');"
style="min-width: 80px;">처리상태</th>
<th onclick="searchFromGridTitle('FFNLG_AMT',this.innerText,'match','perfect');"
<th onclick="searchFromGridTitle('FFNLG_CRDN_AMT',this.innerText,'match','perfect');"
style="min-width: 80px;">원금액</th>
<th onclick="searchFromGridTitle('UNKNOWN',this.innerText,'match','perfect');"
style="min-width: 80px;">감경금액</th>
@ -209,7 +209,7 @@
style="max-width:500px;">{CRDN_PLC}</td>
<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{ATCH_FILE_CNT}</td>
<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CRDN_STTS_CD}</td>
<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-end">{FFNLG_AMT}</td>
<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-end">{FFNLG_CRDN_AMT}</td>
<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-end">{unknown}</td>
<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CRDN_INPT_SE_CD}</td>
</tr>
@ -298,7 +298,7 @@
>단속장소</th>
<th onclick="searchFromGridTitle('CRDN_STTS_CD',this.innerText,'codeValue','FIM010');"
>처리상태</th>
<th onclick="searchFromGridTitle('FFNLG_AMT',this.innerText,'match','perfect');"
<th onclick="searchFromGridTitle('FFNLG_CRDN_AMT',this.innerText,'match','perfect');"
>금액</th>
<th onclick="searchFromGridTitle('RTPYR_NM',this.innerText,'match','part');"
>성명</th>
@ -317,7 +317,7 @@
<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-start text-truncate"
style="max-width:500px;min-width: 300px;">{CRDN_PLC}</td>
<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CRDN_STTS_CD}</td>
<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-end">{FFNLG_AMT}</td>
<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-end">{FFNLG_CRDN_AMT}</td>
<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-start">{RTPYR_NM}</td>
<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center privacy">{RTPYR_NO}</td>
<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center privacy-mask">************</td>
@ -371,7 +371,7 @@ $(document).ready(function(){
CRDN_YMD_TM : datetimeFormat,
CRDN_INPT_SE_CD : FIM003,
CRDN_STTS_CD : FIM010,
FFNLG_AMT : numberFormat
FFNLG_CRDN_AMT : numberFormat
//감경금액
}
});
@ -383,7 +383,7 @@ $(document).ready(function(){
urls : { load : "", getInfo : "" },
dataGetter : obj => obj["List"], appendData:true,
keymapper : info => info ? info.CRDN_ID_LIST : "",
formats: { CRDN_CNT : numberFormat, FFNLG_AMT : numberFormat }
formats: { CRDN_CNT : numberFormat, FFNLG_CRDN_AMT : numberFormat }
},
{
urls : { load : "", getInfo : "" },

2
src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp
Unescape Escape View File

@ -144,7 +144,7 @@ $(document).ready(function(){
formats: {
CRDN_INPT_SE_CD : FIM003,
CRDN_YMD_TM : datetimeFormat,
FFNLG_AMT : numberFormat,
FFNLG_CRDN_AMT : numberFormat,
CRDN_STTS_CD : FIM010,
BLNC : numberFormat
}

Write Preview
Loading…
Cancel
Save