课程考试

web/src/main/java/com/ynfy/buss/course/course/controller/CourseController.java

@@ -6,9 +6,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ynfy.buss.course.course.entity.Course;
 import com.ynfy.buss.course.course.service.ICourseService;
 import com.ynfy.buss.course.coursecatalog.service.ICourseCatalogService;
+import com.ynfy.buss.exam.exam.entity.Exam;
+import com.ynfy.buss.exam.exam.service.IExamService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
@@ -21,6 +24,7 @@ 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 +43,8 @@ public class CourseController extends JeecgController<Course, ICourseService> {
     @Autowired
     private ICourseCatalogService courseCatalogService;
 
+    @Autowired
+    private IExamService examService;
 
     /**
      * 分页列表查询
@@ -125,6 +131,11 @@ public class CourseController extends JeecgController<Course, ICourseService> {
             return Result.error("未找到对应数据");
         }
         course.setCatalogList(courseCatalogService.listByCourseId(course.getId()));
+
+        if (StringUtils.isNotBlank(course.getExamId())) {
+            Exam exam = examService.getById(course.getExamId());
+            course.setExamTitle(!Objects.isNull(exam) ? exam.getTitle() : null);
+        }
         return Result.OK(course);
     }
 

web/src/main/java/com/ynfy/buss/course/course/entity/Course.java

@@ -113,6 +113,22 @@ public class Course implements Serializable {
     @Excel(name = "是否必修", width = 15)
     @ApiModelProperty(value = "是否必修")
     private Boolean mustLearn;
+
+    /**
+     * 课程id
+     */
+    @Excel(name = "课程id", width = 15)
+    @ApiModelProperty(value = "课程id")
+    private String examId;
+
+    /**
+     * 课程名称
+     */
+    @Excel(name = "课程名称", width = 15)
+    @ApiModelProperty(value = "课程名称")
+    @TableField(exist = false)
+    private String examTitle;
+
     /**
      * 1公开2部门3定员
      */