资产负债表- 广州百伦供应链科技有限公司工会委员会不参与统计其他应收款

data-finance/finance-balance-sheet/src/main/java/com/bailuntec/balancesheet/mapper/DcBalanceSheetMapper.java

@@ -148,7 +148,7 @@ public interface DcBalanceSheetMapper {
     @Select("select finished_accounts_payable from dc_balance_sheet where statistical_time <= #{lastDay} and finished_accounts_payable > 0 order by finished_accounts_payable desc limit 1 ")
     BigDecimal getLogisticsAccountsPayableSumByOld(@Param("date") Date date);
 
-    @Select("select sum((amount - ifnull(had_pay, 0) + ifnull(compensate, 0)) * to_rmb_rate) from dc_daily_fee where recoed_time = #{lastDay} and company_value in (53,3,5,60,66,59,50,8,1,61,2,70)")
+    @Select("select sum((amount - ifnull(had_pay, 0) + ifnull(compensate, 0)) * to_rmb_rate) from dc_daily_fee where recoed_time = #{lastDay} and company_value in (53,3,5,60,66,59,50,8,1,61,2)")
     BigDecimal getAmountBorrowed(@Param("lastDay") Date lastDay);
 
     @Select("select accounts_receivable_import from dc_balance_sheet where statistical_time = #{lastDay} ")

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

@@ -576,7 +576,7 @@ public class BalanceSheetService {
         dcBalanceSheet.setSemiAccountsPayable(semiAccountsPayableSum);
         // 物流供应商应付款项
         BigDecimal logisticsAccountsPayableSum = dcBalanceSheetMapper.getLogisticsAccountsPayableInit(date);
-        if(logisticsAccountsPayableSum == null) {
+        if(logisticsAccountsPayableSum == null || logisticsAccountsPayableSum.compareTo(BigDecimal.ZERO) == 0) {
             logisticsAccountsPayableSum = dcBalanceSheetMapper.getLogisticsAccountsPayableSum(date);
             if(logisticsAccountsPayableSum == null){
                 logisticsAccountsPayableSum = dcBalanceSheetMapper.getLogisticsAccountsPayableSumByOld(date);
@@ -588,7 +588,7 @@ public class BalanceSheetService {
         dcBalanceSheet.setAccountsPayable(accountsPayableSum);
         // 应收款项
         BigDecimal accountsReceivableSum = dcBalanceSheetMapper.getAccountsReceivableImport(date);
-        if(accountsReceivableSum == null) {
+        if(accountsReceivableSum == null || accountsReceivableSum.compareTo(BigDecimal.ZERO) == 0) {
             accountsReceivableSum = dcSupplierTransactionMapper.getAccountsReceivable(date);
             if(accountsReceivableSum == null) accountsReceivableSum = BigDecimal.ZERO;
         }
@@ -818,7 +818,7 @@ public class BalanceSheetService {
         dcBalanceSheet.setWithdrawAmount(withdrawOnWaySum);
         // 第三方平台余额
         BigDecimal platformBalanceSum = dcBalanceSheetMapper.getPlatformBalanceUpdate(date);
-        if(platformBalanceSum == null) {
+        if(platformBalanceSum == null || platformBalanceSum.compareTo(BigDecimal.ZERO) == 0) {
             platformBalanceSum = dcPlatformBalanceMapper.getPlatformBalanceSum(date);
             if(platformBalanceSum == null) {
                 platformBalanceSum = dcBalanceSheetMapper.getPlatformBalanceSum(date);