From 5ca6bce24de05fca4f334962a8eed416b053fc24 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 1 Jul 2022 09:39:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E5=8A=A0=E6=B4=BB=E5=8A=A8=E6=80=BB?= =?UTF-8?q?=E7=BB=93=E5=86=85=E5=AE=B9=E5=8F=98=E6=9B=B4=E4=B8=BAlongtext?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/ActSummaryDTO.java | 2 +- .../com/epmet/dto/form/work/PublishActContentFormDTO.java | 4 ++-- .../src/main/java/com/epmet/entity/ActSummaryEntity.java | 2 +- .../src/main/resources/db/migration/V0.0.22__act_addcol.sql | 5 ++++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActSummaryDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActSummaryDTO.java index 9e8acacb88..b1b73cfdc1 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActSummaryDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActSummaryDTO.java @@ -50,7 +50,7 @@ public class ActSummaryDTO implements Serializable { private String content; /** - * 内容类型 图片：img；文字：text + * 内容类型 图片：img；文字：text;富文本：rich_text */ private String contentType; diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/PublishActContentFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/PublishActContentFormDTO.java index efe2592e7a..82b405949d 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/PublishActContentFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/PublishActContentFormDTO.java @@ -29,8 +29,8 @@ public class PublishActContentFormDTO implements Serializable { private String content; /** - * 内容类型 图片：img；文字：text + * 内容类型 图片：img；文字：text;富文本：rich_text */ - @NotBlank(message = "内容类型不能为空,图片：img;文字：text", groups = {UserInternalGroup.class}) + @NotBlank(message = "内容类型 图片：img；文字：text;富文本：rich_text", groups = {UserInternalGroup.class}) private String contentType; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActSummaryEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActSummaryEntity.java index bc09dfcc52..1dd1bc354c 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActSummaryEntity.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActSummaryEntity.java @@ -48,7 +48,7 @@ public class ActSummaryEntity extends BaseEpmetEntity { private String content; /** - * 内容类型 图片：img；文字：text + * 内容类型 图片：img；文字：text;富文本：rich_text */ private String contentType; diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.22__act_addcol.sql b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.22__act_addcol.sql index 91fe197874..4d25597cae 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.22__act_addcol.sql +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.22__act_addcol.sql @@ -3,4 +3,7 @@ alter table act_content MODIFY COLUMN CONTENT LONGTEXT not null COMMENT '内容 alter table act_info add COLUMN RICH_TEXT_FLAG TINYINT(1) not null DEFAULT '0' COMMENT '1：富文本；0：不是' AFTER SUMMARY_FLAG; alter table latest_act_info add COLUMN RICH_TEXT_FLAG TINYINT(1) not null DEFAULT '0' COMMENT '1：富文本；0：不是' AFTER AUDIT_SWITCH; alter table latest_act_content MODIFY COLUMN CONTENT_TYPE varchar(32) NOT NULL COMMENT '内容类型 图片：img；文字：text;富文本：rich_text'; -alter table latest_act_content MODIFY COLUMN CONTENT LONGTEXT not null COMMENT '内容'; \ No newline at end of file +alter table latest_act_content MODIFY COLUMN CONTENT LONGTEXT not null COMMENT '内容'; + +alter table act_summary MODIFY COLUMN CONTENT LONGTEXT not null COMMENT '总结内容'; +alter table act_summary MODIFY CONTENT_TYPE VARCHAR(32)not null COMMENT '内容类型 图片：img；文字：text;富文本：rich_text'; \ No newline at end of file