feat：会员管理添加搜索条件

fs-service-system/src/main/java/com/fs/store/domain/FsUser.java

@@ -1,5 +1,6 @@
 package com.fs.store.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fs.common.annotation.Excel;
 import com.fs.common.core.domain.BaseEntity;
@@ -151,6 +152,17 @@ public class FsUser extends BaseEntity
     // 是否已购0 否 1程序内下单 2程序外下单
     private Integer payOrder;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(exist = false)
+    private Date startCreateTime;
+
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endCreateTime;
+
+    @TableField(exist = false)
+    private String companyUserNickName;
+
     public Integer getQwRepeat() {
         return qwRepeat;
     }
@@ -606,5 +618,27 @@ public class FsUser extends BaseEntity
         return isDel;
     }
 
+    public Date getStartCreateTime() {
+        return startCreateTime;
+    }
 
+    public Date getEndCreateTime() {
+        return endCreateTime;
+    }
+
+    public void setStartCreateTime(Date startCreateTime) {
+        this.startCreateTime = startCreateTime;
+    }
+
+    public void setEndCreateTime(Date endCreateTime) {
+        this.endCreateTime = endCreateTime;
+    }
+
+    public String getCompanyUserNickName() {
+        return companyUserNickName;
+    }
+
+    public void setCompanyUserNickName(String companyUserNickName) {
+        this.companyUserNickName = companyUserNickName;
+    }
 }

fs-service-system/src/main/resources/mapper/store/FsUserMapper.xml

@@ -272,8 +272,10 @@
         <if test = "maps.phone != null   and  maps.phone !='' " >
         AND u.phone LIKE CONCAT("%",#{maps.phone},"%")
         </if >
-        <if test = "maps.createTime != null" >
-        AND DATE_FORMAT( u.create_time, "%Y-%m-%d" ) = DATE_FORMAT(#{maps.createTime}, "%Y-%m-%d")
+        <if test = "maps.startCreateTime != null and maps.endCreateTime != null" >
+        AND (DATE_FORMAT( u.create_time, "%Y-%m-%d" ) &gt;= DATE_FORMAT(#{maps.startCreateTime}, "%Y-%m-%d")
+                and DATE_FORMAT( u.create_time, "%Y-%m-%d" ) &lt;= DATE_FORMAT(#{maps.endCreateTime}, "%Y-%m-%d")
+            )
         </if >
         <if test = "maps.registerCode != null  and  maps.registerCode !=''  " >
         AND u.register_code = #{maps.registerCode}
@@ -281,6 +283,9 @@
         <if test = "maps.status != null" >
         AND u.STATUS = #{maps.status}
         </if >
+        <if test = "maps.companyUserNickName != null and maps.companyUserNickName != '' " >
+        AND company_user.nick_name like CONCAT ("%",#{maps.companyUserNickName},"%")
+        </if >
         <if test = "maps.level != null  and  maps.level !=''" >
         AND u.LEVEL = #{maps.level}
         </if >