From 32f38db040141f9a96dfb92e6f9b6263abf2c88a Mon Sep 17 00:00:00 2001 From: jinbooks_dev Date: Wed, 11 Jun 2025 09:39:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/StatementBalanceSheetConfigServiceImpl.java | 10 +++++----- .../service/impl/StatementBalanceSheetServiceImpl.java | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/StatementBalanceSheetConfigServiceImpl.java b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/StatementBalanceSheetConfigServiceImpl.java index 3248eaf..492b840 100644 --- a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/StatementBalanceSheetConfigServiceImpl.java +++ b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/StatementBalanceSheetConfigServiceImpl.java @@ -20,6 +20,7 @@ package com.jinbooks.persistence.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.jinbooks.constants.ConstsSysConfig; import com.jinbooks.entity.Message; import com.jinbooks.entity.statement.StatementBalanceSheet; import com.jinbooks.entity.statement.StatementBalanceSheetItem; @@ -67,10 +68,9 @@ public class StatementBalanceSheetConfigServiceImpl implements StatementBalanceS */ @Override public Message get(String bookId, String itemCode) { - StatementBalanceSheet balanceSheet = getBalanceSheetCurrentPeriod(bookId); LambdaQueryWrapper itemLqw = Wrappers.lambdaQuery(); 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); StatementBalanceSheetItem balanceSheetItem = statementBalanceSheetItemMapper.selectOne(itemLqw); @@ -107,12 +107,12 @@ public class StatementBalanceSheetConfigServiceImpl implements StatementBalanceS */ @Override public Message list(String bookId) { - StatementBalanceSheet balanceSheet = getBalanceSheetCurrentPeriod(bookId); + //StatementBalanceSheet balanceSheet = getBalanceSheetCurrentPeriod(bookId); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(StatementBalanceSheetItem::getBookId, bookId); - lqw.eq(StatementBalanceSheetItem::getBalanceSheetId, balanceSheet.getId()); + lqw.eq(StatementBalanceSheetItem::getBalanceSheetId, ConstsSysConfig.SYS_CONFIG_TEMPLATE_ID); List balanceSheets = statementBalanceSheetItemMapper.selectList(lqw); - refreshItemsBalance(balanceSheets, bookId, balanceSheet.getYearPeriod()); + refreshItemsBalance(balanceSheets, bookId, configSysService.getCurrentTerm(bookId)); StatementBalanceSheetItemListVo itemListVo = insertSubtotals(balanceSheets); itemListVo.getAssets().sort(Comparator.comparing(StatementBalanceSheetItem::getItemCode)); itemListVo.getLiability().sort(Comparator.comparing(StatementBalanceSheetItem::getItemCode)); diff --git a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/StatementBalanceSheetServiceImpl.java b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/StatementBalanceSheetServiceImpl.java index 98df7fe..6f6b521 100644 --- a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/StatementBalanceSheetServiceImpl.java +++ b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/StatementBalanceSheetServiceImpl.java @@ -115,10 +115,10 @@ public class StatementBalanceSheetServiceImpl implements StatementBalanceSheetSe item.setBookId(dto.getBookId()); item.setInitialBalance(BigDecimal.ZERO); item.setCurrentBalance(BigDecimal.ZERO); - balanceSheetItemMapper.insert(item); + //balanceSheetItemMapper.insert(item); } - balanceSheetMapper.insert(balanceSheet); + //balanceSheetMapper.insert(balanceSheet); } // 遍历月份，统计总金额