diff --git a/src/main/java/com/nis/web/controller/configuration/statistics/ConfigureStatisticsController.java b/src/main/java/com/nis/web/controller/configuration/statistics/ConfigureStatisticsController.java index 1844fabf0..1b8a6c178 100644 --- a/src/main/java/com/nis/web/controller/configuration/statistics/ConfigureStatisticsController.java +++ b/src/main/java/com/nis/web/controller/configuration/statistics/ConfigureStatisticsController.java @@ -68,10 +68,12 @@ public class ConfigureStatisticsController extends BaseController{ requestPage.setList(requestStatisticList); model.addAttribute("requestInfos", requestInfos); model.addAttribute("serviceList", serviceDictList); + model.addAttribute("requestStatisticTime", configureStatisticsService.getRequestStatisticTime()); model.addAttribute("page", requestPage); /****************************Config Status Info Statistics*****************************/ List list = configureStatisticsService.getConfigStateStatistics(); model.addAttribute("configStatistics", list); + model.addAttribute("configStatisticTime", configureStatisticsService.getConfigStatisticTime()); return "/index"; } } diff --git a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml index 6d9a86251..c08b6396b 100644 --- a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml @@ -69,11 +69,17 @@ AND r.IS_VALID != -1 - - AND r.request_time between #{beginDate} and #{endDate} - - - AND r.edit_time between #{dobeginDate} and #{doendDate} + + AND r.request_time >= #{beginDate} + + + AND r.request_time <= #{endDate} + + + AND r.edit_time >= #{dobeginDate} + + + AND r.edit_time <= #{doendDate} ${sqlMap.dsf} diff --git a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml index 71df9a380..68116e88d 100644 --- a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml @@ -65,11 +65,17 @@ AND r.is_audit=${isAudit} - - AND r.task_time between #{beginDate} and #{endDate} + + AND r.task_time >= #{beginDate} - - AND r.edit_time between #{dobeginDate} and #{doendDate} + + AND r.task_time <= #{endDate} + + + AND r.edit_time >= #{dobeginDate} + + + AND r.edit_time <= #{doendDate} diff --git a/src/main/java/com/nis/web/dao/configuration/statistics/ConfigureStatisticsDao.java b/src/main/java/com/nis/web/dao/configuration/statistics/ConfigureStatisticsDao.java index 615860b24..cb83f7f1f 100644 --- a/src/main/java/com/nis/web/dao/configuration/statistics/ConfigureStatisticsDao.java +++ b/src/main/java/com/nis/web/dao/configuration/statistics/ConfigureStatisticsDao.java @@ -14,6 +14,8 @@ import com.nis.web.dao.MyBatisDao; @MyBatisDao public interface ConfigureStatisticsDao { - public List getConfigStateStatistics( ) ; + public List getConfigStateStatistics( ); + public List getConfigStatisticTime(); + public List getRequestStatisticTime(); public List getRequestStateStatistics(@Param("requestList")List requestList,@Param("serviceList")List serviceList) ; } diff --git a/src/main/java/com/nis/web/dao/configuration/statistics/ConfigureStatisticsDao.xml b/src/main/java/com/nis/web/dao/configuration/statistics/ConfigureStatisticsDao.xml index 3c9d4698c..92fcb4a36 100644 --- a/src/main/java/com/nis/web/dao/configuration/statistics/ConfigureStatisticsDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/statistics/ConfigureStatisticsDao.xml @@ -9,7 +9,7 @@ sum(case when c.cfg_state =3 then 1 else 0 end) as cancle_approved, sum(case when c.cfg_state =0 then 1 else 0 end) as created, sum(case when c.cfg_state =-1 then 1 else 0 end) as deleted - from cfg_num_statistics c + from (select distinct cfg_state,service_id,compile_id from cfg_num_statistics) c group by service_id; @@ -18,13 +18,23 @@ sum(case when c.service_id =${serivice.serviceId} then 1 else 0 end) as ${serivice.serviceName} - from request_num_statistics c + from (select distinct service_id,request_id,compile_id from request_num_statistics) c where request_id in ${requestInfo.id} group by request_id + +