增加时间筛选和机构模糊查询修改

user-service/src/main/java/com/diagbot/dto/CustomerDTO.java

@@ -0,0 +1,26 @@
+package com.diagbot.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: 分页按条件筛选
+ * @date 2018年10月10日 下午2:32:46
+ */
+@Getter
+@Setter
+public class CustomerDTO implements Serializable{
+	
+	 private String userName;// 用户名
+	 private String orgName;//机构名称
+	 private Integer autStatus;//认证状态
+	 private String startTime;//开始时间
+	 private String endTime;//结束时间
+
+}

user-service/src/main/java/com/diagbot/mapper/UserMapper.java

@@ -1,76 +1,77 @@
-package com.diagbot.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.diagbot.dto.AuthenticationDTO;
-import com.diagbot.dto.OrganizationDTO;
-import com.diagbot.dto.UserAllDTO;
-import com.diagbot.dto.UserInfoDTO;
-import com.diagbot.dto.UserInfoExportDTO;
-import com.diagbot.dto.UserOrgDTO;
-import com.diagbot.dto.UserOrgizationProductDTO;
-import com.diagbot.entity.User;
-import com.diagbot.vo.UserExportVO;
-import com.diagbot.vo.UserInfoOrganizationsVO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * Mapper 接口
- * </p>
- *
- * @author gaodm
- * @since 2018-08-02
- */
-public interface UserMapper extends BaseMapper<User> {
-
-    /**
-     * 根据用户查找信息
-     *
-     * @param username 用户名
-     * @return 用户信息
-     */
-    User findByName(String username);
-
-    /**
-     * 根据用户id获取用户信息(示例)
-     *
-     * @param page 翻页信息
-     * @param user 用户输入信息
-     * @return 翻页用户信息
-     */
-    IPage<User> selectUserListPage(Page page, @Param("user") User user);
-
-    IPage<User> indexPage(Page page, @Param("user") User user);
-
-    IPage<UserInfoDTO> selectUserInfoListPage(Page page, @Param("userInfo") UserInfoDTO userInfo);
-
-    public boolean updateUserInfoAll(@Param("userMap") Map<String, Object> userMap);
-
-    public boolean updateDeleted(@Param("map") Map<String, Object> map);
-
-    public List<User> getByIds(List<Long> ids);
-
-    public List<UserOrgDTO> getUserOrgDTOByIds(List<Long> ids);
-
-    public boolean auditUserInfoAll(@Param("auditMap") Map<String, Object> auditMap);
-
-    public Integer updateById(Map<String, String> map);
-
-    public List<UserInfoDTO> dependentuserInfoByTime(@Param("userExport") Map<String, Object> map);
-
-    public List<User> getUserByOrgName(String orgName);
-    
-    public IPage<UserAllDTO> queryUserInformation(Page page, @Param("userInformation") UserInfoDTO userInfo);
-    
-    public IPage<OrganizationDTO> queryMechanismInformation(Page page, @Param("mechanism")  UserInfoDTO userInfo);
-    
-    public IPage<UserOrgizationProductDTO> queryVerifiedUserOrganizationProduct(Page page, @Param("userOrg")  UserInfoDTO userInfo);
-    
-    public IPage<AuthenticationDTO> queryAuthentication(Page page, @Param("authen")  UserInfoDTO userInfo);
-
-}
+package com.diagbot.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.diagbot.dto.AuthenticationDTO;
+import com.diagbot.dto.CustomerDTO;
+import com.diagbot.dto.OrganizationDTO;
+import com.diagbot.dto.UserAllDTO;
+import com.diagbot.dto.UserInfoDTO;
+import com.diagbot.dto.UserInfoExportDTO;
+import com.diagbot.dto.UserOrgDTO;
+import com.diagbot.dto.UserOrgizationProductDTO;
+import com.diagbot.entity.User;
+import com.diagbot.vo.UserExportVO;
+import com.diagbot.vo.UserInfoOrganizationsVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author gaodm
+ * @since 2018-08-02
+ */
+public interface UserMapper extends BaseMapper<User> {
+
+    /**
+     * 根据用户查找信息
+     *
+     * @param username 用户名
+     * @return 用户信息
+     */
+    User findByName(String username);
+
+    /**
+     * 根据用户id获取用户信息(示例)
+     *
+     * @param page 翻页信息
+     * @param user 用户输入信息
+     * @return 翻页用户信息
+     */
+    IPage<User> selectUserListPage(Page page, @Param("user") User user);
+
+    IPage<User> indexPage(Page page, @Param("user") User user);
+
+    IPage<UserInfoDTO> selectUserInfoListPage(Page page, @Param("userInfo") UserInfoDTO userInfo);
+
+    public boolean updateUserInfoAll(@Param("userMap") Map<String, Object> userMap);
+
+    public boolean updateDeleted(@Param("map") Map<String, Object> map);
+
+    public List<User> getByIds(List<Long> ids);
+
+    public List<UserOrgDTO> getUserOrgDTOByIds(List<Long> ids);
+
+    public boolean auditUserInfoAll(@Param("auditMap") Map<String, Object> auditMap);
+
+    public Integer updateById(Map<String, String> map);
+
+    public List<UserInfoDTO> dependentuserInfoByTime(@Param("userExport") Map<String, Object> map);
+
+    public List<User> getUserByOrgName(String orgName);
+    
+    public IPage<UserAllDTO> queryUserInformation(Page page, @Param("userInformation") CustomerDTO userInfo);
+    
+    public IPage<OrganizationDTO> queryMechanismInformation(Page page, @Param("mechanism")  CustomerDTO userInfo);
+    
+    public IPage<UserOrgizationProductDTO> queryVerifiedUserOrganizationProduct(Page page, @Param("userOrg")  CustomerDTO userInfo);
+    
+    public IPage<AuthenticationDTO> queryAuthentication(Page page, @Param("authen")  CustomerDTO userInfo);
+
+}

