diff --git a/src/main/java/geoinfo/drilling/inquiry/service/impl/DrillingInquiryServiceImpl.java b/src/main/java/geoinfo/drilling/inquiry/service/impl/DrillingInquiryServiceImpl.java index 9bfb9f85..07aa96d3 100644 --- a/src/main/java/geoinfo/drilling/inquiry/service/impl/DrillingInquiryServiceImpl.java +++ b/src/main/java/geoinfo/drilling/inquiry/service/impl/DrillingInquiryServiceImpl.java @@ -313,8 +313,7 @@ public class DrillingInquiryServiceImpl implements DrillingInquiryService { // TODO Auto-generated method stub if( userId == null || userId.trim().isEmpty() ) { throw new Exception( "로그인이 필요한 서비스입니다." ); - } - + } String projectMasterCompanyCode = loginMapper.findProjectMasterCompanyCodeByUserid(userId); diff --git a/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc03Controller.java b/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc03Controller.java index 3d4cef70..01723fb8 100644 --- a/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc03Controller.java +++ b/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc03Controller.java @@ -164,7 +164,8 @@ public class ManageExcelUploadProc03Controller { * @throws Exception */ @SuppressWarnings({ "unchecked"}) - @RequestMapping(value = "/stepSave03.do", method = RequestMethod.POST) + //@RequestMapping(value = "/stepSave03.do", method = RequestMethod.POST) + @RequestMapping(value = "/stepSave03.do", method = RequestMethod.POST, produces = "application/json;charset=UTF-8") public @ResponseBody String stepSave03(@RequestParam HashMap params, ModelMap model ,HttpServletRequest request, HttpServletResponse response) throws Exception{ WebUtil wUtil = new WebUtil(); strUtil sUtil = new strUtil(); diff --git a/src/main/java/geoinfo/regi/status/RegiController.java b/src/main/java/geoinfo/regi/status/RegiController.java index 2ba23a75..275befe3 100644 --- a/src/main/java/geoinfo/regi/status/RegiController.java +++ b/src/main/java/geoinfo/regi/status/RegiController.java @@ -40,6 +40,7 @@ import geoinfo.map.mapControl.service.MapControlService; import geoinfo.regi.selectClassInfo.service.SelectClassService; import geoinfo.regi.status.service.RegiPageService; import geoinfo.regi.util.exportGeotechnicalPointShp2; +import geoinfo.util.MyUtil; import ictway.comm.util.parseData; import ictway.comm.util.strUtil; import ictway.comm.web.WebUtil; @@ -113,13 +114,34 @@ public class RegiController { // String srchReportType = sUtil.checkNull(parseData.parseData(String.valueOf(params.get("searchReportType")))); String userId = String.valueOf(request.getSession().getAttribute("USERID")); - // 첫 페이지 로딩일 경우 최근 3개월 데이터로 조회 + params.put("userId", userId); + + // 첫 페이지에서 + // 사용자가 등록한 프로젝트를 조회한다. 등록된 프로젝트가 없다면 최근 3개월 데이터로 조회 한다. if ("search".equals(srchMode) == false) { - srchStartDate = wUtil.getMonthDay(-3); + + String minDatetime = null; + String maxDatetime = null; + + List inputdateRangeByUserid = masterService.getInputdateRangeByUserid(params); + if( 0 < inputdateRangeByUserid.size() ) { + EgovMap inputdateRangeByUseridItem = inputdateRangeByUserid.get(0); + if( inputdateRangeByUseridItem != null ) { + minDatetime = MyUtil.getStringFromObject( inputdateRangeByUseridItem.get("minDatetime") ); + maxDatetime = MyUtil.getStringFromObject( inputdateRangeByUseridItem.get("maxDatetime") ); + } + } + + if( minDatetime != null && maxDatetime != null ) { + srchStartDate = minDatetime; + } else { + srchStartDate = wUtil.getMonthDay(-3); + } + srchEndDate = wUtil.getToday(); } - params.put("userId", userId); + params.put("projectName", srchProjectName); params.put("startDate", srchStartDate); params.put("endDate", srchEndDate); diff --git a/src/main/java/geoinfo/regi/status/service/RegiPageMapper.java b/src/main/java/geoinfo/regi/status/service/RegiPageMapper.java index c74c8cc6..28c9b101 100644 --- a/src/main/java/geoinfo/regi/status/service/RegiPageMapper.java +++ b/src/main/java/geoinfo/regi/status/service/RegiPageMapper.java @@ -192,4 +192,6 @@ public interface RegiPageMapper { EgovMap selectModeifyCallReason(HashMap params) throws Exception; public ArrayList> getHoleNamesByProjectCode(HashMap params) throws Exception; + + List getInputdateRangeByUserid(Map params) throws Exception; } diff --git a/src/main/java/geoinfo/regi/status/service/RegiPageService.java b/src/main/java/geoinfo/regi/status/service/RegiPageService.java index b60dae9d..8513dcc0 100644 --- a/src/main/java/geoinfo/regi/status/service/RegiPageService.java +++ b/src/main/java/geoinfo/regi/status/service/RegiPageService.java @@ -197,4 +197,6 @@ public interface RegiPageService { public int deleteOldDatas(HashMap params) throws Exception; + + List getInputdateRangeByUserid(Map params) throws Exception; } diff --git a/src/main/java/geoinfo/regi/status/service/impl/RegiPageServiceImpl.java b/src/main/java/geoinfo/regi/status/service/impl/RegiPageServiceImpl.java index b5fca249..717c893f 100644 --- a/src/main/java/geoinfo/regi/status/service/impl/RegiPageServiceImpl.java +++ b/src/main/java/geoinfo/regi/status/service/impl/RegiPageServiceImpl.java @@ -492,4 +492,11 @@ public class RegiPageServiceImpl implements RegiPageService { return 0; } + /** + * 사용자 아이디로 입력된 프로젝트의 최소날짜와 최대 날짜를 구한다. + */ + @Override + public List getInputdateRangeByUserid(Map params) throws Exception { + return regiPageMapper.getInputdateRangeByUserid(params); + } } diff --git a/src/main/resources/egovframework/sqlmap/mapper/map/MapControl_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/map/MapControl_SQL.xml index df54f2db..e4b329b5 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/map/MapControl_SQL.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/map/MapControl_SQL.xml @@ -308,42 +308,49 @@ + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/body/pds/pdsView.jsp b/src/main/webapp/WEB-INF/views/body/pds/pdsView.jsp index c4e32eb2..e57bc7fc 100644 --- a/src/main/webapp/WEB-INF/views/body/pds/pdsView.jsp +++ b/src/main/webapp/WEB-INF/views/body/pds/pdsView.jsp @@ -61,17 +61,17 @@

- ${result.fileName1 } + ${result.fileName1 }

- ${result.fileName2 } + ${result.fileName2 }

- ${result.fileName3 } + ${result.fileName3 }

diff --git a/src/main/webapp/WEB-INF/views/web/index.jsp b/src/main/webapp/WEB-INF/views/web/index.jsp index a301da35..13007fc0 100644 --- a/src/main/webapp/WEB-INF/views/web/index.jsp +++ b/src/main/webapp/WEB-INF/views/web/index.jsp @@ -308,7 +308,7 @@ function fn_help_tour(){
- +