From b002fa3dea050249c5302e64eeae42ac41f8327b Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Thu, 8 Jun 2023 09:57:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=B9=E5=93=A8=E4=B8=8A?= =?UTF-8?q?=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- esua-epdc/epdc-cloud-gateway-shibei | 2 +- .../epdc/dto/item/result/AppealWhistleReportResultDTO.java | 7 +++++++ .../item/service/impl/PushToCityGridServiceImpl.java | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-cloud-gateway-shibei b/esua-epdc/epdc-cloud-gateway-shibei index 9e8daca47..89021d5b3 160000 --- a/esua-epdc/epdc-cloud-gateway-shibei +++ b/esua-epdc/epdc-cloud-gateway-shibei @@ -1 +1 @@ -Subproject commit 9e8daca470705338fa828ffb780da89f91e88e81 +Subproject commit 89021d5b3e35ad1d3be88a03e19de146df5a0d70 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealWhistleReportResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealWhistleReportResultDTO.java index 25837e621..7af8ee907 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealWhistleReportResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealWhistleReportResultDTO.java @@ -68,6 +68,13 @@ public class AppealWhistleReportResultDTO { @JsonProperty("sqdjrq") private String sqdjrq; + + /** + * 诉求上报时间 + */ + @JsonProperty("sbsj") + private String sbsj; + /** * 诉求照片 */ 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 bc18c1330..afc1e391f 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 @@ -322,7 +322,8 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { dto.setSqzynr(itemEntity.getItemContent()); dto.setSqdz(itemEntity.getIssueAddress()); dto.setSqxy(itemEntity.getIssueLongitude() + "," + itemEntity.getIssueLatitude()); - dto.setSqdjrq(DateUtils.format(new Date())); + dto.setSqdjrq(DateUtils.format(itemEntity.getCreatedTime())); + dto.setSbsj(DateUtils.format(new Date(), DateUtils.DATE_TIME_PATTERN)); List list = imgDao.selectListByRefeId(itemDTO.getId()); if (CollUtil.isNotEmpty(list)) { dto.setSqzp(list.stream().map(ImgEntity::getImgUrl).collect(Collectors.joining(",")));