瀏覽代碼

bug修复

dzx 1 年之前
父節點
當前提交
34d8ade579
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      src/main/java/com/xjrsoft/module/databoard/controller/DatadetailController.java

+ 1 - 1
src/main/java/com/xjrsoft/module/databoard/controller/DatadetailController.java

@@ -554,7 +554,7 @@ public class DatadetailController {
                 new QueryWrapper<WfSubscription>().lambda()
                         .between((dto.getStartDate() != null && dto.getEndDate() != null), WfSubscription::getShenQingRiQi4752, dto.getStartDate(), dto.getEndDate())
         );
-        double totalAmount = list.stream().filter(x -> x.getTotalAmount() != null).mapToDouble(WfSubscription::getTotalAmount).sum();
+        double totalAmount = list.stream().filter(x -> x.getTotalAmount() != null && x.getStatus() == 1).mapToDouble(WfSubscription::getTotalAmount).sum();
         result.setTotalAmount(totalAmount);
 
         int adoptCount = list.stream().filter(x -> x.getStatus() == 1).collect(Collectors.toList()).size();