From abc72bc2c28e7dfef626dde89167de3f1d29e0de Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Fri, 14 Oct 2022 13:30:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=B8=8A=E6=8A=A5=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=9F=A5=E8=AF=A2=E5=87=BA=E5=A4=9A=E6=9D=A1bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 esua-epdc/epdc-cloud-gateway-shibei                 |  2 +-
 .../epdc/modules/item/dao/ItemGridPlatformDao.java  | 11 +++++++++++
 .../modules/item/service/impl/ItemServiceImpl.java  |  5 +----
 .../resources/mapper/item/ItemGridPlatformDao.xml   | 13 +++++++++++++
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/esua-epdc/epdc-cloud-gateway-shibei b/esua-epdc/epdc-cloud-gateway-shibei
index 98ecba0e2..8cd538d06 160000
--- a/esua-epdc/epdc-cloud-gateway-shibei
+++ b/esua-epdc/epdc-cloud-gateway-shibei
@@ -1 +1 @@
-Subproject commit 98ecba0e2072cd1819f37e3ba3ba12e95d65ea51
+Subproject commit 8cd538d06bde3502713af17ba3b645eb944180ec
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemGridPlatformDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemGridPlatformDao.java
index a0df738c2..ef037cdd6 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemGridPlatformDao.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemGridPlatformDao.java
@@ -55,6 +55,17 @@ public interface ItemGridPlatformDao extends BaseDao<ItemGridPlatformEntity> {
      */
     List<ItemGridPlatformDTO> getOneOfGridPlatformItemNotEnd(@Param("referenceId") String referenceId);
 
+    /**
+     * 查询最近一条有记录的数据
+     *
+     * @param referenceId
+     * @return com.elink.esua.epdc.modules.item.entity.ItemGridPlatformEntity
+     * @author zhy
+     * @date 2022/10/14 13:26
+     */
+    ItemGridPlatformEntity getOneOfGridPlatformItemByReferenceId(@Param("referenceId") String referenceId);
+
+
     /**
      *
      * 根据任务号查询上报信息
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
index 108e0d65d..050472088 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
@@ -1768,10 +1768,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     }
 
     private ItemGridPlatformEntity getReport(String id) {
-        QueryWrapper<ItemGridPlatformEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq("REFERENCE_ID", id);
-        ItemGridPlatformEntity gridEntity = itemGridPlatformDao.selectOne(wrapper);
-        return gridEntity;
+        return itemGridPlatformDao.getOneOfGridPlatformItemByReferenceId(id);
     }
 
     /**
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemGridPlatformDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemGridPlatformDao.xml
index 4bb5a46b0..22df61911 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemGridPlatformDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemGridPlatformDao.xml
@@ -48,6 +48,19 @@
             CREATED_TIME
     </select>
 
+    <select id="getOneOfGridPlatformItemByReferenceId" resultType="com.elink.esua.epdc.modules.item.entity.ItemGridPlatformEntity">
+        SELECT
+            *
+        FROM
+            epdc_item_grid_platform
+        WHERE
+            DEL_FLAG = '0'
+        AND REFERENCE_ID =  #{referenceId}
+        ORDER BY
+            CREATED_TIME DESC
+        LIMIT 1
+    </select>
+
     <select id="selectOneOfItemGridPlatformByTaskId" resultType="com.elink.esua.epdc.dto.item.ItemGridPlatformDTO">
         SELECT
             ID,