打款问题处理

hx-account/src/main/java/com/fjhx/account/entity/account/vo/AccountPaymentVo.java

@@ -4,6 +4,8 @@ import com.fjhx.account.entity.account.po.AccountPayment;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /**
  * 打款表列表查询返回值实体
  *
@@ -33,10 +35,15 @@ public class AccountPaymentVo extends AccountPayment {
     /**
      * 实际打款的付款账户名称
      */
-    private  String accountManagementName;
+    private String accountManagementName;
 
     /**
      * 业务中选中的付款账户名称
      */
-    private  String businessManagementName;
+    private String businessManagementName;
+
+    /**
+     * 打开记录列表
+     */
+    private List<AccountPaymentRecordsVo> accountPaymentRecordsList;
 }

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

@@ -12,6 +12,7 @@ import com.fjhx.account.entity.account.dto.AccountPaymentDto;
 import com.fjhx.account.entity.account.dto.AccountRequestFundsSelectDto;
 import com.fjhx.account.entity.account.enums.PaymentStatusEnum;
 import com.fjhx.account.entity.account.po.*;
+import com.fjhx.account.entity.account.vo.AccountPaymentRecordsVo;
 import com.fjhx.account.entity.account.vo.AccountPaymentVo;
 import com.fjhx.account.mapper.account.AccountPaymentMapper;
 import com.fjhx.account.service.account.*;
@@ -19,6 +20,7 @@ import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.common.service.corporation.CorporationService;
 import com.fjhx.common.utils.Assert;
 import com.fjhx.file.utils.ObsFileUtil;
+import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.system.service.ISysDeptService;
@@ -153,6 +155,15 @@ public class AccountPaymentServiceImpl extends ServiceImpl<AccountPaymentMapper,
             }
 
         }
+
+        //赋值打款记录
+        List<AccountPaymentRecords> accountPaymentRecordsList = accountPaymentRecordsService.list(q -> q
+                .eq(AccountPaymentRecords::getAccountPaymentId, id)
+                .orderByAsc(BasePo::getCreateTime)
+        );
+        List<AccountPaymentRecordsVo> accountPaymentRecordsVos = BeanUtil.copyToList(accountPaymentRecordsList, AccountPaymentRecordsVo.class);
+        result.setAccountPaymentRecordsList(accountPaymentRecordsVos);
+
         return result;
     }