From ccd647ac0f1cdd50347edbcb52fae0b2cb2ee840 Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Fri, 2 Feb 2024 18:23:56 +0900
Subject: [PATCH] =?UTF-8?q?=EC=86=8C=EC=86=8D=EC=8B=9C=EA=B5=B0=EA=B5=AC?=
 =?UTF-8?q?=EA=B0=80=20=EC=97=86=EB=8A=94=20=EC=B5=9C=EA=B3=A0=EA=B4=80?=
 =?UTF-8?q?=EB=A6=AC=EC=9E=90=EB=A1=9C=20=EB=A1=9C=EA=B7=B8=EC=9D=B8?=
 =?UTF-8?q?=EC=8B=9C=20=EC=8B=9C=EA=B5=B0=EA=B5=AC=EA=B4=80=EB=A6=AC?=
 =?UTF-8?q?=EB=A9=94=EB=89=B4=EC=97=90=EC=84=9C=20=EC=8B=9C=EA=B5=B0?=
 =?UTF-8?q?=EA=B5=AC=EB=A5=BC=20=EC=84=A0=ED=83=9D=ED=95=98=EB=8A=94=20?=
 =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cokr/xit/fims/mngt/dao/FactionMapper.java |  6 ++++
 .../xit/fims/mngt/web/Mngt03Controller.java   | 11 ++++--
 .../sql/mapper/fims/mngt/faction-mapper.xml   |  8 +++++
 .../sql/mapper/fims/mngt/sgg-mapper.xml       |  2 +-
 .../WEB-INF/jsp/fims/mngt/mngt03011-main.jsp  | 10 ------
 .../WEB-INF/jsp/fims/mngt/select-sgg.jsp      | 36 +++++++++++++++++++
 src/main/webapp/WEB-INF/jsp/include/top.jsp   |  6 ++--
 .../resources/js/base/menu-support-fims.js    |  2 +-
 8 files changed, 65 insertions(+), 16 deletions(-)
 delete mode 100644 src/main/webapp/WEB-INF/jsp/fims/mngt/mngt03011-main.jsp
 create mode 100644 src/main/webapp/WEB-INF/jsp/fims/mngt/select-sgg.jsp

diff --git a/src/main/java/cokr/xit/fims/mngt/dao/FactionMapper.java b/src/main/java/cokr/xit/fims/mngt/dao/FactionMapper.java
index 070765c0..38db3725 100644
--- a/src/main/java/cokr/xit/fims/mngt/dao/FactionMapper.java
+++ b/src/main/java/cokr/xit/fims/mngt/dao/FactionMapper.java
@@ -45,4 +45,10 @@ public interface FactionMapper extends AbstractMapper {
 	 * @return 기관 목록
 	 */
 	List<DataObject> selectAllInstList();
+
+	/**모든 시군구 목록을 반환한다.<br />
+	 * @param
+	 * @return 시군구 목록
+	 */
+	List<DataObject> selectAllSggList();
 }
diff --git a/src/main/java/cokr/xit/fims/mngt/web/Mngt03Controller.java b/src/main/java/cokr/xit/fims/mngt/web/Mngt03Controller.java
index 0c2125e0..2579850e 100644
--- a/src/main/java/cokr/xit/fims/mngt/web/Mngt03Controller.java
+++ b/src/main/java/cokr/xit/fims/mngt/web/Mngt03Controller.java
@@ -15,6 +15,7 @@ import cokr.xit.base.web.ApplicationController;
 import cokr.xit.fims.cmmn.CmmnQuery;
 import cokr.xit.fims.mngt.Sgg;
 import cokr.xit.fims.mngt.VltnQuery;
+import cokr.xit.fims.mngt.dao.FactionMapper;
 import cokr.xit.fims.mngt.service.SggService;
 import cokr.xit.fims.mngt.service.TaskService;
 import cokr.xit.fims.mngt.service.VltnService;
