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

epmet-gateway/src/main/resources/bootstrap.yml

@@ -353,8 +353,6 @@ renren:
     - /resi/group/**
     - /resi/partymember/**
     - /gov/grid/**
-    - /heart/**
-    - /point/**
 management:
   endpoints:
     web:

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

@@ -199,9 +199,10 @@
             i.ACT_QUOTA actQuota,
             IFNULL(c.signupNum, 0) signupNum, 	-- 已报名人数
             'auditing' AS actCurrentState -- 活动状态
-        FROM act_info i LEFT JOIN act_user_relation u ON i.ID = u.ACT_ID AND u.DEL_FLAG = '0'
+        FROM act_user_relation u LEFT JOIN act_info i  ON i.ID = u.ACT_ID
         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
         WHERE i.DEL_FLAG = '0'
+        AND u.DEL_FLAG = '0'
         AND u.USER_ID = #{userId}
         AND u.`STATUS` = 'auditing'
         ORDER BY i.CREATED_TIME DESC
@@ -222,9 +223,10 @@
             i.ACT_QUOTA actQuota,
             IFNULL(c.signupNum, 0) signupNum, 	-- 已报名人数
             'passed' AS actCurrentState -- 活动状态
-        FROM act_info i LEFT JOIN act_user_relation u ON i.ID = u.ACT_ID AND u.DEL_FLAG = '0'
+        FROM act_user_relation u LEFT JOIN act_info i  ON i.ID = u.ACT_ID
         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
         WHERE i.DEL_FLAG = '0'
+        AND u.DEL_FLAG = '0'
         AND u.USER_ID = #{userId}
         AND u.`STATUS` = 'passed'
         ORDER BY i.CREATED_TIME DESC
@@ -245,9 +247,10 @@
             i.ACT_QUOTA actQuota,
             IFNULL(c.signupNum, 0) signupNum, 	-- 已报名人数
             'refused' AS actCurrentState -- 活动状态
-        FROM act_info i LEFT JOIN act_user_relation u ON i.ID = u.ACT_ID AND u.DEL_FLAG = '0'
+        FROM act_user_relation u LEFT JOIN act_info i  ON i.ID = u.ACT_ID
         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
         WHERE i.DEL_FLAG = '0'
+        AND u.DEL_FLAG = '0'
         AND u.USER_ID = #{userId}
         AND u.`STATUS` = 'refused'
         ORDER BY i.CREATED_TIME DESC
@@ -268,9 +271,10 @@
             i.ACT_QUOTA actQuota,
             IFNULL(c.signupNum, 0) signupNum, 	-- 已报名人数
             'canceld' AS actCurrentState -- 活动状态
-        FROM act_info i LEFT JOIN act_user_relation u ON i.ID = u.ACT_ID AND u.DEL_FLAG = '0'
+        FROM act_user_relation u LEFT JOIN act_info i  ON i.ID = u.ACT_ID
         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
         WHERE i.DEL_FLAG = '0'
+        AND u.DEL_FLAG = '0'
         AND u.USER_ID = #{userId}
         AND <![CDATA[ DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') < ]]> NOW() -- 活动结束时间 &lt; 当前时间, 活动已结束
         ORDER BY i.CREATED_TIME DESC