From 51a06a286e4d72d43c94b7c9c2db3beb6894ce25 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Wed, 15 Nov 2023 16:36:34 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=82=B4=20=EC=8B=9C=EA=B5=B0?= =?UTF-8?q?=EA=B5=AC=20=EC=A1=B0=ED=9A=8C=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cokr/xit/fims/sprt/SprtQuery.java | 22 ++++++++++++++----- .../xit/fims/sprt/web/Sprt01Controller.java | 7 ++---- .../fims/sprt/integrationSearch-mapper.xml | 14 ++++++------ .../WEB-INF/jsp/fims/sprt/sprt01010-main.jsp | 2 +- .../WEB-INF/jsp/fims/sprt/sprt01011-info.jsp | 9 +++++++- 5 files changed, 34 insertions(+), 20 deletions(-) diff --git a/src/main/java/cokr/xit/fims/sprt/SprtQuery.java b/src/main/java/cokr/xit/fims/sprt/SprtQuery.java index 8dc7dd95..654e51c7 100644 --- a/src/main/java/cokr/xit/fims/sprt/SprtQuery.java +++ b/src/main/java/cokr/xit/fims/sprt/SprtQuery.java @@ -21,10 +21,10 @@ public class SprtQuery extends CmmnQuery { private String cvlcptDscsnId; // 민원 상담 ID private List ischKeywordSet; // 통합조회 키워드 - private List ischOnlyDataSet; //특정자료만 조회 private List ischExclDataSet; //특정자료 제외 - private List ischInclDataSet; //특정자료 포함 + private String schSggGroupYn; + private String instCd; private String vhrno; // 차량번호 private String rtpyrNo; // 납부자 번호 @@ -148,12 +148,22 @@ public class SprtQuery extends CmmnQuery { return self(); } - public List getIschInclDataSet() { - return ifEmpty(ischInclDataSet, () -> null); + public String getSchSggGroupYn() { + return ifEmpty(schSggGroupYn, () -> null); + } + + public T setSchSggGroupYn(String schSggGroupYn) { + this.schSggGroupYn = schSggGroupYn; + + return self(); + } + + public String getInstCd() { + return ifEmpty(instCd, () -> null); } - public T setIschInclDataSet(List ischInclDataSet) { - this.ischInclDataSet = ischInclDataSet; + public T setInstCd(String instCd) { + this.instCd = instCd; return self(); } diff --git a/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java b/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java index 76f4a494..92e77479 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java @@ -115,6 +115,7 @@ public class Sprt01Controller extends ApplicationController { String deptCd = currentUser.getDeptCode(); String sggCd = globalStngMapper.selectSggCd(deptCd); query.setSggCd(sggCd); + query.setInstCd(institute); List list = null; list = sprt01Service.getIntegrationDataList(query); @@ -136,7 +137,6 @@ public class Sprt01Controller extends ApplicationController { List ischOnlyDataSet = new ArrayList<>(); List ischExclDataSet = new ArrayList<>(); - List ischInclDataSet = new ArrayList<>(); while(pns.hasMoreElements()) { @@ -154,15 +154,13 @@ public class Sprt01Controller extends ApplicationController { continue; } - if(key.startsWith("ischOnlyData") || key.startsWith("ischExclData") || key.startsWith("ischInclData")) { + if(key.startsWith("ischOnlyData") || key.startsWith("ischExclData")) { String word = this.fnFirstLower(key.substring(12)); if(key.startsWith("ischOnlyData")) { ischOnlyDataSet.add(word); } else if(key.startsWith("ischExclData")) { ischExclDataSet.add(word); - } else if(key.startsWith("ischInclData")) { - ischInclDataSet.add(word); } continue; } @@ -226,7 +224,6 @@ public class Sprt01Controller extends ApplicationController { query.setIschKeywordSet(ischKeywordSet); query.setIschOnlyDataSet(ischOnlyDataSet); query.setIschExclDataSet(ischExclDataSet); - query.setIschInclDataSet(ischInclDataSet); } private String fnFirstLower(String string) { diff --git a/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml b/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml index 4d3fa6e6..f4da0054 100644 --- a/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml +++ b/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml @@ -159,7 +159,14 @@ LEFT OUTER JOIN TB_PAYER P ON (C.RTPYR_ID = P.RTPYR_ID) LEFT OUTER JOIN TB_LEVY L ON (C.CRDN_ID = L.CRDN_ID AND L.DEL_YN = 'N') /* 부과 대장 */ LEFT OUTER JOIN TB_RCVMT R ON (L.LEVY_ID = R.LEVY_ID AND R.DEL_YN = 'N') /* 수납 대장 */ WHERE C.DEL_YN = 'N' + + + AND C.SGG_CD IN (SELECT SGG_CD FROM TB_SGG_INFO WHERE INST_CD = #{instCd}) + + AND C.SGG_CD = #{sggCd} + + AND C.TASK_SE_CD = #{taskSeCd} @@ -284,13 +291,6 @@ LEFT OUTER JOIN TB_RCVMT R ON (L.LEVY_ID = R.LEVY_ID AND R.DEL_YN = 'N - - - - - - - diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp index 2869b7ed..ab3cba45 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp @@ -211,7 +211,7 @@ integrationSearch.fnSearchList = () => { if(!key.startsWith("isch")){ continue; } - if(key.startsWith("ischOnlyData") || key.startsWith("ischExclData") || key.startsWith("ischInclData") + if(key.startsWith("ischOnlyData") || key.startsWith("ischExclData") || key.endsWith("Similar")){ continue; } diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01011-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01011-info.jsp index ae3c4fb5..311d31be 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01011-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01011-info.jsp @@ -52,8 +52,9 @@
+ -
+
+
+ +