1.业务全过程联调修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/CommonMapper.java

@@ -131,6 +131,6 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
      * @param dpFilterParamDto 过滤条件
      * @return 统计数量数组
      */
-    List<Long> countAllBizDataInFlowingForDP(@Param("orgCode")String orgCode, @Param("dto") DPFilterParamDto dpFilterParamDto);
+    List<Long> countAllInFlowingForDPNoFinishedBizData(@Param("orgCode")String orgCode, @Param("dto") DPFilterParamDto dpFilterParamDto);
 }
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/DPStatisticsServiceImpl.java

@@ -633,15 +633,20 @@ public class DPStatisticsServiceImpl {
     private String calPercentForBizCycleData(DPFilterParamDto dpFilterParamDto, Long allFinishedCount) {
         Long allBizDataInFlowingCount = this.countAllBizDataInFlowing(dpFilterParamDto);
         BigDecimal finish = new BigDecimal(String.valueOf(allFinishedCount));
-        BigDecimal total = new BigDecimal(String.valueOf(allBizDataInFlowingCount));
+        BigDecimal flowing = new BigDecimal(String.valueOf(allBizDataInFlowingCount));
+        BigDecimal total = finish.add(flowing);
+        if(total.compareTo(BigDecimal.ZERO) > 0){
             BigDecimal result = finish.divide(total, 2, RoundingMode.HALF_UP);
             BigDecimal percentage = result.multiply(new BigDecimal("100")).setScale(0, RoundingMode.HALF_UP);
             return percentage.toPlainString();
+        }  else {
+            return "0";
+        }
     }
 
     private Long countAllBizDataInFlowing(DPFilterParamDto dpFilterParamDto) {
         String orgCode = getAndSetOrgCode(dpFilterParamDto.getCityCode());
-        List<Long> inFlowingForDP = commonMapper.countAllBizDataInFlowingForDP(orgCode, dpFilterParamDto);
+        List<Long> inFlowingForDP = commonMapper.countAllInFlowingForDPNoFinishedBizData(orgCode, dpFilterParamDto);
         return inFlowingForDP.stream().mapToLong(e -> e).sum();
     }