yangfeng 1 年間 前
コミット
6a45759e3b

+ 12 - 0
system/system-biz/src/main/java/org/jeecg/modules/system/service/ISysPositionService.java

@@ -3,6 +3,8 @@ package org.jeecg.modules.system.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.system.entity.SysPosition;
 
+import java.util.List;
+
 /**
  * @Description: 职务表
  * @Author: jeecg-boot
@@ -13,9 +15,19 @@ public interface ISysPositionService extends IService<SysPosition> {
 
     /**
      * 通过code查询
+     *
      * @param code 职务编码
      * @return SysPosition
      */
     SysPosition getByCode(String code);
 
+
+    /**
+     * 根据code获取岗位名称
+     *
+     * @param codes
+     * @return
+     */
+    String listByCodes(List<String> codes);
+
 }

+ 16 - 0
system/system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPositionServiceImpl.java

@@ -7,6 +7,9 @@ import org.jeecg.modules.system.mapper.SysPositionMapper;
 import org.jeecg.modules.system.service.ISysPositionService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * @Description: 职务表
  * @Author: jeecg-boot
@@ -23,4 +26,17 @@ public class SysPositionServiceImpl extends ServiceImpl<SysPositionMapper, SysPo
         return super.getOne(queryWrapper);
     }
 
+    /**
+     * 根据code获取岗位名称
+     *
+     * @param codes
+     * @return
+     */
+    @Override
+    public String listByCodes(List<String> codes) {
+        LambdaQueryWrapper<SysPosition> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.in(SysPosition::getCode, codes);
+        List<SysPosition> positionList = list(queryWrapper);
+        return positionList.stream().map(SysPosition::getName).collect(Collectors.joining(","));
+    }
 }

+ 5 - 4
web/src/main/java/com/ynfy/buss/course/course/controller/CourseController.java

@@ -6,8 +6,6 @@ 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;
@@ -17,6 +15,7 @@ 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.ISysPositionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -24,7 +23,6 @@ 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
@@ -44,7 +42,7 @@ public class CourseController extends JeecgController<Course, ICourseService> {
     private ICourseCatalogService courseCatalogService;
 
     @Autowired
-    private IExamService examService;
+    private ISysPositionService sysPositionService;
 
     /**
      * 分页列表查询
@@ -131,6 +129,9 @@ public class CourseController extends JeecgController<Course, ICourseService> {
             return Result.error("未找到对应数据");
         }
         course.setCatalogList(courseCatalogService.listByCourseId(course.getId()));
+        if (StringUtils.isNotBlank(course.getTeacherPost())) {
+            course.setTeacherPost(sysPositionService.listByCodes(Arrays.asList(course.getTeacherPost().split(","))));
+        }
         return Result.OK(course);
     }
 

+ 5 - 0
web/src/main/java/com/ynfy/buss/course/course/entity/Course.java

@@ -193,6 +193,11 @@ public class Course implements Serializable {
     @TableField(exist = false)
     private String teacherAvatar;
 
+    @Excel(name = "讲师岗位", width = 15)
+    @ApiModelProperty(value = "讲师岗位")
+    @TableField(exist = false)
+    private String teacherPost;
+
     /**
      * createTime
      */

+ 2 - 1
web/src/main/java/com/ynfy/buss/course/course/mapper/xml/CourseMapper.xml

@@ -45,7 +45,8 @@
             e.title AS examTitle,
             u.realname AS teacherName,
             u.avatar as teacherAvatar,
-            u.teacher_introduce as teacherIntroduce
+            u.teacher_introduce as teacherIntroduce,
+            u.post as teacherPost
         FROM
             course c
                 LEFT JOIN exam e ON c.exam_id = e.id