diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java index 846aac9398..26302753eb 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java @@ -117,7 +117,7 @@ public class ProjectServiceImpl implements ProjectService { if (null == agencyProjectDailyDTO) { return resultList; } - //2:获取当前组织最近日期的直属下级组织项目统计数据，按项目总量降序 + //2:获取机关下直属网格最近一天的日统计数据，按项目总数降序 resultList = projectDao.selectSubGrid(agencyProjectDailyDTO); return resultList; } diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml index 7d0105ae55..f61c01dedb 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml @@ -123,15 +123,18 @@ ( SELECT da.id AS "agencyId", - da.agency_name AS "name", + dg.grid_name AS "name", fgpd.pending_total AS "value", "处理中" AS "type", fgpd.project_total FROM fact_grid_project_daily fgpd LEFT JOIN dim_agency da ON fgpd.agency_id = da.id + LEFT JOIN dim_grid dg ON fgpd.grid_id = dg.id WHERE fgpd.del_flag = '0' + AND da.del_flag = '0' + AND dg.del_flag = '0' AND fgpd.agency_id = #{agencyId} AND fgpd.date_id = #{dateId} ) @@ -139,15 +142,18 @@ ( SELECT da.id AS "agencyId", - da.agency_name AS "name", + dg.grid_name AS "name", fgpd.closed_total AS "value", "已结案" AS "type", fgpd.project_total FROM fact_grid_project_daily fgpd LEFT JOIN dim_agency da ON fgpd.agency_id = da.id + LEFT JOIN dim_grid dg ON fgpd.grid_id = dg.id WHERE fgpd.del_flag = '0' + AND da.del_flag = '0' + AND dg.del_flag = '0' AND fgpd.agency_id = #{agencyId} AND fgpd.date_id = #{dateId} ) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java index 7935f44b5e..f5eec05e4b 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java @@ -71,7 +71,7 @@ public class StatsProjectServiceImpl implements StatsProjectService { if (!CollectionUtils.isEmpty(customerIdList)) { for (String customerId : customerIdList) { try { - log.debug("for循环统计机关-项目-日月数据，当前统计的客户Id:" + customerId); + log.info("for循环统计机关-项目-日月数据，当前统计的客户Id:" + customerId); //遍历统计每一个客户数据 customerAgencyStats(customerId); } catch (Exception e) { @@ -93,13 +93,13 @@ public class StatsProjectServiceImpl implements StatsProjectService { DimIdGenerator.DimIdBean dimId = DimIdGenerator.getDimIdBean(date); //2:根据客户Id查询机关维度表数据 - log.debug("StatsProjectServiceImpl.customerAgencyStats-根据客户Id查询机关维度数据，当前客户Id:" + customerId); + log.info("StatsProjectServiceImpl.customerAgencyStats-根据客户Id查询机关维度数据，对应客户Id:" + customerId); DimAgencyDTO dimAgencyDTO = new DimAgencyDTO(); dimAgencyDTO.setCustomerId(customerId); List dimAgencyList = dimAgencyService.getDimAgencyList(dimAgencyDTO); //3:根据客户Id查询项目业务表已结案数据(查询传入日期及之前的数据) - log.debug("StatsProjectServiceImpl.customerAgencyStats-根据客户Id查询项目业务表结案数据，当前客户Id:"+customerId); + log.info("StatsProjectServiceImpl.customerAgencyStats-根据客户Id查询项目业务表已结案数据，对应客户Id:"+customerId); ProjectEntity projectEntity = new ProjectEntity(); projectEntity.setCustomerId(customerId); projectEntity.setCreatedTime(date); @@ -107,18 +107,18 @@ public class StatsProjectServiceImpl implements StatsProjectService { List projectList = projectService.getProjectList(projectEntity); //4:查询项目处理进展表中有效数据(创建日期截取yyyy-mm-dd格式字段值)(查询传入日期及之前的数据) - log.debug("StatsProjectServiceImpl.customerAgencyStats-根据客户Id查询项目进展表业务数据，当前客户Id:"+customerId); + log.info("StatsProjectServiceImpl.customerAgencyStats-根据客户Id查询项目进展表业务数据，对应客户Id:"+customerId); List processList = projectProcessService.getProcessList(projectEntity); //5:机关层级日月统计 if (null != dimAgencyList && dimAgencyList.size() > NumConstant.ZERO) { //5.1:执行机关日数据统计 - log.debug("StatsProjectServiceImpl.customerAgencyStats-开始执行机关日统计方法，方法名:agencyDateProjectStats,客户Id:"+customerId); + log.info("StatsProjectServiceImpl.customerAgencyStats-开始执行机关日统计方法，方法名:agencyDateProjectStats,客户Id:"+customerId); agencyDateProjectStats(customerId, dimId, dimAgencyList, projectList, processList); //5.2:执行机关月数据统计 //if (Calendar.getInstance().get(Calendar.DATE) == 1) { - log.debug("StatsProjectServiceImpl.customerAgencyStats-开始执行机关月统计方法，方法名:agencyMonthProjectStats,客户Id:"+customerId); + log.info("StatsProjectServiceImpl.customerAgencyStats-开始执行机关月统计方法，方法名:agencyMonthProjectStats,客户Id:"+customerId); agencyMonthProjectStats(customerId, dimId, dimAgencyList); //} } @@ -252,9 +252,11 @@ public class StatsProjectServiceImpl implements StatsProjectService { FactAgencyProjectDailyEntity delEntity = new FactAgencyProjectDailyEntity(); delEntity.setCustomerId(customerId); delEntity.setDateId(dimId.getDateId()); + log.info("StatsProjectServiceImpl.agencyDateProjectStats-根据客户Id、日维度Id批量删除机关项目日统计表数据,对应客户Id:"+customerId+",日维度Id:"+dimId.getDateId()); factAgencyProjectDailyService.delDateProject(delEntity); //2.2:批量保存机关日统计数据 + log.info("StatsProjectServiceImpl.agencyDateProjectStats-批量新增机关项目日统计表数据,对应客户Id:"+customerId+",日维度Id:"+dimId.getDateId()); factAgencyProjectDailyService.insertBatch(projectDateEntityList); } @@ -329,9 +331,11 @@ public class StatsProjectServiceImpl implements StatsProjectService { FactAgencyProjectMonthlyEntity delEntity = new FactAgencyProjectMonthlyEntity(); delEntity.setCustomerId(customerId); delEntity.setMonthId(dimId.getMonthId()); + log.info("StatsProjectServiceImpl.agencyMonthProjectStats-根据客户Id、月维度Id批量删除机关项目月统计表数据,对应客户Id:"+customerId+",月维度Id:"+dimId.getMonthId()); factAgencyProjectMonthlyService.delMonthProject(delEntity); //3.2:批量保存机关月统计数据 + log.info("StatsProjectServiceImpl.agencyMonthProjectStats-批量新增机关项目月统计表数据,对应客户Id:"+customerId+",月维度Id:"+dimId.getMonthId()); factAgencyProjectMonthlyService.insertBatch(monthlyEntityList); } @@ -353,6 +357,7 @@ public class StatsProjectServiceImpl implements StatsProjectService { if (!CollectionUtils.isEmpty(customerIdList)) { for (String customerId : customerIdList) { try { + log.info("for循环统计网格-项目-日月数据，当前统计的客户Id:" + customerId); //遍历统计每一个客户数据 customerGridStats(customerId); } catch (Exception e) { @@ -374,9 +379,11 @@ public class StatsProjectServiceImpl implements StatsProjectService { DimIdGenerator.DimIdBean dimId = DimIdGenerator.getDimIdBean(date); //2:根据客户Id查询网格维度表数据 + log.info("StatsProjectServiceImpl.customerGridStats-根据客户Id查询网格维度数据，对应客户Id:" + customerId); List dimGridList = dimGridService.getGridListByCustomerId(customerId); //3:根据客户Id查询项目业务表已结案数据(查询传入日期及之前的数据) + log.info("StatsProjectServiceImpl.customerGridStats-根据客户Id查询项目业务表已结案数据，对应客户Id:"+customerId); ProjectEntity projectEntity = new ProjectEntity(); projectEntity.setCustomerId(customerId); projectEntity.setCreatedTime(date); @@ -384,15 +391,18 @@ public class StatsProjectServiceImpl implements StatsProjectService { List projectList = projectService.getProjectList(projectEntity); //4:查询项目处理进展表中有效数据(创建日期截取yyyy-mm-dd格式字段值)(查询传入日期及之前的数据) + log.info("StatsProjectServiceImpl.customerGridStats-根据客户Id查询项目进展表业务数据，对应客户Id:"+customerId); List processList = projectProcessService.getProcessList(projectEntity); //5:网格层级日月统计 if (null != dimGridList && dimGridList.size() > NumConstant.ZERO) { //5.1:执行网格日数据统计 + log.info("StatsProjectServiceImpl.customerGridStats-开始执行机关日统计方法，方法名:gridDateProjectStats,客户Id:"+customerId); gridDateProjectStats(customerId, dimId, dimGridList, projectList, processList); //5.2:执行网格月数据统计 //if (Calendar.getInstance().get(Calendar.DATE) == 1) { + log.info("StatsProjectServiceImpl.customerGridStats-开始执行机关月统计方法，方法名:gridMonthProjectStats,客户Id:"+customerId); gridMonthProjectStats(customerId, dimId, dimGridList); //} } @@ -527,9 +537,11 @@ public class StatsProjectServiceImpl implements StatsProjectService { FactAgencyProjectDailyEntity delEntity = new FactAgencyProjectDailyEntity(); delEntity.setCustomerId(customerId); delEntity.setDateId(dimId.getDateId()); + log.info("StatsProjectServiceImpl.gridDateProjectStats-根据客户Id、日维度Id批量删除网格项目日统计表数据,对应客户Id:"+customerId+",日维度Id:"+dimId.getDateId()); factGridProjectDailyService.delDateProject(delEntity); //3.2:批量保存网格日统计数据 + log.info("StatsProjectServiceImpl.gridDateProjectStats-批量新增网格项目日统计表数据,对应客户Id:"+customerId+",日维度Id:"+dimId.getDateId()); factGridProjectDailyService.insertBatch(gridDateEntityList); } @@ -604,9 +616,11 @@ public class StatsProjectServiceImpl implements StatsProjectService { FactAgencyProjectMonthlyEntity delEntity = new FactAgencyProjectMonthlyEntity(); delEntity.setCustomerId(customerId); delEntity.setMonthId(dimId.getMonthId()); + log.info("StatsProjectServiceImpl.gridMonthProjectStats-根据客户Id、月维度Id批量删除网格项目月统计表数据,对应客户Id:"+customerId+",月维度Id:"+dimId.getMonthId()); factGridProjectMonthlyService.delMonthProject(delEntity); //3.2:批量保存机关月统计数据 + log.info("StatsProjectServiceImpl.gridMonthProjectStats-批量新增网格项目月统计表数据,对应客户Id:"+customerId+",月维度Id:"+dimId.getMonthId()); factGridProjectMonthlyService.insertBatch(monthlyEntityList); } @@ -622,7 +636,7 @@ public class StatsProjectServiceImpl implements StatsProjectService { try { DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); Calendar calendar = Calendar.getInstance(); - calendar.set(Calendar.HOUR_OF_DAY, -24); + //calendar.set(Calendar.HOUR_OF_DAY, -24); String str = sdf.format(calendar.getTime()); date = sdf.parse(str); } catch (Exception e) {