From c8063455e7f46d51bbaad1871a6564a2d9d5b886 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 30 Jul 2020 15:45:51 +0800
Subject: [PATCH] =?UTF-8?q?historicalact=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../result/work/UserHistoricalActInfoDTO.java | 23 ++++++++++++++++++
 .../service/impl/WorkActUserServiceImpl.java  |  6 ++++-
 .../resources/mapper/ActUserRelationDao.xml   | 24 +++++++++++++------
 3 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/UserHistoricalActInfoDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/UserHistoricalActInfoDTO.java
index c4bbb1f100..fc921fdb7e 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/UserHistoricalActInfoDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/UserHistoricalActInfoDTO.java
@@ -53,4 +53,27 @@ public class UserHistoricalActInfoDTO implements Serializable {
      * 已处理: handled;  默认"",重新处理时reward_flag置为空字符串
      */
     private String processFlag;
+
+
+    // 新增以下参数
+    /**
+     * 活动状态（
+     已发布/报名中：published；
+     已取消：canceled;
+     已结束：finished）
+     */
+    private String actStatus;
+
+    /**
+     * 当前状态（已报名/待审核auditing，
+     审核通过passed，
+     审核不通过refused
+     取消报名canceled，
+     ）
+     */
+    private String userActStatus;
+    /**
+     * true已签到、false未签到
+     */
+    private Boolean signInFlag;
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java
index c31ad005a6..4efe296e17 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java
@@ -359,7 +359,11 @@ public class WorkActUserServiceImpl implements WorkActUserService {
         resultDTO.setSignUpActNum(historicalActInfo.getSignUpActNum());
         resultDTO.setObtainPointsActNum(historicalActInfo.getObtainPointsActNum());
         //历史活动列表
-        resultDTO.setActInfoList(actUserRelationDao.selectAllByUserId(formDTO.getUserId()));
+        List<UserHistoricalActInfoDTO> actInfoList=actUserRelationDao.selectAllByUserId(formDTO.getUserId());
+        for(UserHistoricalActInfoDTO userHistoricalActInfoDTO:actInfoList){
+
+        }
+        resultDTO.setActInfoList(actInfoList);
         return resultDTO;
     }
 
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml
index e6ddb723fc..343f3babd3 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml
@@ -138,7 +138,7 @@
 
     <!--    根据userId，查询参与活动记录 -->
     <select id="selectAllByUserId" resultType="com.epmet.dto.result.work.UserHistoricalActInfoDTO" parameterType="java.lang.String">
-        SELECT
+                SELECT
             acr.ACT_ID AS actId,
             ACR.USER_ID AS userId,
             ai.TITLE AS title,
@@ -148,17 +148,27 @@
             acr.REWARD_FLAG AS rewardFlag,
             acr.DENY_REWARD_REASON AS denyRewardReason,
             acr.PROCESS_FLAG AS processFlag,
-            (select CREATED_TIME
-                from act_sign_in_rec ar
-                where ar.ACT_ID=acr.ACT_ID
-                and ar.USER_ID=acr.USER_ID
-                order by ar.CREATED_TIME asc limit 1) as signInTime
+            (
+            SELECT
+                CREATED_TIME
+            FROM
+                act_sign_in_rec ar
+            WHERE
+                ar.ACT_ID = acr.ACT_ID
+                AND ar.USER_ID = acr.USER_ID
+            ORDER BY
+                ar.CREATED_TIME ASC
+                LIMIT 1
+            ) AS signInTime,
+            ai.ACT_STATUS AS actStatus,
+            acr.STATUS AS userActStatus,
+            ( CASE acr.SIGN_IN_FLAG WHEN 'signed_in' THEN 1 ELSE 0 END ) AS signInFlag
         FROM
             act_user_relation acr
             LEFT JOIN act_info ai ON ( acr.ACT_ID = ai.id )
         WHERE
             acr.DEL_FLAG = '0'
-            AND acr.USER_ID = #{userId}
+            AND acr.USER_ID =#{userId}
         ORDER BY
             acr.CREATED_TIME DESC
     </select>