Merge branch 'hotfix/pcBug'

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/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;
 

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;
 

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;
+
 
 }

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">

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>
+</mapper>

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);

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 != ''">

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;
 
 
-}
+}