관내 시군구 조회 기능 추가

src/main/java/cokr/xit/fims/sprt/SprtQuery.java

@@ -21,10 +21,10 @@ public class SprtQuery extends CmmnQuery {
 	private String cvlcptDscsnId;												// 민원 상담 ID
 
 	private List<Keyword> ischKeywordSet;										// 통합조회 키워드
-
 	private List<String> ischOnlyDataSet; 										//특정자료만 조회
 	private List<String> ischExclDataSet; 										//특정자료 제외
-	private List<String> 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<String> getIschInclDataSet() {
-		return ifEmpty(ischInclDataSet, () -> null);
+	public String getSchSggGroupYn() {
+		return ifEmpty(schSggGroupYn, () -> null);
+	}
+
+	public <T extends SprtQuery> T setSchSggGroupYn(String schSggGroupYn) {
+		this.schSggGroupYn = schSggGroupYn;
+
+		return self();
+	}
+
+	public String getInstCd() {
+		return ifEmpty(instCd, () -> null);
 	}
 
-	public <T extends SprtQuery> T setIschInclDataSet(List<String> ischInclDataSet) {
-		this.ischInclDataSet = ischInclDataSet;
+	public <T extends SprtQuery> T setInstCd(String instCd) {
+		this.instCd = instCd;
 
 		return self();
 	}

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<DataObject> list = null;
 		list = sprt01Service.getIntegrationDataList(query);
@@ -136,7 +137,6 @@ public class Sprt01Controller extends ApplicationController {
 
 		List<String> ischOnlyDataSet = new ArrayList<>();
 		List<String> ischExclDataSet = new ArrayList<>();
-		List<String> 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) {

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' 
+<choose>
+	<when test='schSggGroupYn == "Y"'>
+	   AND C.SGG_CD IN (SELECT SGG_CD FROM TB_SGG_INFO WHERE INST_CD = #{instCd})
+	</when>
+	<otherwise>
        AND C.SGG_CD = #{sggCd}
+	</otherwise>
+</choose>
 <if test="taskSeCd != null">
        AND C.TASK_SE_CD = #{taskSeCd}
 </if>
@@ -284,13 +291,6 @@ LEFT OUTER JOIN TB_RCVMT         R   ON (L.LEVY_ID = R.LEVY_ID AND R.DEL_YN = 'N
   </foreach>
 </if>
 
-<!-- 특정자료 포함 -->
-<if test="ischInclDataSet != null">
-  <foreach collection="ischInclDataSet" item="item">
-    
-  </foreach>
-</if>
-
 <!-- 동적 검색 -->
 <if test="by != null and by != '' and term != null">
 	<choose>

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;
 		}

src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01011-info.jsp

@@ -52,8 +52,9 @@
 		<!-- 메인 조건 -->
 		<div class="container-search">
 			<div class="row g-1">
+				
 				<!-- 업무구분 -->
-				<div class="col-12">
+				<div class="col-8">
 					<label class="form-label fw-bold form-search-title text-end">업무구분</label>
 					<span class="form-search-linebox">
 						<label>
@@ -70,6 +71,12 @@
 						</c:forEach>
 					</span>
 				</div>
+				<div class="col-4">
+					<label>
+						<input type="checkbox" id="schSggGroupYn--${pageName}" name="schSggGroupYn" 
+						class="form-check-input" value="Y" />관내 시군구 조회
+					</label>
+				</div>
 				
 				<!-- 차량번호 -->
 				<div class="col-4">