push

yd-csf-service/src/main/java/com/yd/csf/service/dto/FnaQueryRequest.java

 package com.yd.csf.service.dto;
 package com.yd.csf.service.dto;
 
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yd.common.dto.PageDto;
 import com.yd.common.dto.PageDto;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -69,6 +71,12 @@ public class FnaQueryRequest extends PageDto implements Serializable {
     private String policyBizId;
     private String policyBizId;
 
 
     /**
     /**
+     * 创建人名称
+     */
+    @Schema(description = "创建人名称")
+    private String creatorName;
+
+    /**
      * 保单号
      * 保单号
      */
      */
     @Schema(description = "保单号")
     @Schema(description = "保单号")

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

 package com.yd.csf.service.model;
 package com.yd.csf.service.model;
 
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.Data;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
@@ -129,11 +126,23 @@ public class Fna implements Serializable {
     private String creatorId;
     private String creatorId;
 
 
     /**
     /**
+     * 创建人名称
+     */
+    @TableField(value = "creator_name", fill = FieldFill.INSERT)
+    private String creatorName;
+
+    /**
      * 更新人ID
      * 更新人ID
      */
      */
     private String updaterId;
     private String updaterId;
 
 
     /**
     /**
+     * 更新人名称
+     */
+    @TableField(value = "updater_name", fill = FieldFill.UPDATE)
+    private String updaterName;
+
+    /**
      * 创建时间
      * 创建时间
      */
      */
     private Date createTime;
     private Date createTime;

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

@@ -124,6 +124,7 @@ public class FnaServiceImpl extends ServiceImpl<FnaMapper, Fna> implements FnaSe
             return queryWrapper;
             return queryWrapper;
         }
         }
         String customerName = fnaQueryRequest.getCustomerName();
         String customerName = fnaQueryRequest.getCustomerName();
+        String creatorName = fnaQueryRequest.getCreatorName();
         String appointmentNo = fnaQueryRequest.getAppointmentNo();
         String appointmentNo = fnaQueryRequest.getAppointmentNo();
         String policyBizId = fnaQueryRequest.getPolicyBizId();
         String policyBizId = fnaQueryRequest.getPolicyBizId();
         String policyNo = fnaQueryRequest.getPolicyNo();
         String policyNo = fnaQueryRequest.getPolicyNo();
@@ -154,6 +155,8 @@ public class FnaServiceImpl extends ServiceImpl<FnaMapper, Fna> implements FnaSe
         queryWrapper.like(StringUtils.isNotBlank(policyBizId), "policy_biz_id", policyBizId);
         queryWrapper.like(StringUtils.isNotBlank(policyBizId), "policy_biz_id", policyBizId);
         // 保单号
         // 保单号
         queryWrapper.like(StringUtils.isNotBlank(policyNo), "policy_no", policyNo);
         queryWrapper.like(StringUtils.isNotBlank(policyNo), "policy_no", policyNo);
+        // 创建人名称
+        queryWrapper.like(StringUtils.isNotBlank(creatorName), "creator_name", creatorName);
 
 
         String sortField = fnaQueryRequest.getSortField();
         String sortField = fnaQueryRequest.getSortField();
         String sortOrder = fnaQueryRequest.getSortOrder();
         String sortOrder = fnaQueryRequest.getSortOrder();

yd-csf-service/src/main/java/com/yd/csf/service/vo/FnaVO.java

@@ -142,6 +142,12 @@ public class FnaVO implements Serializable {
     private Date createTime;
     private Date createTime;
 
 
     /**
     /**
+     * 创建人名称
+     */
+    @Schema(description = "创建人名称")
+    private String creatorName;
+
+    /**
      * 封装类转对象
      * 封装类转对象
      *
      *
      * @param fnaVO
      * @param fnaVO