push

yd-csf-service/src/main/java/com/yd/csf/service/model/Commission.java

@@ -165,11 +165,19 @@ public class Commission implements Serializable {
     /**
      * 创建人ID
      */
+    @TableField(value = "creator_id", fill = FieldFill.INSERT)
     private String creatorId;
 
     /**
+     * 创建人名称
+     */
+    @TableField(value = "creator_name", fill = FieldFill.INSERT)
+    private String creatorName;
+
+    /**
      * 更新人ID
      */
+    @TableField(value = "updater_id", fill = FieldFill.INSERT_UPDATE)
     private String updaterId;
 
     /**

yd-csf-service/src/main/java/com/yd/csf/service/model/CommissionExpected.java

 package com.yd.csf.service.model;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -178,14 +175,28 @@ public class CommissionExpected implements Serializable {
     /**
      * 创建人ID
      */
+    @TableField(value = "creator_id", fill = FieldFill.INSERT)
     private String creatorId;
 
     /**
+     * 创建人名称
+     */
+    @TableField(value = "creator_name", fill = FieldFill.INSERT)
+    private String creatorName;
+
+    /**
      * 更新人ID
      */
+    @TableField(value = "updater_id", fill = FieldFill.INSERT_UPDATE)
     private String updaterId;
 
     /**
+     * 更新人名称
+     */
+    @TableField(value = "updater_name", fill = FieldFill.INSERT_UPDATE)
+    private String updaterName;
+
+    /**
      * 创建时间
      */
     private Date createTime;

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionExpectedServiceImpl.java

@@ -263,6 +263,8 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
         vo.setCurrency(expected.getCurrency());
         vo.setCommissionType(expected.getCommissionType());
         vo.setAmount(expected.getAmount());
+        vo.setRealUpdaterName(expected.getUpdaterName());
+        vo.setRealUpdateTime(expected.getUpdateTime());
 
         // 填充保单信息
         Policy policy = policyMap.get(expected.getPolicyNo());
@@ -369,6 +371,8 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
         vo.setRemark(commission.getRemark());
         vo.setManualRemark(commission.getManualRemark());
         vo.setStatusDesc(commission.getStatusDesc());
+        vo.setRealUpdateTime(commission.getUpdateTime());
+        vo.setRealUpdaterName(commission.getUpdaterName());
 
         // 覆盖公共业务字段
 //        vo.setAmount(commission.getAmount());