平台协议-对接人统计

commons/src/main/java/com/jzg/commons/entity/finance/vo/SettlementReportQueryVo.java

@@ -13,6 +13,11 @@ import java.util.List;
 
 @Data
 public class SettlementReportQueryVo extends PageRequest {
+
+
+    @Schema(description = "是否结算完成， 10 结算完成，20 未结算完成")
+    private String isRemained;
+
     @Schema(description = "应收项/10车险20非车险30全部")
     private String accountsReceivable;
 

tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -6315,6 +6315,14 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
                     action.setUnSettledAmount(BigDecimalUtil.subtract(new BigDecimal(action.getTotalReceivable()),BigDecimal.ZERO).toString());
                 }
             }).toList();
+            // 根据实际情况判断，是否计算完成
+            if(StrUtil.isNotEmpty(settlementReportQueryVo.getIsRemained())){
+                if("10".equals(settlementReportQueryVo.getIsRemained())){
+                    records = records.stream().filter(action-> "0".equals(action.getUnSettledAmount())).toList();
+                }else if("20".equals(settlementReportQueryVo.getIsRemained())){
+                    records = records.stream().filter(action-> !"0".equals(action.getUnSettledAmount())).toList();
+                }
+            }
             receiverSettlementReport.setRecords(records);
         }
         return receiverSettlementReport;