user-service/src/main/java/com/diagbot/service/UserService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.dto.AuthenticationDTO;
+import com.diagbot.dto.CustomerDTO;
 import com.diagbot.dto.OrganizationDTO;
 import com.diagbot.dto.UserAllDTO;
 import com.diagbot.dto.UserInfoDTO;
@@ -61,12 +62,12 @@ public interface UserService extends IService<User> {
 
     public List<User> getUserByOrgName(String orgName);
     
-    public IPage<UserAllDTO> queryUserInformation(Page page, UserInfoDTO userInfo);
+    public IPage<UserAllDTO> queryUserInformation(Page page, CustomerDTO userInfo);
     
-    public IPage<OrganizationDTO> queryMechanismInformation(Page page,  UserInfoDTO userInfo);
+    public IPage<OrganizationDTO> queryMechanismInformation(Page page,  CustomerDTO userInfo);
     
-    public IPage<UserOrgizationProductDTO> queryVerifiedUserOrganizationProduct(Page page, UserInfoDTO userInfo);
+    public IPage<UserOrgizationProductDTO> queryVerifiedUserOrganizationProduct(Page page, CustomerDTO userInfo);
     
-    public IPage<AuthenticationDTO> queryAuthentication(Page page,  UserInfoDTO userInfo);
+    public IPage<AuthenticationDTO> queryAuthentication(Page page,  CustomerDTO userInfo);
 
 }

user-service/src/main/java/com/diagbot/service/impl/UserServiceImpl.java

