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 d04de2beb..cf5a49787 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 @@ -685,11 +685,14 @@ and b.HANDLER_DEPT != '网格化平台' ) process on process.ITEM_ID = item.ID WHERE item.DEL_FLAG = '0' - AND item.evaluation_score = '0' - AND item.evaluation_time ( NOW() - interval 24 HOUR ) and (process.state is not null and process.state not in (11,14,15,1002)) - and (item.IS_PEOPLE = '0' or (item.IS_PEOPLE = '1' and item.PEOPLE_FLAG = '0')) - + and item.IS_PEOPLE = '1' + and ( + (item.PEOPLE_FLAG = '0' + AND item.evaluation_score = '0' + AND item.evaluation_time ( NOW() - interval 24 HOUR )) + or item.PEOPLE_FLAG in ('1','2') + ) and (process.state != 0 or process.state is null) @@ -795,7 +798,7 @@ WHERE item.DEL_FLAG = '0' AND item.evaluation_score = '0' and (process.state is not null and process.state in (1002)) - and (item.IS_PEOPLE = '0' or (item.IS_PEOPLE = '1' and item.PEOPLE_FLAG = '0')) + and item.IS_PEOPLE = '1' and (process.state != 0 or process.state is null)