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 @@ 4.0.0 - 0.0.49 + 0.0.50 com.epmet epmet-heart 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 - 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}