From 06751b05cdb56c16f9c12a2aace1f7b8053f5161 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Thu, 29 Jun 2023 18:45:21 +0900 Subject: [PATCH] =?UTF-8?q?=ED=91=9C=EC=A7=80=EC=A0=95=EB=B3=B4=EB=AF=B8?= =?UTF-8?q?=ED=99=95=EC=9D=B8=EC=9E=90=EB=A3=8C=20=EB=A9=94=EC=9D=B8?= =?UTF-8?q?=ED=99=94=EB=A9=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cokr/xit/fims/crdn/CrdnQuery.java | 40 +++- .../xit/fims/crdn/web/Crdn06Controller.java | 25 +- .../sql/mapper/fims/crdn/crdn06-mapper.xml | 77 ++++--- .../WEB-INF/jsp/fims/crdn/crdn06010-main.jsp | 56 +++-- .../WEB-INF/jsp/fims/crdn/crdn06030-main.jsp | 217 +++++++----------- .../WEB-INF/jsp/fims/crdn/crdn06040-main.jsp | 12 +- 6 files changed, 206 insertions(+), 221 deletions(-) diff --git a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java index 651f022d..9860c3f6 100644 --- a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java +++ b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java @@ -13,9 +13,9 @@ import cokr.xit.foundation.component.QueryRequest; * */ public class CrdnQuery extends QueryRequest { - + private static final long serialVersionUID = 1L; - + private String grid; private String crdnId; private String taskSeCd; @@ -25,7 +25,9 @@ public class CrdnQuery extends QueryRequest { private String vhrno; private String schRductYmdFrom; private String schRductYmdTo; - + private String schCrdnYmdFrom; + private String schCrdnYmdTo; + public String getGrid() { return ifEmpty(grid, () -> null); } @@ -34,7 +36,7 @@ public class CrdnQuery extends QueryRequest { this.grid = grid; return self(); } - + public String getCrdnId() { return ifEmpty(crdnId, () -> null); } @@ -43,7 +45,7 @@ public class CrdnQuery extends QueryRequest { this.crdnId = crdnId; return self(); } - + public String getTaskSeCd() { return ifEmpty(taskSeCd, () -> null); } @@ -52,7 +54,7 @@ public class CrdnQuery extends QueryRequest { this.taskSeCd = taskSeCd; return self(); } - + public String getSchDateOpt() { return ifEmpty(schDateOpt, () -> null); } @@ -61,7 +63,7 @@ public class CrdnQuery extends QueryRequest { this.schDateOpt = schDateOpt; return self(); } - + public String getSchDateFrom() { return ifEmpty(schDateFrom, () -> null); } @@ -70,7 +72,7 @@ public class CrdnQuery extends QueryRequest { this.schDateFrom = schDateFrom; return self(); } - + public String getSchDateTo() { return ifEmpty(schDateTo, () -> null); } @@ -79,7 +81,7 @@ public class CrdnQuery extends QueryRequest { this.schDateTo = schDateTo; return self(); } - + public String getVhrno() { return ifEmpty(vhrno, () -> null); } @@ -97,7 +99,7 @@ public class CrdnQuery extends QueryRequest { this.schRductYmdFrom = schRductYmdFrom; return self(); } - + public String getSchRductYmdTo() { return ifEmpty(schRductYmdTo, () -> null); } @@ -107,4 +109,22 @@ public class CrdnQuery extends QueryRequest { return self(); } + public String getSchCrdnYmdFrom() { + return ifEmpty(schCrdnYmdFrom, () -> null); + } + + public T setSchCrdnYmdFrom(String schCrdnYmdFrom) { + this.schCrdnYmdFrom = schCrdnYmdFrom; + return self(); + } + + public String getSchCrdnYmdTo() { + return ifEmpty(schCrdnYmdTo, () -> null); + } + + public T setSchCrdnYmdTo(String schCrdnYmdTo) { + this.schCrdnYmdTo = schCrdnYmdTo; + return self(); + } + } diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java index 2fb10309..ed84958b 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java @@ -18,7 +18,7 @@ public class Crdn06Controller extends ApplicationController { @Resource(name="crdn06Service") private Crdn06Service crdn06Service; - + /** 단속 관리 메인화면을 연다. * @return fims/crdn/crdn06010-main */ @@ -27,7 +27,7 @@ public class Crdn06Controller extends ApplicationController { ModelAndView mav = new ModelAndView(); mav.setViewName("fims/crdn/crdn06010-main"); mav.addObject("pageName", "crdn06010-main"); - + Map> commonCodes = getCodesOf("FIM001", "FIM002", "FIM010", "FIM026"); mav.addObject("FIM001List", commonCodes.get("FIM001")); mav.addObject("FIM002List", commonCodes.get("FIM002")); @@ -35,7 +35,7 @@ public class Crdn06Controller extends ApplicationController { addCodes(commonCodes, mav, "FIM002", "FIM010", "FIM026"); return mav; } - + /** 단속 자료 검사 메인화면을 연다. * @return fims/crdn/crdn06020-main */ @@ -44,10 +44,16 @@ public class Crdn06Controller extends ApplicationController { ModelAndView mav = new ModelAndView(); mav.setViewName("fims/crdn/crdn06020-main"); mav.addObject("pageName", "crdn06020-main"); - + + Map> commonCodes = getCodesOf("FIM001", "FIM002", "FIM003", "FIM010", "FIM026"); + mav.addObject("FIM001List", commonCodes.get("FIM001")); + mav.addObject("FIM002List", commonCodes.get("FIM002")); + mav.addObject("FIM010List", commonCodes.get("FIM010")); + addCodes(commonCodes, mav, "FIM002", "FIM003", "FIM010", "FIM026"); + return mav; } - + /** 표지정보 미확인 자료 메인화면을 연다. * @return fims/crdn/crdn06030-main */ @@ -56,12 +62,9 @@ public class Crdn06Controller extends ApplicationController { ModelAndView mav = new ModelAndView(); mav.setViewName("fims/crdn/crdn06030-main"); mav.addObject("pageName","crdn06030-main"); - - Map> commonCodes = getCodesOf("FIM001", "FIM002", "FIM003", "FIM010", "FIM026"); - mav.addObject("FIM001List", commonCodes.get("FIM001")); - mav.addObject("FIM002List", commonCodes.get("FIM002")); - mav.addObject("FIM010List", commonCodes.get("FIM010")); - addCodes(commonCodes, mav, "FIM002", "FIM003", "FIM010", "FIM026"); + + Map> commonCodes = getCodesOf("FIM003", "FIM010"); + addCodes(commonCodes, mav, "FIM003", "FIM010"); return mav; } diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml index cb78d86e..361e9bbc 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml @@ -230,58 +230,75 @@ AND C.${by} LIKE CONCAT('%', #{term}, '%') 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 926d19eb..5f77ba6c 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 @@ -27,7 +27,7 @@ class="form-check-input" alt="업무구분" onchange="pageObject['${pageName}'].fnResetAndChangeBiz(this.value);"> ${item.value} - + @@ -37,11 +37,11 @@ - ~ - @@ -64,7 +64,7 @@ - + @@ -171,7 +171,6 @@ $(document).ready(function(){ $P.searchCrdnList = () => { $P.crdnControl.query = $P.getParams(); - $("#crdnTbody--${pageName}").html(""); $P.crdnControl.load(1); } @@ -190,25 +189,20 @@ $(document).ready(function(){ crdnList.inStrings( document.getElementById("crdnRow--${pageName}").innerHTML, (str, dataItem) => str - .replace(/{onclick}/gi, 'onclick="pageObject[\'${pageName}\'].crdnControl.setCurrent(\'' + dataItem.getValue("CRDN_ID") + '\');"') + .replace(/{onclick}/gi, 'onclick="pageObject[\'${pageName}\'].crdnControl.setCurrent(\'' + dataItem.getValue("CRDN_ID") + '\');$(\'#crdnTbody--${pageName}\').setCurrentRow(\'' + dataItem.getValue("CRDN_ID") + '\');"') .replace(/{ondblclick}/gi, 'ondblclick="pageObject[\'${pageName}\'].crdnControl.getInfo(\'' + dataItem.getValue("CRDN_ID") + '\')"') ); $("#crdnTbody--${pageName}").html(trs.join()); //보안모드 - if($("#securityMode--top").is(":checked")){ - fn_securityModeToggle(true); - } else { - fn_securityModeToggle(false); - } + fn_securityModeToggle($("#securityMode--top").is(":checked")); } $P.getParams = () => { var formFields = new FimsFormFields("#frmSearch--${pageName}"); var data = formFields.get(); data.fetchSize = 30; - return data; }