diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java index ebe786eca..f26e3983d 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java @@ -1440,12 +1440,12 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { return; } - LambdaQueryWrapper entityLambdaQueryWrapper = new LambdaQueryWrapper().eq(ItemHandleProcessEntity::getItemId,item.getItemId()).eq(ItemHandleProcessEntity::getState,ItemGridPlatformHandleStatusEnum.HANDLE_QSJB_JS.getValue()); - List list = itemHandleProcessDao.selectList(entityLambdaQueryWrapper); - - if (list.size()>0){ - return; - } +// LambdaQueryWrapper entityLambdaQueryWrapper = new LambdaQueryWrapper().eq(ItemHandleProcessEntity::getItemId,item.getItemId()).eq(ItemHandleProcessEntity::getState,ItemGridPlatformHandleStatusEnum.HANDLE_QSJB_JS.getValue()); +// List list = itemHandleProcessDao.selectList(entityLambdaQueryWrapper); +// +// if (list.size()>0){ +// return; +// } ReceiveResultDTO dto = new ReceiveResultDTO(); dto.setSqid(getSqid(item.getItemId())); 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 36e0f7fb5..c7674add0 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 @@ -537,13 +537,7 @@ WHEN 2 THEN '非常满意' ELSE '' END AS evaluationScore, - eve.APPROVE_NUM, - eve.OPPOSE_NUM, - eve.COMMENT_NUM, - eve.BROWSE_NUM, - (case when (process.STATE = 1001 and HOUR( timediff( now(), item.CREATED_TIME) ) >= 24) then '1' else '' end) as isRemind, - (case when (getworkminute(item.CREATED_TIME,now()) / 60 > 6) then '红灯' when (getworkminute(item.CREATED_TIME,now()) / 60 > 4 and getworkminute(item.CREATED_TIME,now()) / 60 <=6) then '黄灯' when (getworkminute(item.CREATED_TIME,now()) / 60 <= 4) then '绿灯' else '' end) as lamp, @@ -560,13 +554,9 @@ then concat((360 - getworkminute(item.CREATED_TIME,now())),'分钟') else concat((6 - ROUND((getworkminute(item.CREATED_TIME,now()) / 60),1)),'小时') end) end - ) as remainTime, + ) as remainTime - ( eve.APPROVE_NUM + eve.OPPOSE_NUM + eve.COMMENT_NUM + eve.BROWSE_NUM ) AS participantsNum, - (case when d.ID is not null then '1' else '0' end) as isDelay FROM epdc_item item - 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 from epdc_item_handle_process b