Commit 24c3a189 authored by suhuiguang's avatar suhuiguang

1,业务全过程近30天与详情保持一致

parent 479a59c1
...@@ -351,6 +351,15 @@ public class JGDPStatisticsServiceImpl { ...@@ -351,6 +351,15 @@ public class JGDPStatisticsServiceImpl {
} }
} }
private void setDefaultFilter30(DPFilterParamDto dpFilterParamDto) {
if (StringUtils.isEmpty(dpFilterParamDto.getBeginDate())) {
dpFilterParamDto.setBeginDate(cn.hutool.core.date.DateUtil.offsetDay(new Date(), -29).toDateStr());
}
if (StringUtils.isEmpty(dpFilterParamDto.getEndDate())) {
dpFilterParamDto.setEndDate(DateUtil.today());
}
}
public Map<String, Object> getCenterMapCountDataForGlobal(DPFilterParamDto dpFilterParamDto) { public Map<String, Object> getCenterMapCountDataForGlobal(DPFilterParamDto dpFilterParamDto) {
Map<String, Object> result = new HashMap<>(); Map<String, Object> result = new HashMap<>();
...@@ -853,7 +862,8 @@ public class JGDPStatisticsServiceImpl { ...@@ -853,7 +862,8 @@ public class JGDPStatisticsServiceImpl {
public Map<String, Object> queryBizCycleData(DPFilterParamDto dpFilterParamDto) { public Map<String, Object> queryBizCycleData(DPFilterParamDto dpFilterParamDto) {
Map<String, Object> result = new HashMap<>(); Map<String, Object> result = new HashMap<>();
this.setDefaultFilter(dpFilterParamDto); // 近30天
this.setDefaultFilter30(dpFilterParamDto);
result.put("xdata", Arrays.asList("安装告知", "监督检验", "使用登记", "定期检验", "变更登记", "注销报废")); result.put("xdata", Arrays.asList("安装告知", "监督检验", "使用登记", "定期检验", "变更登记", "注销报废"));
// 进行中 // 进行中
List<Long> everyFlowingNum = this.countBizDataInFlowing(dpFilterParamDto); List<Long> everyFlowingNum = this.countBizDataInFlowing(dpFilterParamDto);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment