Browse Source

课程资源从视频改为文档时清空视频时长字段

yangfeng 1 year ago
parent
commit
8849b71c4d

+ 10 - 0
web/src/main/java/com/ynfy/buss/course/course/controller/CourseController.java

@@ -14,13 +14,16 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.system.service.ISysCategoryService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
+import java.util.Objects;
 
 /**
  * @Description: course
@@ -39,6 +42,9 @@ public class CourseController extends JeecgController<Course, ICourseService> {
     @Autowired
     private ICourseCatalogService courseCatalogService;
 
+    @Autowired
+    private ISysCategoryService sysCategoryService;
+
     /**
      * 分页列表查询
      *
@@ -59,6 +65,10 @@ public class CourseController extends JeecgController<Course, ICourseService> {
         QueryWrapper<Course> queryWrapper = QueryGenerator.initQueryWrapper(course, req.getParameterMap());
         Page<Course> page = new Page<Course>(pageNo, pageSize);
         IPage<Course> pageList = courseService.page(page, queryWrapper);
+        if (!Objects.isNull(pageList) && !CollectionUtils.isEmpty(pageList.getRecords())) {
+            pageList.getRecords().forEach(record -> record.setCategoryName(String.join(",",
+                    sysCategoryService.loadDictItem(record.getCategoryId()))));
+        }
         return Result.OK(pageList);
     }
 

+ 13 - 4
web/src/main/java/com/ynfy/buss/course/course/entity/Course.java

@@ -47,11 +47,20 @@ public class Course implements Serializable {
     @ApiModelProperty(value = "课程名称")
     private String name;
     /**
-     * 课程分类
+     * 课程分类id
      */
-    @Excel(name = "课程分类", width = 15)
-    @ApiModelProperty(value = "课程分类")
-    private String category;
+    @Excel(name = "课程分类id", width = 15)
+    @ApiModelProperty(value = "课程分类id")
+    private String categoryId;
+
+    /**
+     * 课程分类名称
+     */
+    @Excel(name = "课程分类名称", width = 15)
+    @ApiModelProperty(value = "课程分类名称")
+    @TableField(exist = false)
+    private String categoryName;
+
     /**
      * 课程介绍
      */