From 60363ecf79135df20fb8106941e32b8d83c944ce Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Tue, 14 Nov 2023 13:42:17 +0900
Subject: [PATCH] =?UTF-8?q?=EC=88=98=EB=82=A9=ED=86=B5=EA=B3=84=20?=
 =?UTF-8?q?=EB=A9=94=EB=89=B4=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xit/fims/stat/web/Stat06Controller.java   | 29 ++++++++
 .../cokr/xit/fims/task/web/CmnController.java | 12 ++++
 .../WEB-INF/jsp/fims/stat/stat01010-main.jsp  |  1 +
 .../WEB-INF/jsp/fims/stat/stat03010-main.jsp  | 15 -----
 .../WEB-INF/jsp/fims/stat/stat06010-main.jsp  | 66 +++++++++++++++++++
 .../WEB-INF/jsp/fims/stat/stat06020-info.jsp  | 30 +++++++++
 6 files changed, 138 insertions(+), 15 deletions(-)
 create mode 100644 src/main/java/cokr/xit/fims/stat/web/Stat06Controller.java
 create mode 100644 src/main/webapp/WEB-INF/jsp/fims/stat/stat06010-main.jsp
 create mode 100644 src/main/webapp/WEB-INF/jsp/fims/stat/stat06020-info.jsp

