修改了打款的列表

hx-account/src/main/java/com/fjhx/account/entity/account/po/AccountRunningWater.java

@@ -26,6 +26,11 @@ public class AccountRunningWater extends BasePo {
     private Long accountManagementId;
 
     /**
+     * 账户-管理表ID
+     */
+    private Long businessId;
+
+    /**
      * 收支类型：10 收入，20支出
      */
     private String status;

hx-account/src/main/java/com/fjhx/account/flow/AccountRequestFundsFlow.java

@@ -67,9 +67,6 @@ public class AccountRequestFundsFlow extends FlowDelegate {
         }
         //添加附件信息
         ObsFileUtil.saveFile(accountRequestFundsDto.getFileList(),accountRequestFundsDto.getId());
-
-
-
         return accountRequestFundsDto.getId();
     }
 
@@ -105,8 +102,10 @@ public class AccountRequestFundsFlow extends FlowDelegate {
         accountPayment.setStatus(PaymentStatusEnum.UNDER_REVIEW.getKey());
         accountPayment.setPaymentTime(accountPayment.getPaymentTime());
         accountPayment.setPaymentRemark(accountRequestFundsDto.getPaymentRemarks());
+
         accountPayment.setDepartmentId(accountRequestFundsDto.getDepartmentId());
         accountPayment.setCorporationId(accountRequestFundsDto.getCorporationId());
+
         accountPayment.setPaymentMethod(accountRequestFundsDto.getPaymentMethod());
         accountPayment.setIncomeAmount(accountRequestFundsDto.getTotal());
         accountPayment.setName(accountRequestFundsDto.getName());

hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountDeptRunningWaterDetailServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fjhx.account.service.account.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fjhx.account.entity.account.po.AccountDeptRunningWater;
@@ -57,18 +58,21 @@ public class AccountDeptRunningWaterDetailServiceImpl extends ServiceImpl<Accoun
         AccountRunningWater accountRunningWater = accountRunningWaterService.getById(id);
         AccountRunningWaterVo accountRunningWaterVo = BeanUtil.toBean(accountRunningWater, AccountRunningWaterVo.class);
 
-        //查询资金流水-部门关联表的信息(一个流水对应一个部门)
-        AccountDeptRunningWater accountDeptRunningWater = accountDeptRunningWaterService.getOne(Wrappers.<AccountDeptRunningWater>lambdaQuery()
-                .eq(AccountDeptRunningWater::getRunningWaterId, accountRunningWater.getId()));
+        if (ObjectUtil.isNotEmpty(accountRunningWaterVo)){
+            //查询资金流水-部门关联表的信息(一个流水对应一个部门)
+            AccountDeptRunningWater accountDeptRunningWater = accountDeptRunningWaterService.getOne(Wrappers.<AccountDeptRunningWater>lambdaQuery()
+                    .eq(AccountDeptRunningWater::getRunningWaterId, accountRunningWater.getId()));
 
-        //查询资金流水分拆部门表明细
-        List<AccountDeptRunningWaterDetail> accountDeptRunningWaterDetailList = this.list(Wrappers.<AccountDeptRunningWaterDetail>lambdaQuery()
-                .eq(AccountDeptRunningWaterDetail::getDeptRunningWaterId, accountDeptRunningWater.getId()));
+            //查询资金流水分拆部门表明细
+            List<AccountDeptRunningWaterDetail> accountDeptRunningWaterDetailList = this.list(Wrappers.<AccountDeptRunningWaterDetail>lambdaQuery()
+                    .eq(AccountDeptRunningWaterDetail::getDeptRunningWaterId, accountDeptRunningWater.getId()));
+
+            //插入资金流水分拆部门表明细信息
+            accountRunningWaterVo.setAccountDeptRunningWaterDetailList(accountDeptRunningWaterDetailList);
+            //插入资金流水-部门关联表ID
+            accountRunningWaterVo.setAccountDeptRunningWaterId(accountDeptRunningWater.getId());
+        }
 
-        //插入资金流水分拆部门表明细信息
-        accountRunningWaterVo.setAccountDeptRunningWaterDetailList(accountDeptRunningWaterDetailList);
-        //插入资金流水-部门关联表ID
-        accountRunningWaterVo.setAccountDeptRunningWaterId(accountDeptRunningWater.getId());
         return accountRunningWaterVo;
     }
 

hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountPaymentServiceImpl.java

@@ -116,13 +116,19 @@ public class AccountPaymentServiceImpl extends ServiceImpl<AccountPaymentMapper,
         if (ObjectUtil.isNotEmpty(result.getAccountManagementId())){
             //查询实际打款的付款账户名称；
             AccountManagement accountManagement = accountManagementService.getById(result.getAccountManagementId());
-            result.setAccountManagementName(accountManagement.getName());
+            if (ObjectUtil.isNotEmpty(accountManagement)){
+                result.setAccountManagementName(accountManagement.getName());
+            }
+
         }
 
         if (ObjectUtil.isNotEmpty(result.getBusinessManagementId())){
             //查询业务中选中的付款账户名称；
             AccountManagement accountManagement = accountManagementService.getById(result.getBusinessManagementId());
-            result.setBusinessManagementName(accountManagement.getName());
+            if (ObjectUtil.isNotEmpty(accountManagement)){
+                result.setBusinessManagementName(accountManagement.getName());
+            }
+
         }
         return result;
     }
@@ -188,6 +194,7 @@ public class AccountPaymentServiceImpl extends ServiceImpl<AccountPaymentMapper,
         accountRunningWater.setName(accountPaymentDto.getName());
         accountRunningWater.setTransactionTime(accountPaymentDto.getExpensesTime());
         accountRunningWater.setRemarks(accountPaymentDto.getRemark());
+        accountRunningWater.setBusinessId(accountPaymentDto.getId());
         accountRunningWaterService.save(accountRunningWater);
 
     }

hx-account/src/main/resources/mapper/account/AccountRunningWaterMapper.xml

@@ -6,6 +6,7 @@
             arw.id,
             arw.account_management_id,
             arw.status,
+            arw.business_id,
             arw.amount,
             arw.currency,
             arw.name,
@@ -28,6 +29,7 @@
             arw.id,
             arw.account_management_id,
             arw.status,
+            arw.business_id,
             arw.amount,
             arw.currency,
             arw.name,