筛选未结案更正

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,
+            p.ID,
-            REFERENCE_ID,
+            p.REFERENCE_ID,
-            TASKID,
+            p.TASKID,
-            `STATUS`
+            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'
+            p.DEL_FLAG = '0'
-            AND `status` <![CDATA[ <> ]]> 60
+          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,
+            p.ID,
-            REFERENCE_ID,
+            p.REFERENCE_ID,
-            TASKID,
+            p.TASKID,
-            `STATUS`
+            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'
+            p.DEL_FLAG = '0'
-          AND REFERENCE_ID =  #{referenceId}
+          AND i.DEL_FLAG = '0'
-          AND `status` <![CDATA[ <> ]]> 60
+          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">