diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index c410ca608..fda65badd 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -2352,7 +2352,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem sendDto.setSJLY(CommonConstants.PARTY_EVENT_SOURCE_MS); if (ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue() == dto.getHandleCategory()) { //结案申请 - sendDto.setSENDACTDEFID(CommonConstants.PARTY_SEND_TO); +// sendDto.setSENDACTDEFID(CommonConstants.PARTY_SEND_TO); sendDto.setSJZT(CommonConstants.PARTY_ITEM_ZT_ZERO); } else { //吹哨 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 17a6d0a60..1a5ca6d9d 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 @@ -2182,7 +2182,18 @@ and i.PEOPLE_FLAG = #{appealType} - and i.ITEM_STATE = #{itemState} + + + and i.EVALUATION_STATE = '1' + and i.EVALUATION_TIME IS NULL + + + and i.EVALUATION_TIME IS NOT NULL + + + and i.ITEM_STATE = #{itemState} + + AND i.GRID_ID IN @@ -2283,7 +2294,18 @@ and i.PEOPLE_FLAG = #{appealType} - and i.ITEM_STATE = #{itemState} + + + and i.EVALUATION_STATE = '1' + and i.EVALUATION_TIME IS NULL + + + and i.EVALUATION_TIME IS NOT NULL + + + and i.ITEM_STATE = #{itemState} + + AND i.GRID_ID IN