From 434aaa0fcc48dad96f39190d0bc6d79daaea7515 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Fri, 24 Apr 2020 17:57:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BF=E5=90=8D=E6=A0=87=E8=AF=86=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/dto/evaluate/EvaluateInfoDTO.java | 8 +++++++-
 .../epdc/dto/evaluate/form/EvaluateSubmitFormDTO.java     | 6 ++++++
 .../epdc/dto/evaluate/result/EvaluateInfoResultDTO.java   | 5 +++++
 .../epdc/modules/evaluate/entity/EvaluateInfoEntity.java  | 8 +++++---
 .../evaluate/service/impl/EvaluateInfoServiceImpl.java    | 1 +
 .../main/resources/mapper/evaluate/EvaluateInfoDao.xml    | 2 ++
 6 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateInfoDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateInfoDTO.java
index 3d0703301..bff4abd26 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateInfoDTO.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateInfoDTO.java
@@ -17,9 +17,10 @@
 
 package com.elink.esua.epdc.dto.evaluate;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -95,4 +96,9 @@ public class EvaluateInfoDTO implements Serializable {
 
     private Integer optionCount;
 
+    /**
+     * 匿名标识
+     */
+    private String anonymousFlag;
+
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/form/EvaluateSubmitFormDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/form/EvaluateSubmitFormDTO.java
index a44894854..c4e76b255 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/form/EvaluateSubmitFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/form/EvaluateSubmitFormDTO.java
@@ -74,4 +74,10 @@ public class EvaluateSubmitFormDTO implements Serializable {
      */
     private List<EvaluateSelectOption> optionList;
 
+    /**
+     * 匿名标识
+     */
+    @NotBlank(message = "匿名标识不能为空")
+    private String anonymousFlag;
+
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/result/EvaluateInfoResultDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/result/EvaluateInfoResultDTO.java
index b40fea6e6..0436cde76 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/result/EvaluateInfoResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/result/EvaluateInfoResultDTO.java
@@ -103,5 +103,10 @@ public class EvaluateInfoResultDTO implements Serializable {
      */
     private List<EvaluateSelectOption> optionsList;
 
+    /**
+     * 匿名标识
+     */
+    private String anonymousFlag;
+
 
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/entity/EvaluateInfoEntity.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/entity/EvaluateInfoEntity.java
index 6bc0ee56f..e0bd43437 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/entity/EvaluateInfoEntity.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/entity/EvaluateInfoEntity.java
@@ -18,13 +18,10 @@
 package com.elink.esua.epdc.modules.evaluate.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 评价信息表 评价信息表
  *
@@ -65,4 +62,9 @@ public class EvaluateInfoEntity extends BaseEpdcEntity {
 
 	private Integer optionCount;
 
+	/**
+	 * 匿名标识
+	 */
+	private String anonymousFlag;
+
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateInfoServiceImpl.java
index 0c5350cc7..94daabdb8 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateInfoServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateInfoServiceImpl.java
@@ -130,6 +130,7 @@ public class EvaluateInfoServiceImpl extends BaseServiceImpl<EvaluateInfoDao, Ev
             dto.setMobile(formDto.getMobile());
             dto.setOfficerId(formDto.getOfficerId());
             dto.setContent(formDto.getContent());
+            dto.setAnonymousFlag(formDto.getAnonymousFlag());
             if (formDto.getRoleCode() != 1
                     && formDto.getRoleCode() != 2) {
                 return new Result().error("评价选项错误。");
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateInfoDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateInfoDao.xml
index fb9ed2fee..a5777380b 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateInfoDao.xml
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateInfoDao.xml
@@ -27,6 +27,7 @@
         <result property="content" column="CONTENT"/>
         <result property="revision" column="REVISION"/>
         <result property="delFlag" column="DEL_FLAG"/>
+        <result property="anonymousFlag" column="ANONYMOUS_FLAG"/>
         <result property="createdBy" column="CREATED_BY"/>
         <result property="createdTime" column="CREATED_TIME"/>
         <result property="updatedBy" column="UPDATED_BY"/>
@@ -43,6 +44,7 @@
         info.OFFICER_ID,
         info.ROLE_CODE,
         info.CONTENT,
+        info.ANONYMOUS_FLAG,
         info.OPTION_COUNT,
         info.CREATED_TIME
         FROM