From 580118197934bd5bdd0dc1e472f6544edbaff638 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= <lipengfei@outlook.com>
Date: Thu, 20 Feb 2020 18:28:56 +0800
Subject: [PATCH] =?UTF-8?q?1118=E4=BB=A3=E7=A0=81=E5=9B=9E=E6=BB=9Aend?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../evaluate/excel/EvaluateDeptCountExcel.java    |  7 +------
 .../evaluate/excel/EvaluateOfficerCountExcel.java | 15 ++++++---------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateDeptCountExcel.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateDeptCountExcel.java
index eb5c6c191..cc5e872f8 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateDeptCountExcel.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateDeptCountExcel.java
@@ -31,13 +31,8 @@ import java.util.Date;
 @Data
 public class EvaluateDeptCountExcel {
 
-    @Excel(name = "主键")
-    private String id;
 
-    @Excel(name = "部门ID")
-    private String deptId;
-
-    @Excel(name = "部门名称")
+    @Excel(name = "街道名称")
     private String deptName;
 
     @Excel(name = "干部人数")
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerCountExcel.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerCountExcel.java
index a1368ded5..10bcb952f 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerCountExcel.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerCountExcel.java
@@ -35,21 +35,14 @@ public class EvaluateOfficerCountExcel {
     @Excel(name = "部门ID 部门表主键ID")
     private String deptId;*/
 
-    @Excel(name = "干部姓名")
+    @Excel(name = "姓名")
     private String fullName;
 
     @Excel(name = "性别", replace = {"女_0", "男_1"})
     private String sex;
 
-    @Excel(name = "单位职务")
+    @Excel(name = "单位职位")
     private String position;
-
-    @Excel(name = "点赞次数")
-    private Integer likesCount;
-
-    @Excel(name = "被踩次数")
-    private Integer opposeCount;
-
     /**
      * 评价总人数
      */
@@ -62,12 +55,16 @@ public class EvaluateOfficerCountExcel {
     @Excel(name = "评价总次数")
     private Integer evaluateCount;
 
+    @Excel(name = "点赞次数")
+    private Integer likesCount;
     /**
      * 点赞选项次数
      */
     @Excel(name = "点赞选项次数")
     private Integer likesOptionCount;
 
+    @Excel(name = "吐槽次数")
+    private Integer opposeCount;
     /**
      * 吐槽选项次数
      */