From 671a2757d839073a2b74c61ef548f3262c624e35 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 18 Feb 2020 13:00:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B9=B2=E9=83=A8=E8=AF=84=E4=BB=B7?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/modules/evaluate/excel/EvaluateOfficerExcel.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerExcel.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerExcel.java index 352dd730a..a2359e974 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerExcel.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerExcel.java @@ -44,15 +44,15 @@ public class EvaluateOfficerExcel { @Excel(name = "单位职务") private String position; + @Excel(name = "排序") + private Integer sort; + @Excel(name = "点赞次数") private Integer likesCount; @Excel(name = "被踩次数") private Integer opposeCount; - @Excel(name = "排序") - private Integer sort; - /* @Excel(name = "乐观锁") private Integer revision; From c80b5dd658c06f785c79ff5b788c3d0485c77a95 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 18 Feb 2020 13:12:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B9=B2=E9=83=A8=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=82=B9=E8=B5=9E=E6=95=B0=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E9=BB=98=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../evaluate/service/impl/EvaluateOfficerServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateOfficerServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateOfficerServiceImpl.java index 6de8cd20b..84f3f287f 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateOfficerServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateOfficerServiceImpl.java @@ -161,6 +161,8 @@ public class EvaluateOfficerServiceImpl extends BaseServiceImpl