From 06bb4971bf754a50ba1043e51219c475fc95f23c Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 19 May 2022 17:44:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=A2=9E=E5=8A=A0=E8=BF=94?= =?UTF-8?q?=E5=8F=82=EF=BC=9B=E5=9B=9E=E5=A4=8D=E3=80=81=E7=AB=8B=E9=A1=B9?= =?UTF-8?q?=E3=80=81=E8=BD=AC=E6=9C=8D=E5=8A=A1=E3=80=81=E5=8A=9E=E7=BB=93?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BA=A2=E7=82=B9=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/IcEventListResultDTO.java | 82 ++++++++++++++++--- .../service/impl/IcEventServiceImpl.java | 15 +++- .../src/main/resources/mapper/IcEventDao.xml | 55 ++++++++++--- 3 files changed, 128 insertions(+), 24 deletions(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java index 933846b759..c4dd90f6be 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java @@ -30,9 +30,13 @@ public class IcEventListResultDTO implements Serializable { */ private String gridName; /** - * 事件内容 + * 网格的所属组织 */ - private String eventContent; + private String agencyId; + /** + * 报事的人【居民端/pc端居民Id】可为空 + */ + private String reportUserId; /** * 图片[url集合] */ @@ -42,18 +46,17 @@ public class IcEventListResultDTO implements Serializable { */ private List voiceList; /** - * 上报渠道[字典表] + * 上报渠道 */ - private String sourceType; + private String sourceTypeName; /** - * 发生时间 + * 纬度 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date happenTime; + private String latitude; /** - * 上报渠道 + * 经度 */ - private String sourceTypeName; + private String longitude; /** * 地址 */ @@ -66,6 +69,23 @@ public class IcEventListResultDTO implements Serializable { * 手机号 */ private String mobile; + /** + * 身份证号 + */ + private String idCard; + /** + * 上报渠道[字典表] + */ + private String sourceType; + /** + * 发生时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date happenTime; + /** + * 事件内容 + */ + private String eventContent; /** * 群众满意度[满意度 - 不满意:bad、基本满意:good、非常满意:perfect] */ @@ -91,7 +111,49 @@ public class IcEventListResultDTO implements Serializable { * 事件创建人 */ private String createdUserId; - + /** + * 办结时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date closeCaseTime; + /** + * 0:已回复 1:已转项目 1:已转需求 + */ + private String operationType; + /** + * 项目、需求ID + */ + private String operationId; + /** + * 事件是否被阅读过;1已读；针对报事人待处理列表 + */ + private Integer readFlag; + /** + * 报事人的红点:展示1；不展示：0；人大代表回复，工作人员回复/立项/转需求/办结更新为1; + */ + private Integer redDot; + /** + * 最近一次操作时间（回复、立项、转需求、办结更新此列） + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date latestOperatedTime; + /** + * 是否解决：已解决 resolved，未解决 un_solved + */ + private String resolveStatus; + /** + * 结案说明 + */ + private String closeRemark; + /** + * 评论人 + */ + private String commentUserId; + /** + * 评论时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date commentTime; /** * 上级分类ID 顶级此列存储0 */ 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 e27260fe39..95de4e4bba 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 @@ -1,6 +1,7 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.FieldConstant; @@ -210,10 +211,14 @@ public class IcEventServiceImpl extends BaseServiceImpl imageEntityList = new ArrayList<>(); if (!CollectionUtils.isEmpty(formDTO.getImageList())) { @@ -294,6 +300,7 @@ public class IcEventServiceImpl extends BaseServiceImpl + - - + - + + + + + + + + + + + + + + + + + + + + - - - SELECT ie.id icEventId, + ie.agency_id, ie.grid_id, - ie.event_content, - ie.source_type, - ie.address, + ie.report_user_id, ie.`name`, ie.mobile, + ie.id_card, + ie.source_type, + ie.happen_time, + ie.event_content, + ie.latitude, + ie.longitude, + ie.address, + ie.`status`, + IF(ie.status = 'processing','处理中',IF (ie.status = 'closed_case','已办结',''))statusName, + ie.close_case_time, ie.satisfaction, IF(ie.satisfaction = 'bad','不满意',IF (ie.satisfaction = 'good','基本满意',IF (ie.satisfaction = 'perfect','非常满意','')))satisfactionName, + ie.operation_type, + ie.operation_id, + ie.read_flag, + ie.red_dot, + ie.latest_operated_time, + ie.resolve_status, + ie.close_remark, + ie.comment_user_id, + ie.comment_time, ie.created_time, - ie.`status`, - IF(ie.status = 'processing','处理中',IF (ie.status = 'closed_case','已办结',''))statusName, - ie.happen_time, ie.created_by, iec.category_id FROM