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

epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-heart-server:
     container_name: epmet-heart-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.49
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.50
     ports:
       - "8111:8111"
     network_mode: host # 使用现有网络

epmet-module/epmet-heart/epmet-heart-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.49</version>
+    <version>0.0.50</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-heart</artifactId>

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

@@ -342,22 +342,34 @@
     <!--活动回顾列表-->
     <select id="selectListLookBackAct" parameterType="com.epmet.dto.form.resi.ResiActBaseFormDTO"
             resultType="com.epmet.dto.result.resi.ResiLookBackActResultDTO">
+        SELECT
+            a.actId,
+            a.title,
+            a.coverPic,
+            a.actStartTime,
+            a.actEndTime,
+            a.actAddress,
+            a.actCurrentState
+         FROM(
              SELECT
                 i.ID actId,
+                i.CUSTOMER_ID,
                 i.TITLE title,
                 i.COVER_PIC coverPic,
                 DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i') actStartTime,
                 DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i') actEndTime,
                 i.ACT_ADDRESS actAddress,
-            'finished' actCurrentState
+                'finished' actCurrentState,
+                i.CREATED_TIME
             FROM act_info i
             LEFT JOIN act_live_rec r ON r.ACT_ID = i.ID AND r.DEL_FLAG = '0'
             WHERE i.DEL_FLAG = '0'
             AND i.SUMMARY_FLAG = 1 OR r.ID is NOT NULL
-        AND i.CUSTOMER_ID = #{customerId}
             AND i.ACT_STATUS = 'finished'
             GROUP BY i.ID
-        ORDER BY i.CREATED_TIME DESC
+		  ) a
+		  WHERE a.CUSTOMER_ID = #{customerId}
+          ORDER BY a.CREATED_TIME DESC
 		  LIMIT #{pageNo}, #{pageSize}
     </select>
 
@@ -716,22 +728,34 @@
     <!--首页组件-活动回顾列表-->
     <select id="selectListLookBackActAssembly" parameterType="com.epmet.dto.form.resi.ResiLatestActFormDTO"
             resultType="com.epmet.dto.result.resi.ResiLookBackActResultDTO">
+        SELECT
+            a.actId,
+            a.title,
+            a.coverPic,
+            a.actStartTime,
+            a.actEndTime,
+            a.actAddress,
+            a.actCurrentState
+         FROM(
              SELECT
                 i.ID actId,
+                i.CUSTOMER_ID,
                 i.TITLE title,
                 i.COVER_PIC coverPic,
                 DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i') actStartTime,
                 DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i') actEndTime,
                 i.ACT_ADDRESS actAddress,
-            'finished' actCurrentState
+                'finished' actCurrentState,
+                i.CREATED_TIME
             FROM act_info i
             LEFT JOIN act_live_rec r ON r.ACT_ID = i.ID AND r.DEL_FLAG = '0'
             WHERE i.DEL_FLAG = '0'
             AND i.SUMMARY_FLAG = 1 OR r.ID is NOT NULL
-        AND i.CUSTOMER_ID = #{customerId}
             AND i.ACT_STATUS = 'finished'
             GROUP BY i.ID
-        ORDER BY i.CREATED_TIME DESC
+          ) a
+          WHERE a.CUSTOMER_ID = #{customerId}
+          ORDER BY a.CREATED_TIME DESC
           LIMIT 0, #{num}
     </select>
 </mapper>