From 028f181a167f9d02f3839a759da038419175812b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 1 Jul 2022 09:29:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8+=E5=B7=A5=E4=BD=9C=E7=AB=AF?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../work/CanceledActDetailResultDTO.java | 5 +++++ .../dto/result/work/CanceledActResultDTO.java | 5 +++++ .../work/FinishedActDetailResultDTO.java | 5 +++++ .../dto/result/work/FinishedActResultDTO.java | 5 +++++ .../work/InProgressActDetailResultDTO.java | 5 +++++ .../result/work/InProgressActResultDTO.java | 5 +++++ .../result/work/ReEditActInfoResultDTO.java | 5 +++++ .../epmet/controller/WorkActController.java | 4 ++-- .../src/main/resources/mapper/ActInfoDao.xml | 20 ++++++++++++------- 9 files changed, 50 insertions(+), 9 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CanceledActDetailResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CanceledActDetailResultDTO.java index 61f6eae029..dbccdd7451 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CanceledActDetailResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CanceledActDetailResultDTO.java @@ -174,4 +174,9 @@ public class CanceledActDetailResultDTO implements Serializable { private String serviceMatterName; private List serviceMatterList; private List serviceMatterNameList; + + /** + * true:富文本；false: 原来小程序那种发布内容 + */ + private Boolean richTextFlag; } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CanceledActResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CanceledActResultDTO.java index 89b1374c03..6af2c03bed 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CanceledActResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CanceledActResultDTO.java @@ -61,4 +61,9 @@ public class CanceledActResultDTO implements Serializable { * 活动类型 爱心活动heart 联建活动party */ private String actType; + + /** + * true:富文本；false: 原来小程序那种发布内容 + */ + private Boolean richTextFlag; } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/FinishedActDetailResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/FinishedActDetailResultDTO.java index 26aa13d4a1..00dfeccf0b 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/FinishedActDetailResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/FinishedActDetailResultDTO.java @@ -164,4 +164,9 @@ public class FinishedActDetailResultDTO implements Serializable { private String serviceMatterName; private List serviceMatterList; private List serviceMatterNameList; + + /** + * true:富文本；false: 原来小程序那种发布内容 + */ + private Boolean richTextFlag; } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/FinishedActResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/FinishedActResultDTO.java index 113d5dc46e..157fc148af 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/FinishedActResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/FinishedActResultDTO.java @@ -63,4 +63,9 @@ public class FinishedActResultDTO implements Serializable { * 活动类型 爱心活动heart 联建活动party */ private String actType; + + /** + * true:富文本；false: 原来小程序那种发布内容 + */ + private Boolean richTextFlag; } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/InProgressActDetailResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/InProgressActDetailResultDTO.java index f220f19a96..a589c1bd5e 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/InProgressActDetailResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/InProgressActDetailResultDTO.java @@ -159,4 +159,9 @@ public class InProgressActDetailResultDTO implements Serializable { private String serviceMatterName; private List serviceMatterList; private List serviceMatterNameList; + + /** + * true:富文本；false: 原来小程序那种发布内容 + */ + private Boolean richTextFlag; } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/InProgressActResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/InProgressActResultDTO.java index eae286055b..adb2e310e7 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/InProgressActResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/InProgressActResultDTO.java @@ -87,4 +87,9 @@ public class InProgressActResultDTO implements Serializable { * 活动类型 爱心活动heart 联建活动party */ private String actType; + + /** + * true:富文本；false: 原来小程序那种发布内容 + */ + private Boolean richTextFlag; } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ReEditActInfoResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ReEditActInfoResultDTO.java index e4db367ee0..365c2c0671 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ReEditActInfoResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ReEditActInfoResultDTO.java @@ -176,4 +176,9 @@ public class ReEditActInfoResultDTO implements Serializable { private String serviceMatterName; private List serviceMatterList; private List serviceMatterNameList; + + /** + * true:富文本；false: 原来小程序那种发布内容 + */ + private Boolean richTextFlag; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActController.java index 845e6d239a..2a328dc800 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActController.java @@ -59,7 +59,7 @@ public class WorkActController { * @param formDTO * @return com.epmet.commons.tools.utils.Result * @author yinzuomei - * @description 发布活动 + * @description 发布活动-----废弃现在使用publishV2 * @Date 2020/7/21 18:32 **/ @PostMapping("publish") @@ -267,7 +267,7 @@ public class WorkActController { * @param rePublishFormDTO * @return com.epmet.commons.tools.utils.Result * @author yinzuomei - * @description 重新发布活动 + * @description 重新发布活动-----废弃现在使用republishV2 * @Date 2020/7/27 13:55 **/ @PostMapping("republish") diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml index 465dd8adb1..0e2d35d965 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml @@ -534,7 +534,8 @@ ai.SIGN_UP_END_TIME as signUpEndTime, ai.SIGN_UP_START_TIME as signUpStartTime, ai.ACT_ADDRESS as actAddress, - ai.act_type as actType + ai.act_type as actType, + ai.RICH_TEXT_FLAG as richTextFlag FROM act_info ai WHERE @@ -556,7 +557,8 @@ ai.CANCEL_TIME AS cancelTime, ai.CANCEL_REASON AS cancelReason, ai.ACT_ADDRESS as actAddress, - ai.act_type as actType + ai.act_type as actType, + ai.RICH_TEXT_FLAG as richTextFlag FROM act_info ai WHERE @@ -579,7 +581,8 @@ ai.ACTUAL_START_TIME as actualStartTime, ai.ACTUAL_END_TIME as actualEndTime, ai.ACT_ADDRESS as actAddress, - ai.act_type as actType + ai.act_type as actType, + ai.RICH_TEXT_FLAG as richTextFlag FROM act_info ai WHERE @@ -669,7 +672,8 @@ ai.ACT_TYPE, ai.UNIT_ID, ai.SERVICE_MATTER, - ai.TARGET + ai.TARGET, + ai.RICH_TEXT_FLAG as richTextFlag FROM act_info ai WHERE @@ -706,7 +710,8 @@ ai.ACT_TYPE, ai.UNIT_ID, ai.SERVICE_MATTER, - ai.TARGET + ai.TARGET, + ai.RICH_TEXT_FLAG as richTextFlag FROM act_info ai WHERE @@ -749,7 +754,8 @@ ai.ACT_TYPE, ai.UNIT_ID, ai.SERVICE_MATTER, - ai.TARGET + ai.TARGET, + ai.RICH_TEXT_FLAG as richTextFlag FROM act_info ai WHERE @@ -829,7 +835,7 @@ AND ( aur.`STATUS` = 'auditing' OR aur.`STATUS` = 'passed' ) ) AS signedUp, ai.SUMMARY_FLAG as summaryFlag, - ai.REWARD as reward, + ai.REWARD as reward FROM act_info ai WHERE