@@ -55,6 +56,9 @@ public class Mngt03Controller extends ApplicationController {
 	@Resource(name = "factionBean")
 	private FactionBean factionBean;
 
+	@Resource(name = "factionMapper")
+	private FactionMapper factionMapper;
+
 	/** 시군구관리 메인화면을 연다.
 	 * @return fims/mngt/mngt03010-main
 	 */
@@ -66,8 +70,11 @@ public class Mngt03Controller extends ApplicationController {
 		if(userInfo.getInstitute().equals("default")) {
 			if(ifEmpty(sggCd, ()->"").equals("")) {
 
-				mav.setViewName("fims/mngt/mngt03011-main");
-				mav.addObject("pageName", "mngt03011");
+				mav.setViewName("fims/mngt/select-sgg");
+				mav.addObject("pageName", "selectSgg");
+
+				List<DataObject> sggList = factionMapper.selectAllSggList();
+				mav.addObject("sggList", sggList);
 
 			} else {
 				mav.setViewName("fims/mngt/mngt03010-main");
diff --git a/src/main/resources/sql/mapper/fims/mngt/faction-mapper.xml b/src/main/resources/sql/mapper/fims/mngt/faction-mapper.xml
index 8efd2141..051d73a0 100644
--- a/src/main/resources/sql/mapper/fims/mngt/faction-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/mngt/faction-mapper.xml
@@ -73,6 +73,14 @@ SELECT S.SGG_CD
  WHERE U.USER_ID = #{userId}
 </select>
 
+<select id="selectAllSggList" parameterType="string" resultType="dataobject">
+/* 모든 시군구 조회(factionMapper.selectAllSggList) */
+SELECT SGG_CD
+     , SGG_NM
+  FROM TB_SGG
+ WHERE USE_YN = 'Y'
+</select>
+
 <select id="selectAllInstList" parameterType="string" resultType="dataobject">
 /* 모든 기관 조회(factionMapper.selectAllInstList) */
 SELECT INST_CD
diff --git a/src/main/resources/sql/mapper/fims/mngt/sgg-mapper.xml b/src/main/resources/sql/mapper/fims/mngt/sgg-mapper.xml
index 60a8ac5e..88c35c9d 100644
--- a/src/main/resources/sql/mapper/fims/mngt/sgg-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/mngt/sgg-mapper.xml
@@ -29,7 +29,7 @@ SELECT S.SGG_CD           <!-- 시군구 코드 -->
 /* 시군구 객체 가져오기(sggMapper.selectSggs) */
     <include refid="select" />
     <where>
-        <if test="deptCd != null">
+        <if test="sggCd != null">
        AND S.SGG_CD     =  #{sggCd}     <!-- 시군구 코드 -->
         </if>
         <if test="useYN != null">
diff --git a/src/main/webapp/WEB-INF/jsp/fims/mngt/mngt03011-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/mngt/mngt03011-main.jsp
deleted file mode 100644
index e9232768..00000000
--- a/src/main/webapp/WEB-INF/jsp/fims/mngt/mngt03011-main.jsp
+++ /dev/null
@@ -1,10 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%>
-<%@ include file="/WEB-INF/jsp/include/taglib.jsp"%>
-<c:set var="pageKorName" scope="request">시군구 목록</c:set>
-<div class="content-wrapper">
-	<div class="container-xxl flex-grow-1 px-0">
-		<div class="card wrapper-list">
-		
-		</div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/fims/mngt/select-sgg.jsp b/src/main/webapp/WEB-INF/jsp/fims/mngt/select-sgg.jsp
new file mode 100644
index 00000000..b37232d8
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/fims/mngt/select-sgg.jsp
@@ -0,0 +1,36 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%>
+<%@ include file="/WEB-INF/jsp/include/taglib.jsp"%>
+<c:set var="pageKorName" scope="request">시군구 목록</c:set>
+<div class="content-wrapper">
+	<div class="container-xxl flex-grow-1 px-0">
+		<div class="card wrapper-list">
+			<h1>시군구 선택</h1>
+			<div id="btnsGoToEditSgg--${pageName}">
+				<c:forEach items="${sggList}" var="item">
+					<c:if test="${item.SGG_CD ne 'default'}">
+						<button type="button" data-value="${item.SGG_CD}" class="w-px-200" 
+						onclick="fnGoToEditSgg('${item.SGG_CD}')">
+						${item.SGG_NM}(${item.SGG_CD})
+						</button>
+					</c:if>
+				</c:forEach>
+			</div>
+		</div>
+	</div>
+</div>
+<script>
+function fnGoToEditSgg(selected){
+	var sggMainMenuNum = "62";
+	
+	var menuUrl = $("#menus").find("li[data-key='"+sggMainMenuNum+"'] a").attr("data-url");
+
+	ajax.get({
+		url: menuUrl,
+		data : { sggCd : selected },
+		success:resp => {
+			$("div[id='innerPage-"+sggMainMenuNum+"']").html(resp);
+		}
+	});
+	
+}
+</script>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/include/top.jsp b/src/main/webapp/WEB-INF/jsp/include/top.jsp
index 52e77ebf..ea9b4963 100644
--- a/src/main/webapp/WEB-INF/jsp/include/top.jsp
+++ b/src/main/webapp/WEB-INF/jsp/include/top.jsp
@@ -346,9 +346,11 @@ $("#btnFastSearch--top").on( "click", function() {
 $("#fastTerm--top").onEnterPress(fnGlobalFastSearch);
 
 function fnGlobalFastSearch(){
-	closeTab("17");
+	var integrationSearchMenuNum = "17";
+
+	closeTab(integrationSearchMenuNum);
 	
-	var itegrationSearchMenu = $("#menus").find("li[data-key='17'] a")[0];
+	var itegrationSearchMenu = $("#menus").find("li[data-key='"+integrationSearchMenuNum+"'] a")[0];
 	
 	if($("#fastTerm--top").val() != ""){
 		var fastTerm = $("#fastTerm--top").val();
diff --git a/src/main/webapp/resources/js/base/menu-support-fims.js b/src/main/webapp/resources/js/base/menu-support-fims.js
index ab58e26a..f969f42e 100644
--- a/src/main/webapp/resources/js/base/menu-support-fims.js
+++ b/src/main/webapp/resources/js/base/menu-support-fims.js
@@ -131,7 +131,7 @@ function openMenu(obj, params) {
 	$("#tab-" + dataKey)[0].appendChild(dynamicPage);
 
 
-    innerPageMap[dataKey] = dynamicPage;
+    innerPageMap[dataKey] = true;
 
 
 	ajax.request({