请款分页添加打款id

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

@@ -61,4 +61,9 @@ public class AccountRequestFundsVo extends AccountRequestFunds {
      */
     private Long flowInfoId;
 
+    /**
+     * 打款id
+     */
+    private Long accountPaymentId;
+
 }

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

@@ -10,11 +10,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.account.entity.account.dto.AccountRequestFundsDto;
 import com.fjhx.account.entity.account.dto.AccountRequestFundsSelectDto;
 import com.fjhx.account.entity.account.po.AccountManagement;
+import com.fjhx.account.entity.account.po.AccountPayment;
 import com.fjhx.account.entity.account.po.AccountRequestFunds;
 import com.fjhx.account.entity.account.vo.AccountRequestFundsDetailVo;
 import com.fjhx.account.entity.account.vo.AccountRequestFundsVo;
 import com.fjhx.account.mapper.account.AccountRequestFundsMapper;
 import com.fjhx.account.service.account.AccountManagementService;
+import com.fjhx.account.service.account.AccountPaymentService;
 import com.fjhx.account.service.account.AccountRequestFundsDetailService;
 import com.fjhx.account.service.account.AccountRequestFundsService;
 import com.fjhx.common.constant.SourceConstant;
@@ -66,6 +68,8 @@ public class AccountRequestFundsServiceImpl extends ServiceImpl<AccountRequestFu
     private AccountManagementService accountManagementService;
     @Autowired
     private ISysRoleService sysRoleService;
+    @Autowired
+    private AccountPaymentService accountPaymentService;
 
     /**
      * 查询请款列表
@@ -148,12 +152,16 @@ public class AccountRequestFundsServiceImpl extends ServiceImpl<AccountRequestFu
         // 切换数据源
         DynamicDataSourceContextHolder.push(SourceConstant.BASE);
 
-        // 赋值流程实例id
         List<Long> accountRequestFundsIds = records.stream().map(AccountRequestFundsVo::getId).collect(Collectors.toList());
         if (ObjectUtil.isNotEmpty(accountRequestFundsIds)) {
+            // 赋值流程实例id
             Map<Long, Long> arfMap = flowExampleService.mapKV(FlowExample::getBusinessId, FlowExample::getId,
                     q -> q.in(FlowExample::getBusinessId, accountRequestFundsIds));
             records.forEach(item -> item.setFlowInfoId(arfMap.get(item.getId())));
+            //赋值打款id
+            Map<Long, Long> accountPaymentMap = accountPaymentService.mapKV(AccountPayment::getBusinessId, AccountPayment::getId,
+                    q -> q.in(AccountPayment::getBusinessId, accountRequestFundsIds));
+            records.forEach(item -> item.setAccountPaymentId(accountPaymentMap.get(item.getId())));
         }
 
         // 查询部门id列表