Merge remote-tracking branch 'origin/dev_heart' into dev

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActDetailResultDTO.java

@@ -152,4 +152,19 @@ public class ResiActDetailResultDTO implements Serializable {
      * 打卡截止时间（yyyy-MM-dd HH:mm）
      */
     private String signInEndTime;
+
+    /**
+     * 活动状态(已发布/报名中：published 已取消：canceled 已结束：finished)
+     */
+    private String actStatus;
+
+    /**
+     * 活动取消的原因
+     */
+    private String cancelReason;
+
+    /**
+     * 取消活动的时间（yyyy-MM-dd HH:mm）
+     */
+    private String cancelTime;
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java

@@ -159,7 +159,7 @@ public class ResiActListController {
     }
 
     /**
-     * 活动详情
+     * 活动详情(包含已取消信息)
      *
      * @param tokenDto
      * @param formDto

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java

@@ -144,7 +144,7 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
             list.addAll(inProgress);
         }
 
-        // 查询活动状态是：已结束 finished
+        // 查询活动状态是：已结束 finished  已取消 canceled
         int pageIndex = (formDto.getPageNo() - NumConstant.ONE) * formDto.getPageSize();
         formDto.setPageNo(pageIndex);
         List<ResiActInfoResultDTO> finished = baseDao.selectListActFinished(formDto);

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml

@@ -154,7 +154,7 @@
         ORDER BY i.CREATED_TIME DESC
     </select>
 
-    <!--活动列表 - (活动结束时间 < 当前时间)，已结束-->
+    <!--活动列表 - 已结束、已取消-->
     <select id="selectListActFinished" parameterType="com.epmet.dto.form.resi.ResiActBaseFormDTO"
             resultType="com.epmet.dto.result.resi.ResiActInfoResultDTO">
         SELECT
@@ -167,7 +167,12 @@
             i.ACT_QUOTA_CATEGORY actQuotaCategory, -- 活动名额类型（true:固定名额(1)  false： 不限制名额(0)）
             i.ACT_QUOTA actQuota,
             IFNULL(c.signupNum, 0) signupNum, 	-- 已报名人数
-            'finished' AS actCurrentState, -- 活动状态：已结束
+            case
+            when i.ACT_STATUS = 'finished'
+            then 'finished'
+            when  i.ACT_STATUS = 'canceled'
+            then 'canceled'
+            end as actCurrentState, -- 活动状态：已结束、已取消
             IF(u.USER_ID = #{userId},'signed_up','no_signed_up') as signupFlag
         FROM act_info i
         LEFT JOIN act_user_relation u ON i.ID = u.ACT_ID AND U.DEL_FLAG = '0' AND  u.`STATUS` != 'refused' AND u.`STATUS` != 'canceled' AND u.USER_ID = #{userId}
@@ -175,7 +180,7 @@
         WHERE i.DEL_FLAG = '0'
         AND i.ACT_STATUS = 'finished'
         AND i.CUSTOMER_ID = #{customerId}
-        ORDER BY i.CREATED_TIME DESC
+        ORDER BY i.ACT_STATUS DESC, i.CREATED_TIME DESC
         LIMIT #{pageNo}, #{pageSize}
     </select>
 
@@ -412,7 +417,10 @@
             i.SPONSOR_NAME sponsor,
             DATE_FORMAT(i.ACTUAL_START_TIME,'%Y-%m-%d %H:%i') actualStartTime,
             DATE_FORMAT(i.ACTUAL_END_TIME,'%Y-%m-%d %H:%i') actualEndTime,
-            IF(aur.SIGN_IN_FLAG = 'signed_in', true , false ) as isSignUp-- 是否已签到(true已签到，false未签到)
+            IF(aur.SIGN_IN_FLAG = 'signed_in', true , false ) as isSignUp, -- 是否已签到(true已签到，false未签到)
+            i.ACT_STATUS actStatus,
+            i.CANCEL_REASON cancelReason,
+            DATE_FORMAT(i.CANCEL_TIME,'%Y-%m-%d %H:%i') cancelTime
         FROM
             act_info i
             LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND re.`STATUS` != 'refused' AND re.`STATUS` != 'canceled' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID