diff --git a/esua-epdc/epdc-cloud-commons-shibei b/esua-epdc/epdc-cloud-commons-shibei index afd07f546..aa34c3ead 160000 --- a/esua-epdc/epdc-cloud-commons-shibei +++ b/esua-epdc/epdc-cloud-commons-shibei @@ -1 +1 @@ -Subproject commit afd07f546d032e9cc6889df29d315af6d32c0f4c +Subproject commit aa34c3eadc59d0ebc055d7980cef773f49b954a2 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealAuditResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealAuditResultDTO.java index 5557100c4..14aa69a24 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealAuditResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealAuditResultDTO.java @@ -53,6 +53,14 @@ public class AppealAuditResultDTO { @JsonProperty("czyj") private String czyj; + + @JsonProperty("cljg") + private String cljg; + + + @JsonProperty("files") + private String files; + @NoArgsConstructor @Data public static class CzrDTO { diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealFormDTO.java index 44b5dfa08..7d5434fa0 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealFormDTO.java @@ -35,6 +35,8 @@ public class AppealFormDTO { private String jjqk; private String sqid; + + public void setCzsj(String czsj) { this.czsj = czsj; } 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 61184b584..b2c1d047d 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 @@ -1320,6 +1320,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { czr.setSsbm(entity.getHandlerDept()); } dto.setCzr(czr); + dto.setCljg(entity.getHandleAdvice()); // 组装好直接推送 String result = cityGridApi.sendItemToCity(dto, PushToCityGridConstant.APPEAL_AUDIT, "诉求审核"); saveLog(entity.getItemId(), entity.getId(), "诉求审核", PushToCityGridConstant.APPEAL_AUDIT, JSONObject.toJSONString(dto), result); @@ -1595,7 +1596,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { public void appeal(AppealFormDTO appealFormDTO) { String result = cityGridApi.sendItemToCity(appealFormDTO, PushToCityGridConstant.APPEAL, "诉求申诉"); - saveLog(appealFormDTO.getCzr().getId(), "", "诉求申诉", PushToCityGridConstant.APPEAL_AUDIT, JSONObject.toJSONString(appealFormDTO), result); + saveLog(appealFormDTO.getCzr().getId(), "", "诉求申诉", PushToCityGridConstant.APPEAL, JSONObject.toJSONString(appealFormDTO), result); }