fix 课程

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/CourseChapterController.java

@@ -106,11 +106,11 @@ public class CourseChapterController extends BaseController {
     /**
      * 删除课程大章
      */
-    @ApiOperation("删除课程大章")
+    /*@ApiOperation("删除课程大章")
     @PreAuthorize("@ss.hasPermi('course:chapter:remove')")
     @Log(title = "课程大章" , businessType = BusinessType.DELETE)
     @PostMapping("/delete")
     public AjaxResult<Void> remove(@RequestBody Long[] chapterIds) {
         return toAjax(iCourseChapterService.deleteWithValidByIds(Arrays.asList(chapterIds), true) ? 1 : 0);
-    }
+    }*/
 }

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/CourseController.java

@@ -3,6 +3,8 @@ package com.zhongzheng.controller.course;
 import java.util.List;
 import java.util.Arrays;
 
+import cn.hutool.http.HttpStatus;
+import com.github.pagehelper.PageInfo;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.zhongzheng.modules.course.bo.CourseAddBo;
 import com.zhongzheng.modules.course.bo.CourseEditBo;
@@ -53,7 +55,13 @@ public class CourseController extends BaseController {
     public TableDataInfo<CourseVo> list(CourseQueryBo bo) {
         startPage();
         List<CourseVo> list = iCourseService.selectCourseList(bo);
-        return getDataTable(list);
+      TableDataInfo<CourseVo> rspData = new TableDataInfo();
+        rspData.setCode(HttpStatus.HTTP_OK);
+        rspData.setMsg("查询成功");
+        rspData.setRows(list);
+        rspData.setTotal(5);
+        return rspData;
+     //   return getDataTable(list);
     }
 
     /**
@@ -106,11 +114,11 @@ public class CourseController extends BaseController {
     /**
      * 删除课程
      */
-    @ApiOperation("删除课程")
+    /*@ApiOperation("删除课程")
     @PreAuthorize("@ss.hasPermi('course:course:remove')")
     @Log(title = "课程" , businessType = BusinessType.DELETE)
     @PostMapping("/delete")
     public AjaxResult<Void> remove(@RequestBody Long[] courseIds) {
         return toAjax(iCourseService.deleteWithValidByIds(Arrays.asList(courseIds), true) ? 1 : 0);
-    }
+    }*/
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseEditBo.java

@@ -8,6 +8,7 @@ import lombok.Data;
 import javax.validation.constraints.DecimalMin;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 import java.math.BigDecimal;
@@ -44,12 +45,12 @@ public class CourseEditBo {
 
     /** 开始时间 */
     @ApiModelProperty("开始时间")
-    @Min(value = 0, message = "开始时间必须为正整数")
+    @NotNull(message = "开始时间必须为正整数")
     private Long startTime;
 
     /** 结束时间 */
     @ApiModelProperty("结束时间")
-    @Min(value = 0, message = "结束时间必须为正整数")
+    @NotNull(message = "结束时间必须为正整数")
     private Long endTime;
 
     /** 封面地址 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseQueryBo.java

@@ -69,4 +69,6 @@ public class CourseQueryBo extends BaseEntity {
 	@ApiModelProperty("课程名称")
 	private String courseName;
 
+	private Integer currIndex;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/Course.java

@@ -66,11 +66,13 @@ private static final long serialVersionUID=1L;
     /** 课程名称 */
     private String courseName;
 
+    @TableField(exist = false)
     private Integer chapterNum;
 
+    @TableField(exist = false)
     private Integer sectionNum;
 
-
+    @TableField(exist = false)
     private String categoryName;
 
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseServiceImpl.java

@@ -59,6 +59,10 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
 
     @Override
     public List<CourseVo> selectCourseList(CourseQueryBo bo) {
+
+        bo.setCurrIndex((bo.getPageNum()-1)*bo.getPageSize());
+        System.out.println(bo.getCurrIndex()+"yeshu");
+        System.out.println(bo.getPageSize()+"yeshu");
         return courseMapper.selectCourseList(bo);
     }
 

zhongzheng-system/src/main/resources/mapper/modules/course/CourseMapper.xml

@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectCourseList" parameterType="com.zhongzheng.modules.course.bo.CourseQueryBo"  resultMap="CourseResult">
         SELECT rs.course_name,
                rs.course_id,rs.status,sum(section_num) as section_num,count(chapter_id)
-                                                            as chapter_num,mc.category_name,sum(total_time) as duration from
+                                                            as chapter_num,mc.category_name,mc.category_id,sum(total_time) as duration from
             (SELECT c.*,count(cs.section_id) as section_num,cs.chapter_id,IFNULL(sum(cs.video_time),0) as total_time
              FROM course c LEFT JOIN course_chapter cc on c.course_id = cc.course_id
                  LEFT JOIN course_section cs
@@ -36,17 +36,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">
                         #{item}
                     </foreach>
-                    <if test="courseName != null and courseName != ''">
-                        AND c.course_name like concat('%', #{courseName}, '%')
-                    </if>
-                    <if test="categoryId != null and categoryId != ''">
-                        AND c.category_id = #{categoryId}
-                    </if>
+                </if>
+                <if test="courseName != null and courseName != ''">
+                    AND c.course_name like concat('%', #{courseName}, '%')
+                </if>
+                <if test="categoryId != null and categoryId != ''">
+                    AND c.category_id = #{categoryId}
                 </if>
 
              GROUP BY cs.chapter_id,c.course_id)rs LEFT JOIN major_category mc on rs.category_id = mc.category_id
         GROUP BY course_id
-
     </select>
 
 </mapper>