@@ -1,136 +1,137 @@
-package com.diagbot.service.impl;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.dto.AuthenticationDTO;
-import com.diagbot.dto.OrganizationDTO;
-import com.diagbot.dto.UserAllDTO;
-import com.diagbot.dto.UserInfoDTO;
-import com.diagbot.dto.UserInfoExportDTO;
-import com.diagbot.dto.UserOrgDTO;
-import com.diagbot.dto.UserOrgizationProductDTO;
-import com.diagbot.entity.User;
-import com.diagbot.mapper.UserMapper;
-import com.diagbot.service.UserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 服务实现类
- * </p>
- *
- * @author gaodm
- * @since 2018-08-02
- */
-@Service
-public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
-
-    @Autowired
-    UserMapper userMapper;
-
-    /**
-     * 根据用户查找信息
-     *
-     * @param username 用户名
-     * @return 用户信息
-     */
-    public User findByName(String username) {
-        return baseMapper.findByName(username);
-    }
-
-    /**
-     * 根据用户id获取用户信息(示例)
-     *
-     * @param page 翻页信息
-     * @param user 用户输入信息
-     * @return 翻页用户信息
-     */
-    @Override
-    public IPage<User> selectUserListPage(Page<User> page, User user) {
-        return baseMapper.selectUserListPage(page, user);
-    }
-
-    @Override
-    public IPage<UserInfoDTO> selectUserInfoListPage(Page page, UserInfoDTO userInfo) {
-        return baseMapper.selectUserInfoListPage(page, userInfo);
-
-    }
-
-    @Override
-    public boolean updateUserInfoAll(Map<String, Object> userMap) {
-        return baseMapper.updateUserInfoAll(userMap);
-
-    }
-
-    @Override
-    public boolean updateDeleted(Map<String, Object> map) {
-        return baseMapper.updateDeleted(map);
-
-    }
-
-    @Override
-    public IPage<User> indexPage(Page<User> page, User user) {
-        return baseMapper.indexPage(page, user);
-    }
-
-    @Override
-    public List<User> getByIds(List<Long> ids) {
-        return userMapper.getByIds(ids);
-    }
-
-
-    /**
-     * 获取用户和机构信息
-     *
-     * @param userIds 用户ids
-     * @return 用户和机构信息
-     */
-    @Override
-    public List<UserOrgDTO> getUserOrgByIds(List<Long> userIds) {
-        return userMapper.getUserOrgDTOByIds(userIds);
-    }
-
-    @Override
-    public boolean auditUserInfoAll(Map<String, Object> auditMap) {
-        // TODO Auto-generated method stub
-        return baseMapper.auditUserInfoAll(auditMap);
-    }
-
-    @Override
-    public List<UserInfoDTO> dependentuserInfoByTime(Map<String, Object> map) {
-
-        return baseMapper.dependentuserInfoByTime(map);
-    }
-
-    @Override
-    public List<User> getUserByOrgName(String orgName) {
-        return baseMapper.getUserByOrgName(orgName);
-    }
-    
-    @Override
-    public IPage<UserAllDTO> queryUserInformation(Page page, UserInfoDTO userInfo){
-    	 return baseMapper.queryUserInformation(page, userInfo);
-    }
-    
-    public IPage<OrganizationDTO> queryMechanismInformation(Page page, UserInfoDTO userInfo){
-    	return baseMapper.queryMechanismInformation(page, userInfo);
-    }
-
-	@Override
-	public IPage<UserOrgizationProductDTO> queryVerifiedUserOrganizationProduct(Page page, UserInfoDTO userInfo) {
-		
-		return baseMapper.queryVerifiedUserOrganizationProduct(page, userInfo);
-	}
-
-	@Override
-	public IPage<AuthenticationDTO> queryAuthentication(Page page, UserInfoDTO userInfo) {
-		
-		return baseMapper.queryAuthentication(page, userInfo);
-	}
-
-}
+package com.diagbot.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.dto.AuthenticationDTO;
+import com.diagbot.dto.CustomerDTO;
+import com.diagbot.dto.OrganizationDTO;
+import com.diagbot.dto.UserAllDTO;
+import com.diagbot.dto.UserInfoDTO;
+import com.diagbot.dto.UserInfoExportDTO;
+import com.diagbot.dto.UserOrgDTO;
+import com.diagbot.dto.UserOrgizationProductDTO;
+import com.diagbot.entity.User;
+import com.diagbot.mapper.UserMapper;
+import com.diagbot.service.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author gaodm
+ * @since 2018-08-02
+ */
+@Service
+public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
+
+    @Autowired
+    UserMapper userMapper;
+
+    /**
+     * 根据用户查找信息
+     *
+     * @param username 用户名
+     * @return 用户信息
+     */
+    public User findByName(String username) {
+        return baseMapper.findByName(username);
+    }
+
+    /**
+     * 根据用户id获取用户信息(示例)
+     *
+     * @param page 翻页信息
+     * @param user 用户输入信息
+     * @return 翻页用户信息
+     */
+    @Override
+    public IPage<User> selectUserListPage(Page<User> page, User user) {
+        return baseMapper.selectUserListPage(page, user);
+    }
+
+    @Override
+    public IPage<UserInfoDTO> selectUserInfoListPage(Page page, UserInfoDTO userInfo) {
+        return baseMapper.selectUserInfoListPage(page, userInfo);
+
+    }
+
+    @Override
+    public boolean updateUserInfoAll(Map<String, Object> userMap) {
+        return baseMapper.updateUserInfoAll(userMap);
+
+    }
+
+    @Override
+    public boolean updateDeleted(Map<String, Object> map) {
+        return baseMapper.updateDeleted(map);
+
+    }
+
+    @Override
+    public IPage<User> indexPage(Page<User> page, User user) {
+        return baseMapper.indexPage(page, user);
+    }
+
+    @Override
+    public List<User> getByIds(List<Long> ids) {
+        return userMapper.getByIds(ids);
+    }
+
+
+    /**
+     * 获取用户和机构信息
+     *
+     * @param userIds 用户ids
+     * @return 用户和机构信息
+     */
+    @Override
+    public List<UserOrgDTO> getUserOrgByIds(List<Long> userIds) {
+        return userMapper.getUserOrgDTOByIds(userIds);
+    }
+
+    @Override
+    public boolean auditUserInfoAll(Map<String, Object> auditMap) {
+        // TODO Auto-generated method stub
+        return baseMapper.auditUserInfoAll(auditMap);
+    }
+
+    @Override
+    public List<UserInfoDTO> dependentuserInfoByTime(Map<String, Object> map) {
+
+        return baseMapper.dependentuserInfoByTime(map);
+    }
+
+    @Override
+    public List<User> getUserByOrgName(String orgName) {
+        return baseMapper.getUserByOrgName(orgName);
+    }
+    
+    @Override
+    public IPage<UserAllDTO> queryUserInformation(Page page, CustomerDTO userInfo){
+    	 return baseMapper.queryUserInformation(page, userInfo);
+    }
+    
+    public IPage<OrganizationDTO> queryMechanismInformation(Page page, CustomerDTO userInfo){
+    	return baseMapper.queryMechanismInformation(page, userInfo);
+    }
+
+	@Override
+	public IPage<UserOrgizationProductDTO> queryVerifiedUserOrganizationProduct(Page page, CustomerDTO userInfo) {
+		
+		return baseMapper.queryVerifiedUserOrganizationProduct(page, userInfo);
+	}
+
+	@Override
+	public IPage<AuthenticationDTO> queryAuthentication(Page page, CustomerDTO userInfo) {
+		
+		return baseMapper.queryAuthentication(page, userInfo);
+	}
+
+}

