Merge branch 'dev_1118' of http://121.42.41.42:7070/r/esua-epdc-cloud into dev_1118

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkIssueController.java

@@ -2,7 +2,10 @@ package com.elink.esua.epdc.controller;
 
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.dto.category.EventCategoryDTO;
+import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO;
+import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO;
 import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO;
 import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
 import com.elink.esua.epdc.dto.issue.form.*;
@@ -30,17 +33,17 @@ public class ApiWorkIssueController {
      * @return
      */
     @GetMapping("issue/statistics")
-    public Result<IssueStateStatisticsResultDTO> statistics(@RequestBody IssueStateStatisticsFormDTO formDto) {
+    public Result<IssueStateStatisticsResultDTO> statistics(IssueStateStatisticsFormDTO formDto) {
         return workIssueService.stateStatistics(formDto);
     }
 
     /**
-     *待回应列表
+     * 事件列表接口（待回应/已驳回）
      * @param formDto
      * @return
      */
     @GetMapping("event/list")
-    public Result<List<IssuePendingResponseResultDTO>> list(@RequestBody IssuePendingResponseFormDTO formDto) {
+    public Result<List<IssuePendingResponseResultDTO>> list(IssuePendingResponseFormDTO formDto) {
         return workIssueService.listIssuePendingResponse(formDto);
     }
 
@@ -60,6 +63,7 @@ public class ApiWorkIssueController {
      */
     @GetMapping("event/categoryList")
     public Result<List<EventCategoryDTO>> categoryList() {
+
         return workIssueService.categoryList();
     }
 
@@ -70,6 +74,7 @@ public class ApiWorkIssueController {
      */
     @PostMapping("event/review")
     public Result review(EpdcEventsReviewFormDTO dto) {
+
         return workIssueService.review(dto);
     }
 
@@ -97,21 +102,34 @@ public class ApiWorkIssueController {
      * @return
      */
     @GetMapping("event/commentList")
-    public Result<List<WorkEventCommentResultDTO>> commentList(@RequestBody WorkEventCommentListFormDTO formDTO){
+    public Result<List<WorkEventCommentResultDTO>> commentList(WorkEventCommentListFormDTO formDTO){
         return workIssueService.selectWorkHotOrNewEventComment(formDTO);
     }
 
     /**
      *
      * 议题处理进度(后台/工作端用)
-     *
-     * @params [issueId]
-     * @return java.util.List<com.elink.esua.epdc.dto.issue.result.IssueProgressResultDTO>
-     * @author liuchuang
-     * @since 2019/11/21 15:16
      */
     @GetMapping("issue/processList")
-    public Result<List<IssueProgressResultDTO>> processList(@RequestBody WorkProcessListFormDTO workProcessListFormDTO){
+    public Result<List<IssueProgressResultDTO>> processList(WorkProcessListFormDTO workProcessListFormDTO){
         return workIssueService.processList(workProcessListFormDTO);
     }
+
+    /**
+     * 议题待处理
+     */
+    @PostMapping("issue/handleSubmit")
+    public Result handleSubmit(@RequestBody IssueWaitHandleSubmitFormDTO dto) {
+        ValidatorUtils.validateEntity(dto);
+        return workIssueService.handleSubmit(dto);
+    }
+
+    /**
+     *
+     * 事件评论回复列表接口
+     */
+    @GetMapping("event/commentReplyList")
+    public Result<WorkEventsCommentsDTO> commentReplyList(WorkCommentReplyFormDTO workCommentReplyFormDTO){
+        return workIssueService.commentReplyList(workCommentReplyFormDTO);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkIssueFeignClient.java

@@ -3,6 +3,8 @@ package com.elink.esua.epdc.feign;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.category.EventCategoryDTO;
+import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO;
+import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO;
 import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO;
 import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
 import com.elink.esua.epdc.dto.issue.form.*;
@@ -83,7 +85,7 @@ public interface WorkIssueFeignClient {
      * @return
      */
     @GetMapping(value = "events/epdc-app/comment/commentList", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<List<WorkEventCommentResultDTO>> commentList(@RequestBody WorkEventCommentListFormDTO formDTO);
+    Result<List<WorkEventCommentResultDTO>> commentList(WorkEventCommentListFormDTO formDTO);
 
     /**
      *
@@ -95,6 +97,22 @@ public interface WorkIssueFeignClient {
      * @since 2019/11/21 15:16
      */
     @GetMapping(value = "events/epdc-app/work/issue/processList", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<List<IssueProgressResultDTO>> processList(@RequestBody WorkProcessListFormDTO workProcessListFormDTO);
+    Result<List<IssueProgressResultDTO>> processList(WorkProcessListFormDTO workProcessListFormDTO);
 
+
+    /**
+     *议题处理
+     * @param dto
+     * @return
+     */
+    @PostMapping(value = "events/epdc-app/work/issue/handleSubmit", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result handleSubmit(IssueWaitHandleSubmitFormDTO dto);
+
+    /**
+     * 工作端-事件评论回复列表接口
+     * @param workCommentReplyFormDTO
+     * @return
+     */
+    @GetMapping(value = "events/epdc-app/comment/commentReplyList", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<WorkEventsCommentsDTO> commentReplyList(WorkCommentReplyFormDTO workCommentReplyFormDTO);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkIssueFeignClientFallback.java

@@ -4,6 +4,8 @@ import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.category.EventCategoryDTO;
+import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO;
+import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO;
 import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO;
 import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO;
 import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
@@ -66,4 +68,14 @@ public class WorkIssueFeignClientFallback implements WorkIssueFeignClient {
     public Result<List<IssueProgressResultDTO>> processList(WorkProcessListFormDTO workProcessListFormDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "processList", workProcessListFormDTO);
     }
+
+    @Override
+    public Result handleSubmit(IssueWaitHandleSubmitFormDTO dto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "handleSubmit", dto);
+    }
+
+    @Override
+    public Result<WorkEventsCommentsDTO> commentReplyList(WorkCommentReplyFormDTO workCommentReplyFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "commentReplyList", workCommentReplyFormDTO);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkIssueService.java

@@ -20,6 +20,8 @@ package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.category.EventCategoryDTO;
+import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO;
+import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO;
 import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO;
 import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
 import com.elink.esua.epdc.dto.issue.form.*;
@@ -31,14 +33,14 @@ import java.util.List;
 public interface WorkIssueService {
 
     /**
-     *议题数据统计
+     * 议题数据统计
      * @param formDto
      * @return
      */
     Result<IssueStateStatisticsResultDTO> stateStatistics(IssueStateStatisticsFormDTO formDto);
 
     /**
-     *待回应列表
+     * 事件列表接口（待回应/已驳回）
      * @param formDto
      * @return
      */
@@ -92,5 +94,21 @@ public interface WorkIssueService {
      * @author liuchuang
      * @since 2019/11/21 15:16
      */
-    Result<List<IssueProgressResultDTO>> processList(@RequestBody WorkProcessListFormDTO workProcessListFormDTO);
+    Result<List<IssueProgressResultDTO>> processList(WorkProcessListFormDTO workProcessListFormDTO);
+
+    /**
+     * 议题处理
+     * @param dto
+     * @return
+     */
+    Result handleSubmit(IssueWaitHandleSubmitFormDTO dto);
+
+    /**
+     * 事件评论回复列表接口
+     * @param workCommentReplyFormDTO
+     * @return
+     */
+    Result<WorkEventsCommentsDTO> commentReplyList(WorkCommentReplyFormDTO workCommentReplyFormDTO);
+
+
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkIssueServiceImpl.java

@@ -19,6 +19,8 @@ package com.elink.esua.epdc.service.impl;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.category.EventCategoryDTO;
+import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO;
+import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO;
 import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO;
 import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
 import com.elink.esua.epdc.dto.issue.form.*;
@@ -127,4 +129,24 @@ public class WorkIssueServiceImpl implements WorkIssueService {
     public Result<List<IssueProgressResultDTO>> processList(WorkProcessListFormDTO workProcessListFormDTO) {
         return workIssueFeignClient.processList(workProcessListFormDTO);
     }
+
+    /**
+     * 议题处理
+     * @param dto
+     * @return
+     */
+    @Override
+    public Result handleSubmit(IssueWaitHandleSubmitFormDTO dto) {
+        return workIssueFeignClient.handleSubmit(dto);
+    }
+
+    /**
+     * 事件评论回复列表接口
+     * @param workCommentReplyFormDTO
+     * @return
+     */
+    @Override
+    public Result<WorkEventsCommentsDTO> commentReplyList(WorkCommentReplyFormDTO workCommentReplyFormDTO) {
+        return workIssueFeignClient.commentReplyList(workCommentReplyFormDTO);
+    }
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/ImageConstant.java

@@ -28,5 +28,6 @@ public interface ImageConstant {
     public final static String TYPE_IMAGE_BIZ_ISSUE_HANDLE = "issueHandle";
 
     public final static String TYPE_IMAGE_ITEM_HANDLE = "itemHandle";
+
     public final static String TYPE_IMAGE_ITEM_OUT_HANDLE = "itemOutHandle";
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/form/WorkCommentReplyFormDTO.java

@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.dto.comment.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+
+/**
+ * 事件评论回复列表接口
+ *
+ */
+@Data
+public class WorkCommentReplyFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String commentId;
+
+}

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/result/WorkEventsCommentsDTO.java

@@ -0,0 +1,53 @@
+package com.elink.esua.epdc.dto.comment.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 事件评论DTO
+ * @Author LC
+ * @Date 2019/9/6 17:20
+ */
+@Data
+public class WorkEventsCommentsDTO implements Serializable {
+    private static final long serialVersionUID = 2112619345374657409L;
+
+
+    /**
+     * 评论人昵称
+     */
+    private String userName;
+
+    /**
+     * 评论人头像
+     */
+    private String userFace;
+
+    /**
+     *评论时间
+     */
+    private Date createdTime;
+
+    /**
+     *评论内容
+     */
+    private String content;
+
+    /**
+     *点赞数
+     */
+    private String likeCount;
+
+    /**
+     *点踩数
+     */
+    private String unLikeCount;
+
+    /**
+     * 回复列表
+     */
+    private List<WorkReplyCommentDTO> replies;
+}

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/result/WorkReplyCommentDTO.java

@@ -0,0 +1,37 @@
+package com.elink.esua.epdc.dto.comment.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 被回复的评论
+ * @Author LC
+ * @Date 2019/9/6 17:25
+ */
+@Data
+public class WorkReplyCommentDTO implements Serializable {
+    private static final long serialVersionUID = 3501567846629315395L;
+
+
+    /**
+     *回复人昵称
+     */
+    private String replyUserName;
+
+    /**
+     *回复人头像
+     */
+    private String replyUserFace;
+
+    /**
+     *回复时间
+     */
+    private Date createdTime;
+
+    /**
+     *回复内容
+     */
+    private String content;
+}

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDetailDTO.java

@@ -54,6 +54,14 @@ public class EpdcEventsDetailDTO implements Serializable {
      * 事件地址
      */
     private String address;
+    /**
+     * 图片
+     */
+    private List<String> handleResidentImages;
+    /**
+     * 事件地址
+     */
+    private String advice;
     /**
      * 纬度
      */

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssuePendingResponseFormDTO.java

@@ -5,19 +5,40 @@ import lombok.Data;
 import java.io.Serializable;
 import java.util.List;
 
+/**
+ * 事件列表接口（待回应/已驳回）
+ */
 @Data
 public class IssuePendingResponseFormDTO implements Serializable {
 
+    /**
+     *事件状态 0-待回应，2-已驳回
+     */
     private Integer state;
 
+    /**
+     *部门ID
+     */
     private Long deptId;
 
+    /**
+     *
+     */
     private List deptIdList;
 
+    /**
+     *页码
+     */
     private Integer pageIndex;
 
+    /**
+     * 页容量
+     */
     private Integer pageSize;
 
+    /**
+     *第一页查询发起时的时间
+     */
     private String timestamp;
 
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueStateStatisticsFormDTO.java

@@ -5,12 +5,15 @@ import lombok.Data;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
+/**
+ * 议题数据统计
+ */
 @Data
 public class IssueStateStatisticsFormDTO implements Serializable {
     private static final long serialVersionUID = -8864248267071206774L;
 
     /**
-     * 用户所属网格ID
+     * 部门ID
      */
     private Long deptId;
 

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueWaitHandleSubmitFormDTO.java

@@ -5,6 +5,7 @@ import lombok.Data;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 议题待处理提交DTO
@@ -29,4 +30,10 @@ public class IssueWaitHandleSubmitFormDTO implements Serializable {
      */
     @NotNull(message = "处理操作不能为空")
     private Integer state;
+
+    /**
+     * 图片
+     */
+    private List<String> images;
+
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssuePendingResponseResultDTO.java

@@ -5,19 +5,40 @@ import lombok.Data;
 import java.io.Serializable;
 import java.util.Date;
 
+/**
+ * 事件列表接口（待回应/已驳回）
+ */
 @Data
 public class IssuePendingResponseResultDTO implements Serializable {
 
+    /**
+     * 事件ID
+     */
     private String id;
 
+    /**
+     *用户昵称
+     */
     private String nickName;
 
+    /**
+     *事件内容
+     */
     private String eventContent;
 
+    /**
+     *提交时间
+     */
     private Date createdTime;
 
+    /**
+     *党员标识 0否；1是
+     */
     private String partyFlag;
 
+    /**
+     *用户头像
+     */
     private String userFace;
 }
 

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueStateStatisticsResultDTO.java

@@ -4,17 +4,32 @@ import lombok.Data;
 
 import java.io.Serializable;
 
+/**
+ *议题数据统计
+ */
 @Data
 public class IssueStateStatisticsResultDTO implements Serializable {
 
     private static final long serialVersionUID = -4512771534907006929L;
 
+    /**
+     *待回应数量
+     */
     private Integer pendingResponseNum;
 
+    /**
+     *待处理数量
+     */
     private Integer pendingHandleNum;
 
+    /**
+     *已驳回数量
+     */
     private Integer rejectedNum;
 
+    /**
+     *已关闭数量
+     */
     private Integer closed;
 }
 

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/controller/AppEventCommentController.java

@@ -23,7 +23,9 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.dto.comment.CommentStatementFormDTO;
 import com.elink.esua.epdc.dto.comment.form.CommentFormDTO;
 import com.elink.esua.epdc.dto.comment.form.EventCommentsFormDTO;
+import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO;
 import com.elink.esua.epdc.dto.comment.result.EventCommentsResultDTO;
+import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO;
 import com.elink.esua.epdc.dto.issue.form.WorkEventCommentListFormDTO;
 import com.elink.esua.epdc.dto.issue.result.WorkEventCommentResultDTO;
 import com.elink.esua.epdc.modules.comment.service.EventCommentService;
@@ -87,4 +89,13 @@ public class AppEventCommentController {
     public Result<List<WorkEventCommentResultDTO>> commentList(@RequestBody WorkEventCommentListFormDTO formDTO){
         return eventCommentService.selectWorkHotOrNewEventComment(formDTO);
     }
+
+    /**
+     *
+     * 事件评论回复列表接口
+     */
+    @GetMapping("commentReplyList")
+    public Result<WorkEventsCommentsDTO> commentReplyList(WorkCommentReplyFormDTO workCommentReplyFormDTO){
+        return eventCommentService.commentReplyList(workCommentReplyFormDTO);
+    }
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/dao/EventCommentDao.java

@@ -18,7 +18,10 @@
 package com.elink.esua.epdc.modules.comment.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.comment.form.EventCommentsFormDTO;
+import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO;
+import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO;
 import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO;
 import com.elink.esua.epdc.dto.issue.form.WorkEventCommentListFormDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueHotCommentResultDTO;
@@ -103,4 +106,10 @@ public interface EventCommentDao extends BaseDao<EventCommentEntity> {
     List<WorkEventCommentResultDTO> selectWorkHotOrNewEventComment(WorkEventCommentListFormDTO formDTO);
 
 
+    /**
+     * 工作端-事件评论回复列表接口
+     * @param workCommentReplyFormDTO
+     * @return
+     */
+    WorkEventsCommentsDTO commentReplyList(WorkCommentReplyFormDTO workCommentReplyFormDTO);
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/EventCommentService.java

@@ -24,7 +24,9 @@ import com.elink.esua.epdc.dto.comment.EpdcCommentsAndAttitudeFromTopicFormDTO;
 import com.elink.esua.epdc.dto.comment.EventCommentDTO;
 import com.elink.esua.epdc.dto.comment.form.CommentFormDTO;
 import com.elink.esua.epdc.dto.comment.form.EventCommentsFormDTO;
+import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO;
 import com.elink.esua.epdc.dto.comment.result.EventCommentsResultDTO;
+import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO;
 import com.elink.esua.epdc.dto.issue.form.WorkEventCommentListFormDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueHotCommentResultDTO;
 import com.elink.esua.epdc.dto.issue.result.WorkEventCommentResultDTO;
@@ -170,4 +172,12 @@ public interface EventCommentService extends BaseService<EventCommentEntity> {
      * @return
      */
     Result<List<WorkEventCommentResultDTO>> selectWorkHotOrNewEventComment(WorkEventCommentListFormDTO formDTO);
+
+
+    /**
+     * 工作端-事件评论回复列表接口
+     * @param workCommentReplyFormDTO
+     * @return
+     */
+    Result<WorkEventsCommentsDTO> commentReplyList(WorkCommentReplyFormDTO workCommentReplyFormDTO);
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java

@@ -31,7 +31,9 @@ import com.elink.esua.epdc.dto.comment.EventCommentDTO;
 import com.elink.esua.epdc.dto.comment.EventCommentUserAttitudeDTO;
 import com.elink.esua.epdc.dto.comment.form.CommentFormDTO;
 import com.elink.esua.epdc.dto.comment.form.EventCommentsFormDTO;
+import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO;
 import com.elink.esua.epdc.dto.comment.result.EventCommentsResultDTO;
+import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
 import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO;
 import com.elink.esua.epdc.dto.issue.form.WorkEventCommentListFormDTO;
@@ -357,4 +359,16 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev
         List<WorkEventCommentResultDTO> list = baseDao.selectWorkHotOrNewEventComment(formDTO);
         return new Result<List<WorkEventCommentResultDTO>>().ok(list);
     }
+
+    /**
+     * 工作端-事件评论回复列表接口
+     * @param workCommentReplyFormDTO
+     * @return
+     */
+    @Override
+    public Result<WorkEventsCommentsDTO> commentReplyList(WorkCommentReplyFormDTO workCommentReplyFormDTO) {
+        WorkEventsCommentsDTO workEventsCommentsDTO = baseDao.commentReplyList(workCommentReplyFormDTO);
+        return new Result<WorkEventsCommentsDTO>().ok(workEventsCommentsDTO);
+
+    }
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java

@@ -195,6 +195,6 @@ public interface EpdcEventsService extends BaseService<EpdcEventsEntity> {
      * @param formDto
      * @return
      */
-    Result<List<IssuePendingResponseResultDTO>> listIssuePendingResponse(@RequestBody IssuePendingResponseFormDTO formDto);
+    Result<List<IssuePendingResponseResultDTO>> listIssuePendingResponse(IssuePendingResponseFormDTO formDto);
 
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/EpdcAppWorkIssueController.java

@@ -2,11 +2,9 @@ package com.elink.esua.epdc.modules.issue.controller;
 
 import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.dto.category.EventCategoryDTO;
-import com.elink.esua.epdc.dto.issue.form.IssuePendingResponseFormDTO;
+import com.elink.esua.epdc.dto.issue.form.*;
-import com.elink.esua.epdc.dto.issue.form.IssueStateStatisticsFormDTO;
-import com.elink.esua.epdc.dto.issue.form.WorkIssueListFormDTO;
-import com.elink.esua.epdc.dto.issue.form.WorkProcessListFormDTO;
 import com.elink.esua.epdc.dto.issue.result.*;
 import com.elink.esua.epdc.modules.category.service.EventCategoryService;
 import com.elink.esua.epdc.modules.issue.service.IssueService;
@@ -95,4 +93,17 @@ public class EpdcAppWorkIssueController {
     }
 
 
+    /**
+     * 议题待处理提交
+     * @Params: [dto]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author: liuchuang
+     * @Date: 2019/9/6 11:26
+     */
+    @PostMapping("handleSubmit")
+    public Result handleSubmit(@RequestBody IssueWaitHandleSubmitFormDTO dto) {
+        ValidatorUtils.validateEntity(dto);
+        return issueService.saveIssueHandleResult(dto);
+    }
+
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java

@@ -219,14 +219,14 @@ public interface IssueService extends BaseService<IssueEntity> {
      * @param formDto
      * @return
      */
-    Result<IssueStateStatisticsResultDTO> stateStatistics(@RequestBody IssueStateStatisticsFormDTO formDto);
+    Result<IssueStateStatisticsResultDTO> stateStatistics(IssueStateStatisticsFormDTO formDto);
 
     /**
      * 工作端-待回应列表
      * @param formDto
      * @return
      */
-    Result<List<IssuePendingResponseResultDTO>> listIssuePendingResponse(@RequestBody IssuePendingResponseFormDTO formDto);
+    Result<List<IssuePendingResponseResultDTO>> listIssuePendingResponse(IssuePendingResponseFormDTO formDto);
 
     /**
      * 工作端-议题待处理或者已关闭的最新最热列表

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java

@@ -31,6 +31,7 @@ import com.elink.esua.epdc.commons.tools.utils.DateUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.constant.EventIssueItemState;
 import com.elink.esua.epdc.constant.EventsNoticeConstant;
+import com.elink.esua.epdc.constant.ImageConstant;
 import com.elink.esua.epdc.constants.MenuCodeConstant;
 import com.elink.esua.epdc.dto.MenuNoticeDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
@@ -43,6 +44,7 @@ import com.elink.esua.epdc.modules.async.DeptRespondTask;
 import com.elink.esua.epdc.modules.async.NewsTask;
 import com.elink.esua.epdc.modules.comment.service.EventCommentService;
 import com.elink.esua.epdc.modules.events.service.EpdcEventsService;
+import com.elink.esua.epdc.modules.events.service.ImgService;
 import com.elink.esua.epdc.modules.feign.GroupFeignClient;
 import com.elink.esua.epdc.modules.issue.dao.IssueDao;
 import com.elink.esua.epdc.modules.issue.entity.IssueEntity;
@@ -98,6 +100,9 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
     @Autowired
     private GroupFeignClient groupFeignClient;
 
+    @Autowired
+    private ImgService imgService;
+
 
     @Override
     public PageData<IssueWaitHandleOrClosedDTO> listOfIssues(Map<String, Object> params) {
@@ -182,6 +187,9 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         // 反馈、关闭
         if (EventIssueItemState.ISSUE_HANDLED_FEEDBACK == dto.getState() || EventIssueItemState.ISSUE_CLOSED == dto.getState()) {
             issueHandleService.insert(handleEntity);
+
+            imgService.saveImages(dto.getImages(),handleEntity.getId(), ImageConstant.TYPE_IMAGE_BIZ_ISSUE_HANDLE);
+
             informationFormDTO.setTitle(EventsNoticeConstant.NOTICE_ISSUE_FEEDBACK);
             if (EventIssueItemState.ISSUE_CLOSED == dto.getState()) {
                 informationFormDTO.setTitle(EventsNoticeConstant.NOTICE_ISSUE_CLOSED);
@@ -205,6 +213,16 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
                 itemHandleProcessEntity.setHandlerDeptId(user.getDeptId());
                 itemHandleProcessEntity.setHandlerDept(user.getDeptName());
                 itemHandleProcessService.insert(itemHandleProcessEntity);
+
+                /**
+                 * 内部处理图片
+                 */
+                imgService.saveImages(dto.getImages(),itemHandleProcessEntity.getId(), ImageConstant.TYPE_IMAGE_ITEM_HANDLE);
+                /**
+                 * 外部处理图片
+                 */
+                imgService.saveImages(dto.getImages(),itemHandleProcessEntity.getId(), ImageConstant.TYPE_IMAGE_ITEM_OUT_HANDLE);
+
                 // 插入项目部门关联表
                 ItemDeptEntity itemDeptEntity = new ItemDeptEntity();
                 itemDeptEntity.setDeptId(SecurityUser.getDeptId());

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml

@@ -205,4 +205,42 @@
         LIMIT #{pageIndex},#{pageSize}
     </select>
 
+    <resultMap id="workCommentReplyListMap" type="com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO">
+        <result property="userName" column="USER_NAME"/>
+        <result property="userFace" column="USER_FACE"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="content" column="CONTENT"/>
+        <result property="likeCount" column="LIKE_COUNT"/>
+        <result property="unLikeCount" column="UN_LIKE_COUNT"/>
+        <collection property="replies" ofType="com.elink.esua.epdc.dto.comment.result.WorkReplyCommentDTO">
+            <result property="replyUserName" column="replyUserName"/>
+            <result property="replyUserFace" column="replyUserFace"/>
+            <result property="createdTime" column="createdTime"/>
+            <result property="content" column="content"/>
+        </collection>
+    </resultMap>
+
+    <select id="commentReplyList" resultMap="workCommentReplyListMap">
+        SELECT
+        com.USER_NAME,
+        com.USER_FACE,
+        com.CREATED_TIME,
+        com.CONTENT,
+        com.LIKE_COUNT,
+        com.UN_LIKE_COUNT,
+        rep.USER_NAME AS replyUserName,
+        rep.USER_FACE AS replyUserFace,
+        rep.CREATED_TIME AS createdTime,
+        rep.CONTENT AS content
+        FROM
+        epdc_event_comment com
+        LEFT JOIN epdc_event_comment rep ON com.ID = rep.COMMENT_ID
+        AND rep.COMMENT_TYPE = '1'
+        AND rep.SHIELD_FLAG = '0'
+        AND rep.DEL_FLAG = '0'
+        WHERE
+        com.DEL_FLAG = '0'
+        AND com.ID = #{commentId}
+    </select>
+
 </mapper>

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml

@@ -18,6 +18,9 @@
         <collection property="imageArray" ofType="java.lang.String">
             <result property="image" column="IMG_URL"/>
         </collection>
+        <collection property="handleResidentImages" ofType="java.lang.String">
+            <result property="image" column="IIMG_URL"/>
+        </collection>
     </resultMap>
     <select id="selectOneOfEventDetailById" resultMap="eventDetailMap">
         SELECT
@@ -26,17 +29,22 @@
             e.USER_FACE,
             e.IS_PARTY_MEMBER,
             i.IMG_URL,
+            ii.IMG_URL as IIMG_URL,
             e.NICK_NAME,
             e.MOBILE,
             e.CREATED_TIME,
             e.ISSUE_ADDRESS,
             e.ISSUE_LATITUDE,
             e.ISSUE_LONGITUDE,
+            e.ADVICE,
             CONCAT(e.AREA,e.STREET,e.COMMUNITY,e.GRID) AS ownGrid
         FROM
             epdc_events e
             LEFT JOIN epdc_img i ON e.ID = i.REFERENCE_ID
             AND i.DEL_FLAG = '0'
+            LEFT JOIN epdc_img ii ON e.ID = ii.REFERENCE_ID
+            AND ii.DEL_FLAG = '0'
+            AND ii.IMG_TYPE = 'eventsReject'
         WHERE
             e.DEL_FLAG = '0'
             AND e.ID = #{id}
@@ -287,6 +295,7 @@
         <if test="formDto.timestamp != null">
             <![CDATA[ AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
         </if>
+        order by CREATED_TIME
         LIMIT #{pageIndex},#{pageSize}
     </select>
 

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml

@@ -536,12 +536,15 @@
                     #{id}
                 </foreach>
                 <![CDATA[ AND DATE_FORMAT(t1.DISTRIBUTE_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
+                ORDER BY
+                <if test='orderType == "1"'>( t2.APPROVE_NUM + t2.OPPOSE_NUM + t2.COMMENT_NUM + t2.BROWSE_NUM ) DESC,</if>
+                issue.DISTRIBUTE_TIME DESC
                 LIMIT #{pageIndex},#{pageSize}
             ) temp
         )
         ORDER BY
-        <if test='orderType == "1"'>statementNum DESC</if>
+        <if test='orderType == "1"'>statementNum DESC,</if>
-        <if test='orderType == "0"'>issue.DISTRIBUTE_TIME DESC</if>
+        issue.DISTRIBUTE_TIME DESC
     </select>
 
 

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java

@@ -315,4 +315,19 @@ public class UserDTO implements Serializable {
 
     private String leaderFlag;
 
-}
+    /**
+     * 认证历史-累计提交认证次数
+     */
+    private Integer totalSubmitNum;
+
+    /**
+     * 认证历史-通过次数
+     */
+    private Integer totalPassSubmitNum;
+
+    /**
+     * 认证历史-不通过次数
+     */
+    private Integer totalFailNum;
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserAuthenticateHistoryController.java

@@ -26,8 +26,10 @@ import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.dto.UserAuthenticateHistoryDTO;
+import com.elink.esua.epdc.entity.UserAuthenticateHistoryEntity;
 import com.elink.esua.epdc.excel.UserAuthenticateHistoryExcel;
 import com.elink.esua.epdc.service.UserAuthenticateHistoryService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -45,7 +47,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("userauthenticatehistory")
 public class UserAuthenticateHistoryController {
-    
+
     @Autowired
     private UserAuthenticateHistoryService userAuthenticateHistoryService;
 
@@ -61,6 +63,22 @@ public class UserAuthenticateHistoryController {
         return new Result<UserAuthenticateHistoryDTO>().ok(data);
     }
 
+    /**
+     * @param userId 用户id
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.UserAuthenticateHistoryDTO>>
+     * @Author yinzuomei
+     * @Description 根据用户id查询认证历史记录
+     * @Date 2019/11/21 13:59
+     **/
+    @GetMapping("listUserAuthenticateHistory/{userId}")
+    public Result<List<UserAuthenticateHistoryEntity>> listUserAuthenticateHistory(@PathVariable("userId") String userId) {
+        if (StringUtils.isBlank(userId)) {
+            return new Result().error("用户id不能为空");
+        }
+        List<UserAuthenticateHistoryEntity> list = userAuthenticateHistoryService.listUserAuthenticateHistory(userId);
+        return new Result<List<UserAuthenticateHistoryEntity>>().ok(list);
+    }
+
     @PostMapping
     public Result save(@RequestBody UserAuthenticateHistoryDTO dto){
         //效验数据
@@ -91,4 +109,4 @@ public class UserAuthenticateHistoryController {
         ExcelUtils.exportExcelToTarget(response, null, list, UserAuthenticateHistoryExcel.class);
     }
 
-}
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserGridRelationController.java

@@ -36,13 +36,13 @@ import java.util.Map;
 /**
  * 网格长与网格关系表
  *
- * @author work@yujt.net.cn 
+ * @author work@yujt.net.cn
  * @since v1.0.0 2019-10-23
  */
 @RestController
 @RequestMapping("usergrid")
 public class UserGridRelationController {
-    
+
     @Autowired
     private UserGridRelationService userGridRelationService;
 
@@ -89,4 +89,17 @@ public class UserGridRelationController {
         return new Result<List<UserGridRelationDTO>>().ok(data);
     }
 
-}
+    /**
+     * @param id epdc_user_grid_relation表主键
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author yinzuomei
+     * @Description 解绑
+     * @Date 2019/11/21 19:00
+     **/
+    @GetMapping("unbindGridHandle/{id}")
+    public Result unbindGridHandle(@PathVariable("id") String id) {
+        userGridRelationService.unbindGridHandle(id);
+        return new Result();
+    }
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserAuthenticateHistoryDao.java

@@ -20,6 +20,10 @@ package com.elink.esua.epdc.dao;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.entity.UserAuthenticateHistoryEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.poi.ss.formula.functions.T;
+
+import java.util.List;
 
 /**
  * 用户认证历史表
@@ -29,5 +33,22 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface UserAuthenticateHistoryDao extends BaseDao<UserAuthenticateHistoryEntity> {
-	
+	/**
-}
+	 * @param userId 用户id
+	 * @return java.util.List<com.elink.esua.epdc.entity.UserAuthenticateHistoryEntity>
+	 * @Author yinzuomei
+	 * @Description 根据用户id查询认证历史记录
+	 * @Date 2019/11/21 15:26
+	 **/
+	List<UserAuthenticateHistoryEntity> selectListUserAuthenticateHistory(String userId);
+
+	/**
+	 * @param userId 用户id
+	 * @param authenticatedFlag  是否认证通过 0未通过1通过
+	 * @return java.lang.Integer
+	 * @Author yinzuomei
+	 * @Description  统计用户认证次数
+	 * @Date 2019/11/21 15:55
+	 **/
+	Integer countAuthenticateHistory(@Param("userId") String userId, @Param("authenticatedFlag")String authenticatedFlag);
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserAuthenticateHistoryService.java

@@ -92,4 +92,13 @@ public interface UserAuthenticateHistoryService extends BaseService<UserAuthenti
      * @date 2019-11-21
      */
     void delete(String[] ids);
-}
+
+    /**
+     * @param userId 用户id
+     * @return java.util.List<com.elink.esua.epdc.dto.UserAuthenticateHistoryDTO>
+     * @Author yinzuomei
+     * @Description 根据用户id查询认证历史记录
+     * @Date 2019/11/21 14:01
+     **/
+    List<UserAuthenticateHistoryEntity> listUserAuthenticateHistory(String userId);
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserGridRelationService.java

@@ -146,4 +146,13 @@ public interface UserGridRelationService extends BaseService<UserGridRelationEnt
      * @date 2019/10/30 17:55
      */
     int delete(String userId, Long gridId);
-}
+
+    /**
+     * @param id 主键
+     * @return void
+     * @Author yinzuomei
+     * @Description 解绑
+     * @Date 2019/11/21 18:06
+     **/
+    void unbindGridHandle(String id);
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserAuthenticateHistoryServiceImpl.java

@@ -101,4 +101,16 @@ public class UserAuthenticateHistoryServiceImpl extends BaseServiceImpl<UserAuth
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
+    /**
+     * @param userId 用户id
+     * @return java.util.List<com.elink.esua.epdc.dto.UserAuthenticateHistoryDTO>
+     * @Author yinzuomei
+     * @Description 根据用户id查询认证历史记录
+     * @Date 2019/11/21 14:01
+     **/
+    @Override
+    public List<UserAuthenticateHistoryEntity> listUserAuthenticateHistory(String userId) {
+        return baseDao.selectListUserAuthenticateHistory(userId);
+    }
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserGridRelationServiceImpl.java

@@ -22,6 +22,8 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.redis.RedisKeys;
+import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -33,6 +35,7 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO;
 import com.elink.esua.epdc.entity.UserGridRelationEntity;
 import com.elink.esua.epdc.service.UserGridRelationService;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -49,7 +52,8 @@ import java.util.Map;
  */
 @Service
 public class UserGridRelationServiceImpl extends BaseServiceImpl<UserGridRelationDao, UserGridRelationEntity> implements UserGridRelationService {
-
+    @Autowired
+    private RedisUtils redisUtils;
     @Override
     public PageData<UserGridRelationDTO> page(Map<String, Object> params) {
         IPage<UserGridRelationEntity> page = baseDao.selectPage(
@@ -161,4 +165,24 @@ public class UserGridRelationServiceImpl extends BaseServiceImpl<UserGridRelatio
                 .eq(FieldConstant.GRID_ID, gridId);
         return this.baseDao.delete(wrapper);
     }
-}
+
+    /**
+     * @param id 主键
+     * @return void
+     * @Author yinzuomei
+     * @Description 解绑
+     * @Date 2019/11/21 18:06
+     **/
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void unbindGridHandle(String id) {
+        UserGridRelationEntity userGridRelationEntity = this.baseDao.selectById(id);
+        this.baseDao.deleteById(id);
+        String key = RedisKeys.getCpUserKey(userGridRelationEntity.getUserId());
+        Map<String, Object> map = redisUtils.hGetAll(key);
+        Long currentGridId = userGridRelationEntity.getGridId();
+        if (map.containsKey("gridId") && currentGridId.equals(map.get("gridId"))) {
+            redisUtils.delete(RedisKeys.getCpUserKey(userGridRelationEntity.getUserId()));
+        }
+    }
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -112,8 +112,11 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     @Override
     public UserDTO get(String id) {
         UserEntity entity = baseDao.selectById(id);
-
+        UserDTO resultDTO=ConvertUtils.sourceToTarget(entity, UserDTO.class);
-        return ConvertUtils.sourceToTarget(entity, UserDTO.class);
+        resultDTO.setTotalSubmitNum(userAuthenticateHistoryDao.countAuthenticateHistory(id,null));
+        resultDTO.setTotalFailNum(userAuthenticateHistoryDao.countAuthenticateHistory(id,NumConstant.ZERO_STR));//0 未通过1通过
+        resultDTO.setTotalPassSubmitNum(userAuthenticateHistoryDao.countAuthenticateHistory(id,NumConstant.ONE_STR));
+        return resultDTO;
     }
 
     @Override
@@ -154,6 +157,21 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             userTagRelationDTO.setTagId(tagId);
             userTagRelationService.save(userTagRelationDTO);
         }*/
+        //组装数据并插入用户认证历史表(epdc_user_authenticate_history)
+        UserEntity userEntity=this.baseDao.selectById(entity.getId());
+        UserAuthenticateHistoryEntity userAuthenticateHistoryEntity=new UserAuthenticateHistoryEntity();
+        userAuthenticateHistoryEntity.setUserId(userEntity.getId());
+        userAuthenticateHistoryEntity.setMobile(userEntity.getMobile());
+        userAuthenticateHistoryEntity.setRealName(userEntity.getRealName());
+        userAuthenticateHistoryEntity.setAddress(userEntity.getAddress());
+        userAuthenticateHistoryEntity.setAuthenticatedFlag(userEntity.getState());//状态(0-已注册，1-已完善信息待审核，2-信息审核不通过，3-信息审核通过)
+        if(NumConstant.THREE_STR.equals(entity.getState())){
+            userAuthenticateHistoryEntity.setAuthenticatedFlag(YesOrNoEnum.YES.value());
+        }else{
+            userAuthenticateHistoryEntity.setAuthenticatedFlag(YesOrNoEnum.NO.value());
+        }
+        userAuthenticateHistoryEntity.setRemark(dto.getRemark());
+        userAuthenticateHistoryDao.insert(userAuthenticateHistoryEntity);
     }
 
 
@@ -483,6 +501,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             userAuthenticateHistoryEntity.setMobile(userDto.getMobile());
             userAuthenticateHistoryEntity.setRealName(userDto.getRealName());
             userAuthenticateHistoryEntity.setAddress(userDto.getAddress());
+            userAuthenticateHistoryEntity.setRemark(userDto.getRemark());
             userAuthenticateHistoryDao.insert(userAuthenticateHistoryEntity);
         } else {
             if (oldEntity.getState().equals(AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value())) {

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserAuthenticateHistoryDao.xml

@@ -19,5 +19,25 @@
         <result property="delFlag" column="DEL_FLAG"/>
     </resultMap>
 
+    <!--  根据用户id查询认证历史记录  -->
+    <select id="selectListUserAuthenticateHistory" resultMap="userAuthenticateHistoryMap">
+        select *
+        from epdc_user_authenticate_history m
+        where  m.DEL_FLAG='0'
+        and m.USER_ID=#{value}
+	    order by m.CREATED_TIME desc
+    </select>
 
-</mapper>
+    <!--  统计用户认证次数  -->
+    <select id="countAuthenticateHistory" parameterType="map" resultType="java.lang.Integer">
+        SELECT
+            count(1)as totalNum
+        FROM
+            epdc_user_authenticate_history m
+            where m.DEL_FLAG='0'
+            and m.USER_ID=#{userId}
+            <if test="authenticatedFlag!=null and authenticatedFlag!=''">
+                and m.AUTHENTICATED_FLAG=#{authenticatedFlag}
+            </if>
+    </select>
+</mapper>