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 4a78c04e..71ae9a42 100644 --- a/src/main/java/cokr/xit/fims/stat/web/Stat01Controller.java +++ b/src/main/java/cokr/xit/fims/stat/web/Stat01Controller.java @@ -115,4 +115,83 @@ public class Stat01Controller extends ApplicationController { mav.addObject("stat", stat); return mav; } + + /** 종합 통계 메인 화면을 연다. + * @return fims/stat/stat01010-main + */ + public ModelAndView comprehensiveStatisticsMain() { + + ModelAndView mav = new ModelAndView(); + mav.setViewName("fims/stat/stat01010-main"); + mav.addObject("pageName", "stat01010-main"); + + Map> commonCodes = getCodesOf("FIM054","FIM002"); + mav.addObject("FIM054List", commonCodes.get("FIM054")); + mav.addObject("FIM002List", commonCodes.get("FIM002")); + + return mav; + } + + /** 단속 통계 메인 화면을 연다. + * @return fims/stat/stat01020-main + */ + public ModelAndView crackdownStatisticsMain() { + + ModelAndView mav = new ModelAndView(); + mav.setViewName("fims/stat/stat01020-main"); + mav.addObject("pageName", "stat01020-main"); + + Map> commonCodes = getCodesOf("FIM054","FIM002"); + mav.addObject("FIM054List", commonCodes.get("FIM054")); + mav.addObject("FIM002List", commonCodes.get("FIM002")); + + return mav; + } + + + /** 부과 통계 메인 화면을 연다. + * @return fims/stat/stat01030-main + */ + public ModelAndView levyStatisticsMain() { + + ModelAndView mav = new ModelAndView(); + mav.setViewName("fims/stat/stat01030-main"); + mav.addObject("pageName", "stat01030-main"); + + Map> commonCodes = getCodesOf("FIM054"); + mav.addObject("FIM054List", commonCodes.get("FIM054")); + + return mav; + } + + /** 발송 통계 메인 화면을 연다. + * @return fims/stat/stat01040-main + */ + public ModelAndView sendStatisticsMain() { + + ModelAndView mav = new ModelAndView(); + mav.setViewName("fims/stat/stat01040-main"); + mav.addObject("pageName", "stat01040-main"); + + Map> commonCodes = getCodesOf("FIM054"); + mav.addObject("FIM054List", commonCodes.get("FIM054")); + + return mav; + } + + /** 수납 통계 메인 화면을 연다. + * @return fims/stat/stat01050-main + */ + public ModelAndView receivingStatisticsMain() { + + ModelAndView mav = new ModelAndView(); + mav.setViewName("fims/stat/stat01050-main"); + mav.addObject("pageName", "stat01050-main"); + + Map> 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/stat/web/Stat02Controller.java b/src/main/java/cokr/xit/fims/stat/web/Stat02Controller.java deleted file mode 100644 index 9ce70e8f..00000000 --- a/src/main/java/cokr/xit/fims/stat/web/Stat02Controller.java +++ /dev/null @@ -1,28 +0,0 @@ -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> 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/stat/web/Stat03Controller.java b/src/main/java/cokr/xit/fims/stat/web/Stat03Controller.java deleted file mode 100644 index e3868d1a..00000000 --- a/src/main/java/cokr/xit/fims/stat/web/Stat03Controller.java +++ /dev/null @@ -1,27 +0,0 @@ -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> 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 deleted file mode 100644 index ae46893c..00000000 --- a/src/main/java/cokr/xit/fims/stat/web/Stat04Controller.java +++ /dev/null @@ -1,27 +0,0 @@ -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> commonCodes = getCodesOf("FIM054"); - mav.addObject("FIM054List", commonCodes.get("FIM054")); - - return mav; - } -} diff --git a/src/main/java/cokr/xit/fims/stat/web/Stat05Controller.java b/src/main/java/cokr/xit/fims/stat/web/Stat05Controller.java deleted file mode 100644 index 7d534c5c..00000000 --- a/src/main/java/cokr/xit/fims/stat/web/Stat05Controller.java +++ /dev/null @@ -1,27 +0,0 @@ -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 Stat05Controller extends ApplicationController { - /** 종합 통계 메인 화면을 연다. - * @return fims/stat/stat05010-main - */ - public ModelAndView statMain() { - - ModelAndView mav = new ModelAndView(); - mav.setViewName("fims/stat/stat05010-main"); - mav.addObject("pageName", "stat05010-main"); - - Map> 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/stat/web/Stat06Controller.java b/src/main/java/cokr/xit/fims/stat/web/Stat06Controller.java deleted file mode 100644 index 081d848c..00000000 --- a/src/main/java/cokr/xit/fims/stat/web/Stat06Controller.java +++ /dev/null @@ -1,29 +0,0 @@ -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> 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 e852941c..c307412e 100644 --- a/src/main/java/cokr/xit/fims/task/web/CmnController.java +++ b/src/main/java/cokr/xit/fims/task/web/CmnController.java @@ -402,67 +402,38 @@ public class CmnController { return super.getStatistics(query); } - } + @Override + @RequestMapping(name="종합 통계 메인", value="/010/main.do") + public ModelAndView comprehensiveStatisticsMain() { + return super.comprehensiveStatisticsMain(); + } - @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(); + @Override + @RequestMapping(name="단속 통계 메인", value="/020/main.do") + public ModelAndView crackdownStatisticsMain() { + return super.crackdownStatisticsMain(); } - } - - @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(); + @Override + @RequestMapping(name="부과 통계 메인", value="/030/main.do") + public ModelAndView levyStatisticsMain() { + return super.levyStatisticsMain(); } - } - - @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(); + @Override + @RequestMapping(name="발송 통계 메인", value="/040/main.do") + public ModelAndView sendStatisticsMain() { + return super.sendStatisticsMain(); } - } - - @Controller - @RequestMapping(name="종합 통계", value="/stat/stat05") - class Stat05Controller extends cokr.xit.fims.stat.web.Stat05Controller { - @Override - @RequestMapping(name="종합 통계 메인", value="/010/main.do") - public ModelAndView statMain() { - return super.statMain(); - } - + @RequestMapping(name="수납 통계 메인", value="/050/main.do") + public ModelAndView receivingStatisticsMain() { + return super.receivingStatisticsMain(); + } } - @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 @RequestMapping(name="납부자", value="/payer") diff --git a/src/main/webapp/WEB-INF/jsp/fims/stat/stat-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/stat/stat-main.jsp new file mode 100644 index 00000000..e30c3fe3 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/fims/stat/stat-main.jsp @@ -0,0 +1,628 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%> +<%@ include file="/WEB-INF/jsp/include/taglib.jsp"%> + +통계 공통 + +
+
+
+ + +
+ + + + +
+ + + +
+ + +
+
+ + +
+ +
+
+ + + +
+
+ + +
+ +
+ + \ No newline at end of file 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 e30c3fe3..a76d0748 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,628 +1,116 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%> <%@ include file="/WEB-INF/jsp/include/taglib.jsp"%> -통계 공통 - -
-
-
- - -
- - - - -
- - - -
- - -
-
- - -
- -
-
- - - -
+단속 통계 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/fims/stat/stat05020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/stat/stat01011-info.jsp similarity index 100% rename from src/main/webapp/WEB-INF/jsp/fims/stat/stat05020-info.jsp rename to src/main/webapp/WEB-INF/jsp/fims/stat/stat01011-info.jsp diff --git a/src/main/webapp/WEB-INF/jsp/fims/stat/stat02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/stat/stat01020-main.jsp similarity index 97% rename from src/main/webapp/WEB-INF/jsp/fims/stat/stat02010-main.jsp rename to src/main/webapp/WEB-INF/jsp/fims/stat/stat01020-main.jsp index 507601a8..44d5e2fb 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/stat/stat02010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/stat/stat01020-main.jsp @@ -2,7 +2,7 @@ <%@ include file="/WEB-INF/jsp/include/taglib.jsp"%> 단속 통계 - + @@ -120,4 +120,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/fims/stat/stat02020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/stat/stat01021-info.jsp similarity index 100% rename from src/main/webapp/WEB-INF/jsp/fims/stat/stat02020-info.jsp rename to src/main/webapp/WEB-INF/jsp/fims/stat/stat01021-info.jsp diff --git a/src/main/webapp/WEB-INF/jsp/fims/stat/stat03010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/stat/stat01030-main.jsp similarity index 94% rename from src/main/webapp/WEB-INF/jsp/fims/stat/stat03010-main.jsp rename to src/main/webapp/WEB-INF/jsp/fims/stat/stat01030-main.jsp index 6ef8eb06..dbb773d2 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/stat/stat03010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/stat/stat01030-main.jsp @@ -2,7 +2,7 @@ <%@ include file="/WEB-INF/jsp/include/taglib.jsp"%> 부과 통계 - + @@ -61,4 +61,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/fims/stat/stat03020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/stat/stat01031-info.jsp similarity index 100% rename from src/main/webapp/WEB-INF/jsp/fims/stat/stat03020-info.jsp rename to src/main/webapp/WEB-INF/jsp/fims/stat/stat01031-info.jsp diff --git a/src/main/webapp/WEB-INF/jsp/fims/stat/stat04010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/stat/stat01040-main.jsp similarity index 88% rename from src/main/webapp/WEB-INF/jsp/fims/stat/stat04010-main.jsp rename to src/main/webapp/WEB-INF/jsp/fims/stat/stat01040-main.jsp index 1ab783fc..a8650124 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/stat/stat04010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/stat/stat01040-main.jsp @@ -2,7 +2,7 @@ <%@ include file="/WEB-INF/jsp/include/taglib.jsp"%> 발송 통계 - + @@ -26,4 +26,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/fims/stat/stat04020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/stat/stat01041-info.jsp similarity index 100% rename from src/main/webapp/WEB-INF/jsp/fims/stat/stat04020-info.jsp rename to src/main/webapp/WEB-INF/jsp/fims/stat/stat01041-info.jsp diff --git a/src/main/webapp/WEB-INF/jsp/fims/stat/stat06010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/stat/stat01050-main.jsp similarity index 95% rename from src/main/webapp/WEB-INF/jsp/fims/stat/stat06010-main.jsp rename to src/main/webapp/WEB-INF/jsp/fims/stat/stat01050-main.jsp index f5357fcd..b289d2d4 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/stat/stat06010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/stat/stat01050-main.jsp @@ -2,7 +2,7 @@ <%@ include file="/WEB-INF/jsp/include/taglib.jsp"%> 부과 통계 - + @@ -63,4 +63,4 @@ - \ No newline at end of file + \ 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/stat01051-info.jsp similarity index 100% rename from src/main/webapp/WEB-INF/jsp/fims/stat/stat06020-info.jsp rename to src/main/webapp/WEB-INF/jsp/fims/stat/stat01051-info.jsp diff --git a/src/main/webapp/WEB-INF/jsp/fims/stat/stat05010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/stat/stat05010-main.jsp deleted file mode 100644 index e7824c06..00000000 --- a/src/main/webapp/WEB-INF/jsp/fims/stat/stat05010-main.jsp +++ /dev/null @@ -1,116 +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"%> - -단속 통계 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file