From ecacd151f22241770e7fd8a16c310ef1a082d88e Mon Sep 17 00:00:00 2001 From: mjkhan21 Date: Thu, 12 Jun 2025 13:48:58 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B0=A8=EB=9F=89=EC=A0=95=EC=9B=90=20?= =?UTF-8?q?=EC=B2=B4=ED=81=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fims/chongno/ChongnoTaskProcessor.java | 47 ++++++++++++++-- .../WEB-INF/jsp/fims/crdn/crdn05030-info.jsp | 2 +- .../WEB-INF/jsp/fims/crdn/crdn06010-main.jsp | 54 ++++++++++++++++++- .../WEB-INF/jsp/fims/ogdp/ogdp01010-main.jsp | 39 +++++++++----- .../resources/html/inputDateDialog.html | 11 ++-- .../webapp/resources/html/searchAddr.html | 19 +++---- 6 files changed, 134 insertions(+), 38 deletions(-) diff --git a/src/main/java/cokr/xit/fims/chongno/ChongnoTaskProcessor.java b/src/main/java/cokr/xit/fims/chongno/ChongnoTaskProcessor.java index 33c8406..f0f7534 100644 --- a/src/main/java/cokr/xit/fims/chongno/ChongnoTaskProcessor.java +++ b/src/main/java/cokr/xit/fims/chongno/ChongnoTaskProcessor.java @@ -4,8 +4,11 @@ import java.util.List; import javax.annotation.Resource; +import cokr.xit.base.code.CommonCode; +import cokr.xit.base.code.dao.CodeMapper; import cokr.xit.fims.crdn.Crdn; import cokr.xit.fims.crdn.CrdnQuery; +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; @@ -18,6 +21,11 @@ public class ChongnoTaskProcessor extends TaskProcessor { vltnCdGrps.set(TASK_SE_CD, "FIM090"); } + @Resource(name = "levyMapper") + private LevyMapper levyMapper; + @Resource(name = "codeMapper") + private CodeMapper codeMapper; + @Override public String[] getExtraCdGrps(String taskSeCd) { if (TASK_SE_CD.equals(taskSeCd)) @@ -31,9 +39,6 @@ public class ChongnoTaskProcessor extends TaskProcessor { || super.isPreImposable(taskSeCd); } - @Resource(name = "levyMapper") - private LevyMapper levyMapper; - @Override public int[] getBasicAmt(Crdn crdn) { String taskSeCd = crdn.getTaskSeCd(); @@ -70,7 +75,8 @@ public class ChongnoTaskProcessor extends TaskProcessor { @Override public String getSealCd3(String taskSeCd, String sndngSeCd) { if (TASK_SE_CD.equals(taskSeCd)) { - + if ("11".equals(sndngSeCd)) + return "E"; } return super.getSealCd3(taskSeCd, sndngSeCd); } @@ -82,4 +88,37 @@ public class ChongnoTaskProcessor extends TaskProcessor { default -> super.getNtrisInterface(taskSeCd); }; } + + @Override + public String getNoticeDelivery(String taskSeCd) { + if (TASK_SE_CD.equals(taskSeCd)) + return "postplus"; + else + return super.getNoticeDelivery(taskSeCd); + } + + private int capacity = -1; + + @Override + public LevyExcl getLevyExcl(Crdn crdn) { + LevyExcl excl = super.getLevyExcl(crdn); + if (!TASK_SE_CD.equals(crdn.getTaskSeCd())) + return excl; + if (excl != null) + return excl; + + if (capacity < 0) { + CommonCode code = codeMapper.getCode("FIM022", "114"); + capacity = toInt(notEmpty(code, "capacity").getEtc1()); + } + if (capacity == 0) + return null; + + int vhclCpct = crdn.getVhclCpct(); + + if (vhclCpct > 0 && vhclCpct < capacity) + return newLevyExcl(crdn, "1", "114"); + + return null; + } } \ 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 2a6ddc9..3e4027f 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 @@ -365,7 +365,7 @@ multiple accept="image/*" hidden />
- +
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp index 541bd80..5d9656e 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp @@ -150,6 +150,9 @@
+ + + diff --git a/src/main/webapp/resources/html/inputDateDialog.html b/src/main/webapp/resources/html/inputDateDialog.html index 6d37011..604ff00 100644 --- a/src/main/webapp/resources/html/inputDateDialog.html +++ b/src/main/webapp/resources/html/inputDateDialog.html @@ -2,21 +2,18 @@
-
- +
- +
- +
- +
diff --git a/src/main/webapp/resources/html/searchAddr.html b/src/main/webapp/resources/html/searchAddr.html index ad5163c..6141e45 100644 --- a/src/main/webapp/resources/html/searchAddr.html +++ b/src/main/webapp/resources/html/searchAddr.html @@ -24,8 +24,7 @@
- - + @@ -41,11 +40,7 @@ - +
@@ -141,7 +136,7 @@ function getAddr(pageNum){ var errCode = jsonStr.results.common.errorCode; var errDesc = jsonStr.results.common.errorMessage; if(errCode != "0"){ - alert(errCode+"="+errDesc); + dialog.alert(errCode+"="+errDesc); }else{ if(jsonStr != null){ addrControl.setData(jsonStr.results); @@ -149,7 +144,7 @@ function getAddr(pageNum){ } } ,error: function(xhr,status, error){ - alert("에러발생"); + dialog.alert("에러발생"); } }); } @@ -160,7 +155,7 @@ function checkSearchedWord(obj){ //특수문자 제거 var expText = /[%=><]/ ; if(expText.test(obj.value) == true){ - alert("특수문자를 입력 할수 없습니다.") ; + dialog.alert("특수문자를 입력 할수 없습니다.") ; obj.value = obj.value.split(expText).join(""); return false; } @@ -177,7 +172,7 @@ function checkSearchedWord(obj){ regex = new RegExp( sqlArray[i] ,"gi") ; if (regex.test(obj.value) ) { - alert("\"" + sqlArray[i]+"\"와(과) 같은 특정문자로 검색할 수 없습니다."); + dialog.alert("\"" + sqlArray[i]+"\"와(과) 같은 특정문자로 검색할 수 없습니다."); obj.value =obj.value.replace(regex, ""); return false; } @@ -248,4 +243,4 @@ function fnReturn(){ Componentization.fnMakeResizableTable($("#table-responsive")[0]); $("#list").hide(); - + \ No newline at end of file