diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealPageResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealPageResultDTO.java index 38d2dd119..1196d852b 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealPageResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealPageResultDTO.java @@ -120,28 +120,4 @@ public class ItemAppealPageResultDTO implements Serializable { */ private String isRemind; - /** - * 创建时间距离当日结束还有几个小时,-17:00 - */ - private String createHour; - - /** - * 今天实际工作几个小时,8:00- - */ - private String todayHour; - - /** - * 创建诉求后过了几天 - */ - private String days; - - /** - * 创建诉求后过了几天 - */ - private String createWeek; - - /** - * 今天是周几 - */ - private String todayWeek; } 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 0a80a8816..a387e6e91 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 @@ -2195,7 +2195,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem } //备注 log.info("上报网格化平台dto:" + dto); - sendDto.setBZXX(dto.getHandleAdvice()); + sendDto.setBZXX(dto.getHandleAdvice()+" 诉求编码:" + itemEntity.getSerialNum()); if (StringUtils.isNotBlank(dto.getHandleAdviceRemark())) { sendDto.setBZXX(sendDto.getBZXX() + "\n不予受理详细说明:" + dto.getHandleAdviceRemark() + "\n诉求编码:" + itemEntity.getSerialNum()); } 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 ebb559ca1..2c264939f 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 @@ -1723,11 +1723,9 @@ SELECT i.id, i.NICK_NAME, i.CREATED_TIME, - TIMESTAMPDIFF(HOUR,i.CREATED_TIME,CONCAT(DATE_FORMAT(i.CREATED_TIME,'%Y-%m-%d'),' 17:00:00')) AS createHour, - TIMESTAMPDIFF(HOUR,CONCAT(DATE_FORMAT(now(),'%Y-%m-%d'),' 09:00:00'),NOW()) AS todayHour, - TIMESTAMPDIFF(DAY,i.CREATED_TIME,NOW()) AS days, - DAYOFWEEK(i.CREATED_TIME) AS createWeek, - DAYOFWEEK(NOW()) AS todayWeek, + case when (getworkminute(item.CREATED_TIME,now()) / 60 > 8) then '1' + when (getworkminute(item.CREATED_TIME,now()) / 60 > 6 and getworkminute(item.CREATED_TIME,now()) / 60 <=8) then '2' + when (getworkminute(item.CREATED_TIME,now()) / 60 <= 6) then '3' else '' end) as isRemind, i.ITEM_STATE, i.SERIAL_NUM, i.GRID as gridName, @@ -1754,8 +1752,7 @@ else '' end as evaluationScoreName, i.EVALUATION_CONTENT, - i.EVALUATION_TIME, - (case when (process.STATE = 1001 and HOUR( timediff( now(), i.CREATED_TIME) ) >= 24) then '1' else '' end) as isRemind + i.EVALUATION_TIME FROM epdc_item i left join ( select b.ID,b.ITEM_ID,b.CREATED_TIME,b.state