Merge branch 'main' of gitee.com:jinbooks/jinbooks

jinbooks-ui/src/views/statement/balance-sheet.vue

@@ -99,16 +99,16 @@
             </template>
           </el-table-column>
           <el-table-column label="行次" align="center" prop="sortIndex" width="100"/>
-          <el-table-column label="年初余额" align="right" header-align="center" width="140" prop="initialBalance">
-            <template #default="scope">
-              {{ formatAmount(scope.row.initialBalance, '') }}
-            </template>
-          </el-table-column>
           <el-table-column label="期末余额" align="right" header-align="center" width="140" prop="currentBalance">
             <template #default="scope">
               {{ formatAmount(scope.row.currentBalance, '') }}
             </template>
           </el-table-column>
+          <el-table-column label="年初余额" align="right" header-align="center" width="140" prop="initialBalance">
+            <template #default="scope">
+              {{ formatAmount(scope.row.initialBalance, '') }}
+            </template>
+          </el-table-column>
           <el-table-column v-if="ableEdit" label="操作" align="center" width="100">
             <template #default="scope">
               <div v-if="scope.row.itemName !='' ">
@@ -128,18 +128,18 @@
             </template>
           </el-table-column>
           <el-table-column label="行次" align="center" width="100" prop="liabilitySortIndex"/>
-          <el-table-column label="年初余额" align="right" header-align="center" width="140"
-                           prop="liabilityInitialBalance">
-            <template #default="scope">
-              {{ formatAmount(scope.row.liabilityInitialBalance, '') }}
-            </template>
-          </el-table-column>
            <el-table-column label="期末余额" align="right" header-align="center" width="140"
                            prop="liabilityCurrentBalance">
             <template #default="scope">
               {{ formatAmount(scope.row.liabilityCurrentBalance, '') }}
             </template>
           </el-table-column>
+          <el-table-column label="年初余额" align="right" header-align="center" width="140"
+                           prop="liabilityInitialBalance">
+            <template #default="scope">
+              {{ formatAmount(scope.row.liabilityInitialBalance, '') }}
+            </template>
+          </el-table-column>
 
           <el-table-column v-if="ableEdit" label="操作" align="center" width="100">
             <template #default="scope">

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<StatementBalanceSheetItem> get(String bookId, String itemCode) {
-        StatementBalanceSheet balanceSheet = getBalanceSheetCurrentPeriod(bookId);
         LambdaQueryWrapper<StatementBalanceSheetItem> 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<StatementBalanceSheetItemListVo> list(String bookId) {
-        StatementBalanceSheet balanceSheet = getBalanceSheetCurrentPeriod(bookId);
+        //StatementBalanceSheet balanceSheet = getBalanceSheetCurrentPeriod(bookId);
         LambdaQueryWrapper<StatementBalanceSheetItem> lqw = Wrappers.lambdaQuery();
         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);
-        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());

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<StatementBalanceSheetItem> itemLqw = Wrappers.lambdaQuery();
             itemLqw.eq(StatementBalanceSheetItem::getBookId, dto.getBookId());

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);
     }
 
     /**

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);
     }
 
     /**