user-service/src/main/java/com/diagbot/vo/UserAndOrgPageVO.java

@@ -17,5 +17,8 @@ public class UserAndOrgPageVO extends Page{
 	
 	String userName;
 	String orgName;
+	Integer autStatus;//认证状态
+	String startTime;//开始时间
+	String endTime;//结束时间
 
 }

user-service/src/main/java/com/diagbot/vo/UserExportVO.java

@@ -16,5 +16,8 @@ public class UserExportVO {
     private String endTime;
     private String filePath;//文件路径
     private String fileName;//文件名
+	private String userName;// 用户名
+	private String orgName;//机构名称
+	private Integer autStatus;//认证状态
 
 }

user-service/src/main/java/com/diagbot/vo/UserInfoPagVO.java

@@ -14,4 +14,6 @@ import lombok.Setter;
 public class UserInfoPagVO extends Page {
     String orgName;
     Integer autStatus;
+	String startTime;//开始时间
+	String endTime;//结束时间
 }

user-service/src/main/java/com/diagbot/web/UserInfoController.java

@@ -143,7 +143,7 @@ public class UserInfoController {
     @SysLogger("queryUserInformation")
     public RespDTO<IPage<UserAllDTO>> queryUserInformation(@RequestBody UserInfoPagVO userInfoPagVO){
     	
-    	return userFacade.queryUserInformations(userInfoPagVO,userInfoPagVO.getOrgName(), userInfoPagVO.getAutStatus());
+    	return userFacade.queryUserInformations(userInfoPagVO,userInfoPagVO.getOrgName(), userInfoPagVO.getAutStatus(),userInfoPagVO.getStartTime(),userInfoPagVO.getEndTime());
     }
     
     
@@ -152,7 +152,7 @@ public class UserInfoController {
     @SysLogger("queryMechanismInformation")
     public RespDTO<IPage<OrganizationDTO>> queryMechanismInformation(@RequestBody UserInfoPagVO userInfoPagVO){
     	
-    	return userFacade.queryMechanismInformations(userInfoPagVO,userInfoPagVO.getOrgName());
+    	return userFacade.queryMechanismInformations(userInfoPagVO,userInfoPagVO.getOrgName(),userInfoPagVO.getStartTime(),userInfoPagVO.getEndTime());
     }
     
     
@@ -161,7 +161,7 @@ public class UserInfoController {
     @SysLogger("queryVerifiedUserOrganizationProduct")
     public RespDTO<IPage<UserOrgizationProductDTO>> queryVerifiedUserOrganizationProduct(@RequestBody UserAndOrgPageVO userAndOrgPageVO) {
 		
-		return userFacade.queryVerifiedUserOrganizationProducts(userAndOrgPageVO,userAndOrgPageVO.getOrgName(),userAndOrgPageVO.getUserName());
+		return userFacade.queryVerifiedUserOrganizationProducts(userAndOrgPageVO,userAndOrgPageVO.getOrgName(),userAndOrgPageVO.getUserName(),userAndOrgPageVO.getStartTime(),userAndOrgPageVO.getEndTime());
 	}
    
     @ApiOperation(value = "分页查询认证中的用户信息接口[by:wangfeng]", notes = "根据每页显示size条数，默认 10，和当前页current")
@@ -169,7 +169,7 @@ public class UserInfoController {
     @SysLogger("queryAuthentication")
 	public RespDTO<IPage<AuthenticationDTO>> queryAuthentication(@RequestBody UserAndOrgPageVO userAndOrgPageVO) {
 		
-		return userFacade.queryAuthentications(userAndOrgPageVO,userAndOrgPageVO.getOrgName(),userAndOrgPageVO.getUserName());
+		return userFacade.queryAuthentications(userAndOrgPageVO,userAndOrgPageVO.getOrgName(),userAndOrgPageVO.getUserName(),userAndOrgPageVO.getStartTime(),userAndOrgPageVO.getEndTime());
 	} 
     
     

user-service/src/main/resources/mapper/OrganizationMapper.xml

@@ -1,33 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.OrganizationMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.Organization">
-        <id column="id" property="id"/>
-        <result column="is_deleted" property="isDeleted"/>
-        <result column="gmt_create" property="gmtCreate"/>
-        <result column="gmt_modified" property="gmtModified"/>
-        <result column="creator" property="creator"/>
-        <result column="modifier" property="modifier"/>
-        <result column="name" property="name"/>
-        <result column="type" property="type"/>
-        <result column="principal" property="principal"/>
-        <result column="address" property="address"/>
-        <result column="parent_id" property="parentId"/>
-        <result column="sub_num" property="subNum"/>
-        <result column="remark" property="remark"/>
-    </resultMap>
-
-    <select id="getByUserId" resultMap="BaseResultMap">
-        SELECT a.* FROM `sys_organization` a, sys_user_organization b
-        where a.id = b.organization_id and b.user_id = #{userId} and a.is_deleted = 'N' and b.is_deleted = 'N'
-    </select>
-
-    <select id="findOrganization" parameterType="java.lang.String"
-            resultType="com.diagbot.entity.Organization">
-		SELECT id,NAME FROM sys_organization WHERE is_deleted = "N" AND NAME LIKE
-		CONCAT('%',  #{organizationName}, '%')
-	</select>
-</mapper>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diagbot.mapper.OrganizationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.Organization">
+        <id column="id" property="id"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="name" property="name"/>
+        <result column="type" property="type"/>
+        <result column="principal" property="principal"/>
+        <result column="address" property="address"/>
+        <result column="parent_id" property="parentId"/>
+        <result column="sub_num" property="subNum"/>
+        <result column="remark" property="remark"/>
+    </resultMap>
+
+    <select id="getByUserId" resultMap="BaseResultMap">
+        SELECT a.* FROM `sys_organization` a, sys_user_organization b
+        where a.id = b.organization_id and b.user_id = #{userId} and a.is_deleted = 'N' and b.is_deleted = 'N'
+    </select>
+
+    <select id="findOrganization" parameterType="java.lang.String"
+            resultType="com.diagbot.entity.Organization">
+	SELECT a.id,a.NAME FROM sys_organization a LEFT JOIN
+	sys_user_organization b ON a.id = b.organization_id WHERE a.is_deleted
+	= "N" AND b.organization_id IS NULL AND a.NAME LIKE CONCAT('%',
+	#{organizationName}, '%')
+	</select>
+</mapper>

user-service/src/main/resources/mapper/UserMapper.xml

@@ -276,6 +276,9 @@
         <if test="userExport.orgName != null">
             AND org.name LIKE CONCAT('%', #{userInfo.orgName}, '%')
         </if>
+        <if test="userExport.userName != null">
+            AND u.username LIKE CONCAT('%', #{userExport.userName}, '%')
+        </if>
         <if test="userExport.autStatus != null">
             AND aut.status = #{userInfo.autStatus}
         </if>
@@ -304,6 +307,9 @@
         </if>
         <if test="userInformation.autStatus != null">
             AND aut.status = #{userInformation.autStatus}
+        </if>
+         <if test="userInformation.startTime != null and userInformation.endTime != null">
+            AND u.gmt_create BETWEEN #{userInformation.startTime} and #{userInformation.endTime}
         </if>
         ORDER BY u.gmt_create DESC  
     </select>
@@ -330,6 +336,9 @@
         </if>
         <if test="mechanism.autStatus != null">
             AND aut.status = #{mechanism.autStatus}
+        </if>
+         <if test="mechanism.startTime != null and mechanism.endTime != null">
+            AND u.gmt_create BETWEEN #{mechanism.startTime} and #{mechanism.endTime}
         </if>
         ORDER BY u.gmt_create DESC 
    </select>
@@ -362,6 +371,9 @@
         </if>
         <if test="userOrg.userName != null">
             AND u.username LIKE CONCAT('%', #{userOrg.userName}, '%')
+        </if>
+         <if test="userOrg.startTime != null and userOrg.endTime != null">
+            AND u.gmt_create BETWEEN #{userOrg.startTime} and #{userOrg.endTime}
         </if>
         AND aut.status = 1
         ORDER BY u.gmt_create DESC
@@ -394,6 +406,9 @@
         <if test="authen.userName != null">
             AND u.username LIKE CONCAT('%', #{authen.userName}, '%')
         </if>
+        <if test="authen.startTime != null and authen.endTime != null">
+            AND u.gmt_create BETWEEN #{authen.startTime} and #{authen.endTime}
+        </if>
         AND aut.status = 2
         ORDER BY u.gmt_create DESC
     </select>