From f6d2ea16edca9db3cbbad5420a2dd645cdc78e23 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 25 Oct 2022 15:26:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=80=BB=E8=BE=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/item/ItemDao.xml | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
index b4b68accb..af6004d75 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
@@ -570,13 +570,12 @@
                     from epdc_item_handle_process
                     where b.ITEM_ID = ITEM_ID
                     and DEL_FLAG = '0'
-                    and STATE != 16
                 )
             and b.HANDLER_DEPT != '网格化平台'
         ) process on process.ITEM_ID = item.ID
         WHERE item.DEL_FLAG = '0'
         <if test="itemState != null and itemState != '' and itemState != '10'">
-            and (process.state is not null and process.state not in (11,14,15))
+            and (process.state is not null and process.state not in (11,14,15,16))
             and (item.IS_PEOPLE = '0' or (item.IS_PEOPLE = '1' and item.PEOPLE_FLAG = '0'))
         </if>
         <if test="itemState != null and itemState != '' and itemState == '0'">
@@ -818,12 +817,10 @@
                 from epdc_item_handle_process
                 where b.ITEM_ID = ITEM_ID
                 and DEL_FLAG = '0'
-                and STATE != 16
             )
-            and b.HANDLER_DEPT != '网格化平台'
         ) process on process.ITEM_ID = item.ID
         WHERE item.DEL_FLAG = '0'
-        and (process.state is not null and process.state not in (11,14,15,1002))
+        and (process.state is not null and process.state in (1004,1106))
         and item.IS_PEOPLE = '1'
         and (
             (item.PEOPLE_FLAG = '0'
@@ -930,7 +927,6 @@
                 from epdc_item_handle_process
                 where b.ITEM_ID = ITEM_ID
                 and DEL_FLAG = '0'
-                and STATE != 16
             )
             and b.HANDLER_DEPT != '网格化平台'
         ) process on process.ITEM_ID = item.ID
@@ -1039,14 +1035,13 @@
                 from epdc_item_handle_process
                 where b.ITEM_ID = ITEM_ID
                 and DEL_FLAG = '0'
-                and STATE != 16
             )
             and b.HANDLER_DEPT != '网格化平台'
         ) process on process.ITEM_ID = item.ID
         WHERE item.DEL_FLAG = '0'
         and (item.IS_PEOPLE = '0' or (item.IS_PEOPLE = '1' and item.PEOPLE_FLAG = '0'))
         <if test="itemState != null and itemState != '' and itemState != '10'">
-            and (process.state is not null and process.state not in (11,14,15))
+            and (process.state is not null and process.state not in (11,14,15,16))
         </if>
         <if test="typeKey != null and typeKey != '' and typeKey == 'grid_party'">
             and (process.state != 0 or process.state is null)
@@ -1157,7 +1152,6 @@
                 from epdc_item_handle_process
                 where b.ITEM_ID = ITEM_ID
                 and DEL_FLAG = '0'
-                and STATE != 16
             )
             and (b.HANDLER_DEPT != '网格化平台' or (b.HANDLER_DEPT = '网格化平台' and b.STATE in (1060,1065)))
         ) process on process.ITEM_ID = item.ID
@@ -1261,7 +1255,6 @@
             from epdc_item_handle_process
             where b.ITEM_ID = ITEM_ID
             and DEL_FLAG = '0'
-            and STATE != 16
         )
         and (b.HANDLER_DEPT != '网格化平台' or (b.HANDLER_DEPT = '网格化平台' and b.STATE in (1060,1065)))
         ) process on process.ITEM_ID = item.ID
@@ -1343,7 +1336,6 @@
                 from epdc_item_handle_process
                 where b.ITEM_ID = ITEM_ID
                 and DEL_FLAG = '0'
-                and STATE != 16
             )
             and (b.HANDLER_DEPT != '网格化平台' or (b.HANDLER_DEPT = '网格化平台' and b.STATE in (1060,1065)))
         ) process on process.ITEM_ID = i.ID
@@ -2170,7 +2162,6 @@
                             from epdc_item_handle_process
                             where b.ITEM_ID = ITEM_ID
                             and DEL_FLAG = '0'
-                            and STATE != 16
                         )
                 and (b.HANDLER_DEPT != '网格化平台' or (b.HANDLER_DEPT = '网格化平台' and b.STATE in (1060,1065)))
                 ) process on process.ITEM_ID = i.ID
@@ -2266,7 +2257,6 @@
                 from epdc_item_handle_process
                 where b.ITEM_ID = ITEM_ID
                 and DEL_FLAG = '0'
-                and STATE != 16
             )
             and (b.HANDLER_DEPT != '网格化平台' or (b.HANDLER_DEPT = '网格化平台' and b.STATE in (1060,1065)))
         ) process on process.ITEM_ID = i.ID
@@ -2449,7 +2439,6 @@
                     max(CREATED_TIME)
                     from epdc_item_handle_process
                     where DEL_FLAG = 0
-                    and STATE != 16
                     and b.ITEM_ID = ITEM_ID
                 )
         ) process on process.ITEM_ID = i.ID
@@ -2483,7 +2472,6 @@
                 max(CREATED_TIME)
                 from epdc_item_handle_process
                 where DEL_FLAG='0'
-                and STATE != 16
                 and b.ITEM_ID = ITEM_ID
             )
         ) process on process.ITEM_ID = i.ID