diff --git a/src/main/java/cokr/xit/fims/stat/web/Stat06Controller.java b/src/main/java/cokr/xit/fims/stat/web/Stat06Controller.java
new file mode 100644
index 00000000..081d848c
--- /dev/null
+++ b/src/main/java/cokr/xit/fims/stat/web/Stat06Controller.java
@@ -0,0 +1,29 @@
+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 Stat06Controller extends ApplicationController {
+
+	/** 수납 통계 메인 화면을 연다.
+	 * @return fims/stat/stat06010-main
+	 */
+	public ModelAndView statMain() {
+
+		ModelAndView mav = new ModelAndView();
+		mav.setViewName("fims/stat/stat06010-main");
+		mav.addObject("pageName", "stat06010-main");
+
+		Map<String, List<CommonCode>> commonCodes = getCodesOf("FIM054","FIM002");
+		mav.addObject("FIM054List", commonCodes.get("FIM054"));
+		mav.addObject("FIM002List", commonCodes.get("FIM002"));
+
+		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 47dcfb29..e852941c 100644
--- a/src/main/java/cokr/xit/fims/task/web/CmnController.java
+++ b/src/main/java/cokr/xit/fims/task/web/CmnController.java
@@ -450,6 +450,18 @@ public class CmnController {
             return super.statMain();
         }
 
+    }
+
+    @Controller
+    @RequestMapping(name="수납 통계", value="/stat/stat06")
+    class Stat06Controller extends cokr.xit.fims.stat.web.Stat06Controller {
+
+        @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 4ad932c9..e30c3fe3 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
@@ -192,6 +192,7 @@ $(document).ready(function(){
 	    	CVLCPT_RCPT_YMD 		: dateFormat,
 	    	LEVY_EXCL_YMD 			: dateFormat,
 	    	CVLCPT_RCPT_YMD 		: dateFormat,
+	    	PSTMARK_YMD 			: dateFormat,
 	    	CRDN_YMD_TM 			: datetimeFormat,
 	    	REG_DT 					: datetimeFormat,
 	    	MDFCN_DT 				: datetimeFormat,
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
index 7a921941..6ef8eb06 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/stat/stat03010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/stat/stat03010-main.jsp
@@ -9,9 +9,6 @@
 <datalist id="dayColumnDatalist--${pageName}">
 	<option value="LEVY_YMD">부과일자</option>
 	<option value="CRDN_STTS_CD">처리일자</option>
-	<option value="">소인일자</option>
-	<option value="">회계일자</option>
-	<option value="RCVMT_YMD">수납일자</option>
 	<option value="">징수결의일자</option>
 	<option value="">부과수납일자</option>
 	<option value="">고지일자</option>
@@ -37,12 +34,6 @@
 	<option value="taskSeCd"      
 		data-ref-col="TASK_SE_CD"      data-ctgr-type="code"      data-dtl-ctgr="FIM054"
 	>과태료</option>
-	<option value="pstmrkYear"      
-		data-ref-col="PSTMRK_YMD"      data-ctgr-type="date"      data-dtl-ctgr="YYYYMM"
-	>소인연월</option>
-	<option value="pstmrkYearMonth"      
-		data-ref-col="PSTMRK_YMD"      data-ctgr-type="date"      data-dtl-ctgr="YYYYMMDD"
-	>소인일자</option>
 	<option value="acntgYear"      
 		data-ref-col="ACNTG_YMD"       data-ctgr-type="date"      data-dtl-ctgr="YYYY"
 	>회계연도</option>
@@ -52,12 +43,6 @@
 	<option value="acntgYmd"      
 		data-ref-col="ACNTG_YMD"       data-ctgr-type="date"      data-dtl-ctgr="YYYYMMDD"
 	>회계일자</option>
-	<option value="rcvmtYearMonth"      
-		data-ref-col="RCVMT_YMD"       data-ctgr-type="date"      data-dtl-ctgr="YYYYMM"
-	>수납연월</option>
-	<option value="rcvmtYmd"      
-		data-ref-col="RCVMT_YMD"       data-ctgr-type="date"      data-dtl-ctgr="YYYYMMDD"
-	>수납일자</option>
 	<option value="levyYear"      
 		data-ref-col="LEVY_YMD"        data-ctgr-type="date"      data-dtl-ctgr="YYYY"
 	>부과연도</option>
diff --git a/src/main/webapp/WEB-INF/jsp/fims/stat/stat06010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/stat/stat06010-main.jsp
new file mode 100644
index 00000000..c35d666c
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/fims/stat/stat06010-main.jsp
@@ -0,0 +1,66 @@
+<%@ 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" />
+
+<input type="hidden" id="defaultStatDomain--${pageName}" value="levy" />
+
+<datalist id="dayColumnDatalist--${pageName}">
+	<option value="PSTMRK_YMD">소인일자</option>
+	<option value="ACNTG_YMD">회계일자</option>
+	<option value="RCVMT_YMD">수납일자</option>
+</datalist>
+
+<template id="searchForMenuTemplate--${pageName}">
+	<div class="col-6">
+		<label class="form-label fw-bold form-search-title text-end">기준연도</label>
+		<input type="text" class="form-control w-px-70" name=""/>
+	</div>
+	<div class="col-6">
+		<label class="form-label fw-bold form-search-title text-end">회계연도</label>
+		<input type="text" class="form-control w-px-70" name=""/>
+	</div>
+</template>
+
+<datalist id="groupLevelDatalist--${pageName}">
+	<option value="sggCd"         
+		data-ref-col="SGG_CD"          data-ctgr-type="otherCode" data-dtl-ctgr="SGG_CD"
+	>시군구</option>
+	<option value="taskSeCd"      
+		data-ref-col="TASK_SE_CD"      data-ctgr-type="code"      data-dtl-ctgr="FIM054"
+	>과태료</option>
+	<option value="pstmrkYear"      
+		data-ref-col="PSTMRK_YMD"      data-ctgr-type="date"      data-dtl-ctgr="YYYYMM"
+	>소인연월</option>
+	<option value="pstmrkYearMonth"      
+		data-ref-col="PSTMRK_YMD"      data-ctgr-type="date"      data-dtl-ctgr="YYYYMMDD"
+	>소인일자</option>
+	<option value="acntgYear"      
+		data-ref-col="ACNTG_YMD"       data-ctgr-type="date"      data-dtl-ctgr="YYYY"
+	>회계연도</option>
+	<option value="acntgYearMonth"      
+		data-ref-col="ACNTG_YMD"       data-ctgr-type="date"      data-dtl-ctgr="YYYYMM"
+	>회계연월</option>
+	<option value="acntgYmd"      
+		data-ref-col="ACNTG_YMD"       data-ctgr-type="date"      data-dtl-ctgr="YYYYMMDD"
+	>회계일자</option>
+	<option value="rcvmtYearMonth"      
+		data-ref-col="RCVMT_YMD"       data-ctgr-type="date"      data-dtl-ctgr="YYYYMM"
+	>수납연월</option>
+	<option value="rcvmtYmd"      
+		data-ref-col="RCVMT_YMD"       data-ctgr-type="date"      data-dtl-ctgr="YYYYMMDD"
+	>수납일자</option>
+	<option value=""      
+		data-ref-col=""      data-ctgr-type="date"      data-dtl-ctgr="YYYY"
+	>고지연도</option>
+	<option value=""      
+		data-ref-col=""      data-ctgr-type="date"      data-dtl-ctgr="YYYYMM"
+	>고지연월</option>
+</datalist>
+
+<datalist id="presetDatalist--${pageName}">
+
+</datalist>
+
+<jsp:include page="/WEB-INF/jsp/fims/stat/stat06020-info.jsp" />
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/fims/stat/stat06020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/stat/stat06020-info.jsp
new file mode 100644
index 00000000..2e84da65
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/fims/stat/stat06020-info.jsp
@@ -0,0 +1,30 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%>
+<%@ include file="/WEB-INF/jsp/include/taglib.jsp"%>
+
+<template id="detailGridTheadTemplate--${pageName}">
+	<th style='width:160px'></th>
+	<th style='width:160px'></th>
+	<th style='width:160px'></th>
+	<th style='width:160px'></th>
+	<th style='width:160px'></th>
+	<th style='width:160px'></th>
+	<th style='width:160px'></th>
+	<th style='width:160px'></th>
+	<th style='width:160px'></th>
+	<th style='width:160px'></th>
+</template>
+
+<template id="detailGridTbodyTemplate--${pageName}">
+<tr data-key="{DATA_ID}">
+	<td>{}</td>
+	<td>{}</td>
+	<td>{}</td>
+	<td>{}</td>
+	<td>{}</td>
+	<td>{}</td>
+	<td>{}</td>
+	<td>{}</td>
+	<td>{}</td>
+	<td>{}</td>
+</tr>	
+</template>