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 525bbcfe0..7d18c99a8 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 @@ -1150,7 +1150,7 @@ LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID AND eve.DEL_FLAG = '0' left join epdc_item_fusing_delay_record d on d.ITEM_ID = item.ID and d.DEL_FLAG = '0' left join ( - select b.ID,b.ITEM_ID,b.CREATED_TIME,b.state + select b.ID,b.ITEM_ID,b.CREATED_TIME,b.state,b.GRID_NEXTPARTNAME from epdc_item_handle_process b where b.DEL_FLAG = '0' and b.CREATED_TIME = ( @@ -1164,7 +1164,7 @@ ) 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 in (14,1065)) + and ((process.state is not null and process.state in (14,1065)) or (process.state is not null and process.state = 1060 and process.GRID_NEXTPARTNAME = '北尚诉办')) AND item.PEOPLE_FLAG = #{peopleFlag} @@ -1253,7 +1253,7 @@ LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID AND eve.DEL_FLAG = '0' left join epdc_item_fusing_delay_record d on d.ITEM_ID = item.ID and d.DEL_FLAG = '0' left join ( - select b.ID,b.ITEM_ID,b.CREATED_TIME,b.state + select b.ID,b.ITEM_ID,b.CREATED_TIME,b.state,b.GRID_NEXTPARTNAME from epdc_item_handle_process b where b.DEL_FLAG = '0' and b.CREATED_TIME = ( @@ -1267,7 +1267,7 @@ ) 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 in (14,1065)) + and ((process.state is not null and process.state in (14,1065)) or (process.state is not null and process.state = 1060 and process.GRID_NEXTPARTNAME = '北尚诉办')) AND item.PEOPLE_FLAG = #{peopleFlag}