添加发起协作时间

doc-biz/src/main/java/com/doc/biz/domain/DocActor.java

@@ -6,8 +6,7 @@ import com.doc.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import lombok.Data;
 
 import java.util.Date;
 
@@ -17,6 +16,7 @@ import java.util.Date;
  * @author wukai
  * @date 2023-09-18
  */
+@Data
 @ApiModel(value = "DocActor", description = "文档协作")
 public class DocActor extends BaseEntity {
     private static final long serialVersionUID = 1L;
@@ -43,36 +43,11 @@ public class DocActor extends BaseEntity {
     @Excel(name = "归档时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date filedTime;
 
-    public void setDocId(Long docId) {
-        this.docId = docId;
-    }
-
-    public Long getDocId() {
-        return docId;
-    }
-
-    public void setIsFiled(String isFiled) {
-        this.isFiled = isFiled;
-    }
-
-    public String getIsFiled() {
-        return isFiled;
-    }
-
-    public void setFiledTime(Date filedTime) {
-        this.filedTime = filedTime;
-    }
-
-    public Date getFiledTime() {
-        return filedTime;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("docId", getDocId())
-                .append("isFiled", getIsFiled())
-                .append("filedTime", getFiledTime())
-                .toString();
-    }
+    /**
+     * 发起协作时间
+     */
+    @ApiModelProperty("发起协作时间")
+    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    @Excel(name = "归档时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date actorTime;
 }

doc-biz/src/main/java/com/doc/biz/domain/DocInfo.java

@@ -83,6 +83,11 @@ public class DocInfo extends BaseEntity {
     @TableField(exist = false)
     private Date filedTime;
 
+    @ApiModelProperty("发起协作时间")
+    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    @TableField(exist = false)
+    private Date actorTime;
+
     @ApiModelProperty("空间信息")
     @TableField(exist = false)
     private DocSpace space;

doc-biz/src/main/java/com/doc/biz/service/impl/DocActorServiceImpl.java

@@ -7,6 +7,7 @@ import com.doc.biz.service.IDocActorService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -50,6 +51,7 @@ public class DocActorServiceImpl implements IDocActorService {
      */
     @Override
     public int insertDocActor(DocActor docActor) {
+        docActor.setActorTime(new Date());
         return docActorMapper.insertDocActor(docActor);
     }
 

doc-biz/src/main/resources/mapper/biz/DocActorMapper.xml

@@ -8,6 +8,7 @@
         <result property="docId" column="DOC_ID"/>
         <result property="isFiled" column="IS_FILED"/>
         <result property="filedTime" column="FILED_TIME"/>
+        <result property="actorTime" column="ACTOR_TIME"/>
     </resultMap>
 
     <sql id="selectDocActorVo">
@@ -31,7 +32,7 @@
         where DOC_ID = #{docId}
     </select>
     <select id="initiationList" resultType="com.doc.biz.domain.DocInfo" parameterType="Long">
-        select a.*, 'Y' is_actor, b.is_filed, b.filed_time
+        select a.*, 'Y' is_actor, b.is_filed, b.filed_time,b.actor_time
         from doc_info a,
              doc_actor b
         where a.doc_id = b.doc_id
@@ -51,11 +52,13 @@
             <if test="docId != null">DOC_ID,</if>
             <if test="isFiled != null">IS_FILED,</if>
             <if test="filedTime != null">FILED_TIME,</if>
+            <if test="actorTime != null">ACTOR_TIME,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="docId != null">#{docId},</if>
             <if test="isFiled != null">#{isFiled},</if>
             <if test="filedTime != null">#{filedTime},</if>
+            <if test="actorTime != null">#{actorTime},</if>
         </trim>
     </insert>
 
@@ -80,4 +83,4 @@
             #{docId}
         </foreach>
     </delete>
-</mapper>
+</mapper>