diff --git a/src/main/java/cokr/xit/fims/sprt/SprtQuery.java b/src/main/java/cokr/xit/fims/sprt/SprtQuery.java index 654e51c7..19a4585d 100644 --- a/src/main/java/cokr/xit/fims/sprt/SprtQuery.java +++ b/src/main/java/cokr/xit/fims/sprt/SprtQuery.java @@ -23,8 +23,6 @@ public class SprtQuery extends CmmnQuery { private List ischKeywordSet; // 통합조회 키워드 private List ischOnlyDataSet; //특정자료만 조회 private List ischExclDataSet; //특정자료 제외 - private String schSggGroupYn; - private String instCd; private String vhrno; // 차량번호 private String rtpyrNo; // 납부자 번호 @@ -148,26 +146,6 @@ public class SprtQuery extends CmmnQuery { return self(); } - 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 setInstCd(String instCd) { - this.instCd = instCd; - - return self(); - } - public String getVhrno() { return ifEmpty(vhrno, () -> null); } 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 92e77479..8f77c58e 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java @@ -59,13 +59,19 @@ public class Sprt01Controller extends ApplicationController { * @return /fims/sprt/sprt01010 */ public ModelAndView integrationSearchMain(HttpServletRequest req) { + ModelAndView mav = new ModelAndView("fims/sprt/sprt01010-main"); + String institute = currentUser().getInstitute(); + String account = currentUser().getAccount(); + ManagedUser currentUser = userMapper.getUser(account, institute); + String deptCd = currentUser.getDeptCode(); + String sggCd = globalStngMapper.selectSggCd(deptCd); + mav.addObject("sggCd", sggCd); + Map> commonCodes = getCodesOf("FIM003", "FIM010", "FIM026", "FIM054" ,"FIM004","FIM005","FIM006","FIM061","FIM064"); - mav.addObject("VLTNList", null); - mav.addObject("FIM003List", commonCodes.get("FIM003")); mav.addObject("FIM010List", commonCodes.get("FIM010")); mav.addObject("FIM026List", commonCodes.get("FIM026")); @@ -109,14 +115,6 @@ public class Sprt01Controller extends ApplicationController { this.makeIntegrationSearchQuery(query, req); - String institute = currentUser().getInstitute(); - String account = currentUser().getAccount(); - ManagedUser currentUser = userMapper.getUser(account, institute); - String deptCd = currentUser.getDeptCode(); - String sggCd = globalStngMapper.selectSggCd(deptCd); - query.setSggCd(sggCd); - query.setInstCd(institute); - List list = null; list = sprt01Service.getIntegrationDataList(query); 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 f4da0054..4566f6dc 100644 --- a/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml +++ b/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml @@ -159,14 +159,9 @@ 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.SGG_CD = #{sggCd} + AND C.TASK_SE_CD = #{taskSeCd} 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 311d31be..bb724de4 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 @@ -73,8 +73,8 @@