数据中心--资产负债表其他应收应付款原来数据来源不取

data-finance/finance-balance-sheet/src/main/java/com/bailuntec/balancesheet/service/BalanceSheetService.java

@@ -637,16 +637,16 @@ public class BalanceSheetService {
             if(amountBorrowedSum == null) amountBorrowedSum = BigDecimal.ZERO;
             dcBalanceSheet.setAmountBorrowed(amountBorrowedSum);
             // 其他应收款
-            BigDecimal otherAccountsReceivable = dcOtherCostMapper.getOtherAccountsReceivableSum(date); // 其他应收款(加借支单未还金额)
-            if(otherAccountsReceivable == null) otherAccountsReceivable = BigDecimal.ZERO;
-            dcBalanceSheet.setOtherAccountsReceivable(otherAccountsReceivable.add(amountBorrowedSum).add(otherAccountsReceivableImport));
+            /*BigDecimal otherAccountsReceivable = dcOtherCostMapper.getOtherAccountsReceivableSum(date); // 其他应收款(加借支单未还金额)
+            if(otherAccountsReceivable == null) otherAccountsReceivable = BigDecimal.ZERO;*/
+            dcBalanceSheet.setOtherAccountsReceivable(amountBorrowedSum.add(otherAccountsReceivableImport));
         }
 
         if(otherAccountsPayableImport != null) {
             // 其他应付款
-            BigDecimal otherAccountsPayable = dcOtherCostMapper.getOtherAccountsPayableSum(date);
-            if(otherAccountsPayable == null) otherAccountsPayable = BigDecimal.ZERO;
-            dcBalanceSheet.setOtherAccountsPayable(otherAccountsPayable.add(otherAccountsPayableImport));
+            /*BigDecimal otherAccountsPayable = dcOtherCostMapper.getOtherAccountsPayableSum(date);
+            if(otherAccountsPayable == null) otherAccountsPayable = BigDecimal.ZERO;*/
+            dcBalanceSheet.setOtherAccountsPayable(otherAccountsPayableImport);
         }
 
         if(fixedAssetsImport != null) {
@@ -755,7 +755,7 @@ public class BalanceSheetService {
     @Transactional
     public void generateBalanceSheet(Integer companyValue, String companyName, Date date) {
         // 生成资产负债表
-    //    dcBalanceSheetMapper.insertBalanceSheet(companyValue, companyName, date);
+        dcBalanceSheetMapper.insertBalanceSheet(companyValue, companyName, date);
 
         DcBalanceSheet dcBalanceSheet = new DcBalanceSheet();
         // 银行账户余额汇总
@@ -781,12 +781,12 @@ public class BalanceSheetService {
         if(amountBorrowedSum == null) amountBorrowedSum = BigDecimal.ZERO;
         dcBalanceSheet.setAmountBorrowed(amountBorrowedSum);
         // 其他应收款、其他应付款
-        BigDecimal otherAccountsReceivable = dcOtherCostMapper.getOtherAccountsReceivableSum(date); // 其他应收款(加借支单未还金额)
-        if(otherAccountsReceivable == null) otherAccountsReceivable = BigDecimal.ZERO;
-        dcBalanceSheet.setOtherAccountsReceivable(otherAccountsReceivable.add(amountBorrowedSum));
-        BigDecimal otherAccountsPayable = dcOtherCostMapper.getOtherAccountsPayableSum(date); // 其他应付款
+        /*BigDecimal otherAccountsReceivable = dcOtherCostMapper.getOtherAccountsReceivableSum(date); // 其他应收款(加借支单未还金额)
+        if(otherAccountsReceivable == null) otherAccountsReceivable = BigDecimal.ZERO;*/
+        dcBalanceSheet.setOtherAccountsReceivable(amountBorrowedSum);
+        /*BigDecimal otherAccountsPayable = dcOtherCostMapper.getOtherAccountsPayableSum(date); // 其他应付款
         if(otherAccountsPayable == null) otherAccountsPayable = BigDecimal.ZERO;
-        dcBalanceSheet.setOtherAccountsPayable(otherAccountsPayable);
+        dcBalanceSheet.setOtherAccountsPayable(otherAccountsPayable);*/
         // 固定资产
         BigDecimal fixedAssetsSum = dcFixedAssetsDetailMapper.getFixedAssetsSum(date);
         if(fixedAssetsSum == null) fixedAssetsSum = BigDecimal.ZERO;