下钻接口修改搜索字段

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/JGDPStatisticsServiceImpl.java

@@ -1572,9 +1572,9 @@ public class JGDPStatisticsServiceImpl {
             }
             Map<String, Object> itemResult = new HashMap<>();
             itemResult.put("xdata", r.getRegionName());
-            List<Long> ydata = this.countBizFinishedNumForDetail(filterParamDto, dpFilterParamForDetailDto.getBusinessType());
+            List<Long> ydata = this.countBizFinishedNumForDetail(filterParamDto, dpFilterParamForDetailDto.getTreeValue());
             BigDecimal finishedNum = BigDecimal.valueOf(ydata.stream().mapToLong(Long::longValue).sum());
-            List<Long> everyInFlow = countBizDataInFlowingForDetail(filterParamDto, dpFilterParamForDetailDto.getBusinessType());
+            List<Long> everyInFlow = countBizDataInFlowingForDetail(filterParamDto, dpFilterParamForDetailDto.getTreeValue());
             BigDecimal everyNum = BigDecimal.valueOf(everyInFlow.stream().mapToLong(Long::longValue).sum());
             BigDecimal all = everyNum.add(finishedNum);
             if (all.compareTo(BigDecimal.ZERO) > 0) {
@@ -1644,17 +1644,17 @@ public class JGDPStatisticsServiceImpl {
             filterParamDto.setBeginDate(dpFilterParamForDetailDto.getTimeSearchOne().getBeginDate());
             filterParamDto.setEndDate(dpFilterParamForDetailDto.getTimeSearchOne().getEndDate());
         }
-        if(BusinessTypeEnum.AZGZ.getCode().equals(dpFilterParamForDetailDto.getBusinessType())){
+        if(BusinessTypeEnum.AZGZ.getCode().equals(dpFilterParamForDetailDto.getTreeValue())){
             maps = commonMapper.countBizFinishedNumForDPListAZGZ(page, orgCode, filterParamDto);
-        }else if(BusinessTypeEnum.JDJY.getCode().equals(dpFilterParamForDetailDto.getBusinessType())){
+        }else if(BusinessTypeEnum.JDJY.getCode().equals(dpFilterParamForDetailDto.getTreeValue())){
             maps = commonMapper.countBizFinishedNumForDPListJDJY(page, orgCode, filterParamDto);
-        }else if(BusinessTypeEnum.SYDJ.getCode().equals(dpFilterParamForDetailDto.getBusinessType())){
+        }else if(BusinessTypeEnum.SYDJ.getCode().equals(dpFilterParamForDetailDto.getTreeValue())){
             maps = commonMapper.countBizFinishedNumForDPListSYDJ(page, orgCode, filterParamDto);
-        }else if(BusinessTypeEnum.DQJY.getCode().equals(dpFilterParamForDetailDto.getBusinessType())){
+        }else if(BusinessTypeEnum.DQJY.getCode().equals(dpFilterParamForDetailDto.getTreeValue())){
             maps = commonMapper.countBizFinishedNumForDPListDQJY(page, orgCode, filterParamDto);
-        }else if(BusinessTypeEnum.BGDJ.getCode().equals(dpFilterParamForDetailDto.getBusinessType())){
+        }else if(BusinessTypeEnum.BGDJ.getCode().equals(dpFilterParamForDetailDto.getTreeValue())){
             maps = commonMapper.countBizFinishedNumForDPListBGDJ(page, orgCode, filterParamDto);
-        }else if(BusinessTypeEnum.ZXBX.getCode().equals(dpFilterParamForDetailDto.getBusinessType())){
+        }else if(BusinessTypeEnum.ZXBX.getCode().equals(dpFilterParamForDetailDto.getTreeValue())){
             maps = commonMapper.countBizFinishedNumForDPListZXBX(page, orgCode, filterParamDto);
         }else {
             maps = commonMapper.countBizFinishedNumForDPList(page, orgCode, filterParamDto);

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/JYJCDPStatisticsServiceImpl.java

@@ -889,9 +889,9 @@ public class JYJCDPStatisticsServiceImpl {
             }
             Map<String, Object> itemResult = new HashMap<>();
             itemResult.put("xdata", r.getRegionName());
-            Long ydata = this.countBizFinishedNumForDetail(filterParamDto, dpFilterParamForDetailDto.getBusinessType());
+            Long ydata = this.countBizFinishedNumForDetail(filterParamDto, dpFilterParamForDetailDto.getTreeValue());
             BigDecimal finishedNum = BigDecimal.valueOf(ydata);
-            Long everyInFlow = this.countBizDataInFlowingForDetail(filterParamDto,dpFilterParamForDetailDto.getBusinessType());
+            Long everyInFlow = this.countBizDataInFlowingForDetail(filterParamDto,dpFilterParamForDetailDto.getTreeValue());
             BigDecimal everyNum = BigDecimal.valueOf(everyInFlow);
             BigDecimal all = everyNum.add(finishedNum);
             if (all.compareTo(BigDecimal.ZERO) > 0) {
@@ -967,7 +967,7 @@ public class JYJCDPStatisticsServiceImpl {
             filterParamDto.setBeginDate(dpFilterParamForDetailDto.getTimeSearchOne().getBeginDate());
             filterParamDto.setEndDate(dpFilterParamForDetailDto.getTimeSearchOne().getEndDate());
         }
-        Page<Map<String, Object>> maps = inspectionApplicationMapper.getInspectDetailList(page, orgCode, filterParamDto, dpFilterParamForDetailDto.getBusinessType());
+        Page<Map<String, Object>> maps = inspectionApplicationMapper.getInspectDetailList(page, orgCode, filterParamDto, dpFilterParamForDetailDto.getTreeValue());
         return maps;
     }