From 30e856fde2ba60739280aa1d3c5d7f1d0fc247e1 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Fri, 25 Nov 2022 09:28:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=9C=AA=E7=BB=93=E6=A1=88?=
 =?UTF-8?q?=E6=9B=B4=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/item/ItemGridPlatformDao.xml       | 38 ++++++++++---------
 1 file changed, 21 insertions(+), 17 deletions(-)

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 22df61911..61974aa64 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
@@ -19,33 +19,37 @@
 
     <select id="selectListOfGridPlatformItemNotEnd" resultType="com.elink.esua.epdc.dto.item.ItemGridPlatformDTO">
         SELECT
-            ID,
-            REFERENCE_ID,
-            TASKID,
-            `STATUS`
+            p.ID,
+            p.REFERENCE_ID,
+            p.TASKID,
+            p.`STATUS`
         FROM
-            epdc_item_grid_platform
+            epdc_item_grid_platform p
+                INNER JOIN epdc_item i ON i.id = p.REFERENCE_ID
         WHERE
-            DEL_FLAG = '0'
-            AND `status` <![CDATA[ <> ]]> 60
+            p.DEL_FLAG = '0'
+          AND i.DEL_FLAG = '0'
+          AND i.ITEM_STATE != 10
         ORDER BY
-            CREATED_TIME
+            p.CREATED_TIME
     </select>
 
     <select id="getOneOfGridPlatformItemNotEnd" resultType="com.elink.esua.epdc.dto.item.ItemGridPlatformDTO">
         SELECT
-            ID,
-            REFERENCE_ID,
-            TASKID,
-            `STATUS`
+            p.ID,
+            p.REFERENCE_ID,
+            p.TASKID,
+            p.`STATUS`
         FROM
-            epdc_item_grid_platform
+            epdc_item_grid_platform p
+                INNER JOIN epdc_item i ON i.id = p.REFERENCE_ID
         WHERE
-            DEL_FLAG = '0'
-          AND REFERENCE_ID =  #{referenceId}
-          AND `status` <![CDATA[ <> ]]> 60
+            p.DEL_FLAG = '0'
+          AND i.DEL_FLAG = '0'
+          AND i.ITEM_STATE != 10
+          AND p.REFERENCE_ID =  #{referenceId}
         ORDER BY
-            CREATED_TIME
+            p.CREATED_TIME
     </select>
 
     <select id="getOneOfGridPlatformItemByReferenceId" resultType="com.elink.esua.epdc.modules.item.entity.ItemGridPlatformEntity">