|
|
@@ -108,6 +108,8 @@ public class InvAccountServiceImpl extends ServiceImpl<InvAccountMapper, InvAcco
|
|
|
}).orElse(null)
|
|
|
).collect(Collectors.toList());
|
|
|
|
|
|
+ //本季度开票总额度和本年开票总额度
|
|
|
+ List<InvAccountSumAmount> sumYearAmount = insAccountMapper.getYearAndQuarterAmount();
|
|
|
|
|
|
collect1.forEach(invAccount -> {
|
|
|
if (invAccount != null) {
|
|
|
@@ -121,8 +123,7 @@ public class InvAccountServiceImpl extends ServiceImpl<InvAccountMapper, InvAcco
|
|
|
invAccount.setInvoicingAmountExcess(null);
|
|
|
}
|
|
|
}
|
|
|
- //本季度开票总额度和本年开票总额度
|
|
|
- List<InvAccountSumAmount> sumYearAmount = insAccountMapper.getYearAndQuarterAmount();
|
|
|
+
|
|
|
boolean found = false;
|
|
|
for (InvAccountSumAmount yearAmount : sumYearAmount) {
|
|
|
if (yearAmount.getAccountId().equals(invAccount.getAccountId())) {
|