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

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

@@ -72,6 +72,7 @@
 		AND  <![CDATA[ DATE_FORMAT(i.SIGN_UP_END_TIME,'%Y-%m-%d %H:%i:%s') >= ]]> NOW() -- 报名截止时间  >= 当前时间
         AND (i.ACT_QUOTA_CATEGORY = 0 OR i.ACT_QUOTA > IFNULL(c.signupNum, 0)) -- 不限名额或者报名人数未报满
         AND i.CUSTOMER_ID = #{customerId}
+        GROUP BY i.ID
         ORDER BY i.ACT_QUOTA_CATEGORY DESC,i.CREATED_TIME DESC
     </select>
 
@@ -99,6 +100,7 @@
         AND i.ACT_QUOTA_CATEGORY = 1   -- 固定名额
         AND i.ACT_QUOTA = IFNULL(c.signupNum, 0) -- 名额已满
         AND i.CUSTOMER_ID = #{customerId}
+        GROUP BY i.ID
         ORDER BY i.CREATED_TIME DESC
     </select>
 
@@ -125,6 +127,7 @@
         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}
+        GROUP BY i.ID
         ORDER BY i.CREATED_TIME DESC
     </select>
 
@@ -151,6 +154,7 @@
         AND ( <![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() )
         AND i.ACT_STATUS != 'canceled'
         AND i.CUSTOMER_ID = #{customerId}
+        GROUP BY i.ID
         ORDER BY i.CREATED_TIME DESC
     </select>
 
@@ -176,6 +180,7 @@
         AND i.ACT_STATUS != 'canceled'
         AND <![CDATA[ DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') < ]]> NOW()
         AND i.CUSTOMER_ID = #{customerId}
+        GROUP BY i.ID
         ORDER BY i.CREATED_TIME DESC
         LIMIT #{pageNo}, #{pageSize}
     </select>