Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -3891,12 +3891,24 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                             BigDecimal a1 = baseMapper.selectA1(busVinSid);
 //                            BigDecimal a2 = baseMapper.selectA2(busVinSid);
                             List<String> stringList = baseMapper.selectBys(loanRepaymentPlanDetails.getBusVinSid());
-                            BigDecimal a3 = baseMapper.selectA3(stringList);
+                            stringList.removeAll(Collections.singleton(null));
+                            BigDecimal a3 = BigDecimal.ZERO;
+                            if(!stringList.isEmpty()){
+                                a3 = baseMapper.selectA3(stringList);
+                            }
                             unall = unall.add(a1).add(a3);
                             List<String> unList = baseMapper.selectUnA(busVinSid);
+                            unList.removeAll(Collections.singleton(null));
+                            BigDecimal a4 = BigDecimal.ZERO;
+                            if(!unList.isEmpty()){
                                 //已收
-                            BigDecimal a4 = baseMapper.selectA4(unList);
-                            BigDecimal a5 = baseMapper.selectA5(stringList);
+                                a4 = baseMapper.selectA4(unList);
+                            }
+                            BigDecimal a5 = BigDecimal.ZERO;
+                            if(!stringList.isEmpty()){
+                                a5 = baseMapper.selectA5(stringList);
+                            }
+
                             yAll = yAll.add(a4).add(a5);
                         }
 
@@ -3905,13 +3917,25 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                         if (loanRepaymentPlanDetails != null) {
                             busVinSid = loanRepaymentPlanDetails.getBusVinSid();
                             List<String> stringList = baseMapper.selectBys(loanRepaymentPlanDetails.getBusVinSid());
-                            BigDecimal a3 = baseMapper.selectA3(stringList);
+                            stringList.removeAll(Collections.singleton(null));
+                            BigDecimal a3 = BigDecimal.ZERO;
+                            if(!stringList.isEmpty()){
+                                a3 = baseMapper.selectA3(stringList);
+                            }
                             BigDecimal a1 = baseMapper.selectA1(busVinSid);
                             unall = unall.add(a1).add(a3);
                             List<String> unList = baseMapper.selectUnA(busVinSid);
                             //已收
-                            BigDecimal a4 = baseMapper.selectA4(unList);
-                            BigDecimal a5 = baseMapper.selectA5(stringList);
+                            unList.removeAll(Collections.singleton(null));
+                            BigDecimal a4 = BigDecimal.ZERO;
+                            if(!unList.isEmpty()){
+                                //已收
+                                a4 = baseMapper.selectA4(unList);
+                            }
+                            BigDecimal a5 = BigDecimal.ZERO;
+                            if(!stringList.isEmpty()){
+                                a5 = baseMapper.selectA5(stringList);
+                            }
                             yAll = yAll.add(a4).add(a5);
                         }
                     }