【pc端-bug修改】【导出顺序和标题调整】魏凯 2020-07-03

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;
 

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 = "模块名称")
+    @Excel(name = "用户名")
-    private String module;
+    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;
 

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"})
+    @Excel(name = "部门名称")
-    private Integer gender;
+    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;
+
 
 }

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)

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiMassEvaluationExcel.java

@@ -41,7 +41,7 @@ public class KpiMassEvaluationExcel {
     @Excel(name = "部门类别")
     private String deptTypeKey;
 
-    @Excel(name = "年")
+    @Excel(name = "年份")
     private String year;
 
     @Excel(name = "满意分数")