列表+工作端小程序增加返参

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<String> serviceMatterList;
     private List<String> serviceMatterNameList;
+
+    /**
+     * true:富文本；false: 原来小程序那种发布内容
+     */
+    private Boolean richTextFlag;
 }

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;
 }

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<String> serviceMatterList;
     private List<String> serviceMatterNameList;
+
+    /**
+     * true:富文本；false: 原来小程序那种发布内容
+     */
+    private Boolean richTextFlag;
 }

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;
 }

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<String> serviceMatterList;
     private List<String> serviceMatterNameList;
+
+    /**
+     * true:富文本；false: 原来小程序那种发布内容
+     */
+    private Boolean richTextFlag;
 }

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;
 }

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<String> serviceMatterList;
     private List<String> serviceMatterNameList;
+
+    /**
+     * true:富文本；false: 原来小程序那种发布内容
+     */
+    private Boolean richTextFlag;
 }

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<com.epmet.dto.result.work.PublishActResultDTO>
      * @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<com.epmet.dto.result.work.PublishActResultDTO>
      * @author yinzuomei
-     * @description 重新发布活动
+     * @description 重新发布活动-----废弃现在使用republishV2
      * @Date 2020/7/27 13:55
      **/
     @PostMapping("republish")

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