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

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

@@ -120,7 +120,7 @@
         LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID
         WHERE i.DEL_FLAG = '0'
         --  活动开始时间 > 当前时间 并且  报名截止时间 < 当前时间   报名已结束,活动未开始   未开始
-        AND ( <![CDATA[ DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i:%s') > ]]> NOW() AND <![CDATA[ DATE_FORMAT(i.SIGNUP_END_TIME,'%Y-%m-%d %H:%i:%s') < ]]> NOW() )
+        AND ( <![CDATA[ DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i:%s') > ]]> NOW() AND <![CDATA[ DATE_FORMAT(i.SIGN_UP_END_TIME,'%Y-%m-%d %H:%i:%s') < ]]> NOW() )
         AND i.ACT_STATUS != 'canceled'
         AND i.CUSTOMER_ID = #{customerId}
         ORDER BY i.CREATED_TIME DESC
@@ -146,7 +146,7 @@
         LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID
         WHERE i.DEL_FLAG = '0'
         --  活动开始时间 &lt;= 当前时间  并且活动结束时间 >= 当前时间  进行中
-        AND ( <![CDATA[ DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> NOW() AND <![CDATA[ DATE_FORMAT(i.SIGNUP_END_TIME,'%Y-%m-%d %H:%i:%s') >= ]]> NOW() )
+        AND ( <![CDATA[ DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> NOW() AND <![CDATA[ DATE_FORMAT(i.SIGN_UP_END_TIME,'%Y-%m-%d %H:%i:%s') >= ]]> NOW() )
         AND i.ACT_STATUS != 'canceled'
         AND i.CUSTOMER_ID = #{customerId}
         ORDER BY i.CREATED_TIME DESC
@@ -290,7 +290,7 @@
                 then 'enough'
                 else 'signing_up' end
             when <![CDATA[ DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i:%s') > ]]> NOW()
-            and <![CDATA[ DATE_FORMAT(i.SIGNUP_END_TIME,'%Y-%m-%d %H:%i:%s') < ]]> NOW()
+            and <![CDATA[ DATE_FORMAT(i.SIGN_UP_END_TIME,'%Y-%m-%d %H:%i:%s') < ]]> NOW()
             then 'end_sign_up'
             when <![CDATA[ DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> NOW()
             and <![CDATA[ DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') >= ]]> NOW()