diff --git a/src/main/java/cokr/xit/fims/crdn/dao/GlobalStngMapper.java b/src/main/java/cokr/xit/fims/crdn/dao/GlobalStngMapper.java index 4d6fac64..981239f1 100644 --- a/src/main/java/cokr/xit/fims/crdn/dao/GlobalStngMapper.java +++ b/src/main/java/cokr/xit/fims/crdn/dao/GlobalStngMapper.java @@ -13,7 +13,7 @@ public interface GlobalStngMapper extends AbstractMapper { * @param query 단속자료 정보 * @return 기본금액 */ - int selectBasicAmt(CrdnQuery query); + String selectBasicAmt(CrdnQuery query); /**기관코드에 따른 시군구코드를 조회한다. * @param institute 기관코드 diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnStngBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnStngBean.java index b35f5a93..041c3f77 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnStngBean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnStngBean.java @@ -116,8 +116,9 @@ public class CrdnStngBean extends AbstractComponent { query.setDtlAmtDcsnCd("02"); } - int ffnlgAmt = globalStngMapper.selectBasicAmt(query); - if(crdn.getOvtimeYn().equals("Y")) { + int ffnlgAmt = Integer.parseInt(ifEmpty(globalStngMapper.selectBasicAmt(query), () -> "0")); + + if(ffnlgAmt > 0 && crdn.getOvtimeYn().equals("Y")) { ffnlgAmt += 10000; } @@ -137,7 +138,7 @@ public class CrdnStngBean extends AbstractComponent { query.setAmtDcsnCd("03"); } - int ffnlgAmt = globalStngMapper.selectBasicAmt(query); + int ffnlgAmt = Integer.parseInt(ifEmpty(globalStngMapper.selectBasicAmt(query), () -> "0")); amt[0] = ffnlgAmt; amt[1] = ffnlgAmt; @@ -146,13 +147,13 @@ public class CrdnStngBean extends AbstractComponent { query.setAmtDcsnCdGroupId("FIM006"); query.setAmtDcsnCd(crdn.getVltnCd()); - int ffnlgAmt = globalStngMapper.selectBasicAmt(query); + int ffnlgAmt = Integer.parseInt(ifEmpty(globalStngMapper.selectBasicAmt(query), () -> "0")); amt[0] = ffnlgAmt; amt[1] = (int)(ffnlgAmt * 0.8); } else if(taskSeCd.equals("ECA")) { - int ffnlgAmt = globalStngMapper.selectBasicAmt(query); + int ffnlgAmt = Integer.parseInt(ifEmpty(globalStngMapper.selectBasicAmt(query), () -> "0")); amt[0] = ffnlgAmt; amt[1] = (int)(ffnlgAmt * 0.8); @@ -180,8 +181,9 @@ public class CrdnStngBean extends AbstractComponent { query.setDtlAmtDcsnCdGroupId("FIM058"); //query.setDtlAmtDcsnCd(업종); // TODO : 차주 업종 } + ; - int ffnlgAmt = globalStngMapper.selectBasicAmt(query); + int ffnlgAmt = Integer.parseInt(ifEmpty(globalStngMapper.selectBasicAmt(query), () -> "0")); amt[0] = ffnlgAmt; boolean isPenaltyAmt = (crdn.getFfnlgCarmdlCd().equals("13") || crdn.getFfnlgCarmdlCd().equals("14")); //과징금 if(isPenaltyAmt) { diff --git a/src/main/resources/sql/mapper/fims/crdn/global-stng-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/global-stng-mapper.xml index 92168e30..c9b7322b 100644 --- a/src/main/resources/sql/mapper/fims/crdn/global-stng-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/global-stng-mapper.xml @@ -2,7 +2,7 @@ - + /* 기본금액 조회(globalStngMapper.selectBasicAmt) */ SELECT AMT FROM TB_AMT_INFO diff --git a/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml b/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml index 3af5e46e..458b1ca3 100644 --- a/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml +++ b/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml @@ -356,6 +356,7 @@ SELECT C.CRDN_ID , CC.CVLCPT_APLY_CN , CC.CVLCPT_RCPT_YMD , CC.CVLCPT_PRCS_PRNMNT_DT + , CC.DSTRBNC_YN , P.RTPYR_NM , P.RTPYR_SE_CD , P.RTPYR_NO @@ -378,6 +379,7 @@ SELECT C.CRDN_ID , CVLCPT_TRSM_CD = #{cvlcptTrsmCd} /* 민원전송코드 */ , CVLCPT_PRCS_SUMRY = #{cvlcptPrcsSumry} /* 민원처리요약 */ , CVLCPT_PRCS_RSLT_CN = #{cvlcptPrcsRsltCn} /* 민원처리결과내용 */ + , DSTRBNC_YN = NULLIF(#{dstrbncYn},'N') /* 방해 여부 */ , CVLCPT_PRCS_PIC = #{modifiedBy} /* 수정자 */ , MDFCN_DT = /* 수정일시 */ , MDFR = #{modifiedBy} /* 수정자 */ diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp index 3b981f38..89b36f8d 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp @@ -62,6 +62,10 @@ ${item.value} + + + 1면 방해 + 법정동 @@ -742,6 +746,14 @@ $(document).ready(function(){ dialog.close("cvlcptInitialDataEditDialog--${openerPageName}"); } + /************************************************************************** + * 초기화(업무별 입력항목) + **************************************************************************/ + var clsForTask = "${taskSeCd}".toLowerCase(); + + //업무별 입력 항목 + renderForTask('frmEdit--${pageName}', clsForTask); + /************************************************************************** * element.on **************************************************************************/ @@ -912,6 +924,17 @@ $(document).ready(function(){ } }); + if("${taskSeCd}" == "DPV"){ + $("#vltnCd--${pageName}").on("change", function(){ + if(this.value == "01"){ + $("label[for='dstrbncYn--${pageName}']").show(); + } else { + $("label[for='dstrbncYn--${pageName}']").hide(); + $("input[id='dstrbncYn--${pageName}']").prop("checked", false); + } + }); + } + $("#refreshEnd--${pageName}").on("refreshEnd", function(){ if(this.dataset.cursorKey != null && this.dataset.cursorKey != ""){ $P.fnGo(this.dataset.cursorKey); @@ -923,11 +946,6 @@ $(document).ready(function(){ /************************************************************************** * 초기화 **************************************************************************/ - var clsForTask = "${taskSeCd}".toLowerCase(); - - //업무별 입력 항목 - renderForTask('frmEdit--${pageName}', clsForTask); - initDatepicker("frmEdit--${pageName}"); //달력 초기화 $("#frmEdit--${pageName}").find(".form-date").each(function(){ @@ -959,6 +977,12 @@ $(document).ready(function(){ crdnInfo.CVLCPT_APLY_CN = escapeHTMLEntity(crdnInfo.CVLCPT_APLY_CN); $P.crdnControl.setData([crdnInfo]); + if($("#taskSeCd--${pageName}").val() == "DPV" && $("#vltnCd--${pageName}").val() == "01"){ + $("label[for='dstrbncYn--${pageName}']").show(); + } else { + $("label[for='dstrbncYn--${pageName}']").hide(); + } + //보안모드 fn_securityModeToggle($("#securityMode--top").is(":checked"));