From f26b6e8a4a8885a7f57636779c761275d2813c8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Fri, 10 Apr 2020 13:23:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=9C=AA=E9=80=9A=E8=BF=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/activity/ActInfoDao.xml  | 93 ++++++++++---------
 1 file changed, 48 insertions(+), 45 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml
index c1b406193..03a4a0304 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml
@@ -143,50 +143,50 @@
     </resultMap>
     <select id="listItemsByApp" resultMap="actAppResultMap">
         select * from (
-            SELECT
-                actInfo.ID, actInfo.TITLE, actInfo.HEAD_PIC,
-                DATE_FORMAT(actInfo.ACT_START_TIME,'%Y-%m-%d %H:%i') ACT_START_TIME,
-                DATE_FORMAT(actInfo.ACT_END_TIME,'%Y-%m-%d %H:%i') ACT_END_TIME,
-                actInfo.PUBLISH_TIME,actInfo.ACT_ADDRESS, actInfo.ACT_QUOTA_CATEGORY, actInfo.ACT_QUOTA,
-                actInfo.SIGNUP_NUM, actInfo.CLOCK_NUM,
-                case
-                when <![CDATA[ DATE_FORMAT(actInfo.SIGNUP_END_TIME,'%Y-%m-%d %H:%i:%s') >= ]]> #{timestamp}
-                then case
-                when <![CDATA[actInfo.SIGNUP_NUM >= ACT_QUOTA ]]> and actInfo.ACT_QUOTA_CATEGORY = 1 then '1'
-                else '0' end
-                when <![CDATA[ DATE_FORMAT(actInfo.ACT_START_TIME,'%Y-%m-%d %H:%i:%s') > ]]> #{timestamp}
-                and <![CDATA[ DATE_FORMAT(actInfo.SIGNUP_END_TIME,'%Y-%m-%d %H:%i:%s') < ]]> #{timestamp}
-                then '2'
-                when <![CDATA[ DATE_FORMAT(actInfo.ACT_START_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
-                and <![CDATA[ DATE_FORMAT(actInfo.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') >= ]]> #{timestamp}
-                then '3'
-                when <![CDATA[ DATE_FORMAT(actInfo.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') < ]]> #{timestamp}
-                then '4'
-                end as actCurrentState,
-                IF(relation.USER_ID = #{userId},'1','0') as signupFlag
-            FROM
-            epdc_act_info actInfo
-            left join epdc_act_user_relation relation on relation.DEL_FLAG = '0'
-            and relation.USER_ID = #{userId}
-            and relation.STATUS not in ('3','4')
-            and actInfo.ID = relation.ACT_ID
-            WHERE actInfo.DEL_FLAG = '0' and actInfo.ACT_STATUS = '1'
-            <if test="timestamp != null">
-                <![CDATA[ AND DATE_FORMAT(actInfo.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
-            </if>
-            <if test='actId != null and actId != "" '>
-                AND actInfo.ID = #{actId}
-            </if>
-            <if test='actType != null and actType != "" and actType == "0"'>
-                <![CDATA[ AND DATE_FORMAT(actInfo.SIGNUP_END_TIME,'%Y-%m-%d %H:%i:%s') >= ]]> #{timestamp}
-            </if>
-            <if test='actType != null and actType != "" and actType == "1"'>
-                <![CDATA[ AND DATE_FORMAT(actInfo.SIGNUP_END_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
-            </if>
+        SELECT
+        actInfo.ID, actInfo.TITLE, actInfo.HEAD_PIC,
+        DATE_FORMAT(actInfo.ACT_START_TIME,'%Y-%m-%d %H:%i') ACT_START_TIME,
+        DATE_FORMAT(actInfo.ACT_END_TIME,'%Y-%m-%d %H:%i') ACT_END_TIME,
+        actInfo.PUBLISH_TIME,actInfo.ACT_ADDRESS, actInfo.ACT_QUOTA_CATEGORY, actInfo.ACT_QUOTA,
+        actInfo.SIGNUP_NUM, actInfo.CLOCK_NUM,
+        case
+        when <![CDATA[ DATE_FORMAT(actInfo.SIGNUP_END_TIME,'%Y-%m-%d %H:%i:%s') >= ]]> #{timestamp}
+        then case
+        when <![CDATA[actInfo.SIGNUP_NUM >= ACT_QUOTA ]]> and actInfo.ACT_QUOTA_CATEGORY = 1 then '1'
+        else '0' end
+        when <![CDATA[ DATE_FORMAT(actInfo.ACT_START_TIME,'%Y-%m-%d %H:%i:%s') > ]]> #{timestamp}
+        and <![CDATA[ DATE_FORMAT(actInfo.SIGNUP_END_TIME,'%Y-%m-%d %H:%i:%s') < ]]> #{timestamp}
+        then '2'
+        when <![CDATA[ DATE_FORMAT(actInfo.ACT_START_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
+        and <![CDATA[ DATE_FORMAT(actInfo.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') >= ]]> #{timestamp}
+        then '3'
+        when <![CDATA[ DATE_FORMAT(actInfo.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') < ]]> #{timestamp}
+        then '4'
+        end as actCurrentState,
+        IF(relation.USER_ID = #{userId},'1','0') as signupFlag
+        FROM
+        epdc_act_info actInfo
+        left join epdc_act_user_relation relation on relation.DEL_FLAG = '0'
+        and relation.USER_ID = #{userId}
+        and relation.STATUS not in ('3','4')
+        and actInfo.ID = relation.ACT_ID
+        WHERE actInfo.DEL_FLAG = '0' and actInfo.ACT_STATUS = '1'
+        <if test="timestamp != null">
+            <![CDATA[ AND DATE_FORMAT(actInfo.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
+        </if>
+        <if test='actId != null and actId != "" '>
+            AND actInfo.ID = #{actId}
+        </if>
+        <if test='actType != null and actType != "" and actType == "0"'>
+            <![CDATA[ AND DATE_FORMAT(actInfo.SIGNUP_END_TIME,'%Y-%m-%d %H:%i:%s') >= ]]> #{timestamp}
+        </if>
+        <if test='actType != null and actType != "" and actType == "1"'>
+            <![CDATA[ AND DATE_FORMAT(actInfo.SIGNUP_END_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
+        </if>
         ) temp
         ORDER BY temp.actCurrentState ASC
-        <if test='actType != null and actType != "" and actType == "0"'> ,temp.PUBLISH_TIME DESC </if>
-        <if test='actType != null and actType != "" and actType == "1"'> ,temp.ACT_START_TIME ASC</if>
+        <if test='actType != null and actType != "" and actType == "0"'>,temp.PUBLISH_TIME DESC</if>
+        <if test='actType != null and actType != "" and actType == "1"'>,temp.ACT_START_TIME ASC</if>
         LIMIT #{pageIndex},#{pageSize}
     </select>
     <select id="signupListItemsByApp" resultMap="actAppResultMap">
@@ -228,7 +228,8 @@
         and relation.USER_ID = #{userId}
         and relation.STATUS != '3'
         and actInfo.ID = relation.ACT_ID
-        LEFT JOIN ( SELECT count( * ) AS clockCount, ACT_USER_ID FROM epdc_act_user_clock_log WHERE DEL_FLAG = '0' GROUP BY ACT_USER_ID ) clock ON clock.ACT_USER_ID = relation.ID
+        LEFT JOIN ( SELECT count( * ) AS clockCount, ACT_USER_ID FROM epdc_act_user_clock_log WHERE DEL_FLAG = '0' GROUP
+        BY ACT_USER_ID ) clock ON clock.ACT_USER_ID = relation.ID
         WHERE
         actInfo.DEL_FLAG = '0'
         and relation.USER_ID = #{userId}
@@ -403,9 +404,11 @@
         left join epdc_act_user_relation relation on aul.ACT_USER_RELATION_ID = relation.id and relation.DEL_FLAG = '0'
         left join epdc_act_info actInfo on actInfo.ID = relation.ACT_ID and actInfo.DEL_FLAG = '0'
         WHERE
-        aul.DEL_FLAG = '0' AND aul.ID = #{id}
+        aul.DEL_FLAG = '0'
+        AND actInfo.id = #{id}
         ORDER BY
-        actInfo.CREATED_TIME DESC
+            aul.CREATED_TIME DESC
+        limit 1
     </select>
     <select id="getCancelDetailByApp" resultMap="actDetailAppResultMap">
         SELECT