采购付款修改

hx-purchase/src/main/java/com/fjhx/purchase/entity/purchase/po/PurchasePayRecord.java

@@ -32,8 +32,8 @@ public class PurchasePayRecord extends BasePo {
     private Date payDate;
 
     /**
-     * 付款账户id
+     * 付款账户 租房字典
      */
-    private Long payAccountId;
+    private String payAccount;
 
 }

hx-purchase/src/main/java/com/fjhx/purchase/entity/purchase/vo/PurchasePayRecordDetailVo.java

@@ -20,13 +20,8 @@ public class PurchasePayRecordDetailVo extends PurchasePayRecordDetail {
     private String payUserName;
 
     /**
-     * 付款账户id
+     * 付款账户
      */
-    private Long payAccountId;
-
-    /**
-     * 付款账户名称
-     */
-    private String payAccountName;
+    private String payAccount;
 
 }

hx-purchase/src/main/java/com/fjhx/purchase/service/purchase/impl/PurchasePayRecordDetailServiceImpl.java

@@ -6,7 +6,6 @@ import com.alibaba.fastjson2.JSONWriter;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.account.service.account.AccountManagementService;
 import com.fjhx.common.utils.Assert;
 import com.fjhx.purchase.entity.purchase.dto.PurchasePayRecordDetailSelectDto;
 import com.fjhx.purchase.entity.purchase.po.Purchase;
@@ -42,8 +41,6 @@ public class PurchasePayRecordDetailServiceImpl extends ServiceImpl<PurchasePayR
     private PurchaseService purchaseService;
     @Autowired
     private PurchasePayRecordService purchasePayRecordService;
-    @Autowired
-    private AccountManagementService accountManagementService;
 
     @Override
     public Page<PurchasePayRecordDetailVo> getPage(PurchasePayRecordDetailSelectDto dto) {
@@ -52,10 +49,6 @@ public class PurchasePayRecordDetailServiceImpl extends ServiceImpl<PurchasePayR
         wrapper.orderByDesc("pprd", PurchasePayRecordDetail::getId);
         Page<PurchasePayRecordDetailVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         UserUtil.assignmentNickName(page.getRecords(), PurchasePayRecordDetailVo::getCreateUser, PurchasePayRecordDetailVo::setPayUserName);
-        //赋值付款账户名称
-        accountManagementService.attributeAssign(page.getRecords(), PurchasePayRecordDetailVo::getPayAccountId, (item, accountManagement) -> {
-            item.setPayAccountName(accountManagement.getName());
-        });
         return page;
     }
 

hx-purchase/src/main/resources/mapper/purchase/PurchasePayRecordDetailMapper.xml

@@ -10,7 +10,7 @@
                pprd.create_time,
                pprd.update_user,
                pprd.update_time,
-               ppr.pay_account_id
+               ppr.pay_account
         FROM purchase_pay_record_detail pprd
                  LEFT JOIN purchase_pay_record ppr ON pprd.purchase_pay_record_id = ppr.id
             ${ew.customSqlSegment}