diff --git a/src/main/java/cokr/xit/fims/chongno/ChongnoTaskProcessor.java b/src/main/java/cokr/xit/fims/chongno/ChongnoTaskProcessor.java index 346484d..ae220d7 100644 --- a/src/main/java/cokr/xit/fims/chongno/ChongnoTaskProcessor.java +++ b/src/main/java/cokr/xit/fims/chongno/ChongnoTaskProcessor.java @@ -6,8 +6,6 @@ import javax.annotation.Resource; import cokr.xit.fims.crdn.Crdn; import cokr.xit.fims.crdn.CrdnQuery; -import cokr.xit.fims.crdn.dao.ExmptnVhclMapper; -import cokr.xit.fims.excl.LevyExcl; import cokr.xit.fims.levy.LevyQuery; import cokr.xit.fims.levy.dao.LevyMapper; import cokr.xit.fims.mngt.service.bean.TaskProcessor; @@ -33,8 +31,6 @@ public class ChongnoTaskProcessor extends TaskProcessor { || super.isPreImposable(taskSeCd); } - @Resource(name = "exmptnVhclMapper") - private ExmptnVhclMapper exmptnVhclMapper; @Resource(name = "levyMapper") private LevyMapper levyMapper; @@ -68,19 +64,4 @@ public class ChongnoTaskProcessor extends TaskProcessor { } return super.getBasicAmt(crdn); } - - @Override - public LevyExcl getLevyExcl(Crdn crdn) { - if ("83".equals(crdn.getCrdnSttsCd())) - return super.getLevyExcl(crdn); - - CrdnQuery req = new CrdnQuery() - .setVhrno(crdn.getVhrno()) - .setCrdnYmd(crdn.getCrdnYmd()) - .setSggCd(crdn.getSggCd()) - .setTaskSeCd(crdn.getTaskSeCd()); - List list = exmptnVhclMapper.selectExemptionVehicleList(req); - - return !list.isEmpty() ? newLevyExcl(crdn, "1", "145") : null; - } } \ No newline at end of file diff --git a/src/main/resources/intf-conf/public-info.conf b/src/main/resources/intf-conf/public-info.conf index 9ef0756..21754cc 100644 --- a/src/main/resources/intf-conf/public-info.conf +++ b/src/main/resources/intf-conf/public-info.conf @@ -1,10 +1,33 @@ { - "basic-info-ext": { /* 자동차 기본정보(연료 제원 포함) 조회 */ - "apiKey": "59f26bf09ed196bfbd98210388c4c6ea9dd0f77bde3f35526f082647a305325b", /* 행정정보 공동이용 서비스가 발급한 api key */ - "apiUrl": "http://localhost:9079/piss/api/molit/SignguCarBassMatterInqireService", /* 행정정보 개발 url */ - "userServerId": "SVR1311000030", /* 이용기관 gpki server id */ - "providerServerId": "SVR1500000015", /* 보유기관 gpki server id */ - "gpki": false, /* 데이터 암복호화 사용 여부 */ - "mock": false /* 보유기관 가상 데이터 사용 여부 */ - } + "host": "http://localhost:9079", +/* 행정정보 url + 운영: http://10.188.225.25:29001 + 개발: http://10.188.225.94:29001 +*/ + "apis": [ + { + "name": "basic-info-ext", + + "url": "/piss/api/molit/SignguCarBassMatterInqireService", + "key": "59f26bf09ed196bfbd98210388c4c6ea9dd0f77bde3f35526f082647a305325b", + + "userServerId": "SVR1311000030", + "providerServerId": "SVR1500000015", + "gpki": true, + "mock": false + } + ] +/* API 설정 템플릿 + { + "name": "이용 API 이름", + + "url": "API URL", + "key": "행정정보 공동이용 서비스가 발급한 api key", + + "userServerId": "이용기관 gpki server id", + "providerServerId": "보유기관 gpki server id", + "gpki": true, // 데이터 암복호화 사용 여부 + "mock": false // 보유기관 가상 데이터 사용 여부 + } +*/ } \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp index fd0cbed..10a4653 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp @@ -320,10 +320,13 @@
+
@@ -409,7 +412,7 @@ $(document).ready(function(){ tagsText += ""; tagsText += ""; - if(index % 2 == 1){ + if (index % 2 == 1){ tagsText += "
"; } } @@ -427,13 +430,13 @@ $(document).ready(function(){ $P.fnSave = async() => { - if(!AppSupport.customValidate($P.$findn("frmEdit").find("input"))) return; + if (!AppSupport.customValidate($P.$findn("frmEdit").find("input"))) return; - if($P.$findn("doWarning").is(":checked")){ + if ($P.$findn("doWarning").is(":checked")){ var rtpyrNm = $P.findn("rtpyrNm"); - if(rtpyrNm.value == ""){ - dialog.alert({ + if (!rtpyrNm.value){ + return dialog.alert({ content:"계고 처리를 하기 위해선 소유주정보가 입력되어야 합니다.", init : function(){ AppSupport.setDialogZindex(); @@ -441,16 +444,12 @@ $(document).ready(function(){ }, onClose:function(){rtpyrNm.focus();} }); - return; } } - if(await confirm2("현재 단속 정보를 저장하시겠습니까?")){ + if (await confirm2("현재 단속 정보를 저장하시겠습니까?")){ var info = $P.formFields.get(); - - if (!info) { - return; - } + if (!info) return; var formData = new FormData($P.findn("frmFile")); for(var key in info) { @@ -460,11 +459,11 @@ $(document).ready(function(){ formData.delete("newFileList"); - if($P.localUploadArr.length > 0){ + if ($P.localUploadArr.length > 0){ $P.localUploadArr.forEach(item => formData.append("newFileList",item)); } - if($P.captureFileArr.length > 0){ + if ($P.captureFileArr.length > 0){ $P.captureFileArr.forEach(item => formData.append("newFileList",item)); } @@ -500,7 +499,7 @@ $(document).ready(function(){ file.id = "file-" + identify; file.url = (window.URL || window.webkitURL).createObjectURL(file); $P.captureFileArr.push(file); - if(index === array.length - 1){ + if (index === array.length - 1){ $P.fnDisplay(); } }); @@ -545,10 +544,8 @@ $(document).ready(function(){ $P.$findn("btnCancelAddFile").on('click', () => { var checked = $P.$findn("display").find("[name='newPhoto']:checked"); - if(checked.length < 1){ - alert("선택된 사진이 없습니다."); - return; - } + if (checked.length < 1) + return alert("선택된 사진이 없습니다."); var checkedArr = []; for(var i=0; i < checked.length; i++){ @@ -565,7 +562,7 @@ $(document).ready(function(){ var crdnYmd = $P.$findn("crdnYmd").val().replaceAll("-", ""); var vhrnoEl = event.target; var vhrno = vhrnoEl.value; - if(!crdnYmd) + if (!crdnYmd) return dialog.alert({ content : "단속일자를 입력하세요.", init : function(){ @@ -575,7 +572,7 @@ $(document).ready(function(){ onClose : function(){ $P.$findn("crdnYmd").focus(); } }); - if(!vhrno){ + if (!vhrno){ return dialog.alert({ content:"차량번호를 입력하세요.", init : function(){ @@ -587,7 +584,7 @@ $(document).ready(function(){ } let resp = await FimsSupport.getVhclInfo($P.$findn("sggCd").val(), vhrno, crdnYmd); - if(!resp.found){ + if (!resp.found){ dialog.alert({ content : "차량정보가 없습니다.", init : function(){ @@ -625,17 +622,17 @@ $(document).ready(function(){ $P.$findn("vhclColr").val(vehicle.color_nm); $P.$findn("useFuelCd").val(vehicle.use_fuel_code); - if(vehicle.vhcty_asort_code == "1"){ //승용 + if (vehicle.vhcty_asort_code == "1"){ //승용 $P.$findn("ffnlgCarmdlCd").val("11"); - } else if(vehicle.vhcty_asort_code == "2"){ //승합 + } else if (vehicle.vhcty_asort_code == "2"){ //승합 $P.$findn("ffnlgCarmdlCd").val("12"); - } else if(vehicle.vhcty_asort_code == "3"){ //화물 - if(vehicle.mxmm_ldg <= 4000){ + } else if (vehicle.vhcty_asort_code == "3"){ //화물 + if (vehicle.mxmm_ldg <= 4000){ $P.$findn("ffnlgCarmdlCd").val("13"); } else { $P.$findn("ffnlgCarmdlCd").val("14"); } - } else if(vehicle.vhcty_asort_code == "4"){ //특수 + } else if (vehicle.vhcty_asort_code == "4"){ //특수 $P.$findn("ffnlgCarmdlCd").val("15"); } else { $P.$findn("ffnlgCarmdlCd").val(""); @@ -644,8 +641,15 @@ $(document).ready(function(){ $P.$findn("zip").val(vehicle.zip_code); //우편번호 $P.$findn("addr").val(vehicle.road_nm_adres); //주소 $P.$findn("dtlAddr").val(vehicle.use_strnghld_adres_nm); //상세주소 - if (resp.exempted) + let doExempt = document.querySelector('label[for^=doExempt]').classList; + if (resp.exempted) { + doExempt.remove('hidden'); dialog.alert("면제차량이 설정됐습니다."); + } else { + if (!doExempt.contains('hidden')) + doExempt.add('hidden'); + } + }; let input = $P.$findn("vhrno"); @@ -658,12 +662,12 @@ $(document).ready(function(){ $P.$findn("teamer3").val(""); $P.$findn("teamer4").val(""); - if(this.value != ""){ + if (this.value != ""){ ajax.get({ url: wctx.url("/crdn/crdn07/010/info.do"), data: { "teamId" : this.value}, success : (resp) => { - if(resp.teamInfo != null){ + if (resp.teamInfo != null){ var teamInfo = resp.teamInfo; $P.$findn("teamer1").val(teamInfo.TEAMER_1); $P.$findn("teamer2").val(teamInfo.TEAMER_2); @@ -684,10 +688,10 @@ $(document).ready(function(){ $(this).on("input",function(){ var value = this.value.replaceAll("-",""); - if(value.length > 7){ - this.value = value.substring(0,4)+"-"+value.substring(4,6)+"-"+value.substring(6); - } else if(value.length > 5){ - this.value = value.substring(0,4)+"-"+value.substring(4); + if (value.length > 7){ + this.value = value.substring(0,4) + "-" + value.substring(4,6) + "-" + value.substring(6); + } else if (value.length > 5){ + this.value = value.substring(0,4) + "-" + value.substring(4); } }); @@ -696,10 +700,10 @@ $(document).ready(function(){ $(this).on("input",function(){ var value = this.value.replaceAll(":",""); - if(value.length > 5){ - this.value = value.substring(0,2)+":"+value.substring(2,4)+":"+value.substring(4); - } else if(value.length > 3){ - this.value = value.substring(0,2)+":"+value.substring(2); + if (value.length > 5){ + this.value = value.substring(0,2) + ":" + value.substring(2,4) + ":" + value.substring(4); + } else if (value.length > 3){ + this.value = value.substring(0,2) + ":" + value.substring(2); } }); @@ -711,4 +715,5 @@ $(document).ready(function(){ ctrl.dataset.append({}); }); +//# sourceURL=crdn05030-info.jsp \ No newline at end of file