@@ -128,18 +128,18 @@
+
+
+ {{ formatAmount(scope.row.liabilityCurrentBalance, '') }}
+
+
{{ formatAmount(scope.row.liabilityInitialBalance, '') }}
-
-
- {{ formatAmount(scope.row.liabilityCurrentBalance, '') }}
-
-
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..622adad 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));
@@ -135,7 +135,7 @@ public class StatementBalanceSheetConfigServiceImpl implements StatementBalanceS
// updateSortIndex(dto, StatementSymbolEnum.PLUS);
statementBalanceSheetItemMapper.updateById(dto);
// 规则更新
- if (dto.getRules() != null && !dto.getRules().isEmpty()) {
+ if (dto.getRules() != null) {
for (StatementRules rule : dto.getRules()) {
rule.setItemCode(dto.getItemCode());
rule.setBookId(dto.getBookId());
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 c3c8aa6..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);
}
// 遍历月份,统计总金额
@@ -126,9 +126,7 @@ public class StatementBalanceSheetServiceImpl implements StatementBalanceSheetSe
balanceSheetConfigService.refreshItemsBalance(items, dto.getBookId(), month);
}
}
- }
- // 拉取历史数据
- else {
+ }else {// 拉取历史数据
// 查询条目
LambdaQueryWrapper itemLqw = Wrappers.lambdaQuery();
itemLqw.eq(StatementBalanceSheetItem::getBookId, dto.getBookId());
diff --git a/jinbooks/jinbooks-web/src/main/java/com/jinbooks/web/statement/controller/StatementBalanceSheetController.java b/jinbooks/jinbooks-web/src/main/java/com/jinbooks/web/statement/controller/StatementBalanceSheetController.java
index 48bee5f..0317453 100644
--- a/jinbooks/jinbooks-web/src/main/java/com/jinbooks/web/statement/controller/StatementBalanceSheetController.java
+++ b/jinbooks/jinbooks-web/src/main/java/com/jinbooks/web/statement/controller/StatementBalanceSheetController.java
@@ -57,7 +57,7 @@ public class StatementBalanceSheetController {
@CurrentUser UserInfo userInfo) {
dto.setBookId(userInfo.getBookId());
validParams(dto);
- return statementBalanceSheetService.queryBalanceSheet(dto, true);
+ return statementBalanceSheetService.queryBalanceSheet(dto, false);
}
/**
diff --git a/jinbooks/jinbooks-web/src/main/java/com/jinbooks/web/statement/controller/StatementIncomeController.java b/jinbooks/jinbooks-web/src/main/java/com/jinbooks/web/statement/controller/StatementIncomeController.java
index 1794a51..e10c436 100644
--- a/jinbooks/jinbooks-web/src/main/java/com/jinbooks/web/statement/controller/StatementIncomeController.java
+++ b/jinbooks/jinbooks-web/src/main/java/com/jinbooks/web/statement/controller/StatementIncomeController.java
@@ -59,7 +59,7 @@ public class StatementIncomeController {
dto.setBookId(userInfo.getBookId());
validParams(dto);
log.debug("StatementParamsDto {} ", dto);
- return statementIncomeService.getIncomeStatement(dto, true);
+ return statementIncomeService.getIncomeStatement(dto, false);
}
/**