From aebfdf72396097f2a6154076dcc15f48a7de1588 Mon Sep 17 00:00:00 2001 From: luyan Date: Wed, 17 May 2023 10:56:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8B=E4=BB=B6=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=84=E7=90=86=E6=B5=81=E7=A8=8B=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/AuthApplication.java | 3 +-- .../epmet/dto/form/IcEventReplyFormDTO.java | 23 ++++++++++++++++++- .../result/IcEventProcessListResultDTO.java | 21 +++++++++++++++++ .../java/com/epmet/entity/IcEventEntity.java | 9 ++++++-- .../com/epmet/entity/IcEventReplyEntity.java | 20 ++++++++++++++++ .../service/impl/IcEventServiceImpl.java | 4 ++++ .../main/resources/mapper/IcEventReplyDao.xml | 8 +++++-- 7 files changed, 81 insertions(+), 7 deletions(-) diff --git a/epmet-auth/src/main/java/com/epmet/AuthApplication.java b/epmet-auth/src/main/java/com/epmet/AuthApplication.java index 07d85a0d5f..7cd7afed50 100644 --- a/epmet-auth/src/main/java/com/epmet/AuthApplication.java +++ b/epmet-auth/src/main/java/com/epmet/AuthApplication.java @@ -8,7 +8,6 @@ package com.epmet; -import com.taobao.dingtalk.spring.annotations.EnableDingTalk; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.web.servlet.ServletComponentScan; @@ -21,7 +20,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; * @author Mark sunlightcs@gmail.com * @since 1.0.0 */ -@EnableDingTalk +//@EnableDingTalk @SpringBootApplication @EnableDiscoveryClient @EnableFeignClients diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventReplyFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventReplyFormDTO.java index 6c9bacafa8..05e42de873 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventReplyFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventReplyFormDTO.java @@ -6,6 +6,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; import java.io.Serializable; +import java.util.Date; /** * @Description 事件管理_回复 @@ -50,7 +51,27 @@ public class IcEventReplyFormDTO implements Serializable { @NotBlank(message = "满意度不能为空", groups = {Comment.class}) private String satisfaction; + /** + * 办理状态：0、上报 1、阅收 2、完结 3、审核 4、事件评价 5、结案归档 + */ + private Integer manageStatus; + + /** + * 办理时间 + */ + private Date manageTime; + + /** + * 办理人 + */ + private String manageResi; + + /** + * 办理人电话 + */ + private String manageResiTel; + private String customerId; private String userId; -} \ No newline at end of file +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventProcessListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventProcessListResultDTO.java index 4379252a67..51b82fcfca 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventProcessListResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventProcessListResultDTO.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; +import java.util.Date; import java.util.List; /** @@ -92,5 +93,25 @@ public class IcEventProcessListResultDTO implements Serializable { */ private String actualServiceTime; + /** + * 办理状态：0、上报 1、阅收 2、完结 3、审核 4、事件评价 5、结案归档 + */ + private Integer manageStatus; + + /** + * 办理时间 + */ + private Date manageTime; + + /** + * 办理人 + */ + private String manageResi; + + /** + * 办理人电话 + */ + private String manageResiTel; + } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventEntity.java index 81c5635aaf..c20ab1ec25 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventEntity.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventEntity.java @@ -61,6 +61,11 @@ public class IcEventEntity extends BaseEpmetEntity { */ private String idCard; + /** + * 事件分类分类Id :灵山专用 + */ + private String categoryId; + /** * 反映渠道【字典表】dictTypeKey:ic_event_source_type;随手拍随时讲0、多媒体反应1、社区电话2、12345:3、网格员手持终端：4 */ @@ -117,7 +122,7 @@ public class IcEventEntity extends BaseEpmetEntity { private Integer readFlag; /** - * 报事人的红点:展示1；不展示：0；人大代表回复，工作人员回复/立项/转需求/办结更新为1; + * 报事人的红点:展示1；不展示：0；人大代表回复，工作人员回复/立项/转需求/办结更新为1; */ private Integer redDot; @@ -157,7 +162,7 @@ public class IcEventEntity extends BaseEpmetEntity { private Date commentTime; /** - * 事件审核状态[涉及附件审核需要加的状态]（审核中：auditing； + * 事件审核状态[涉及附件审核需要加的状态]（审核中：auditing； auto_passed: 自动通过； review：结果不确定，需要人工审核； block: 结果违规； diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventReplyEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventReplyEntity.java index e477a9cb2a..dfa2b8cbc7 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventReplyEntity.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventReplyEntity.java @@ -46,4 +46,24 @@ public class IcEventReplyEntity extends BaseEpmetEntity { */ private String userShowName; + /** + * 办理状态：0、上报 1、阅收 2、完结 3、审核 4、事件评价 5、结案归档 + */ + private Integer manageStatus; + + /** + * 办理时间 + */ + private Date manageTime; + + /** + * 办理人 + */ + private String manageResi; + + /** + * 办理人电话 + */ + private String manageResiTel; + } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index e5bf477bc6..62a42a2aea 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -798,6 +798,10 @@ public class IcEventServiceImpl extends BaseServiceImpl - \ No newline at end of file +