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