|
|
@ -99,7 +99,7 @@ public class StatsProjectServiceImpl implements StatsProjectService { |
|
|
|
List<DimAgencyDTO> dimAgencyList = dimAgencyService.getDimAgencyList(dimAgencyDTO); |
|
|
|
|
|
|
|
//3:根据客户Id查询项目业务表已结案数据(查询传入日期及之前的数据)
|
|
|
|
log.info("StatsProjectServiceImpl.customerAgencyStats-根据客户Id查询项目业务表已结案数据,对应客户Id:"+customerId); |
|
|
|
log.info("StatsProjectServiceImpl.customerAgencyStats-根据客户Id查询项目业务表已结案数据,对应客户Id:" + customerId); |
|
|
|
ProjectEntity projectEntity = new ProjectEntity(); |
|
|
|
projectEntity.setCustomerId(customerId); |
|
|
|
projectEntity.setCreatedTime(date); |
|
|
@ -107,19 +107,27 @@ public class StatsProjectServiceImpl implements StatsProjectService { |
|
|
|
List<ProjectEntity> projectList = projectService.getProjectList(projectEntity); |
|
|
|
|
|
|
|
//4:查询项目处理进展表中有效数据(创建日期截取yyyy-mm-dd格式字段值)(查询传入日期及之前的数据)
|
|
|
|
log.info("StatsProjectServiceImpl.customerAgencyStats-根据客户Id查询项目进展表业务数据,对应客户Id:"+customerId); |
|
|
|
log.info("StatsProjectServiceImpl.customerAgencyStats-根据客户Id查询项目进展表业务数据,对应客户Id:" + customerId); |
|
|
|
List<ProjectProcessEntity> processList = projectProcessService.getProcessList(projectEntity); |
|
|
|
|
|
|
|
//5:机关层级日月统计
|
|
|
|
if (null != dimAgencyList && dimAgencyList.size() > NumConstant.ZERO) { |
|
|
|
//5.1:执行机关日数据统计
|
|
|
|
log.info("StatsProjectServiceImpl.customerAgencyStats-开始执行机关日统计方法,方法名:agencyDateProjectStats,客户Id:"+customerId); |
|
|
|
agencyDateProjectStats(customerId, dimId, dimAgencyList, projectList, processList); |
|
|
|
try { |
|
|
|
log.info("StatsProjectServiceImpl.customerAgencyStats-开始执行机关日统计方法,方法名:agencyDateProjectStats,客户Id:" + customerId); |
|
|
|
agencyDateProjectStats(customerId, dimId, dimAgencyList, projectList, processList); |
|
|
|
} catch (Exception e) { |
|
|
|
log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "agencyDateProjectStats", customerId, dimId.getDateId(), e.getMessage())); |
|
|
|
} |
|
|
|
|
|
|
|
//5.2:执行机关月数据统计
|
|
|
|
//if (Calendar.getInstance().get(Calendar.DATE) == 1) {
|
|
|
|
log.info("StatsProjectServiceImpl.customerAgencyStats-开始执行机关月统计方法,方法名:agencyMonthProjectStats,客户Id:"+customerId); |
|
|
|
agencyMonthProjectStats(customerId, dimId, dimAgencyList); |
|
|
|
try { |
|
|
|
log.info("StatsProjectServiceImpl.customerAgencyStats-开始执行机关月统计方法,方法名:agencyMonthProjectStats,客户Id:" + customerId); |
|
|
|
agencyMonthProjectStats(customerId, dimId, dimAgencyList); |
|
|
|
} catch (Exception e) { |
|
|
|
log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "agencyMonthProjectStats", customerId, dimId.getMonthId(), e.getMessage())); |
|
|
|
} |
|
|
|
//}
|
|
|
|
} |
|
|
|
|
|
|
@ -252,11 +260,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()); |
|
|
|
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()); |
|
|
|
log.info("StatsProjectServiceImpl.agencyDateProjectStats-批量新增机关项目日统计表数据,对应客户Id:" + customerId + ",日维度Id:" + dimId.getDateId()); |
|
|
|
factAgencyProjectDailyService.insertBatch(projectDateEntityList); |
|
|
|
} |
|
|
|
|
|
|
@ -331,11 +339,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()); |
|
|
|
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()); |
|
|
|
log.info("StatsProjectServiceImpl.agencyMonthProjectStats-批量新增机关项目月统计表数据,对应客户Id:" + customerId + ",月维度Id:" + dimId.getMonthId()); |
|
|
|
factAgencyProjectMonthlyService.insertBatch(monthlyEntityList); |
|
|
|
} |
|
|
|
|
|
|
@ -383,7 +391,7 @@ public class StatsProjectServiceImpl implements StatsProjectService { |
|
|
|
List<DimGridEntity> dimGridList = dimGridService.getGridListByCustomerId(customerId); |
|
|
|
|
|
|
|
//3:根据客户Id查询项目业务表已结案数据(查询传入日期及之前的数据)
|
|
|
|
log.info("StatsProjectServiceImpl.customerGridStats-根据客户Id查询项目业务表已结案数据,对应客户Id:"+customerId); |
|
|
|
log.info("StatsProjectServiceImpl.customerGridStats-根据客户Id查询项目业务表已结案数据,对应客户Id:" + customerId); |
|
|
|
ProjectEntity projectEntity = new ProjectEntity(); |
|
|
|
projectEntity.setCustomerId(customerId); |
|
|
|
projectEntity.setCreatedTime(date); |
|
|
@ -391,19 +399,27 @@ public class StatsProjectServiceImpl implements StatsProjectService { |
|
|
|
List<ProjectEntity> projectList = projectService.getProjectList(projectEntity); |
|
|
|
|
|
|
|
//4:查询项目处理进展表中有效数据(创建日期截取yyyy-mm-dd格式字段值)(查询传入日期及之前的数据)
|
|
|
|
log.info("StatsProjectServiceImpl.customerGridStats-根据客户Id查询项目进展表业务数据,对应客户Id:"+customerId); |
|
|
|
log.info("StatsProjectServiceImpl.customerGridStats-根据客户Id查询项目进展表业务数据,对应客户Id:" + customerId); |
|
|
|
List<ProjectProcessEntity> 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); |
|
|
|
try { |
|
|
|
log.info("StatsProjectServiceImpl.customerGridStats-开始执行机关日统计方法,方法名:gridDateProjectStats,客户Id:" + customerId); |
|
|
|
gridDateProjectStats(customerId, dimId, dimGridList, projectList, processList); |
|
|
|
} catch (Exception e) { |
|
|
|
log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "gridDateProjectStats", customerId, dimId.getDateId(), e.getMessage())); |
|
|
|
} |
|
|
|
|
|
|
|
//5.2:执行网格月数据统计
|
|
|
|
//if (Calendar.getInstance().get(Calendar.DATE) == 1) {
|
|
|
|
log.info("StatsProjectServiceImpl.customerGridStats-开始执行机关月统计方法,方法名:gridMonthProjectStats,客户Id:"+customerId); |
|
|
|
gridMonthProjectStats(customerId, dimId, dimGridList); |
|
|
|
try { |
|
|
|
log.info("StatsProjectServiceImpl.customerGridStats-开始执行机关月统计方法,方法名:gridMonthProjectStats,客户Id:" + customerId); |
|
|
|
gridMonthProjectStats(customerId, dimId, dimGridList); |
|
|
|
} catch (Exception e) { |
|
|
|
log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "gridMonthProjectStats", customerId, dimId.getMonthId(), e.getMessage())); |
|
|
|
} |
|
|
|
//}
|
|
|
|
} |
|
|
|
|
|
|
@ -537,11 +553,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()); |
|
|
|
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()); |
|
|
|
log.info("StatsProjectServiceImpl.gridDateProjectStats-批量新增网格项目日统计表数据,对应客户Id:" + customerId + ",日维度Id:" + dimId.getDateId()); |
|
|
|
factGridProjectDailyService.insertBatch(gridDateEntityList); |
|
|
|
} |
|
|
|
|
|
|
@ -616,11 +632,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()); |
|
|
|
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()); |
|
|
|
log.info("StatsProjectServiceImpl.gridMonthProjectStats-批量新增网格项目月统计表数据,对应客户Id:" + customerId + ",月维度Id:" + dimId.getMonthId()); |
|
|
|
factGridProjectMonthlyService.insertBatch(monthlyEntityList); |
|
|
|
} |
|
|
|
|
|
|
@ -636,7 +652,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) { |
|
|
|