he2802 3 years ago
parent
commit
115ecc1a41

+ 6 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/base/bo/UserProfileQueryBo.java

@@ -108,4 +108,10 @@ public class UserProfileQueryBo extends BaseEntity implements Serializable {
 	@Excel(name = "类型")
 	@ApiModelProperty("类型")
 	private Long typeStatus;
+
+	@ApiModelProperty("查询开始时间")
+	private Long searchStartTime;
+
+	@ApiModelProperty("查询结束时间")
+	private Long searchEndTime;
 }

+ 6 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeUserQueryBo.java

@@ -135,4 +135,10 @@ public class ClassGradeUserQueryBo extends BaseEntity {
 
 	@ApiModelProperty("搜索关键词")
 	private String searchKey;
+
+	@ApiModelProperty("查询开始时间")
+	private Long searchStartTime;
+
+	@ApiModelProperty("查询结束时间")
+	private Long searchEndTime;
 }

+ 6 - 0
zhongzheng-system/src/main/resources/mapper/modules/base/UserProfileMapper.xml

@@ -98,6 +98,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="realname != null and realname !='' ">
             AND (SELECT count(1) FROM `user` u where u.user_id = up.user_id and u.realname like concat('%', #{realname}, '%') )> 0
         </if>
+        <if test="searchStartTime != null and searchStartTime !='' ">
+            AND up.update_time >=#{searchStartTime}
+        </if>
+        <if test="searchEndTime != null and searchEndTime !='' ">
+            AND {searchEndTime} >= up.update_time
+        </if>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
         order by up.create_time desc

+ 6 - 0
zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeUserMapper.xml

@@ -364,6 +364,12 @@
         <if test="searchKey != null and searchKey != '' ">
             and (u.realname like concat('%', #{searchKey}, '%') or u.id_card like concat('%', #{searchKey}, '%') or g.goods_name like concat('%', #{searchKey}, '%') or g.code like concat('%', #{searchKey}, '%'))
         </if>
+        <if test="searchStartTime != null and searchStartTime !='' ">
+            AND cgu.create_time >=#{searchStartTime}
+        </if>
+        <if test="searchEndTime != null and searchEndTime !='' ">
+            AND {searchEndTime} >= cgu.create_time
+        </if>
         <if test="periodStatus != 2 ">
             order by cgu.update_time desc
         </if>