diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/LingShanScreenServiceRstDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/LingShanScreenServiceRstDTO.java index f9e9cf9db2..dc6988ccb8 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/LingShanScreenServiceRstDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/LingShanScreenServiceRstDTO.java @@ -5,7 +5,6 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import java.security.PrivateKey; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -14,6 +13,7 @@ import java.util.List; @AllArgsConstructor @NoArgsConstructor public class LingShanScreenServiceRstDTO { + private String id; private String content; private String applicantName; private String applicantMobile; @@ -50,8 +50,8 @@ public class LingShanScreenServiceRstDTO { @NoArgsConstructor @AllArgsConstructor public static class ProcessNode { - private Integer processType; - private String processTypeName; + private Integer processStatus; + private String processStatusName; private String processorName; private String processDesc; private List processAttachments = new ArrayList<>(); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java index 0b2fc2bd19..8819a436e9 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java @@ -524,7 +524,7 @@ public class LingShanAgentServiceServiceImpl implements LingShanAgentServiceServ // d.setApplicantHomeAddress(resiUserGridInfo.getGridName()); // } // } - + d.setId(rec.getId()); d.setContent(rec.getContent()); d.setExceptServeAddress(rec.getExceptServeAddress()); d.setExceptServeTime(rec.getExceptServeTime()); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/ResiImportDyzxhPostProcessor.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/ResiImportDyzxhPostProcessor.java index ec5628378d..83e0d49964 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/ResiImportDyzxhPostProcessor.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/ResiImportDyzxhPostProcessor.java @@ -31,5 +31,6 @@ public class ResiImportDyzxhPostProcessor extends ResiImportPostProcessor{ form.setMessageType(SystemMessageType.IC_RESI_USER_ADD); form.setContent(mqMsg); epmetMessageOpenFeignClient.sendSystemMsgByMQ(form); + } }