From b4f5d82b43498f1530aaa1dea271f28853c27b3a Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Fri, 31 Jul 2020 16:57:43 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E3=80=90PC=E7=AB=AF=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=91=E8=AF=9D=E9=A2=98=E7=AE=A1=E7=90=86=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=AE=B5=E6=9F=A5=E8=AF=A2SQL=E4=BF=AE=E6=94=B9-=E7=8E=8B?=
 =?UTF-8?q?=E5=85=AC=E5=B3=B0-2020-07-31?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/topic/TopicDao.xml                 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicDao.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicDao.xml
index 21b4ea89f..dfeed6fd0 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicDao.xml
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicDao.xml
@@ -222,7 +222,6 @@
             OR find_in_set(#{gridId},temp.ALL_DEPT_IDS))
         </if>
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-            AND DATE_FORMAT( epgr.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
             AND DATE_FORMAT( temp.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
         </if>
         <if test="groupId != null and groupId != ''">

From 9128686432a775fbf5e1c2e1763426f1c68e58e7 Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Mon, 3 Aug 2020 16:01:46 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E3=80=90pc=E7=AB=AF-bug=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E3=80=91=E3=80=90=E5=AF=BC=E5=87=BA=E9=A1=BA=E5=BA=8F=E5=92=8C?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E8=B0=83=E6=95=B4=E3=80=91=E9=AD=8F=E5=87=AF?=
 =?UTF-8?q?=202020-07-03?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/excel/SysLogErrorExcel.java     |  4 ++--
 .../esua/epdc/excel/SysLogOperationExcel.java | 10 ++++++----
 .../elink/esua/epdc/excel/SysUserExcel.java   | 19 ++++++++++++-------
 .../mapper/enterprise/EnterpriseInfoDao.xml   | 14 +++++++++-----
 .../epdc/excel/KpiMassEvaluationExcel.java    |  6 +++---
 5 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/excel/SysLogErrorExcel.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/excel/SysLogErrorExcel.java
index d0642a2d1..9245dea13 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/excel/SysLogErrorExcel.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/excel/SysLogErrorExcel.java
@@ -29,10 +29,10 @@ public class SysLogErrorExcel {
     private String requestMethod;
     @Excel(name = "请求参数")
     private String requestParams;
-    @Excel(name = "User-Agent")
-    private String userAgent;
     @Excel(name = "操作IP")
     private String ip;
+    @Excel(name = "用户代理")
+    private String userAgent;
     @Excel(name = "创建时间", format = "yyyy-MM-dd HH:mm:ss")
     private Date createDate;
 
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/excel/SysLogOperationExcel.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/excel/SysLogOperationExcel.java
index 39d4b9527..9f1c807bc 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/excel/SysLogOperationExcel.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/excel/SysLogOperationExcel.java
@@ -21,10 +21,13 @@ import java.util.Date;
  */
 @Data
 public class SysLogOperationExcel {
-    @Excel(name = "模块名称")
-    private String module;
+    @Excel(name = "用户名")
+    private String creatorName;
     @Excel(name = "用户操作")
     private String operation;
+    @Excel(name = "模块名称")
+    private String module;
+
     @Excel(name = "请求URI")
     private String requestUri;
     @Excel(name = "请求方式")
@@ -39,8 +42,7 @@ public class SysLogOperationExcel {
     private String ip;
     @Excel(name = "状态", replace = {"失败_0", "成功_1"})
     private Integer status;
-    @Excel(name = "用户名")
-    private String creatorName;
+
     @Excel(name = "创建时间", format = "yyyy-MM-dd HH:mm:ss")
     private Date createDate;
 
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/excel/SysUserExcel.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/excel/SysUserExcel.java
index 2dd8be894..1da0b2183 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/excel/SysUserExcel.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/excel/SysUserExcel.java
@@ -23,21 +23,26 @@ import java.util.Date;
 public class SysUserExcel {
     @Excel(name = "用户名")
     private String username;
-    @Excel(name = "姓名")
+    @Excel(name = "真实姓名")
     private String realName;
-    @Excel(name = "性别", replace = {"男_0", "女_1", "保密_2"})
-    private Integer gender;
+    @Excel(name = "部门名称")
+    private String deptName;
     @Excel(name = "邮箱")
     private String email;
     @Excel(name = "手机号")
     private String mobile;
-    @Excel(name = "部门名称")
-    private String deptName;
     @Excel(name = "状态", replace = {"停用_0", "正常_1"})
     private Integer status;
-    @Excel(name = "备注")
-    private String remark;
     @Excel(name = "创建时间", format = "yyyy-MM-dd HH:mm:ss")
     private Date createDate;
+//    @Excel(name = "性别", replace = {"男_0", "女_1", "保密_2"})
+//    private Integer gender;
+//
+//
+//
+//
+//    @Excel(name = "备注")
+//    private String remark;
+
 
 }
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/enterprise/EnterpriseInfoDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/enterprise/EnterpriseInfoDao.xml
index c27945705..1116a535a 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/enterprise/EnterpriseInfoDao.xml
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/enterprise/EnterpriseInfoDao.xml
@@ -47,16 +47,20 @@
         select * from epdc_enterprise_info t
         where DEL_FLAG = '0'
         <if test="enterpriseName != null and enterpriseName != ''">
-            AND ENTERPRISE_NAME = #{enterpriseName}
+         <bind name="enterpriseName_like" value="'%'+enterpriseName+'%'"/>
+            AND ENTERPRISE_NAME like #{enterpriseName_like}
         </if>
         <if test="mobile != null and mobile != ''">
-            AND MOBILE = #{mobile}
+            <bind name="mobile_like" value="'%'+mobile+'%'"/>
+            AND MOBILE like #{mobile_like}
         </if>
         <if test="uniformSocialCreditCode != null and uniformSocialCreditCode != ''">
-            AND UNIFORM_SOCIAL_CREDIT_CODE = #{uniformSocialCreditCode}
+            <bind name="uniformSocialCreditCode_like" value="'%'+uniformSocialCreditCode+'%'"/>
+            AND UNIFORM_SOCIAL_CREDIT_CODE like #{uniformSocialCreditCode_like}
         </if>
         <if test="legalPerson != null and legalPerson != ''">
-            AND LEGAL_PERSON = #{legalPerson}
+            <bind name="legalPerson_like" value="'%'+legalPerson+'%'"/>
+            AND LEGAL_PERSON like #{legalPerson_like}
         </if>
         <if test="streetId != null and streetId != ''">
             AND (find_in_set(#{streetId},PARENT_DEPT_IDS)
@@ -96,4 +100,4 @@
         </if>
         and DEL_FLAG = '0'
     </select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiMassEvaluationExcel.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiMassEvaluationExcel.java
index 2ad4b0451..06d7fcb4a 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiMassEvaluationExcel.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiMassEvaluationExcel.java
@@ -21,7 +21,7 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Data;
 
 /**
- * 群众评价打分表 
+ * 群众评价打分表
  *
  * @author elink elink@elink-cn.com
  * @since v1.0.0 2020-06-16
@@ -41,7 +41,7 @@ public class KpiMassEvaluationExcel {
     @Excel(name = "部门类别")
     private String deptTypeKey;
 
-    @Excel(name = "年")
+    @Excel(name = "年份")
     private String year;
 
     @Excel(name = "满意分数")
@@ -84,4 +84,4 @@ public class KpiMassEvaluationExcel {
 //    private String delFlag;
 
 
-}
\ No newline at end of file
+}

From 92ccca1c02e274d2681d0a5cb717d830dd6d46da Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Mon, 3 Aug 2020 16:26:13 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E3=80=90pc=E7=AB=AF-bug=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E3=80=91=E3=80=90=E5=AF=BC=E5=87=BA=E9=A1=BA=E5=BA=8F=E5=92=8C?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E8=B0=83=E6=95=B4=E3=80=91=E9=AD=8F=E5=87=AF?=
 =?UTF-8?q?=202020-07-03?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/elink/esua/epdc/excel/SysUserExcel.java   | 2 +-
 .../epdc-admin-server/src/main/resources/mapper/SysUserDao.xml  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/excel/SysUserExcel.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/excel/SysUserExcel.java
index 1da0b2183..535372cb8 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/excel/SysUserExcel.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/excel/SysUserExcel.java
@@ -25,7 +25,7 @@ public class SysUserExcel {
     private String username;
     @Excel(name = "真实姓名")
     private String realName;
-    @Excel(name = "部门名称")
+    @Excel(name = "所属部门")
     private String deptName;
     @Excel(name = "邮箱")
     private String email;
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml
index 0e0bb8b9e..00685b287 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml
@@ -31,6 +31,7 @@
                 #{id}
             </foreach>
         </if>
+        ORDER BY  t1.create_date desc
     </select>
 
     <select id="getById" resultType="com.elink.esua.epdc.entity.SysUserEntity">

From 78d34aa25bbeac0595d29098e58055ec962799d6 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Mon, 3 Aug 2020 17:17:30 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E3=80=90PC=E7=AB=AF=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=91BUG=E4=BF=AE=E6=94=B9-=E7=8E=8B=E5=85=AC=E5=B3=B0-2020?=
 =?UTF-8?q?-08-03?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/topic/controller/TopicController.java               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/controller/TopicController.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/controller/TopicController.java
index 407ebd6fc..6d264ff5d 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/controller/TopicController.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/controller/TopicController.java
@@ -55,7 +55,7 @@ public class TopicController {
     private TopicService topicService;
 
     @GetMapping("page")
-    @DataFilter(tableAlias = "temp", deptId = "grid_id", prefix = "AND", isPendingCreator = false)
+//    @DataFilter(tableAlias = "temp", deptId = "grid_id", prefix = "AND", isPendingCreator = false)
     public Result<PageData<TopicDTO>> page(@RequestParam Map<String, Object> params){
         PageData<TopicDTO> page = topicService.listTopic(params);
         return new Result<PageData<TopicDTO>>().ok(page);

From 90c83d977464c5dcc548d602d871d114efeb0d5d Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Tue, 4 Aug 2020 10:32:06 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E3=80=90=E5=90=8E=E5=8F=B0BUG=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E3=80=91-=E3=80=90=E5=AF=BC=E5=87=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E8=B0=83=E6=95=B4=E3=80=91-=EF=BC=88=E7=8E=8B?=
 =?UTF-8?q?=E7=AB=A5=EF=BC=89-2020/8/4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../elink/esua/epdc/excel/SysLogLoginExcel.java    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/excel/SysLogLoginExcel.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/excel/SysLogLoginExcel.java
index c7468e326..7ff22699d 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/excel/SysLogLoginExcel.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/excel/SysLogLoginExcel.java
@@ -21,16 +21,16 @@ import java.util.Date;
  */
 @Data
 public class SysLogLoginExcel {
-    @Excel(name = "用户操作")
-    private String operation;
-    @Excel(name = "状态", replace = {"失败_0", "成功_1", "账号已锁定_1"})
+    @Excel(name = "用户名")
+    private String creatorName;
+    @Excel(name = "操作类型", replace = {"登录_0", "退出_1"})
+    private Integer operation;
+    @Excel(name = "状态", replace = {"失败_0", "成功_1", "账号已锁定_2"})
     private Integer status;
-    @Excel(name = "User-Agent")
-    private String userAgent;
     @Excel(name = "操作IP")
     private String ip;
-    @Excel(name = "用户名")
-    private String creatorName;
+    @Excel(name = "User-Agent")
+    private String userAgent;
     @Excel(name = "创建时间", format = "yyyy-MM-dd HH:mm:ss")
     private Date createDate;