purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决多账户的明细合计的空bug

Browse Source
This commit is contained in:
jishenghua
2024-01-14 15:38:22 +08:00
parent 644abc7a14
commit 9f2dee507e
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
jshERP-boot/src/main/java/com/jsh/erp/service/account/AccountService.java
View File

@@ -331,15 +331,17 @@ public class AccountService {
List<DepotHead> dataList = accountMapperEx.getManyAccountSum(accountId, beginTime, endTime, forceFlag);
if (dataList != null) {
for (DepotHead depotHead : dataList) {
String accountIdList = depotHead.getAccountIdList();
String accountMoneyList = depotHead.getAccountMoneyList();
if(StringUtil.isNotEmpty(accountIdList) && StringUtil.isNotEmpty(accountMoneyList)) {
String[] aList = accountIdList.split(",");
String[] amList = accountMoneyList.split(",");
for (int i = 0; i < aList.length; i++) {
if (aList[i].equals(accountId.toString())) {
if(amList.length>0) {
accountSum = accountSum.add(new BigDecimal(amList[i]));
if(depotHead != null) {
String accountIdList = depotHead.getAccountIdList();
String accountMoneyList = depotHead.getAccountMoneyList();
if(StringUtil.isNotEmpty(accountIdList) && StringUtil.isNotEmpty(accountMoneyList)) {
String[] aList = accountIdList.split(",");
String[] amList = accountMoneyList.split(",");
for (int i = 0; i < aList.length; i++) {
if (aList[i].equals(accountId.toString())) {
if(amList.length>0) {
accountSum = accountSum.add(new BigDecimal(amList[i]));
}
}
}
}