心理咨询相关问题修复，对接前端

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/conflict/form/ConflictMediateDetailFormDTO.java

@@ -1,51 +0,0 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- * <p>
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * <p>
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.elink.esua.epdc.dto.conflict.form;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-
-/**
- * 工作端--矛盾调解 详情
- *
- * @author zhangyuan qu@elink-cn.com
- * @since v1.0.0 2020-06-08
- */
-@Data
-public class ConflictMediateDetailFormDTO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 网格ID
-     */
-    private Long gridId;
-
-    /**
-     * 用户ID
-     */
-    private String userId;
-
-    /**
-     * 纠纷id
-     */
-    private String conflictId;
-
-}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/conflict/form/ConflictMediateFormDTO.java

@@ -20,8 +20,8 @@ package com.elink.esua.epdc.dto.conflict.form;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**
@@ -33,75 +33,65 @@ import java.util.Date;
 @Data
 public class ConflictMediateFormDTO implements Serializable {
 
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 8427657960024158180L;
-
-    /**
-     * 提交人ID
-     */
-	private Long userId;
-
-    /**
-     * 提交人
-     */
-    private String userName;
 
     /**
      * 矛盾纠纷类型
      */
     @NotBlank(message = "纠纷类型不能为空")
-	private String conflictType;
+    private String conflictType;
 
     /**
      * 行成原因
      */
     @NotBlank(message = "行测原因不能为空")
-	private String conflictReason;
+    private String conflictReason;
 
     /**
      * 涉及人数
      */
-    @NotBlank(message = "涉及人数不能为空")
+    @NotNull(message = "涉及人数不能为空")
-	private Integer involvedNum;
+    private Integer involvedNum;
 
     /**
      * 挑头骨干人员
      */
     @NotBlank(message = "挑头骨干人员不能为空")
-	private String mainstayLeader;
+    private String mainstayLeader;
 
     /**
      * 责任单位
      */
     @NotBlank(message = "责任部门不能为空")
-	private String responsibleDept;
+    private String responsibleDept;
 
     /**
      * 责任人
      */
     @NotBlank(message = "责任人不能为空")
-	private String responsiblePeople;
+    private String responsiblePeople;
 
     /**
      * 主要采取措施
      */
     @NotBlank(message = "主要措施不能为空")
-	private String majorMeasures;
+    private String majorMeasures;
 
     /**
      * 目前稳控情况
      */
     @NotBlank(message = "当前状态不能为空")
-	private String currentSituation;
+    private String currentSituation;
 
     /**
      * 备注
      */
-	private String remark;
+    private String remark;
 
     /**
      * 提报时间
      */
     @NotBlank(message = "提报时间不能为空")
-	private Date submitTime;
+    private String submitTime;
 
 }

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/conflict/form/ConflictMediateHistoryFormDTO.java

@@ -20,6 +20,7 @@ package com.elink.esua.epdc.dto.conflict.form;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 
@@ -32,33 +33,31 @@ import java.io.Serializable;
 @Data
 public class ConflictMediateHistoryFormDTO implements Serializable {
 
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 581178037019807001L;
-
-    /**
-     * 网格ID
-     */
-    private Long gridId;
-
-    /**
-     * 用户ID
-     */
-    private String userId;
 
+    // --------------------------------------前端上送字段
     /**
      * 页码
      */
-    @NotBlank(message = "页码不能为空")
+    @NotNull(message = "页码不能为空")
     private Integer pageIndex;
 
     /**
      * 页容量
      */
-    @NotBlank(message = "页容量不能为空")
+    @NotNull(message = "页容量不能为空")
     private Integer pageSize;
 
     /**
      * 第一页查询发起时的时间
      */
+    @NotBlank(message = "查询时间戳不能为空")
     private String timestamp;
 
+    // --------------------------------------冗余字段
+
+    /**
+     * 用户ID
+     */
+    private String userId;
 }

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/conflict/result/ConflictMediateDetailResultDTO.java

@@ -87,6 +87,6 @@ public class ConflictMediateDetailResultDTO implements Serializable {
     /**
      * 提报时间
      */
-	private Date submitTime;
+	private String submitTime;
 
 }

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/conflict/result/ConflictMediateHistoryResultDTO.java

@@ -20,7 +20,6 @@ package com.elink.esua.epdc.dto.conflict.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**
@@ -32,7 +31,7 @@ import java.util.Date;
 @Data
 public class ConflictMediateHistoryResultDTO implements Serializable {
 
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = -8401232788693706494L;
 
     /**
      * 主键
@@ -42,6 +41,6 @@ public class ConflictMediateHistoryResultDTO implements Serializable {
     /**
      * 提报时间
      */
-	private Date submitTime;
+	private String submitTime;
 
 }

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/psychology/form/PsychologySubmitAnswerFormDTO.java

@@ -47,13 +47,13 @@ public class PsychologySubmitAnswerFormDTO implements Serializable {
     /**
      * 问题id
      */
-    @NotBlank(message = "问题id不能为空")
+    @NotBlank(message = "问题主键不能为空")
     private String questionId;
 
     /**
      * 问题回复文本
      */
-    @NotBlank(message = "问题回复不能为空")
+    @NotBlank(message = "回复内容不能为空")
     private String answerContent;
 
 }