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'
- 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'))
@@ -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'))
- 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 (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