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 6c74dbdf4..c0cd74d27 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 @@ -523,13 +523,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem sqdjr.setSsjg(name); sqdjr.setSsjgbm(code); data.setSqdjr(sqdjr); - // todo jack照片格式调整为http List imageList = imgDao.selectListByRefeId(entity.getEventId() == null?entity.getId():entity.getEventId()); log.info("执法照片imageList:"+imageList); //诉求照片 StringBuffer sqzp = new StringBuffer(""); imageList.forEach(img ->{ - sqzp.append(img.getImgUrl()).append(","); + sqzp.append(img.getImgUrl().replace(ApiConstants.eventOssUrlBefore, ApiConstants.eventOssUrlAfter)).append(","); }); log.info("执法照片sqzp:"+sqzp); if(StringUtils.isNotBlank(sqzp)){ @@ -2940,14 +2939,13 @@ public class ItemServiceImpl extends BaseServiceImpl implem sqdjr.setSsjg(name); sqdjr.setSsjgbm(code); data.setSqdjr(sqdjr); - // todo jack照片格式调整为http QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("REFERENCE_ID", entity.getEventId() == null?entity.getId():entity.getEventId()); List imageList = imgDao.selectList(wrapper); //诉求照片 StringBuffer sqzp = new StringBuffer(""); imageList.forEach(img ->{ - sqzp.append(img.getImgUrl()).append(","); + sqzp.append(img.getImgUrl().replace(ApiConstants.eventOssUrlBefore, ApiConstants.eventOssUrlAfter)).append(","); }); if(StringUtils.isNotBlank(sqzp)){ data.setSqzp(sqzp.substring(0,sqzp.length()-1)); @@ -3017,13 +3015,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem /* sqdjr.setSsjgbm(getJgbm(entity.getGridId()));*/ sqdjr.setSsjgbm(code); data.setSqdjr(sqdjr); - // todo jack照片格式调整为http List imageList = imgDao.selectListByRefeId(entity.getEventId() == null?entity.getId():entity.getEventId()); log.info("发展照片imageList:"+imageList); //诉求照片 StringBuffer sqzp = new StringBuffer(""); imageList.forEach(img ->{ - sqzp.append(img.getImgUrl()).append(","); + sqzp.append(img.getImgUrl().replace(ApiConstants.eventOssUrlBefore, ApiConstants.eventOssUrlAfter)).append(","); }); log.info("发展照片sqzp:"+sqzp); if(StringUtils.isNotBlank(sqzp)){ 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 8c813a8b6..8654a7ad5 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 @@ -871,9 +871,13 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { dto.setSqid(getSqid(item.getItemId())); dto.setSqzt(CityPushStateEnum.DSH.getCode()); dto.setDqclhj(CityPushLinkEnum.SQ_CL.getCode()); - dto.setCzjg(item.getGridDelayresult()); - //dto.setYqsj(DateUtils.format(item.getGridDelayhour(),DateUtils.DATE_TIME_PATTERN)); - dto.setYqsj(DateUtils.format(item.getCreatedTime(),DateUtils.DATE_TIME_PATTERN)); + dto.setCzjg(StringUtils.isNotBlank(item.getGridDelayresult())?item.getGridDelayresult():"0"); + //延期时间(创建时间加小时数) + long hour = 0; + if (StringUtils.isNotBlank(item.getGridDelayhour())) { + hour = 3600 * 1000 * Integer.parseInt(item.getGridDelayhour()); + } + dto.setYqsj(DateUtils.format(new Date(item.getCreatedTime().getTime() + hour), DateUtils.DATE_TIME_PATTERN)); dto.setCzsj(DateUtils.format(item.getCreatedTime(),DateUtils.DATE_TIME_PATTERN)); dto.setCzyj(item.getHandleAdvice()); DelayAuditResultDTO.CzrDTO czr = new DelayAuditResultDTO.CzrDTO();