통계 시군구 조회조건 추가

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;
 
 /**통계 관리 서비스 웹 컨트롤러.<br />
  * {웹 컨텍스트}/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());
+		//ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute());
-		String curDeptCode = currentUser.getDeptCode();
+		//String curDeptCode = currentUser.getDeptCode();
-		String sggCd = globalStngMapper.selectSggCd(curDeptCode);
+		//String sggCd = globalStngMapper.selectSggCd(curDeptCode);
-		statQuery.setSggCd(sggCd);
+		//statQuery.setSggCd(sggCd);
 
 		List<String> codeGroup = new ArrayList<String>();
 
@@ -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<String, List<CommonCode>> 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<String, List<CommonCode>> 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<String, List<CommonCode>> 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<String, List<CommonCode>> 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<String, List<CommonCode>> commonCodes = getCodesOf("FIM054","FIM002");
 		mav.addObject("FIM054List", commonCodes.get("FIM054"));
 		mav.addObject("FIM002List", commonCodes.get("FIM002"));

src/main/webapp/WEB-INF/jsp/fims/stat/stat-main.jsp

@@ -28,7 +28,7 @@
 					<div class="container-search">
 						<div class="row g-1 my-2">
 							<!-- 업무구분 -->
-							<div class="col-12">
+							<div class="col-8">
 								<label class="form-label fw-bold form-search-title text-end">업무구분</label>
 								<span class="form-search-linebox">
 									<label>
@@ -45,6 +45,15 @@
 									</c:forEach>
 								</span>
 							</div>
+							<div class="col-4">
+								<label class="form-label fw-bold form-search-title text-end">시군구</label>
+								<span class="form-search-linebox">
+									<select id="sggCd--${pageName}" name="sggCd" class="form-select">
+										<option value="">전체</option>
+										<option value="${sggCd}" selected>${sggNm}</option>
+									</select>
+								</span>
+							</div>
 						</div>
 						<div class="row g-1 my-2">
 							<div class="col-12">
@@ -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());