xuemingqiang/jinbooks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
jinbooks_dev
2025-06-11 09:39:56 +08:00
parent 7740b5de8e
commit 32f38db040
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/StatementBalanceSheetConfigServiceImpl.java
View File

@ -20,6 +20,7 @@ package com.jinbooks.persistence.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.jinbooks.constants.ConstsSysConfig;
import com.jinbooks.entity.Message; import com.jinbooks.entity.Message;
import com.jinbooks.entity.statement.StatementBalanceSheet; import com.jinbooks.entity.statement.StatementBalanceSheet;
import com.jinbooks.entity.statement.StatementBalanceSheetItem; import com.jinbooks.entity.statement.StatementBalanceSheetItem;
@ -67,10 +68,9 @@ public class StatementBalanceSheetConfigServiceImpl implements StatementBalanceS
*/ */
@Override @Override
public Message<StatementBalanceSheetItem> get(String bookId, String itemCode) { public Message<StatementBalanceSheetItem> get(String bookId, String itemCode) {
StatementBalanceSheet balanceSheet = getBalanceSheetCurrentPeriod(bookId);
LambdaQueryWrapper<StatementBalanceSheetItem> itemLqw = Wrappers.lambdaQuery(); LambdaQueryWrapper<StatementBalanceSheetItem> itemLqw = Wrappers.lambdaQuery();
itemLqw.eq(StatementBalanceSheetItem::getBookId, bookId); itemLqw.eq(StatementBalanceSheetItem::getBookId, bookId);
itemLqw.eq(StatementBalanceSheetItem::getBalanceSheetId, balanceSheet.getId()); itemLqw.eq(StatementBalanceSheetItem::getBalanceSheetId, ConstsSysConfig.SYS_CONFIG_TEMPLATE_ID);
itemLqw.eq(StatementBalanceSheetItem::getItemCode, itemCode); itemLqw.eq(StatementBalanceSheetItem::getItemCode, itemCode);
StatementBalanceSheetItem balanceSheetItem = statementBalanceSheetItemMapper.selectOne(itemLqw); StatementBalanceSheetItem balanceSheetItem = statementBalanceSheetItemMapper.selectOne(itemLqw);
@ -107,12 +107,12 @@ public class StatementBalanceSheetConfigServiceImpl implements StatementBalanceS
*/ */
@Override @Override
public Message<StatementBalanceSheetItemListVo> list(String bookId) { public Message<StatementBalanceSheetItemListVo> list(String bookId) {
StatementBalanceSheet balanceSheet = getBalanceSheetCurrentPeriod(bookId); //StatementBalanceSheet balanceSheet = getBalanceSheetCurrentPeriod(bookId);
LambdaQueryWrapper<StatementBalanceSheetItem> lqw = Wrappers.lambdaQuery(); LambdaQueryWrapper<StatementBalanceSheetItem> lqw = Wrappers.lambdaQuery();
lqw.eq(StatementBalanceSheetItem::getBookId, bookId); lqw.eq(StatementBalanceSheetItem::getBookId, bookId);
lqw.eq(StatementBalanceSheetItem::getBalanceSheetId, balanceSheet.getId()); lqw.eq(StatementBalanceSheetItem::getBalanceSheetId, ConstsSysConfig.SYS_CONFIG_TEMPLATE_ID);
List<StatementBalanceSheetItem> balanceSheets = statementBalanceSheetItemMapper.selectList(lqw); List<StatementBalanceSheetItem> balanceSheets = statementBalanceSheetItemMapper.selectList(lqw);
refreshItemsBalance(balanceSheets, bookId, balanceSheet.getYearPeriod()); refreshItemsBalance(balanceSheets, bookId, configSysService.getCurrentTerm(bookId));
StatementBalanceSheetItemListVo itemListVo = insertSubtotals(balanceSheets); StatementBalanceSheetItemListVo itemListVo = insertSubtotals(balanceSheets);
itemListVo.getAssets().sort(Comparator.comparing(StatementBalanceSheetItem::getItemCode)); itemListVo.getAssets().sort(Comparator.comparing(StatementBalanceSheetItem::getItemCode));
itemListVo.getLiability().sort(Comparator.comparing(StatementBalanceSheetItem::getItemCode)); itemListVo.getLiability().sort(Comparator.comparing(StatementBalanceSheetItem::getItemCode));

4
jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/StatementBalanceSheetServiceImpl.java
View File

@ -115,10 +115,10 @@ public class StatementBalanceSheetServiceImpl implements StatementBalanceSheetSe
item.setBookId(dto.getBookId()); item.setBookId(dto.getBookId());
item.setInitialBalance(BigDecimal.ZERO); item.setInitialBalance(BigDecimal.ZERO);
item.setCurrentBalance(BigDecimal.ZERO); item.setCurrentBalance(BigDecimal.ZERO);
balanceSheetItemMapper.insert(item); //balanceSheetItemMapper.insert(item);
} }
balanceSheetMapper.insert(balanceSheet); //balanceSheetMapper.insert(balanceSheet);
} }
// 遍历月份，统计总金额 // 遍历月份，统计总金额