From ee1ef8b0f5afc70d0f28fc3490c538327b6b8f28 Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Tue, 7 Nov 2023 10:54:12 +0900
Subject: [PATCH] =?UTF-8?q?=ED=86=B5=EA=B3=84=20=EB=A9=94=EB=89=B4=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xit/fims/stat/web/Stat01Controller.java   | 15 ---
 .../xit/fims/stat/web/Stat02Controller.java   | 27 ++++++
 .../xit/fims/stat/web/Stat03Controller.java   | 27 ++++++
 .../xit/fims/stat/web/Stat04Controller.java   | 27 ++++++
 .../cokr/xit/fims/task/web/CmnController.java | 42 ++++++--
 .../WEB-INF/jsp/fims/stat/stat01010-main.jsp  | 97 ++++++++++++-------
 .../WEB-INF/jsp/fims/stat/stat02010-main.jsp  |  5 +
 .../WEB-INF/jsp/fims/stat/stat03010-main.jsp  |  5 +
 .../WEB-INF/jsp/fims/stat/stat04010-main.jsp  |  5 +
 9 files changed, 193 insertions(+), 57 deletions(-)
 create mode 100644 src/main/java/cokr/xit/fims/stat/web/Stat02Controller.java
 create mode 100644 src/main/java/cokr/xit/fims/stat/web/Stat03Controller.java
 create mode 100644 src/main/java/cokr/xit/fims/stat/web/Stat04Controller.java
 create mode 100644 src/main/webapp/WEB-INF/jsp/fims/stat/stat02010-main.jsp
 create mode 100644 src/main/webapp/WEB-INF/jsp/fims/stat/stat03010-main.jsp
 create mode 100644 src/main/webapp/WEB-INF/jsp/fims/stat/stat04010-main.jsp

