能力申请增加申请时间

config/db/V3.7__ability_application_add_col.sql

@@ -0,0 +1 @@
+alter table `t_ability_application` ADD COLUMN `creator` bigint(20) NULL,ADD COLUMN `create_date` datetime NULL;

renren-admin/src/main/java/io/renren/modules/processForm/dto/TAbilityApplicationDTO.java

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -84,4 +85,7 @@ public class TAbilityApplicationDTO extends AuditingBaseDTO implements Serializa
     @ApiModelProperty(value = "申请单号")
     private String applyNumber;
 
+    @ApiModelProperty(value = "创建时间")
+    private Date createDate;
+
 }

renren-admin/src/main/java/io/renren/modules/processForm/dto/TAbilityApplicationV2DTO.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -54,6 +55,9 @@ public class TAbilityApplicationV2DTO implements Serializable {
     @ApiModelProperty(value = "审核状态：审核中，通过，不通过")
     private String approveStatus;
 
+    @ApiModelProperty(value = "创建时间")
+    private Date createDate;
+
     // 以上为申请时公共信息
 
     @ApiModelProperty(value = "资源申请情况(包含资源信息和流程流转)")

renren-admin/src/main/java/io/renren/modules/processForm/entity/TAbilityApplicationEntity.java

@@ -1,9 +1,9 @@
 package io.renren.modules.processForm.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import io.renren.common.entity.BaseEntity;
 import io.renren.modules.sys.dto.SysDeptDTO;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -20,11 +20,11 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @TableName(value = "t_ability_application", autoResultMap = true)
-public class TAbilityApplicationEntity implements Serializable {
+public class TAbilityApplicationEntity extends BaseEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    @TableId
+//    @TableId
-    private Long id;
+//    private Long id;
     /**
      * 申请人
      */

renren-admin/src/main/resources/db/V3.7__ability_application_add_col.sql

@@ -0,0 +1 @@
+alter table `t_ability_application` ADD COLUMN `creator` bigint(20) NULL,ADD COLUMN `create_date` datetime NULL;

renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml

@@ -28,6 +28,7 @@
         <result property="resourceOwnerDept" column="resource_owner_dept"
                 typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
         <result property="applyNumber" column="apply_number"/>
+        <result property="createDate" column="create_date"/>
     </resultMap>
     <resultMap id="resourceDTO" type="io.renren.modules.processForm.dto.TAbilityApplicationDTO">
         <result property="id" column="id"/>
@@ -53,6 +54,7 @@
         <result property="resourceOwnerDept" column="resource_owner_dept"
                 typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
         <result property="applyNumber" column="apply_number"/>
+        <result property="createDate" column="create_date"/>
     </resultMap>
 
     <update id="updateInstanceId">