From fbd1cdb2894d78b0af2b168b4f3bbad4f9b14ad7 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Wed, 15 Nov 2023 16:56:54 +0900 Subject: [PATCH] =?UTF-8?q?=ED=86=B5=EA=B3=84=20=EC=8B=9C=EA=B5=B0?= =?UTF-8?q?=EA=B5=AC=20=EC=A1=B0=ED=9A=8C=EC=A1=B0=EA=B1=B4=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xit/fims/stat/web/Stat01Controller.java | 53 +++++++++++++++++-- .../WEB-INF/jsp/fims/stat/stat-main.jsp | 14 ++++- 2 files changed, 61 insertions(+), 6 deletions(-) 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 a20737ff..04147a32 100644 --- a/src/main/java/cokr/xit/fims/stat/web/Stat01Controller.java +++ b/src/main/java/cokr/xit/fims/stat/web/Stat01Controller.java @@ -19,7 +19,9 @@ import cokr.xit.fims.stat.GroupInfo; import cokr.xit.fims.stat.NumberValueInfo; import cokr.xit.fims.stat.Stat; import cokr.xit.fims.stat.StatQuery; +import cokr.xit.fims.stat.dao.StatMapper; import cokr.xit.fims.stat.service.StatService; +import cokr.xit.foundation.data.DataObject; /**통계 관리 서비스 웹 컨트롤러.
* {웹 컨텍스트}/stat 로 접근할 수 있다. @@ -49,16 +51,19 @@ public class Stat01Controller extends ApplicationController { @Resource(name="userMapper") protected UserMapper userMapper; + @Resource(name="statMapper") + protected StatMapper statMapper; + /** * @return */ public ModelAndView getStatistics(StatQuery statQuery) { ModelAndView mav = new ModelAndView("jsonView"); - ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); - String curDeptCode = currentUser.getDeptCode(); - String sggCd = globalStngMapper.selectSggCd(curDeptCode); - statQuery.setSggCd(sggCd); + //ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); + //String curDeptCode = currentUser.getDeptCode(); + //String sggCd = globalStngMapper.selectSggCd(curDeptCode); + //statQuery.setSggCd(sggCd); List codeGroup = new ArrayList(); @@ -138,6 +143,14 @@ public class Stat01Controller extends ApplicationController { mav.setViewName("fims/stat/stat01010-main"); mav.addObject("pageName", "stat01010-main"); + ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); + String curDeptCode = currentUser.getDeptCode(); + String sggCd = globalStngMapper.selectSggCd(curDeptCode); + mav.addObject("sggCd", sggCd); + DataObject sgg = statMapper.selectSggByCode(sggCd); + String sggNm = sgg.string("NAME"); + mav.addObject("sggNm", sggNm); + Map> commonCodes = getCodesOf("FIM054","FIM002"); mav.addObject("FIM054List", commonCodes.get("FIM054")); mav.addObject("FIM002List", commonCodes.get("FIM002")); @@ -154,6 +167,14 @@ public class Stat01Controller extends ApplicationController { mav.setViewName("fims/stat/stat01020-main"); mav.addObject("pageName", "stat01020-main"); + ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); + String curDeptCode = currentUser.getDeptCode(); + String sggCd = globalStngMapper.selectSggCd(curDeptCode); + mav.addObject("sggCd", sggCd); + DataObject sgg = statMapper.selectSggByCode(sggCd); + String sggNm = sgg.string("NAME"); + mav.addObject("sggNm", sggNm); + Map> commonCodes = getCodesOf("FIM054","FIM002"); mav.addObject("FIM054List", commonCodes.get("FIM054")); mav.addObject("FIM002List", commonCodes.get("FIM002")); @@ -171,6 +192,14 @@ public class Stat01Controller extends ApplicationController { mav.setViewName("fims/stat/stat01030-main"); mav.addObject("pageName", "stat01030-main"); + ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); + String curDeptCode = currentUser.getDeptCode(); + String sggCd = globalStngMapper.selectSggCd(curDeptCode); + mav.addObject("sggCd", sggCd); + DataObject sgg = statMapper.selectSggByCode(sggCd); + String sggNm = sgg.string("NAME"); + mav.addObject("sggNm", sggNm); + Map> commonCodes = getCodesOf("FIM054"); mav.addObject("FIM054List", commonCodes.get("FIM054")); @@ -186,6 +215,14 @@ public class Stat01Controller extends ApplicationController { mav.setViewName("fims/stat/stat01040-main"); mav.addObject("pageName", "stat01040-main"); + ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); + String curDeptCode = currentUser.getDeptCode(); + String sggCd = globalStngMapper.selectSggCd(curDeptCode); + mav.addObject("sggCd", sggCd); + DataObject sgg = statMapper.selectSggByCode(sggCd); + String sggNm = sgg.string("NAME"); + mav.addObject("sggNm", sggNm); + Map> commonCodes = getCodesOf("FIM054"); mav.addObject("FIM054List", commonCodes.get("FIM054")); @@ -201,6 +238,14 @@ public class Stat01Controller extends ApplicationController { mav.setViewName("fims/stat/stat01050-main"); mav.addObject("pageName", "stat01050-main"); + ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); + String curDeptCode = currentUser.getDeptCode(); + String sggCd = globalStngMapper.selectSggCd(curDeptCode); + mav.addObject("sggCd", sggCd); + DataObject sgg = statMapper.selectSggByCode(sggCd); + String sggNm = sgg.string("NAME"); + mav.addObject("sggNm", sggNm); + Map> commonCodes = getCodesOf("FIM054","FIM002"); mav.addObject("FIM054List", commonCodes.get("FIM054")); mav.addObject("FIM002List", commonCodes.get("FIM002")); 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 index e30c3fe3..b1620878 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/stat/stat-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/stat/stat-main.jsp @@ -28,7 +28,7 @@
-
+
+
+ + + + +
@@ -230,7 +239,8 @@ $(document).ready(function(){ var searchForm = $("#frmSearch--${pageName}"); searchForm.find("input[type='radio'][name='taskSeCd'][value='']").prop("checked", true); - $("select[id='#dayColumn--${pageName}']").find("option:eq(0)").prop("selected", true); + $("select[id='sggCd--${pageName}']").find("option:eq(1)").prop("selected", true); + $("select[id='dayColumn--${pageName}']").find("option:eq(0)").prop("selected", true); $("#firstDay--${pageName}").datepicker('setDate', new Date()); $("#lastDay--${pageName}").datepicker('setDate', new Date());