From 16022f1fc25ae20171c143a0590516d3db550f41 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Thu, 13 Aug 2020 14:34:42 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=9B=9E=E9=A1=BE?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/ActInfoDao.xml  | 88 ++++++++++++-------
 1 file changed, 56 insertions(+), 32 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml
index ea1f6501d9..20bc885ec1 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml
@@ -343,22 +343,34 @@
     <select id="selectListLookBackAct" parameterType="com.epmet.dto.form.resi.ResiActBaseFormDTO"
             resultType="com.epmet.dto.result.resi.ResiLookBackActResultDTO">
         SELECT
-            i.ID actId,
-            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
-        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
-        LIMIT #{pageNo}, #{pageSize}
+            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,
+                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.ACT_STATUS = 'finished'
+            GROUP BY i.ID
+		  ) a
+		  WHERE a.CUSTOMER_ID = #{customerId}
+          ORDER BY a.CREATED_TIME DESC
+		  LIMIT #{pageNo}, #{pageSize}
     </select>
 
     <select id="queryActAccordingToActIdAndUserId" resultType="com.epmet.dto.ActInfoDTO">
@@ -717,21 +729,33 @@
     <select id="selectListLookBackActAssembly" parameterType="com.epmet.dto.form.resi.ResiLatestActFormDTO"
             resultType="com.epmet.dto.result.resi.ResiLookBackActResultDTO">
         SELECT
-            i.ID actId,
-            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
-        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
-        LIMIT 0, #{num}
+            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,
+                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.ACT_STATUS = 'finished'
+            GROUP BY i.ID
+          ) a
+          WHERE a.CUSTOMER_ID = #{customerId}
+          ORDER BY a.CREATED_TIME DESC
+          LIMIT 0, #{num}
     </select>
 </mapper>

From 2f8c454cb7b9148ef2b1f69267902e06baf0057b Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Thu, 13 Aug 2020 15:27:24 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=83=A8=E7=BD=B2heart?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet-heart-server/deploy/docker-compose-dev.yml            | 2 +-
 epmet-module/epmet-heart/epmet-heart-server/pom.xml             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml
index 40f1e509f5..ba3776d6fe 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml
+++ b/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 # 使用现有网络
diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml
index a2185d6b09..5b2fef6ae2 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml
+++ b/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>