bug fixed

src/main/java/cn/wisenergy/chnmuseum/party/model/Audit.java

 package cn.wisenergy.chnmuseum.party.model;
 
 import cn.wisenergy.chnmuseum.party.common.validator.groups.Add;
-import cn.wisenergy.chnmuseum.party.common.validator.groups.Update;
 import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -71,20 +70,27 @@ public class Audit implements Serializable {
 
     @ApiModelProperty("创建日期")
     @TableField(value = "create_time", fill = FieldFill.INSERT)
-    @NotNull(message = "创建日期不能为空", groups = {Add.class})
     private LocalDateTime createTime;
 
-    @ApiModelProperty("更新日期")
-    @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
-    private LocalDateTime updateTime;
+    @ApiModelProperty("初审时间")
+    @TableField("first_time")
+    private LocalDateTime firstTime;
+
+    @ApiModelProperty("复审时间")
+    @TableField("second_time")
+    private LocalDateTime secondTime;
 
     @ApiModelProperty("0：未删除，1：已删除")
     @TableField("is_deleted")
     private Boolean isDeleted;
 
-    @ApiModelProperty("备注")
-    @TableField("remarks")
-    private String remarks;
+    @ApiModelProperty("初审意见")
+    @TableField("first_remarks")
+    private String firstRemarks;
+
+    @ApiModelProperty("复审意见")
+    @TableField("second_remarks")
+    private String secondRemarks;
 
     @ApiModelProperty(value = "审核层级", allowableValues = "初审 TBC,复审 TBCA")
     @TableField("level")

src/main/resources/mapper/AuditMapper.xml

@@ -13,14 +13,17 @@
         <result column="operation" property="operation"/>
         <result column="status" property="status"/>
         <result column="create_time" property="createTime"/>
-        <result column="update_time" property="updateTime"/>
+        <result column="first_time" property="firstTime"/>
+        <result column="second_time" property="secondTime"/>
         <result column="is_deleted" property="isDeleted"/>
-        <result column="remarks" property="remarks"/>
+        <result column="first_remarks" property="firstRemarks"/>
+        <result column="second_remarks" property="secondRemarks"/>
+        <result column="level" property="level"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, content, organ_id, ref_item_id, user_id, type, operation, status, create_time, update_time, is_deleted, remarks
+        id, content, organ_id, ref_item_id, user_id, type, operation, status, create_time, first_time, second_time, is_deleted, first_remarks, second_remarks, level
     </sql>
 
     <select id="getUserList" resultMap="BaseResultMap">
@@ -30,7 +33,8 @@
         left join t_user u on u.id = a.user_id
         where 1 = 1
         <if test="user.userName != null and user.userName != ''">
-            and (u.user_name LIKE concat('%', #{user.userName}, '%') or a.content LIKE concat('%', #{user.userName}, '%'))
+            and (u.user_name LIKE concat('%', #{user.userName}, '%') or a.content LIKE concat('%', #{user.userName},
+            '%'))
         </if>
         <if test="user.status != null and user.status != ''">
             and a.status = #{user.status}
@@ -38,7 +42,7 @@
         <if test="user.auditStatus != null and user.auditStatus != ''">
             and a.level = #{user.auditStatus}
         </if>
-         <if test="user.orgCode != null and user.orgCode != ''">
+        <if test="user.orgCode != null and user.orgCode != ''">
             and o.code LIKE concat(#{user.orgCode}, '%')
         </if>
         and a.is_deleted = false