采购付款记录添加付款账户

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

@@ -19,4 +19,14 @@ public class PurchasePayRecordDetailVo extends PurchasePayRecordDetail {
      */
     private String payUserName;
 
+    /**
+     * 付款账户id
+     */
+    private Long payAccountId;
+
+    /**
+     * 付款账户名称
+     */
+    private String payAccountName;
+
 }

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

@@ -6,6 +6,7 @@ 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;
@@ -41,6 +42,8 @@ public class PurchasePayRecordDetailServiceImpl extends ServiceImpl<PurchasePayR
     private PurchaseService purchaseService;
     @Autowired
     private PurchasePayRecordService purchasePayRecordService;
+    @Autowired
+    private AccountManagementService accountManagementService;
 
     @Override
     public Page<PurchasePayRecordDetailVo> getPage(PurchasePayRecordDetailSelectDto dto) {
@@ -49,6 +52,10 @@ 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;
     }
 
@@ -62,7 +69,7 @@ public class PurchasePayRecordDetailServiceImpl extends ServiceImpl<PurchasePayR
         String victoriatouristJson = purchase.getVictoriatouristJson();
         JSONObject json = ObjectUtil.isEmpty(victoriatouristJson) ? new JSONObject() : JSONObject.parseObject(victoriatouristJson);
         json.put("paidAmount", BigDecimal.ZERO);
-        purchase.setVictoriatouristJson(JSONObject.toJSONString(json,JSONWriter.Feature.WriteLongAsString));
+        purchase.setVictoriatouristJson(JSONObject.toJSONString(json, JSONWriter.Feature.WriteLongAsString));
         purchaseService.updateById(purchase);
 
         //清空付款记录记录信息

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

@@ -2,16 +2,17 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.purchase.mapper.purchase.PurchasePayRecordDetailMapper">
     <select id="getPage" resultType="com.fjhx.purchase.entity.purchase.vo.PurchasePayRecordDetailVo">
-        select
-            pprd.id,
-            pprd.purchase_id,
-            pprd.amount,
-            pprd.pay_date,
-            pprd.create_user,
-            pprd.create_time,
-            pprd.update_user,
-            pprd.update_time
-        from purchase_pay_record_detail pprd
+        SELECT pprd.id,
+               pprd.purchase_id,
+               pprd.amount,
+               pprd.pay_date,
+               pprd.create_user,
+               pprd.create_time,
+               pprd.update_user,
+               pprd.update_time,
+               ppr.pay_account_id
+        FROM purchase_pay_record_detail pprd
+                 LEFT JOIN purchase_pay_record ppr ON pprd.purchase_pay_record_id = ppr.id
             ${ew.customSqlSegment}
     </select>