1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/ExpenseInfoServiceImpl.java

@@ -276,7 +276,7 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
                                 .ne("status","已驳回")
                                 .eq("comp_id",expenseInfo.getCompId()));
                         if (!CollectionUtils.isEmpty(expenseInfoList)){
-                            money = expenseInfoList.stream().mapToDouble(ExpenseInfo::getAmountMoney).sum();
+                            money = money+ expenseInfoList.stream().mapToDouble(ExpenseInfo::getAmountMoney).sum();
                         }
                         //本次金额加上已请款金额>总粮款时
                         if (money+expenseInfo.getAmountMoney()>grainFund){
@@ -520,7 +520,7 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
                                 .ne("status","已驳回")
                                 .eq("comp_id",expenseInfo1.getCompId()));
                         if (!CollectionUtils.isEmpty(expenseInfoList)){
-                            money = expenseInfoList.stream().mapToDouble(ExpenseInfo::getAmountMoney).sum();
+                            money = money+ expenseInfoList.stream().mapToDouble(ExpenseInfo::getAmountMoney).sum();
                         }
                         //本次金额加上已请款金额>总粮款时
                         if (money+expenseInfo.getAmountMoney()>grainFund){