课程加入新检索项

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CourseInfoController.java

@@ -82,13 +82,15 @@ public class CourseInfoController {
     @SaCheckPermission("/disk/courseinfo/page")
     @GetMapping("/disk/courseinfo/page")
     public CommonResult<Page<Map<String,Object>>> page(CourseInfoPageParam courseInfoPageParam, HttpServletRequest req) {
-        Map param =new HashMap(6);
+        Map param =new HashMap();
         param.put("courseName", req.getParameter("courseName"));
         param.put("collegeId", req.getParameter("collegeId"));
         param.put("collegeTwoId", req.getParameter("collegeTwoId"));
         param.put("collegeThreeId", req.getParameter("collegeThreeId"));
         param.put("majorId", req.getParameter("majorId"));
         param.put("courseType", req.getParameter("courseType"));
+        param.put("beginTime", req.getParameter("beginTime"));
+        param.put("endTime", req.getParameter("endTime"));
         //排序类型，0最新，1热门
         String sortflag="0";
         if(StringUtils.isNotEmpty(req.getParameter("sortflag")))sortflag=req.getParameter("sortflag");
@@ -243,7 +245,7 @@ public class CourseInfoController {
     @SaCheckPermission("/disk/coursecentry/page")
     @GetMapping("/disk/coursecentry/page")
     public CommonResult<Page<Map<String,Object>>> coursecentryPage(CourseInfoPageParam courseInfoPageParam, HttpServletRequest req) {
-        Map param =new HashMap(6);
+        Map param =new HashMap();
         //查询学生自己的课程
         param.put("userId", StpLoginUserUtil.getLoginUser().getId());
         param.put("courseName", req.getParameter("courseName"));
@@ -252,6 +254,8 @@ public class CourseInfoController {
         param.put("collegeThreeId", req.getParameter("collegeThreeId"));
         param.put("majorId", req.getParameter("majorId"));
         param.put("courseType", req.getParameter("courseType"));
+        param.put("beginTime", req.getParameter("beginTime"));
+        param.put("endTime", req.getParameter("endTime"));
         //排序类型，0最新，1热门
         param.put("sortflag", req.getParameter("sortflag"));
 

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CourseStudentCollectController.java

@@ -76,6 +76,8 @@ public class CourseStudentCollectController {
         param.put("collegeThreeId", req.getParameter("collegeThreeId"));
         param.put("majorId", req.getParameter("majorId"));
         param.put("courseType", req.getParameter("courseType"));
+        param.put("beginTime", req.getParameter("beginTime"));
+        param.put("endTime", req.getParameter("endTime"));
         //排序类型，0最新，1热门
         String sortflag="0";
         if(StringUtils.isNotEmpty(req.getParameter("sortflag")))sortflag=req.getParameter("sortflag");

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/CourseInfoMapper.xml

@@ -54,6 +54,12 @@
         <if test="param.courseName !=null and param.courseName != ''">
             and ci.COURSE_NAME like CONCAT('%', #{param.courseName}, '%')
         </if>
+        <if test="param.beginTime != null and param.beginTime != ''">
+            AND ci.PUBLISH_TIME &gt;= #{param.beginTime}
+        </if>
+        <if test="param.endTime != null and param.endTime != ''">
+            AND ci.PUBLISH_TIME &lt;= #{param.endTime}
+        </if>
         <if test="param.sortflag !=null and param.sortflag != ''">
             <if test=" param.sortflag == 0">
                 order by ci.CREATE_TIME desc
@@ -153,6 +159,12 @@
         <if test="param.courseName !=null and param.courseName != ''">
             and ci.COURSE_NAME=#{param.courseName}
         </if>
+        <if test="param.beginTime != null and param.beginTime != ''">
+            AND ci.PUBLISH_TIME &gt;= #{param.beginTime}
+        </if>
+        <if test="param.endTime != null and param.endTime != ''">
+            AND ci.PUBLISH_TIME &lt;= #{param.endTime}
+        </if>
         <if test="param.sortflag !=null and param.sortflag != ''">
             <if test=" param.sortflag == 0">
                 order by ci.CREATE_TIME desc

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/CourseStudentCollectMapper.xml

@@ -60,6 +60,12 @@
         <if test="param.courseName !=null and param.courseName != ''">
             and ci.COURSE_NAME like CONCAT('%', #{param.courseName}, '%')
         </if>
+        <if test="param.beginTime != null and param.beginTime != ''">
+            AND ci.PUBLISH_TIME &gt;= #{param.beginTime}
+        </if>
+        <if test="param.endTime != null and param.endTime != ''">
+            AND ci.PUBLISH_TIME &lt;= #{param.endTime}
+        </if>
         <if test="param.sortflag !=null and param.sortflag != ''">
             <if test=" param.sortflag == 0">
                 order by ci.CREATE_TIME desc