From 97d26d9e1a7e5d10b9cc8be37a85625cceb05ce6 Mon Sep 17 00:00:00 2001 From: wangliwen Date: Wed, 13 Jul 2022 15:44:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E7=94=B3=E8=AF=B7=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=94=B3=E8=AF=B7=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/db/V3.7__ability_application_add_col.sql | 1 + .../modules/processForm/dto/TAbilityApplicationDTO.java | 4 ++++ .../modules/processForm/dto/TAbilityApplicationV2DTO.java | 4 ++++ .../processForm/entity/TAbilityApplicationEntity.java | 8 ++++---- .../resources/db/V3.7__ability_application_add_col.sql | 1 + .../mapper/processForm/TAbilityApplicationDao.xml | 2 ++ 6 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 config/db/V3.7__ability_application_add_col.sql create mode 100644 renren-admin/src/main/resources/db/V3.7__ability_application_add_col.sql diff --git a/config/db/V3.7__ability_application_add_col.sql b/config/db/V3.7__ability_application_add_col.sql new file mode 100644 index 00000000..551110a3 --- /dev/null +++ b/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; \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/dto/TAbilityApplicationDTO.java b/renren-admin/src/main/java/io/renren/modules/processForm/dto/TAbilityApplicationDTO.java index 63af0f77..98cce623 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/dto/TAbilityApplicationDTO.java +++ b/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; + } \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/dto/TAbilityApplicationV2DTO.java b/renren-admin/src/main/java/io/renren/modules/processForm/dto/TAbilityApplicationV2DTO.java index 6c6a1601..59c65cb8 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/dto/TAbilityApplicationV2DTO.java +++ b/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 = "资源申请情况(包含资源信息和流程流转)") diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/entity/TAbilityApplicationEntity.java b/renren-admin/src/main/java/io/renren/modules/processForm/entity/TAbilityApplicationEntity.java index c142bd9c..12acb125 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/entity/TAbilityApplicationEntity.java +++ b/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 - private Long id; +// @TableId +// private Long id; /** * 申请人 */ diff --git a/renren-admin/src/main/resources/db/V3.7__ability_application_add_col.sql b/renren-admin/src/main/resources/db/V3.7__ability_application_add_col.sql new file mode 100644 index 00000000..551110a3 --- /dev/null +++ b/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; \ No newline at end of file diff --git a/renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml b/renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml index 554efea7..866ea21e 100644 --- a/renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml +++ b/renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml @@ -28,6 +28,7 @@ + @@ -53,6 +54,7 @@ +