Browse Source

bug修复

dzx 6 months ago
parent
commit
34d8ade579

+ 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();