课程条件查询

zhongzheng-admin/src/main/java/com/zhongzheng/controller/user/UserController.java

@@ -6,6 +6,7 @@ import java.util.Arrays;
 import com.zhongzheng.modules.user.bo.UserAddBo;
 import com.zhongzheng.modules.user.bo.UserEditBo;
 import com.zhongzheng.modules.user.bo.UserQueryBo;
+import com.zhongzheng.modules.user.bo.UserStudyRecordQueryBo;
 import com.zhongzheng.modules.user.service.IUserService;
 import com.zhongzheng.modules.user.vo.UserStudyRecordVo;
 import com.zhongzheng.modules.user.vo.UserVo;
@@ -117,7 +118,7 @@ public class UserController extends BaseController {
     @ApiOperation("客户端用户学习记录列表")
     @PreAuthorize("@ss.hasPermi('app:user:studyRecordList')")
     @GetMapping("/studyRecordList")
-    public TableDataInfo<UserStudyRecordVo> studyRecordList(UserQueryBo bo) {
+    public TableDataInfo<UserStudyRecordVo> studyRecordList(UserStudyRecordQueryBo bo) {
         startPage();
         List<UserStudyRecordVo> list = iUserService.selectStudyRecordList(bo);
         return getDataTable(list);

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -148,7 +148,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     }
 
     @Override
-    public List<UserStudyRecordVo> selectStudyRecordList(UserQueryBo bo) {
+    public List<UserStudyRecordVo> selectStudyRecordList(UserStudyRecordQueryBo bo) {
         return userMapper.selectStudyRecordList(bo);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserStudyRecordQueryBo.java

@@ -54,5 +54,23 @@ public class UserStudyRecordQueryBo extends BaseEntity {
 	/** 结束时间 */
 	@ApiModelProperty("结束时间")
 	private Long endTime;
+	/** 课程名 */
+	@ApiModelProperty("课程名")
+	private String courseName;
+	/** 视频名 */
+	@ApiModelProperty("视频名")
+	private String title;
+	/** 开始时间1 */
+	@ApiModelProperty("开始时间1")
+	private String startTime1;
+	/** 开始时间2 */
+	@ApiModelProperty("开始时间2")
+	private String startTime2;
+	/** 结束时间1 */
+	@ApiModelProperty("结束时间1")
+	private String endTime1;
+	/** 结束时间2 */
+	@ApiModelProperty("结束时间2")
+	private String endTime2;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserMapper.java

@@ -2,6 +2,7 @@ package com.zhongzheng.modules.user.mapper;
 
 import com.zhongzheng.modules.user.bo.RanKingUserQuery;
 import com.zhongzheng.modules.user.bo.UserQueryBo;
+import com.zhongzheng.modules.user.bo.UserStudyRecordQueryBo;
 import com.zhongzheng.modules.user.domain.User;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.user.vo.RanKingUser;
@@ -30,5 +31,5 @@ public interface UserMapper extends BaseMapper<User> {
 
     List<User> selectList(UserQueryBo bo);
 
-    List<UserStudyRecordVo> selectStudyRecordList(UserQueryBo bo);
+    List<UserStudyRecordVo> selectStudyRecordList(UserStudyRecordQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserService.java

@@ -1,13 +1,10 @@
 package com.zhongzheng.modules.user.service;
 
-import com.zhongzheng.modules.user.bo.RanKingUserQuery;
+import com.zhongzheng.modules.user.bo.*;
 import com.zhongzheng.modules.user.domain.User;
 import com.zhongzheng.modules.user.vo.RanKingUser;
 import com.zhongzheng.modules.user.vo.UserStudyRecordVo;
 import com.zhongzheng.modules.user.vo.UserVo;
-import com.zhongzheng.modules.user.bo.UserQueryBo;
-import com.zhongzheng.modules.user.bo.UserAddBo;
-import com.zhongzheng.modules.user.bo.UserEditBo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.math.BigDecimal;
@@ -38,7 +35,7 @@ public interface IUserService extends IService<User> {
 
 	List<UserVo> selectList(UserQueryBo bo);
 
-	List<UserStudyRecordVo> selectStudyRecordList(UserQueryBo bo);
+	List<UserStudyRecordVo> selectStudyRecordList(UserStudyRecordQueryBo bo);
 
 	/**
 	 * 根据新增业务对象插入用户

zhongzheng-system/src/main/resources/mapper/modules/user/UserMapper.xml

@@ -168,6 +168,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="userId != null and userId != ''" >
             AND usr.user_id = #{userId}
         </if>
+        <if test="courseName != null and courseName != ''" >
+            AND c.course_name like concat('%', #{courseName}, '%')
+        </if>
+        <if test="title != null and title != ''" >
+            AND pv.title like concat('%', #{title}, '%')
+        </if>
+        <if test="startTime1 != null and startTime1 != ''" >
+            AND usr.start_time > #{startTime1}
+        </if>
+        <if test="startTime2 != null and startTime2 != ''" >
+            AND #{startTime2} > usr.start_time
+        </if>
+        <if test="endTime1 != null and endTime1 != ''" >
+            AND usr.end_time > #{endTime1}
+        </if>
+        <if test="endTime2 != null and endTime2 != ''" >
+            AND #{endTime2} > usr.end_time
+        </if>
         ORDER BY
             usr.record_id DESC
     </select>