diff --git a/src/main/java/cokr/xit/fims/stat/web/Stat01Controller.java b/src/main/java/cokr/xit/fims/stat/web/Stat01Controller.java
index 9e52d52a..58acbe8d 100644
--- a/src/main/java/cokr/xit/fims/stat/web/Stat01Controller.java
+++ b/src/main/java/cokr/xit/fims/stat/web/Stat01Controller.java
@@ -35,21 +35,6 @@ public class Stat01Controller extends ApplicationController {
 	@Resource(name="userMapper")
 	protected UserMapper userMapper;
 
-	/** 통계 메인 화면을 연다.
-	 * @return fims/stat/stat01010-main
-	 */
-	public ModelAndView statMain() {
-
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("fims/stat/stat01010-main");
-		mav.addObject("pageName", "stat01010-main");
-
-		Map<String, List<CommonCode>> commonCodes = getCodesOf("FIM054");
-		mav.addObject("FIM054List", commonCodes.get("FIM054"));
-
-		return mav;
-	}
-
 	/**
 	 * @return
 	 */
diff --git a/src/main/java/cokr/xit/fims/stat/web/Stat02Controller.java b/src/main/java/cokr/xit/fims/stat/web/Stat02Controller.java
new file mode 100644
index 00000000..b9c4b42a
--- /dev/null
+++ b/src/main/java/cokr/xit/fims/stat/web/Stat02Controller.java
@@ -0,0 +1,27 @@
+package cokr.xit.fims.stat.web;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.web.servlet.ModelAndView;
+
+import cokr.xit.base.code.CommonCode;
+import cokr.xit.base.web.ApplicationController;
+
+public class Stat02Controller extends ApplicationController {
+
+	/** 단속 통계 메인 화면을 연다.
+	 * @return fims/stat/stat02010-main
+	 */
+	public ModelAndView statMain() {
+
+		ModelAndView mav = new ModelAndView();
+		mav.setViewName("fims/stat/stat02010-main");
+		mav.addObject("pageName", "stat02010-main");
+
+		Map<String, List<CommonCode>> commonCodes = getCodesOf("FIM054");
+		mav.addObject("FIM054List", commonCodes.get("FIM054"));
+
+		return mav;
+	}
+}
diff --git a/src/main/java/cokr/xit/fims/stat/web/Stat03Controller.java b/src/main/java/cokr/xit/fims/stat/web/Stat03Controller.java
new file mode 100644
index 00000000..e3868d1a
--- /dev/null
+++ b/src/main/java/cokr/xit/fims/stat/web/Stat03Controller.java
@@ -0,0 +1,27 @@
+package cokr.xit.fims.stat.web;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.web.servlet.ModelAndView;
+
+import cokr.xit.base.code.CommonCode;
+import cokr.xit.base.web.ApplicationController;
+
+public class Stat03Controller extends ApplicationController {
+
+	/** 부과 통계 메인 화면을 연다.
+	 * @return fims/stat/stat03010-main
+	 */
+	public ModelAndView statMain() {
+
+		ModelAndView mav = new ModelAndView();
+		mav.setViewName("fims/stat/stat03010-main");
+		mav.addObject("pageName", "stat03010-main");
+
+		Map<String, List<CommonCode>> commonCodes = getCodesOf("FIM054");
+		mav.addObject("FIM054List", commonCodes.get("FIM054"));
+
+		return mav;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/cokr/xit/fims/stat/web/Stat04Controller.java b/src/main/java/cokr/xit/fims/stat/web/Stat04Controller.java
new file mode 100644
index 00000000..ae46893c
--- /dev/null
+++ b/src/main/java/cokr/xit/fims/stat/web/Stat04Controller.java
@@ -0,0 +1,27 @@
+package cokr.xit.fims.stat.web;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.web.servlet.ModelAndView;
+
+import cokr.xit.base.code.CommonCode;
+import cokr.xit.base.web.ApplicationController;
+
+public class Stat04Controller extends ApplicationController {
+
+	/** 발송 통계 메인 화면을 연다.
+	 * @return fims/stat/stat04010-main
+	 */
+	public ModelAndView statMain() {
+
+		ModelAndView mav = new ModelAndView();
+		mav.setViewName("fims/stat/stat04010-main");
+		mav.addObject("pageName", "stat04010-main");
+
+		Map<String, List<CommonCode>> commonCodes = getCodesOf("FIM054");
+		mav.addObject("FIM054List", commonCodes.get("FIM054"));
+
+		return mav;
+	}
+}
diff --git a/src/main/java/cokr/xit/fims/task/web/CmnController.java b/src/main/java/cokr/xit/fims/task/web/CmnController.java
index 8518271e..3b2a442a 100644
--- a/src/main/java/cokr/xit/fims/task/web/CmnController.java
+++ b/src/main/java/cokr/xit/fims/task/web/CmnController.java
@@ -369,18 +369,48 @@ public class CmnController {
     @RequestMapping(name="통계", value="/stat/stat01")
     class Stat01Controller extends cokr.xit.fims.stat.web.Stat01Controller {
 
-		@Override
-		@RequestMapping(name="통계 메인", value="/010/main.do")
-		public ModelAndView statMain() {
-			return super.statMain();
-		}
-
         @Override
         @RequestMapping(name="통계 요청", value="/010/info.do")
         public ModelAndView getStatistics(StatQuery query) {
             return super.getStatistics(query);
         }
 
+    }
+
+	@Controller
+    @RequestMapping(name="단속 통계", value="/stat/stat02")
+    class Stat02Controller extends cokr.xit.fims.stat.web.Stat02Controller {
+
+		@Override
+		@RequestMapping(name="단속 통계 메인", value="/010/main.do")
+		public ModelAndView statMain() {
+			return super.statMain();
+		}
+
+    }
+
+	@Controller
+    @RequestMapping(name="부과 통계", value="/stat/stat03")
+    class Stat03Controller extends cokr.xit.fims.stat.web.Stat03Controller {
+
+		@Override
+		@RequestMapping(name="부과 통계 메인", value="/010/main.do")
+		public ModelAndView statMain() {
+			return super.statMain();
+		}
+
+    }
+
+	@Controller
+    @RequestMapping(name="발송 통계", value="/stat/stat04")
+    class Stat04Controller extends cokr.xit.fims.stat.web.Stat04Controller {
+
+		@Override
+		@RequestMapping(name="발송 통계 메인", value="/010/main.do")
+		public ModelAndView statMain() {
+			return super.statMain();
+		}
+
     }
 
 	@Controller
diff --git a/src/main/webapp/WEB-INF/jsp/fims/stat/stat01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/stat/stat01010-main.jsp
index 81eb510c..0a439fc8 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/stat/stat01010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/stat/stat01010-main.jsp
@@ -1,8 +1,7 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-	pageEncoding="UTF-8" isELIgnored="false" session="false"%>
+<%@ 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="prefixName" scope="request">통계1</c:set>
+<c:set var="prefixName" scope="request">통계 공통</c:set>
 <div class="content-wrapper">
 	<div class="container-xxl flex-grow-1 px-0">
 		<div class="card wrapper-list">
@@ -26,7 +25,7 @@
 				<form id="frmSearch--${pageName}" name="frmSearch">
 					<!-- 메인 조건 -->
 					<div class="container-search">
-						<div class="row g-1">
+						<div class="row g-1 my-2">
 							<!-- 업무구분 -->
 							<div class="col-12">
 								<label class="form-label fw-bold form-search-title text-end">업무구분</label>
@@ -45,36 +44,79 @@
 									</c:forEach>
 								</span>
 							</div>
+						</div>
+						<div class="row g-1 my-2">
+							<div class="col-12">
+								<select id="schDateOpt--${pageName}" name="schDateOpt" class="form-select">
+	                                
+	                            </select>
+	                            <span class="form-search-linebox">
+	                                <input type="text" id="schDateFrom--${pageName}" name="schDateFrom" 
+	                                class="form-control form-date"
+	                                	data-fmt-type="day"   title="시작 날짜 선택" />
+	                                <button type="button" class="bx bx-sm bx-calendar bg-white"></button>
+	                                ~
+	                                <input type="text" id="schDateTo--${pageName}" name="schDateTo" 
+	                                class="form-control form-date"
+	                                	data-fmt-type="day" title="종료 날짜 선택">
+	                                <button type="button" class="bx bx-sm bx-calendar bg-white"></button>
+	                            </span>
+	                            
+							</div>
+						</div>
+						<div class="row g-1 my-2" id="searchForMenu--${pageName}">
 							
+						</div>
+						<div class="row g-1 my-2 bg-lighter">
 							<div class="col-3">
 								<label class="form-label fw-bold form-search-title text-end">그룹단위1</label>
-								<span class="form-search-linebox">
-									
-								</span>
+								<select name="groupLevel1" class="form-select">
+								
+								</select>
 							</div>
 							<div class="col-3">
 								<label class="form-label fw-bold form-search-title text-end">그룹단위2</label>
-								<span class="form-search-linebox">
-									
-								</span>
+								<select name="groupLevel2" class="form-select">
+									<option value="">미선택</option>
+								</select>
 							</div>
 							<div class="col-3">
 								<label class="form-label fw-bold form-search-title text-end">그룹단위3</label>
-								<span class="form-search-linebox">
-									
-								</span>
+								<select name="groupLevel3" class="form-select">
+									<option value="">미선택</option>
+								</select>
 							</div>
 							<div class="col-3">
 								<label class="form-label fw-bold form-search-title text-end">그룹단위4</label>
-								<span class="form-search-linebox">
-									
-								</span>
+								<select name="groupLevel4" class="form-select">
+									<option value="">미선택</option>
+								</select>
 							</div>
 						</div>
+						
+						<div class="row g-1 my-2">
+							<div class="col-3">
+								<label class="form-label fw-bold form-search-title text-end">집계항목</label>
+							</div>
+						</div>
+						
+						<div class="row g-1 my-2 bg-lighter">
+							<div class="col-3">
+								<label class="form-label fw-bold form-search-title text-end">상세목록</label>
+							</div>
+						</div>
+						
 					</div> <!-- / 메인 조건 -->
 				</form>
 			</span>
 		
+			<span id="grid--${pageName}">
+			
+			</span>
+			
+			<span id="detailGrid--${pageName}">
+			
+			</span>
 			
 		</div>
 	</div>
@@ -106,29 +148,10 @@ $(document).ready(function(){
 			ctgrType 		: ["code"],
 			dtlCtgr 		: ["FIM031"]
 		};
-		
-		var codeSubsetInfoList = [
-			{
-				sourceGroup : "FIM002",
-				sourceCodes : ["08","09","10","11"],
-				targetCode : "minwon",
-				targetCodeVal : "민원"
-			},
-			{
-				sourceGroup : "FIM002",
-				sourceCodes : ["06","13"],
-				targetCode : "dobo",
-				targetCodeVal : "도보"
-			}
-		];
-		
-		var queryInQuery1 = fnJsonArrayToFormData(codeSubsetInfoList,"codeSubsetInfoList");
-		
-		var mergedQuery = { ...defaultQuery, ...queryInQuery1 };
 
 		ajax.get({
 			url : wctx.url("/stat/stat01/010/info.do"),
-			data : mergedQuery,
+			data : defaultQuery,
 			success : (resp) => {
 				
 			}
@@ -136,6 +159,8 @@ $(document).ready(function(){
 		
 	}
 	
+	initDatepicker("frmSearch--${pageName}"); //달력 초기화
+	
 	/**************************************************************************
 	 * element.on
 	 **************************************************************************/
diff --git a/src/main/webapp/WEB-INF/jsp/fims/stat/stat02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/stat/stat02010-main.jsp
new file mode 100644
index 00000000..b1bcc2f9
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/fims/stat/stat02010-main.jsp
@@ -0,0 +1,5 @@
+<%@ 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="prefixName" scope="request">단속 통계</c:set>
+<jsp:include page="/WEB-INF/jsp/fims/stat/stat01010-main.jsp" />
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/fims/stat/stat03010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/stat/stat03010-main.jsp
new file mode 100644
index 00000000..96de85fd
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/fims/stat/stat03010-main.jsp
@@ -0,0 +1,5 @@
+<%@ 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="prefixName" scope="request">부과 통계</c:set>
+<jsp:include page="/WEB-INF/jsp/fims/stat/stat01010-main.jsp" />
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/fims/stat/stat04010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/stat/stat04010-main.jsp
new file mode 100644
index 00000000..289932fb
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/fims/stat/stat04010-main.jsp
@@ -0,0 +1,5 @@
+<%@ 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="prefixName" scope="request">발송 통계</c:set>
+<jsp:include page="/WEB-INF/jsp/fims/stat/stat01010-main.jsp" />
\ No newline at end of file