From 9128686432a775fbf5e1c2e1763426f1c68e58e7 Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Mon, 3 Aug 2020 16:01:46 +0800
Subject: [PATCH] =?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'
- AND ENTERPRISE_NAME = #{enterpriseName}
+
+ AND ENTERPRISE_NAME like #{enterpriseName_like}
- AND MOBILE = #{mobile}
+
+ AND MOBILE like #{mobile_like}
- AND UNIFORM_SOCIAL_CREDIT_CODE = #{uniformSocialCreditCode}
+
+ AND UNIFORM_SOCIAL_CREDIT_CODE like #{uniformSocialCreditCode_like}
- AND LEGAL_PERSON = #{legalPerson}
+
+ AND LEGAL_PERSON like #{legalPerson_like}
AND (find_in_set(#{streetId},PARENT_DEPT_IDS)
@@ -96,4 +100,4 @@
and DEL_FLAG = '0'
-
\ No newline at end of file
+
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
+}