diff --git a/src/main/java/egovframework/dms/hdb/dao/DmsHdbDAO.java b/src/main/java/egovframework/dms/hdb/dao/DmsHdbDAO.java index 1ee38cc..b856ab7 100644 --- a/src/main/java/egovframework/dms/hdb/dao/DmsHdbDAO.java +++ b/src/main/java/egovframework/dms/hdb/dao/DmsHdbDAO.java @@ -46,6 +46,10 @@ extends EgovComAbstractDAO { return (Integer)this.select("dmsHdbDAO.selectDmsHdbListTotCnt_S", (Object)searchVO); } + public List selectDmsHdbStat(DmsHdbDefaultVO searchVO) throws Exception { + return this.list("dmsHdbDAO.selectDmsHdbStat_D", (Object)searchVO); + } + public List selectDmsHdbReplyList(DmsHdbDefaultVO searchVO) { return this.list("dmsHdbDAO.selectDmsHdbReplyList_D", (Object)searchVO); } @@ -70,8 +74,10 @@ extends EgovComAbstractDAO { return (List) this.list("dmsHdbDAO.selectDmsHdbPerYearChart", (Object)searchVO); } - public DmsHdbGraphVO selectDmsHdbForMonthChart(DmsHdbDefaultVO searchVO) { - return (DmsHdbGraphVO)this.select("dmsHdbDAO.selectDmsHdbForMonthChart", (Object)searchVO); - } + /* + * public DmsHdbGraphVO selectDmsHdbForMonthChart(DmsHdbDefaultVO searchVO) { + * return (DmsHdbGraphVO)this.select("dmsHdbDAO.selectDmsHdbForMonthChart", + * (Object)searchVO); } + */ } diff --git a/src/main/java/egovframework/dms/hdb/service/DmsHdbService.java b/src/main/java/egovframework/dms/hdb/service/DmsHdbService.java index 93edc18..845f23d 100644 --- a/src/main/java/egovframework/dms/hdb/service/DmsHdbService.java +++ b/src/main/java/egovframework/dms/hdb/service/DmsHdbService.java @@ -32,6 +32,8 @@ public interface DmsHdbService { public int selectDmsHdbListTotCnt(DmsHdbDefaultVO var1); + public List selectDmsHdbStat(DmsHdbDefaultVO var1) throws Exception; + public String checkFileWhiteList(MultipartHttpServletRequest var1, String var2, String var3) throws Exception; public List selectDmsHdbReplyList(DmsHdbDefaultVO var1); @@ -46,6 +48,6 @@ public interface DmsHdbService { public List selectDmsHdbPerYearChart(DmsHdbDefaultVO var1); - public DmsHdbGraphVO selectDmsHdbForMonthChart(DmsHdbDefaultVO var1); + /* public DmsHdbGraphVO selectDmsHdbForMonthChart(DmsHdbDefaultVO var1); */ } diff --git a/src/main/java/egovframework/dms/hdb/service/impl/DmsHdbServiceImpl.java b/src/main/java/egovframework/dms/hdb/service/impl/DmsHdbServiceImpl.java index b95e2a8..f7b454d 100644 --- a/src/main/java/egovframework/dms/hdb/service/impl/DmsHdbServiceImpl.java +++ b/src/main/java/egovframework/dms/hdb/service/impl/DmsHdbServiceImpl.java @@ -135,6 +135,10 @@ public class DmsHdbServiceImpl implements DmsHdbService { public int selectDmsHdbListTotCnt(DmsHdbDefaultVO searchVO) { return this.dmsHdbDAO.selectDmsHdbListTotCnt(searchVO); } + + public List selectDmsHdbStat(DmsHdbDefaultVO searchVO) throws Exception { + return this.dmsHdbDAO.selectDmsHdbStat(searchVO); + } public String addMultiFiles(MultipartHttpServletRequest multiRequest, String targetNm) throws Exception { multiRequest.setCharacterEncoding("utf-8"); @@ -301,7 +305,8 @@ public class DmsHdbServiceImpl implements DmsHdbService { return this.dmsHdbDAO.selectDmsHdbPerYearChart(searchVO); } - public DmsHdbGraphVO selectDmsHdbForMonthChart(DmsHdbDefaultVO searchVO) { - return this.dmsHdbDAO.selectDmsHdbForMonthChart(searchVO); - } + /* + * public DmsHdbGraphVO selectDmsHdbForMonthChart(DmsHdbDefaultVO searchVO) { + * return this.dmsHdbDAO.selectDmsHdbForMonthChart(searchVO); } + */ } diff --git a/src/main/java/egovframework/dms/hdb/web/DmsHdbController.java b/src/main/java/egovframework/dms/hdb/web/DmsHdbController.java index 1b741f4..49596fe 100644 --- a/src/main/java/egovframework/dms/hdb/web/DmsHdbController.java +++ b/src/main/java/egovframework/dms/hdb/web/DmsHdbController.java @@ -46,6 +46,7 @@ import egovframework.edosi.egov.helper.UserDetailsHelper; import egovframework.edosi.filter.XssFilter; import egovframework.edosi.resource.EdosiResource; import egovframework.rte.fdl.property.EgovPropertyService; +import egovframework.rte.psl.dataaccess.util.EgovMap; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import java.util.HashMap; import java.util.Iterator; @@ -86,9 +87,6 @@ public class DmsHdbController { String prjSeq = request.getParameter("prjSeq"); Map prjInfo = (Map) request.getSession().getAttribute("prjInfo"); String prjNm = prjInfo == null ? null : (String) prjInfo.get("prjNm"); - String hdbStsA = prjInfo == null ? null : (String) prjInfo.get("hdbStsA"); - String hdbStsB = prjInfo == null ? null : (String) prjInfo.get("hdbStsB"); - String hdbStsC = prjInfo == null ? null : (String) prjInfo.get("hdbStsC"); if (moveDetail != null || prjSeq != null) { request.getSession().setAttribute("prjSeq", (Object)prjSeq); @@ -114,9 +112,6 @@ public class DmsHdbController { model.addAttribute("ROLE_CUS", (Object)UserDetailsHelper.isRole((String)"ROLE_CUS")); model.addAttribute("ROLE_EMP", (Object)UserDetailsHelper.isRole((String)"ROLE_EMP")); model.addAttribute("prjNm", prjNm); - model.addAttribute("hdbStsA", hdbStsA); - model.addAttribute("hdbStsB", hdbStsB); - model.addAttribute("hdbStsC", hdbStsC); this.initModelData(model, bmode); return viewName; } @@ -159,6 +154,12 @@ public class DmsHdbController { if (totCnt > 0) { List dmsHdbList = this.dmsHdbService.selectDmsHdbList(searchVO); model.addAttribute("resultList", (Object)dmsHdbList); + List dmsHdbStatList = this.dmsHdbService.selectDmsHdbStat(searchVO); + EgovMap dmsHdbStat = null; + if (dmsHdbStatList != null && !dmsHdbStatList.isEmpty()) { + dmsHdbStat = (EgovMap) dmsHdbStatList.get(0); + } + model.addAttribute("dmsHdbStat", (Object)dmsHdbStat); } } catch (Exception e) { @@ -170,8 +171,11 @@ public class DmsHdbController { List annualList = dmsHdbService.selectDmsHdbPerYearChart(searchVO); model.addAttribute("annualList", annualList); - DmsHdbGraphVO monthlyList = dmsHdbService.selectDmsHdbForMonthChart(searchVO); - model.addAttribute("monthlyList", monthlyList); + /* + * DmsHdbGraphVO monthlyList = + * dmsHdbService.selectDmsHdbForMonthChart(searchVO); + * model.addAttribute("monthlyList", monthlyList); + */ // model.addAttribute("year", year); return "dms/dmsHdb/DmsHdbList"; diff --git a/src/main/java/egovframework/edosi/web/TemplateController.java b/src/main/java/egovframework/edosi/web/TemplateController.java index 24e6fe5..d34d722 100644 --- a/src/main/java/egovframework/edosi/web/TemplateController.java +++ b/src/main/java/egovframework/edosi/web/TemplateController.java @@ -51,9 +51,6 @@ public class TemplateController { HashMap prjInfo = new HashMap(); prjInfo.put("prjSeq", prjSeq); prjInfo.put("prjNm", dmsPrjVO.getPrjNm()); - prjInfo.put("hdbStsA", request.getParameter("hdbStsA")); - prjInfo.put("hdbStsB", request.getParameter("hdbStsB")); - prjInfo.put("hdbStsC", request.getParameter("hdbStsC")); request.getSession().setAttribute("prjInfo", prjInfo); } } diff --git a/src/main/resources/egovframework/sqlmap/dms/dmsHdb/DmsHdb_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/dms/dmsHdb/DmsHdb_SQL_Mysql.xml index 0b671f4..5a0f0cf 100644 --- a/src/main/resources/egovframework/sqlmap/dms/dmsHdb/DmsHdb_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/dms/dmsHdb/DmsHdb_SQL_Mysql.xml @@ -171,6 +171,77 @@ + + -