Merge branch 'master' of http://git.elinkit.com.cn:7070/r/esua-epdc-cloud

esua-epdc/epdc-cloud-gateway-shibei

@@ -1 +1 @@
-Subproject commit 9e8daca470705338fa828ffb780da89f91e88e81
+Subproject commit 89021d5b3e35ad1d3be88a03e19de146df5a0d70

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;
+
     /**
      * 诉求照片
      */

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<ImgEntity> list = imgDao.selectListByRefeId(itemDTO.getId());
             if (CollUtil.isNotEmpty(list)) {
                 dto.setSqzp(list.stream().map(ImgEntity::getImgUrl).collect(Collectors.joining(",")));