add:课程管理权限修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/ExaminationImportDto.java

@@ -38,12 +38,12 @@ public class ExaminationImportDto {
     @ExcelDBFieldDesc(name = "课程名称")
     private String courseName;
 
-    @ApiModelProperty(value = "校区")
-    @ExcelDBFieldDesc(name = "校区")
+    @ApiModelProperty(value = "校区（考点）")
+    @ExcelDBFieldDesc(name = "校区（考点）")
     private String examPlace;
 
-    @ApiModelProperty(value = "考试教室")
-    @ExcelDBFieldDesc(name = "考试教室")
+    @ApiModelProperty(value = "考试教室（考场）")
+    @ExcelDBFieldDesc(name = "考试教室（考场）")
     private String examRoom;
 
     @ApiModelProperty(value = "考试日期")

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/AssignClazzParam.java

@@ -16,14 +16,11 @@ import java.util.List;
  * @Date: 2024-03-07
  */
 public class AssignClazzParam {
-    @ApiModelProperty("考试id")
+    @ApiModelProperty("教学课程id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @NotNull(message = "请选择考试")
-    @Range(min = 1L, message = "请选择考试")
-    private Long examId;
-
-    @ApiModelProperty("课程编号")
-    private String courseCode;
+    @NotNull(message = "缺少教学课程")
+    @Range(min = 1L, message = "缺少教学课程")
+    private Long teachCourseId;
 
     @ApiModelProperty("教师id")
     @JsonSerialize(using = ToStringSerializer.class)
@@ -37,20 +34,12 @@ public class AssignClazzParam {
     @Size(min = 1, message = "请选择班级")
     private List<Long> clazzIdList;
 
-    public Long getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Long examId) {
-        this.examId = examId;
-    }
-
-    public String getCourseCode() {
-        return courseCode;
+    public Long getTeachCourseId() {
+        return teachCourseId;
     }
 
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
+    public void setTeachCourseId(Long teachCourseId) {
+        this.teachCourseId = teachCourseId;
     }
 
     public Long getTeacherId() {

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/CourseEvaluationParam.java

@@ -16,16 +16,11 @@ import javax.validation.constraints.NotNull;
  */
 public class CourseEvaluationParam {
 
-    @ApiModelProperty("考试id")
+    @ApiModelProperty("教学课程id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @NotNull(message = "缺少考试")
-    @Range(min = 1L, message = "缺少考试")
-    private Long examId;
-
-    @ApiModelProperty("课程编号")
-    @NotNull(message = "缺少课程编号")
-    @Length(min = 1, message = "缺少课程编号")
-    private String courseCode;
+    @NotNull(message = "缺少教学课程")
+    @Range(min = 1L, message = "缺少教学课程")
+    private Long teachCourseId;
 
     @ApiModelProperty("评价方式")
     @NotNull(message = "缺少评价方式")
@@ -40,20 +35,12 @@ public class CourseEvaluationParam {
     @ApiModelProperty("评价方式类型")
     private CourseEvaluationTypeEnum type;
 
-    public Long getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Long examId) {
-        this.examId = examId;
-    }
-
-    public String getCourseCode() {
-        return courseCode;
+    public Long getTeachCourseId() {
+        return teachCourseId;
     }
 
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
+    public void setTeachCourseId(Long teachCourseId) {
+        this.teachCourseId = teachCourseId;
     }
 
     public String getEvaluation() {

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/CourseTargetParam.java

@@ -22,16 +22,11 @@ public class CourseTargetParam {
     @EditKey
     private Long id;
 
-    @ApiModelProperty("考试ID")
+    @ApiModelProperty("教学课程id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @NotNull(message = "缺少考试")
-    @Range(min = 1L, message = "缺少考试")
-    private Long examId;
-
-    @ApiModelProperty("课程编号（新增必填）")
-    @NotNull(message = "缺少课程编号")
-    @Length(min = 1, message = "缺少课程编号")
-    private String courseCode;
+    @NotNull(message = "缺少教学课程id")
+    @Range(min = 1L, message = "缺少教学课程id")
+    private Long teachCourseId;
 
     @ApiModelProperty("课程目标名称")
     @NotNull(message = "请输入课程目标")
@@ -52,20 +47,12 @@ public class CourseTargetParam {
         this.id = id;
     }
 
-    public Long getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Long examId) {
-        this.examId = examId;
-    }
-
-    public String getCourseCode() {
-        return courseCode;
+    public Long getTeachCourseId() {
+        return teachCourseId;
     }
 
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
+    public void setTeachCourseId(Long teachCourseId) {
+        this.teachCourseId = teachCourseId;
     }
 
     public String getTargetName() {

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/CourseWeightParam.java

@@ -4,7 +4,6 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.distributed.print.business.bean.dto.CourseWeightDto;
 import io.swagger.annotations.ApiModelProperty;
-import org.hibernate.validator.constraints.Length;
 import org.hibernate.validator.constraints.Range;
 
 import javax.validation.constraints.NotEmpty;
@@ -19,16 +18,11 @@ import java.util.List;
  */
 public class CourseWeightParam {
 
-    @ApiModelProperty("考试id")
+    @ApiModelProperty("教学课程id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @NotNull(message = "缺少考试")
-    @Range(min = 1L, message = "缺少考试")
-    private Long examId;
-
-    @ApiModelProperty("课程编号（新增必填）")
-    @NotNull(message = "缺少课程编号")
-    @Length(min = 1, message = "缺少课程编号")
-    private String courseCode;
+    @NotNull(message = "缺少教学课程")
+    @Range(min = 1L, message = "缺少教学课程")
+    private Long teachCourseId;
 
     @ApiModelProperty("默认占比")
     private BigDecimal defaultRate;
@@ -40,20 +34,12 @@ public class CourseWeightParam {
     @NotEmpty(message = "缺少权重设置表单")
     private List<CourseWeightDto> submitForm;
 
-    public Long getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Long examId) {
-        this.examId = examId;
-    }
-
-    public String getCourseCode() {
-        return courseCode;
+    public Long getTeachCourseId() {
+        return teachCourseId;
     }
 
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
+    public void setTeachCourseId(Long teachCourseId) {
+        this.teachCourseId = teachCourseId;
     }
 
     public BigDecimal getDefaultRate() {

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/TeacherTeamParam.java

@@ -25,16 +25,12 @@ public class TeacherTeamParam {
     @Length(message = "请填写工号")
     private String teacherCode;
 
-    @ApiModelProperty("基础课程id")
-    @NotNull(message = "缺少考试")
-    @Range(min = 1L, message = "缺少考试")
+    @ApiModelProperty("教学课程id")
+    @NotNull(message = "缺少教学课程")
+    @Range(min = 1L, message = "缺少教学课程id")
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long examId;
+    private Long teachCourseId;
 
-    @ApiModelProperty("课程编号")
-    @NotNull(message = "缺少课程编号")
-    @Length(min = 1, message = "缺少课程编号")
-    private String courseCode;
 
     public String getTeacherName() {
         return teacherName;
@@ -52,19 +48,11 @@ public class TeacherTeamParam {
         this.teacherCode = teacherCode;
     }
 
-    public Long getExamId() {
-        return examId;
+    public Long getTeachCourseId() {
+        return teachCourseId;
     }
 
-    public void setExamId(Long examId) {
-        this.examId = examId;
-    }
-
-    public String getCourseCode() {
-        return courseCode;
-    }
-
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
+    public void setTeachCourseId(Long teachCourseId) {
+        this.teachCourseId = teachCourseId;
     }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/TeachCourseResult.java

@@ -26,9 +26,15 @@ public class TeachCourseResult {
     private Long createId;
 
     @ApiModelProperty(value = "创建时间")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long createTime;
 
+    @ApiModelProperty(value = "用户id(教师id)")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long userId;
+
+    @ApiModelProperty(value = "用户名称(教师名称)")
+    private String userName;
+
     public Long getId() {
         return id;
     }
@@ -68,4 +74,20 @@ public class TeachCourseResult {
     public void setCreateTime(Long createTime) {
         this.createTime = createTime;
     }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/TeachCourseMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.distributed.print.business.bean.result.TeachCourseResult;
 import com.qmth.distributed.print.business.entity.TeachCourse;
+import com.qmth.teachcloud.common.bean.dto.DataPermissionRule;
 import com.qmth.teachcloud.common.bean.result.TeacherSelectResult;
 import com.qmth.teachcloud.common.bean.result.TeacherTeamResult;
 import com.qmth.teachcloud.common.entity.BasicCourse;
@@ -25,11 +26,11 @@ public interface TeachCourseMapper extends BaseMapper<TeachCourse> {
      * @param iPage      分页参数
      * @param examId     考试id
      * @param courseName 课程名称
-     * @param userId     用户id
+     * @param dpr        数据权限
      * @return 结果
      */
     IPage<TeachCourseResult> findTeachCoursePage(@Param("iPage") Page<TeachCourseResult> iPage,
-            @Param("examId") Long examId, @Param("courseName") String courseName, @Param("userId") Long userId);
+            @Param("examId") Long examId, @Param("courseName") String courseName, @Param("dpr") DataPermissionRule dpr);
 
     /**
      * 教师团队分页查询

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/CourseDimensionService.java

@@ -20,20 +20,17 @@ public interface CourseDimensionService extends IService<CourseDimension> {
     /**
      * 导入课程知识点
      *
-     * @param requestUser 请求人
-     * @param file        知识点excel
-     * @param examId      考试id
-     * @param courseCode  课程编号
+     * @param requestUser   请求人
+     * @param file          知识点excel
+     * @param teachCourseId 教学课程id
      */
-    void importCourseDimension(SysUser requestUser, MultipartFile file, Long examId, String courseCode)
+    void importCourseDimension(SysUser requestUser, MultipartFile file, Long teachCourseId)
             throws IOException, NoSuchFieldException;
 
     /**
      * 同步题库课程知识点属性
      *
-     * @param examId     考试id
-     * @param courseCode 课程编号
-     * @param userId     教师id
+     * @param teachCourseId 教学课程id
      */
-    void syncTikuCourseProperties(Long examId, String courseCode, Long userId);
+    void syncTikuCourseProperties(Long teachCourseId);
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/CourseEvaluationService.java

@@ -21,20 +21,17 @@ public interface CourseEvaluationService extends IService<CourseEvaluation> {
     /**
      * 查询课程评价方式集合
      *
-     * @param examId     考试id
-     * @param courseCode 课程编号
-     * @param userId     用户id
+     * @param teachCourseId 教学课程id
      * @return 课程评价方式结果
      */
-    List<CourseEvaluationResult> findCourseEvaluationList(Long examId, String courseCode, Long userId);
+    List<CourseEvaluationResult> findCourseEvaluationList(Long teachCourseId);
 
     /**
      * 保存课程评价方式
      *
      * @param courseEvaluationParam 课程评价方式参数
-     * @param userId                用户id
      */
-    void saveCourseEvaluation(CourseEvaluationParam courseEvaluationParam, Long userId);
+    void saveCourseEvaluation(CourseEvaluationParam courseEvaluationParam);
 
     /**
      * 删除课程评价方式
@@ -46,9 +43,7 @@ public interface CourseEvaluationService extends IService<CourseEvaluation> {
     /**
      * 创建默认的评价方式
      *
-     * @param examId     考试id
-     * @param courseCode 课程编号
-     * @param userId     教师id
+     * @param teachCourseId 教学课程id
      */
-    void createDefaultCourseEvaluation(Long examId, String courseCode, Long userId);
+    void createDefaultCourseEvaluation(Long teachCourseId);
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/CourseTargetService.java

@@ -22,22 +22,18 @@ public interface CourseTargetService extends IService<CourseTarget> {
     /**
      * 查询课程目标集合
      *
-     * @param examId     考试id
-     * @param courseCode 课程编号
-     * @param userId     教师id
+     * @param teachCourseId     教学课程id
      * @return 目标集合
      */
-    List<CourseTargetResult> findCourseTargetList(Long examId, String courseCode, Long userId);
+    List<CourseTargetResult> findCourseTargetList(Long teachCourseId);
 
     /**
      * 查询知识点树
      *
-     * @param examId     考试id
-     * @param courseCode 课程编号
-     * @param userId     教师id
+     * @param teachCourseId     教学课程id
      * @return 课程知识点树
      */
-    List<CourseDimensionTree> findDimensionTree(Long examId, String courseCode, Long userId);
+    List<CourseDimensionTree> findDimensionTree(Long teachCourseId);
 
     /**
      * 保存课程目标

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/CourseWeightService.java

@@ -22,22 +22,28 @@ public interface CourseWeightService extends IService<CourseWeight> {
     /**
      * 查询课程权重
      *
+     * @param teachCourseId 教学课程id
+     * @return 课程权重信息
+     */
+    CourseWeightResult findCourseWeight(Long teachCourseId);
+
+    /**
+     * 重载-查询课程权重
+     *
      * @param examId     考试id
      * @param courseCode 课程编号
-     * @param userId     教师id
+     * @param teacherId  教师id
      * @return 课程权重信息
      */
-    CourseWeightResult findCourseWeight(Long examId, String courseCode, Long userId);
+    CourseWeightResult findCourseWeight(Long examId, String courseCode, Long teacherId);
 
     /**
      * 查询课程权重(report)
      *
-     * @param examId     考试id
-     * @param courseCode 课程编号
-     * @param userId     教师id
+     * @param teachCourseId 教学课程id
      * @return 课程权重信息
      */
-    CourseWeightResult findCourseWeightReport(Long examId, String courseCode, Long userId);
+    CourseWeightResult findCourseWeightReport(Long teachCourseId);
 
     /**
      * 保存课程权重
@@ -57,10 +63,8 @@ public interface CourseWeightService extends IService<CourseWeight> {
     /**
      * 获取课程权重表单数据
      *
-     * @param examId     考试id
-     * @param courseCode 课程编号
-     * @param userId     教师id
+     * @param teachCourseId 教学课程id
      * @return 课程权重表单平铺数据
      */
-    List<CourseWeightFormDto> findCourseWeightForm(Long examId, String courseCode, Long userId);
-}
+    List<CourseWeightFormDto> findCourseWeightForm(Long teachCourseId);
+}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/TeachClazzService.java

@@ -20,14 +20,13 @@ public interface TeachClazzService extends IService<TeachClazz> {
     /**
      * 分页查询教学班列表
      *
-     * @param examId         考试id
-     * @param courseCode     考试编号
+     * @param teachCourseId  教学课程id
      * @param teachClazzName 教学班名称
      * @param pageNumber     分页页数
      * @param pageSize       分页容量
      * @return 分页结果
      */
-    IPage<TeachClazzResult> teachClazzPage(Long examId, String courseCode, String teachClazzName, int pageNumber, int pageSize);
+    IPage<TeachClazzResult> teachClazzPage(Long teachCourseId, String teachClazzName, int pageNumber, int pageSize);
 
     /**
      * 编辑教学班

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/TeachCourseService.java

@@ -36,10 +36,9 @@ public interface TeachCourseService extends IService<TeachCourse> {
      * @param courseName 课程名称
      * @param pageNumber 分页参数
      * @param pageSize   分页容量
-     * @param userId     用户id
      * @return 教学课程分页结果
      */
-    IPage<TeachCourseResult> teachCoursePage(Long examId, String courseName, int pageNumber, int pageSize, Long userId);
+    IPage<TeachCourseResult> teachCoursePage(Long examId, String courseName, int pageNumber, int pageSize);
 
     /**
      * 手动创建教学课程
@@ -94,12 +93,11 @@ public interface TeachCourseService extends IService<TeachCourse> {
     /**
      * 教师库添加教师团队
      *
-     * @param examId      考试id
-     * @param courseCode  课程编号
-     * @param userIdList  用户id集合
-     * @param requestUser 请求人
+     * @param teachCourseId 教学课程id
+     * @param userIdList    用户id集合
+     * @param requestUser   请求人
      */
-    void selectCreateTeacher(Long examId, String courseCode, List<Long> userIdList, SysUser requestUser);
+    void selectCreateTeacher(Long teachCourseId, List<Long> userIdList, SysUser requestUser);
 
     /**
      * 导入教师团队
@@ -114,14 +112,13 @@ public interface TeachCourseService extends IService<TeachCourse> {
     /**
      * 分页查询教师团队
      *
-     * @param examId     考试id
-     * @param courseCode 课程编号
-     * @param userInfo   教师信息
-     * @param pageNumber 分页页数
-     * @param pageSize   分页容量
+     * @param teachCourseId 教学课程id
+     * @param userInfo      教师信息
+     * @param pageNumber    分页页数
+     * @param pageSize      分页容量
      * @return 分页结果
      */
-    IPage<TeacherTeamResult> findTeacherTeamPage(Long examId, String courseCode, String userInfo, int pageNumber, int pageSize);
+    IPage<TeacherTeamResult> findTeacherTeamPage(Long teachCourseId, String userInfo, int pageNumber, int pageSize);
 
     /**
      * 根据机构id查询用户
@@ -162,22 +159,19 @@ public interface TeachCourseService extends IService<TeachCourse> {
     /**
      * 查询课程权重设置状态
      *
-     * @param examId     考试id
-     * @param courseCode 课程编号
-     * @param userId     教师id
+     * @param teachCourseId         教学课程id
      * @return 课程权重设置状态
      */
-    CourseWeightSettingStatusResult findCourseWeightSettingStatus(Long examId, String courseCode, Long userId);
+    CourseWeightSettingStatusResult findCourseWeightSettingStatus(Long teachCourseId);
 
     /**
      * 查询班级分配情况
      *
-     * @param examId     考试id
-     * @param courseCode 课程编号
-     * @param clazzName  班级名称
+     * @param teachCourseId 教学课程id
+     * @param clazzName     班级名称
      * @return 分配情况结果
      */
-    List<ClazzDistributedResult> findClazzDistributedStatus(Long examId, String courseCode, String clazzName);
+    List<ClazzDistributedResult> findClazzDistributedStatus(Long teachCourseId, String clazzName);
 
     /**
      * 分配班级

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/CourseDimensionServiceImpl.java

@@ -22,6 +22,7 @@ import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.kit.TikuUtils;
 import com.qmth.teachcloud.common.util.ExcelUtil;
+import com.qmth.teachcloud.common.util.ServletUtil;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -60,13 +61,17 @@ public class CourseDimensionServiceImpl extends ServiceImpl<CourseDimensionMappe
 
     @Transactional
     @Override
-    public void importCourseDimension(SysUser requestUser, MultipartFile file, Long examId, String courseCode)
+    public void importCourseDimension(SysUser requestUser, MultipartFile file, Long teachCourseId)
             throws IOException, NoSuchFieldException {
         Long requestUserId = requestUser.getId();
         Long schoolId = requestUser.getSchoolId();
 
-        TeachCourse teachCourse = teachCourseService.findByExamIdCourseCodeAndUserId(examId, courseCode, requestUserId);
-        Long teachCourseId = teachCourse.getId();
+        TeachCourse teachCourse = teachCourseService.getById(teachCourseId);
+        if (Objects.isNull(teachCourse)) {
+            throw ExceptionResultEnum.ERROR.exception("教学课程不存在");
+        }
+        Long examId = teachCourse.getExamId();
+        String courseCode = teachCourse.getCourseCode();
 
         BasicExam basicExam = basicExamService.getById(examId);
         if (Objects.isNull(basicExam)) {
@@ -136,7 +141,7 @@ public class CourseDimensionServiceImpl extends ServiceImpl<CourseDimensionMappe
         temp.setSemesterId(semesterId);
         temp.setExamId(examId);
         temp.setCourseCode(courseCode);
-        temp.setUserId(requestUserId);
+        temp.setUserId(teachCourse.getUserId());
         temp.setSource(CourseDimensionSourceEnum.IMPORT);
 
         List<CourseDimension> willSaveDimensions = new ArrayList<>();
@@ -182,10 +187,16 @@ public class CourseDimensionServiceImpl extends ServiceImpl<CourseDimensionMappe
 
     @Transactional
     @Override
-    public void syncTikuCourseProperties(Long examId, String courseCode, Long userId) {
-        TeachCourse teachCourse = teachCourseService.findByExamIdCourseCodeAndUserId(examId, courseCode, userId);
+    public void syncTikuCourseProperties(Long teachCourseId) {
+        SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
+        Long requestUserId = requestUser.getId();
+        TeachCourse teachCourse = teachCourseService.getById(teachCourseId);
+        if (Objects.isNull(teachCourse)) {
+            throw ExceptionResultEnum.ERROR.exception("教学课程不存在");
+        }
+        Long examId = teachCourse.getExamId();
+        String courseCode = teachCourse.getCourseCode();
         Long schoolId = teachCourse.getSchoolId();
-        Long teachCourseId = teachCourse.getId();
         BasicExam basicExam = basicExamService.getById(examId);
         if (Objects.isNull(basicExam)) {
             throw ExceptionResultEnum.ERROR.exception("考试不存在");
@@ -206,7 +217,7 @@ public class CourseDimensionServiceImpl extends ServiceImpl<CourseDimensionMappe
                 temp.setSemesterId(semesterId);
                 temp.setExamId(examId);
                 temp.setCourseCode(courseCode);
-                temp.setUserId(userId);
+                temp.setUserId(teachCourse.getUserId());
                 temp.setSource(CourseDimensionSourceEnum.UNION_QUESTION);
                 List<CourseDimension> willAddList = new ArrayList<>();
 
@@ -224,7 +235,7 @@ public class CourseDimensionServiceImpl extends ServiceImpl<CourseDimensionMappe
                     willAddFirst.setCode(fCode);
                     willAddFirst.setName(fName);
                     willAddFirst.setNumber(fNumber);
-                    willAddFirst.insertInfo(userId);
+                    willAddFirst.insertInfo(requestUserId);
                     willAddFirst.setParentId(0L);
                     willAddList.add(willAddFirst);
 
@@ -240,7 +251,7 @@ public class CourseDimensionServiceImpl extends ServiceImpl<CourseDimensionMappe
                         willAddSecond.setCode(sCode);
                         willAddSecond.setName(sName);
                         willAddSecond.setNumber(sNumber);
-                        willAddSecond.insertInfo(userId);
+                        willAddSecond.insertInfo(requestUserId);
                         willAddSecond.setParentId(sParentId);
                         willAddList.add(willAddSecond);
                     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/CourseEvaluationServiceImpl.java

@@ -13,6 +13,7 @@ import com.qmth.distributed.print.business.service.CourseEvaluationService;
 import com.qmth.distributed.print.business.service.TeachCourseService;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.util.ServletUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -35,22 +36,30 @@ public class CourseEvaluationServiceImpl extends ServiceImpl<CourseEvaluationMap
     private TeachCourseService teachCourseService;
 
     @Override
-    public List<CourseEvaluationResult> findCourseEvaluationList(Long examId, String courseCode, Long userId) {
-        TeachCourse teachCourse = teachCourseService.findByExamIdCourseCodeAndUserId(examId, courseCode, userId);
-        return this.baseMapper.findCourseEvaluationList(teachCourse.getId());
+    public List<CourseEvaluationResult> findCourseEvaluationList(Long teachCourseId) {
+        TeachCourse teachCourse = teachCourseService.getById(teachCourseId);
+        if (Objects.isNull(teachCourse)){
+            throw ExceptionResultEnum.ERROR.exception("教学课程不存在");
+        }
+        return this.baseMapper.findCourseEvaluationList(teachCourseId);
     }
 
     @Transactional
     @Override
-    public void saveCourseEvaluation(CourseEvaluationParam courseEvaluationParam, Long userId) {
-        Long examId = courseEvaluationParam.getExamId();
-        String courseCode = courseEvaluationParam.getCourseCode();
+    public void saveCourseEvaluation(CourseEvaluationParam courseEvaluationParam) {
+        SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
+
+        Long teachCourseId = courseEvaluationParam.getTeachCourseId();
         String evaluation = courseEvaluationParam.getEvaluation();
         String evaluationDesc = courseEvaluationParam.getEvaluationDesc();
         CourseEvaluationTypeEnum type = courseEvaluationParam.getType();
+        TeachCourse teachCourse = teachCourseService.getById(teachCourseId);
+        if (Objects.isNull(teachCourse)){
+            throw ExceptionResultEnum.ERROR.exception("教学课程不存在");
+        }
+        Long examId = teachCourse.getExamId();
+        String courseCode = teachCourse.getCourseCode();
 
-        TeachCourse teachCourse = teachCourseService.findByExamIdCourseCodeAndUserId(examId, courseCode, userId);
-        Long teachCourseId = teachCourse.getId();
         if (this.count(
                 new QueryWrapper<CourseEvaluation>().lambda().eq(CourseEvaluation::getTeachCourseId, teachCourseId)
                         .eq(CourseEvaluation::getEvaluation, evaluation)) > 0) {
@@ -62,11 +71,11 @@ public class CourseEvaluationServiceImpl extends ServiceImpl<CourseEvaluationMap
         courseEvaluation.setSchoolId(teachCourse.getSchoolId());
         courseEvaluation.setExamId(examId);
         courseEvaluation.setCourseCode(courseCode);
-        courseEvaluation.setUserId(userId);
+        courseEvaluation.setUserId(teachCourse.getUserId());
         courseEvaluation.setType(type);
         courseEvaluation.setEvaluation(evaluation);
         courseEvaluation.setEvaluationDesc(evaluationDesc);
-        courseEvaluation.insertInfo(userId);
+        courseEvaluation.insertInfo(requestUser.getId());
         this.save(courseEvaluation);
     }
 
@@ -86,15 +95,14 @@ public class CourseEvaluationServiceImpl extends ServiceImpl<CourseEvaluationMap
 
     @Transactional
     @Override
-    public void createDefaultCourseEvaluation(Long examId, String courseCode, Long userId) {
+    public void createDefaultCourseEvaluation(Long teachCourseId) {
         // 创建默认评价方式
         CourseEvaluationTypeEnum type = CourseEvaluationTypeEnum.DEFAULT;
         CourseEvaluationParam courseEvaluationParam = new CourseEvaluationParam();
-        courseEvaluationParam.setExamId(examId);
-        courseEvaluationParam.setCourseCode(courseCode);
+        courseEvaluationParam.setTeachCourseId(teachCourseId);
         courseEvaluationParam.setEvaluation(type.getName());
         courseEvaluationParam.setEvaluationDesc(type.getValue());
         courseEvaluationParam.setType(type);
-        this.saveCourseEvaluation(courseEvaluationParam, userId);
+        this.saveCourseEvaluation(courseEvaluationParam);
     }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/CourseTargetServiceImpl.java

@@ -47,9 +47,11 @@ public class CourseTargetServiceImpl extends ServiceImpl<CourseTargetMapper, Cou
     private CourseDimensionService courseDimensionService;
 
     @Override
-    public List<CourseTargetResult> findCourseTargetList(Long examId, String courseCode, Long userId) {
-        TeachCourse teachCourse = teachCourseService.findByExamIdCourseCodeAndUserId(examId, courseCode, userId);
-        Long teachCourseId = teachCourse.getId();
+    public List<CourseTargetResult> findCourseTargetList(Long teachCourseId) {
+        TeachCourse teachCourse = teachCourseService.getById(teachCourseId);
+        if (Objects.isNull(teachCourse)) {
+            throw ExceptionResultEnum.ERROR.exception("教学课程不存在");
+        }
         List<CourseTarget> courseTargetList = this.list(
                 new QueryWrapper<CourseTarget>().lambda().eq(CourseTarget::getTeachCourseId, teachCourse.getId()).orderByAsc(CourseTarget::getId));
 
@@ -84,9 +86,11 @@ public class CourseTargetServiceImpl extends ServiceImpl<CourseTargetMapper, Cou
     }
 
     @Override
-    public List<CourseDimensionTree> findDimensionTree(Long examId, String courseCode, Long userId) {
-        TeachCourse teachCourse = teachCourseService.findByExamIdCourseCodeAndUserId(examId, courseCode, userId);
-        Long teachCourseId = teachCourse.getId();
+    public List<CourseDimensionTree> findDimensionTree(Long teachCourseId) {
+        TeachCourse teachCourse = teachCourseService.getById(teachCourseId);
+        if (Objects.isNull(teachCourse)) {
+            throw ExceptionResultEnum.ERROR.exception("教学课程不存在");
+        }
 
         // 课程目标
         List<CourseTarget> courseTargetList = this.list(
@@ -140,13 +144,17 @@ public class CourseTargetServiceImpl extends ServiceImpl<CourseTargetMapper, Cou
     public void saveCourseTarget(CourseTargetParam courseTargetParam, SysUser requestUser) {
         Long requestUserId = requestUser.getId();
         Long id = courseTargetParam.getId();
-        Long examId = courseTargetParam.getExamId();
-        String courseCode = courseTargetParam.getCourseCode();
+        Long teachCourseId = courseTargetParam.getTeachCourseId();
+        TeachCourse teachCourse = teachCourseService.getById(teachCourseId);
+        if (Objects.isNull(teachCourse)) {
+            throw ExceptionResultEnum.ERROR.exception("教学课程不存在");
+        }
+
+        Long examId = teachCourse.getExamId();
+        String courseCode = teachCourse.getCourseCode();
         String targetName = courseTargetParam.getTargetName();
         String degreeRequirement = courseTargetParam.getDegreeRequirement();
         List<Long> dimensionIdList = courseTargetParam.getDimensionIdList();
-        TeachCourse teachCourse = teachCourseService.findByExamIdCourseCodeAndUserId(examId, courseCode, requestUserId);
-        Long teachCourseId = teachCourse.getId();
 
         // 知识点检查
         Map<Long, CourseDimension> courseDimensionMap = courseDimensionService.list(

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/CourseWeightServiceImpl.java

@@ -56,18 +56,20 @@ public class CourseWeightServiceImpl extends ServiceImpl<CourseWeightMapper, Cou
     private CourseEvaluationService courseEvaluationService;
 
     @Override
-    public CourseWeightResult findCourseWeight(Long examId, String courseCode, Long userId) {
-        TeachCourse teachCourse = teachCourseService.findByExamIdCourseCodeAndUserId(examId, courseCode, userId);
+    public CourseWeightResult findCourseWeight(Long teachCourseId) {
+        TeachCourse teachCourse = teachCourseService.getById(teachCourseId);
+        if (Objects.isNull(teachCourse)) {
+            throw ExceptionResultEnum.ERROR.exception("教学班不存在");
+        }
+
         BigDecimal defaultRate = teachCourse.getDefaultRate();
         BigDecimal customRate = teachCourse.getCustomRate();
 
-        Long teachCourseId = teachCourse.getId();
-
         // 现有目标
-        List<CourseTargetResult> courseTargetList = courseTargetService.findCourseTargetList(examId, courseCode, userId);
+        List<CourseTargetResult> courseTargetList = courseTargetService.findCourseTargetList(teachCourseId);
         // 现有评价方式
         List<CourseEvaluationResult> courseEvaluationResultList = courseEvaluationService.findCourseEvaluationList(
-                examId, courseCode, userId).stream().sorted((o1, o2) -> {
+                teachCourseId).stream().sorted((o1, o2) -> {
             if (o1.getType().getIndex() == o2.getType().getIndex()) {
                 return o1.getEvaluationId() < o2.getEvaluationId() ? -1 : 0;
             } else {
@@ -147,18 +149,26 @@ public class CourseWeightServiceImpl extends ServiceImpl<CourseWeightMapper, Cou
     }
 
     @Override
-    public CourseWeightResult findCourseWeightReport(Long examId, String courseCode, Long userId) {
-        TeachCourse teachCourse = teachCourseService.findByExamIdCourseCodeAndUserId(examId, courseCode, userId);
+    public CourseWeightResult findCourseWeight(Long examId, String courseCode, Long teacherId) {
+        return this.findCourseWeight(
+                teachCourseService.findByExamIdCourseCodeAndUserId(examId, courseCode, teacherId).getId());
+    }
+
+    @Override
+    public CourseWeightResult findCourseWeightReport(Long teachCourseId) {
+        TeachCourse teachCourse = teachCourseService.getById(teachCourseId);
+        if (Objects.isNull(teachCourse)) {
+            throw ExceptionResultEnum.ERROR.exception("教学班不存在");
+        }
+
         BigDecimal defaultRate = teachCourse.getDefaultRate();
         BigDecimal customRate = teachCourse.getCustomRate();
 
-        Long teachCourseId = teachCourse.getId();
-
         // 现有目标
-        List<CourseTargetResult> courseTargetList = courseTargetService.findCourseTargetList(examId, courseCode, userId);
+        List<CourseTargetResult> courseTargetList = courseTargetService.findCourseTargetList(teachCourseId);
         // 现有评价方式
         List<CourseEvaluationResult> courseEvaluationResultList = courseEvaluationService.findCourseEvaluationList(
-                examId, courseCode, userId).stream().sorted((o1, o2) -> {
+                teachCourseId).stream().sorted((o1, o2) -> {
             if (o1.getType().getIndex() == o2.getType().getIndex()) {
                 return o1.getEvaluationId() < o2.getEvaluationId() ? -1 : 0;
             } else {
@@ -237,15 +247,18 @@ public class CourseWeightServiceImpl extends ServiceImpl<CourseWeightMapper, Cou
     public void saveCourseWeight(CourseWeightParam courseWeightParam, SysUser requestUser) {
         List<String> errorMsgList = new ArrayList<>();
         Long requestUserId = requestUser.getId();
-        Long examId = courseWeightParam.getExamId();
-        String courseCode = courseWeightParam.getCourseCode();
+        Long teachCourseId = courseWeightParam.getTeachCourseId();
         BigDecimal defaultRate = courseWeightParam.getDefaultRate();
         BigDecimal customRate = courseWeightParam.getCustomRate();
 
         List<CourseWeightDto> submitForm = courseWeightParam.getSubmitForm();
 
-        TeachCourse teachCourse = teachCourseService.findByExamIdCourseCodeAndUserId(examId, courseCode, requestUserId);
-        Long teachCourseId = teachCourse.getId();
+        TeachCourse teachCourse = teachCourseService.getById(teachCourseId);
+        if (Objects.isNull(teachCourse)) {
+            throw ExceptionResultEnum.ERROR.exception("教学课程不存在");
+        }
+        Long examId = teachCourse.getExamId();
+        String courseCode = teachCourse.getCourseCode();
 
         teachCourseService.clearCourseSetting(teachCourseId, CourseSettingTypeEnum.COURSE_WEIGHT);
 
@@ -377,9 +390,11 @@ public class CourseWeightServiceImpl extends ServiceImpl<CourseWeightMapper, Cou
     }
 
     @Override
-    public List<CourseWeightFormDto> findCourseWeightForm(Long examId, String courseCode, Long userId) {
-        TeachCourse teachCourse = teachCourseService.findByExamIdCourseCodeAndUserId(examId, courseCode, userId);
-        Long teachCourseId = teachCourse.getId();
+    public List<CourseWeightFormDto> findCourseWeightForm(Long teachCourseId) {
+        TeachCourse teachCourse = teachCourseService.getById(teachCourseId);
+        if (Objects.isNull(teachCourse)) {
+            throw ExceptionResultEnum.ERROR.exception("教学课程不存在");
+        }
         return this.baseMapper.findCourseWeightForm(teachCourseId);
     }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamTaskServiceImpl.java

@@ -793,7 +793,8 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                 .eq(ExamTask::getId, examTask.getId());
         this.update(updateWrapper);
 
-        ExamTaskDetail detail = examTaskDetailService.getByExamTaskId(examTaskDetail.getExamTaskId());
+//        ExamTaskDetail detail = examTaskDetailService.getByExamTaskId(examTaskDetail.getExamTaskId());
+        ExamTaskDetail detail = null;
         if (detail != null) {
             examTaskDetail.setId(detail.getId());
             // 已曝光试卷和未曝光试卷赋值

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TeachClazzServiceImpl.java

@@ -49,14 +49,16 @@ public class TeachClazzServiceImpl extends ServiceImpl<TeachClazzMapper,TeachCla
     private BasicTeachClazzService basicTeachClazzService;
 
     @Override
-    public IPage<TeachClazzResult> teachClazzPage(Long examId, String courseCode, String teachClazzName, int pageNumber,
+    public IPage<TeachClazzResult> teachClazzPage(Long teachCourseId, String teachClazzName, int pageNumber,
             int pageSize) {
-        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        Long userId = sysUser.getId();
-        TeachCourse teachCourse = teachCourseService.findByExamIdCourseCodeAndUserId(examId, courseCode, userId);
-        Long teachCourseId = teachCourse.getId();
-        Long leaderId = teachCourse.getCreateId();
+        TeachCourse teachCourse = teachCourseService.getById(teachCourseId);
+        if (Objects.isNull(teachCourse)) {
+            throw ExceptionResultEnum.ERROR.exception("教学课程不存在");
+        }
+        Long examId = teachCourse.getExamId();
+        String courseCode = teachCourse.getCourseCode();
 
+        Long leaderId = teachCourse.getCreateId();
         TeachCourse leaderTeachCourse = teachCourseService.findByExamIdCourseCodeAndUserId(examId, courseCode, leaderId);
         Long leaderTeachCourseId = leaderTeachCourse.getId();
 
@@ -98,6 +100,11 @@ public class TeachClazzServiceImpl extends ServiceImpl<TeachClazzMapper,TeachCla
     @Override
     public void selectTeachClazz(TeachClazzParams teachClazzParams, SysUser requestUser) {
         Long teachCourseId = teachClazzParams.getTeachCourseId();
+        TeachCourse teachCourse = teachCourseService.getById(teachCourseId);
+        if (Objects.isNull(teachCourse)) {
+            throw ExceptionResultEnum.ERROR.exception("教学课程不存在");
+        }
+
         List<Long> dbIdList = this.list(
                 new QueryWrapper<TeachClazz>().lambda().eq(TeachClazz::getTeachCourseId, teachCourseId)).stream().map(TeachClazz::getBasicTeachClazzId).collect(Collectors.toList());
 
@@ -106,14 +113,14 @@ public class TeachClazzServiceImpl extends ServiceImpl<TeachClazzMapper,TeachCla
         for (Long basicTeachClazzId : idList) {
             BasicTeachClazz basicTeachClazz = basicTeachClazzService.getById(basicTeachClazzId);
             if (Objects.isNull(basicTeachClazz)) {
-                throw ExceptionResultEnum.ERROR.exception("教学课程字典不存在");
+                throw ExceptionResultEnum.ERROR.exception("课程字典不存在");
             }
 
             TeachClazz teachClazz = new TeachClazz();
             teachClazz.setSchoolId(basicTeachClazz.getSchoolId());
             teachClazz.setTeachCourseId(teachCourseId);
             teachClazz.setBasicTeachClazzId(basicTeachClazzId);
-            teachClazz.setUserId(requestUser.getId());
+            teachClazz.setUserId(teachCourse.getUserId());
             teachClazz.setClazzName(basicTeachClazz.getClazzName());
             teachClazz.insertInfo(requestUser.getId());
             teachClazzList.add(teachClazz);

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TeachCourseServiceImpl.java

@@ -18,6 +18,7 @@ import com.qmth.distributed.print.business.enums.CourseSettingTypeEnum;
 import com.qmth.distributed.print.business.mapper.TeachCourseMapper;
 import com.qmth.distributed.print.business.service.*;
 import com.qmth.teachcloud.common.base.BaseEntity;
+import com.qmth.teachcloud.common.bean.dto.DataPermissionRule;
 import com.qmth.teachcloud.common.bean.params.UserSaveParams;
 import com.qmth.teachcloud.common.bean.result.TeacherSelectResult;
 import com.qmth.teachcloud.common.bean.result.TeacherTeamResult;
@@ -89,10 +90,17 @@ public class TeachCourseServiceImpl extends ServiceImpl<TeachCourseMapper, Teach
     @Resource
     private SysUserRoleService sysUserRoleService;
 
+    @Resource
+    private BasicRoleDataPermissionService basicRoleDataPermissionService;
+
     @Override
-    public IPage<TeachCourseResult> teachCoursePage(Long examId, String courseName, int pageNumber, int pageSize, Long userId) {
+    public IPage<TeachCourseResult> teachCoursePage(Long examId, String courseName, int pageNumber, int pageSize) {
         courseName = SystemConstant.translateSpecificSign(courseName);
-        return this.baseMapper.findTeachCoursePage(new Page<>(pageNumber, pageSize), examId, courseName, userId);
+        SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
+
+        DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(requestUser.getSchoolId(),
+                requestUser.getId(), ServletUtil.getRequest().getServletPath());
+        return this.baseMapper.findTeachCoursePage(new Page<>(pageNumber, pageSize), examId, courseName, dpr);
     }
 
     @Deprecated
@@ -171,7 +179,7 @@ public class TeachCourseServiceImpl extends ServiceImpl<TeachCourseMapper, Teach
                 this.save(cell);
 
                 // 创建默认评价方式
-                courseEvaluationService.createDefaultCourseEvaluation(examId, courseCode, userId);
+                courseEvaluationService.createDefaultCourseEvaluation(cell.getId());
             }
         }
     }
@@ -232,9 +240,10 @@ public class TeachCourseServiceImpl extends ServiceImpl<TeachCourseMapper, Teach
     @Override
     public void deleteTeachCourseBatch(List<Long> idList) {
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
-        Long userId = requestUser.getId();
+        Long requestUserId = requestUser.getId();
         List<TeachCourse> teachCourseList = this.listByIds(idList);
-        List<String> cantDeleteCourseCodeList = teachCourseList.stream().filter(e -> !e.getCreateId().equals(userId)).map(TeachCourse::getCourseCode).collect(Collectors.toList());
+        List<String> cantDeleteCourseCodeList = teachCourseList.stream().filter(e -> !e.getCreateId().equals(requestUserId)).map(TeachCourse::getCourseCode)
+                .collect(Collectors.toList());
         if (CollectionUtils.isNotEmpty(cantDeleteCourseCodeList)) {
             throw ExceptionResultEnum.ERROR.exception(
                     String.format("[%s]课程非本人创建,无法删除", String.join(",", cantDeleteCourseCodeList)));
@@ -245,7 +254,7 @@ public class TeachCourseServiceImpl extends ServiceImpl<TeachCourseMapper, Teach
                 List<TeachCourse> teamList = this.list(
                         new QueryWrapper<TeachCourse>().lambda().eq(TeachCourse::getExamId, mainTeachCourse.getExamId())
                                 .eq(TeachCourse::getCourseCode, mainTeachCourse.getCourseCode())
-                                .eq(TeachCourse::getCreateId, userId).ne(TeachCourse::getUserId, userId));
+                                .eq(TeachCourse::getCreateId, requestUserId).ne(TeachCourse::getUserId, requestUserId));
                 if (CollectionUtils.isNotEmpty(teamList)) {
                     throw ExceptionResultEnum.ERROR.exception(
                             String.format("请先删除课程(编号)[%s]下的教师团队，再删除课程", mainTeachCourse.getCourseCode()));
@@ -285,8 +294,14 @@ public class TeachCourseServiceImpl extends ServiceImpl<TeachCourseMapper, Teach
     public void manualCreateTeacher(TeacherTeamParam teacherTeamParam, SysUser requestUser) throws IllegalAccessException {
         String name = teacherTeamParam.getTeacherName();
         String code = teacherTeamParam.getTeacherCode();
-        Long examId = teacherTeamParam.getExamId();
-        String courseCode = teacherTeamParam.getCourseCode();
+        Long teachCourseId = teacherTeamParam.getTeachCourseId();
+        TeachCourse teachCourse = this.getById(teachCourseId);
+        if (Objects.isNull(teachCourse)) {
+            throw ExceptionResultEnum.ERROR.exception("教学课程不存在");
+        }
+        Long examId = teachCourse.getExamId();
+        String courseCode = teachCourse.getCourseCode();
+
         Long requestUserId = requestUser.getId();
         Long schoolId = requestUser.getSchoolId();
         Long teacherId;
@@ -325,25 +340,33 @@ public class TeachCourseServiceImpl extends ServiceImpl<TeachCourseMapper, Teach
             teacherId = sysUserService.saveUser(userSaveParams);
         }
         // 添加教师团队
-        TeachCourse teachCourse = new TeachCourse();
-        teachCourse.setSchoolId(schoolId);
-        teachCourse.setExamId(examId);
-        teachCourse.setCourseCode(courseCode);
-        teachCourse.setWeightSetting(false);
-        teachCourse.setUserId(teacherId);
-        teachCourse.setEnable(true);
-        teachCourse.insertInfo(requestUserId);
-        this.save(teachCourse);
+        TeachCourse tmp = new TeachCourse();
+        tmp.setSchoolId(schoolId);
+        tmp.setExamId(examId);
+        tmp.setCourseCode(courseCode);
+        tmp.setWeightSetting(false);
+        tmp.setUserId(teacherId);
+        tmp.setEnable(true);
+        tmp.insertInfo(requestUserId);
+        this.save(tmp);
 
         // 创建默认的评价方式
-        courseEvaluationService.createDefaultCourseEvaluation(examId, courseCode, teacherId);
+        courseEvaluationService.createDefaultCourseEvaluation(tmp.getId());
     }
 
     @Transactional
     @Override
-    public void selectCreateTeacher(Long examId, String courseCode, List<Long> userIdList, SysUser requestUser) {
+    public void selectCreateTeacher(Long teachCourseId, List<Long> userIdList, SysUser requestUser) {
         Long schoolId = requestUser.getSchoolId();
         Long requestUserId = requestUser.getId();
+
+        TeachCourse teachCourse = this.getById(teachCourseId);
+        if (Objects.isNull(teachCourse)) {
+            throw ExceptionResultEnum.ERROR.exception("教学班不存在");
+        }
+        Long examId = teachCourse.getExamId();
+        String courseCode = teachCourse.getCourseCode();
+
         if (CollectionUtils.isNotEmpty(userIdList)) {
             // 过滤userIdList
             userIdList = sysUserService.listByIds(userIdList).stream().filter(SysUser::getEnable).map(BaseEntity::getId)
@@ -360,23 +383,23 @@ public class TeachCourseServiceImpl extends ServiceImpl<TeachCourseMapper, Teach
 
                 // 创建教学课程
                 List<TeachCourse> teachCourseList = userIdList.stream().flatMap(e -> {
-                    TeachCourse teachCourse = new TeachCourse();
-                    teachCourse.setSchoolId(schoolId);
-                    teachCourse.setExamId(examId);
-                    teachCourse.setCourseCode(courseCode);
-                    teachCourse.setWeightSetting(false);
-                    teachCourse.setUserId(e);
-                    teachCourse.setEnable(true);
-                    teachCourse.insertInfo(requestUserId);
-                    return Stream.of(teachCourse);
+                    TeachCourse tmp = new TeachCourse();
+                    tmp.setSchoolId(schoolId);
+                    tmp.setExamId(examId);
+                    tmp.setCourseCode(courseCode);
+                    tmp.setWeightSetting(false);
+                    tmp.setUserId(e);
+                    tmp.setEnable(true);
+                    tmp.insertInfo(requestUserId);
+                    return Stream.of(tmp);
                 }).collect(Collectors.toList());
 
                 // 新增课程
                 this.saveBatch(teachCourseList);
 
-                for (Long userId : userIdList) {
+                for (TeachCourse tmp : teachCourseList) {
                     // 创建默认评价方式
-                    courseEvaluationService.createDefaultCourseEvaluation(examId, courseCode, userId);
+                    courseEvaluationService.createDefaultCourseEvaluation(tmp.getId());
                 }
             }
         }
@@ -414,9 +437,15 @@ public class TeachCourseServiceImpl extends ServiceImpl<TeachCourseMapper, Teach
     }
 
     @Override
-    public IPage<TeacherTeamResult> findTeacherTeamPage(Long examId, String courseCode, String userInfo, int pageNumber,
+    public IPage<TeacherTeamResult> findTeacherTeamPage(Long teachCourseId, String userInfo, int pageNumber,
             int pageSize) {
-        Long schoolId = SystemConstant.convertIdToLong(ServletUtil.getRequestHeaderSchoolId().toString());
+        TeachCourse teachCourse = this.getById(teachCourseId);
+        if (Objects.isNull(teachCourse)) {
+            throw ExceptionResultEnum.ERROR.exception("教学课程不存在");
+        }
+        Long examId = teachCourse.getExamId();
+        String courseCode = teachCourse.getCourseCode();
+
         if (SystemConstant.strNotNull(userInfo)) {
             userInfo = SystemConstant.translateSpecificSign(userInfo);
         }
@@ -500,7 +529,7 @@ public class TeachCourseServiceImpl extends ServiceImpl<TeachCourseMapper, Teach
             UpdateWrapper<TeachCourse> teachCourseUpdateWrapper = new UpdateWrapper<>();
             teachCourseUpdateWrapper.lambda().eq(TeachCourse::getId, teachCourseId)
                     .set(TeachCourse::getWeightSettingSign, SystemConstant.getDbUuid())
-                    .set(TeachCourse::getDimensionSign,SystemConstant.getDbUuid());
+                    .set(TeachCourse::getDimensionSign, SystemConstant.getDbUuid());
             this.update(teachCourseUpdateWrapper);
         } else {
             // 删除权重设置
@@ -509,10 +538,12 @@ public class TeachCourseServiceImpl extends ServiceImpl<TeachCourseMapper, Teach
     }
 
     @Override
-    public CourseWeightSettingStatusResult findCourseWeightSettingStatus(Long examId, String courseCode, Long userId) {
+    public CourseWeightSettingStatusResult findCourseWeightSettingStatus(Long teachCourseId) {
         CourseWeightSettingStatusResult result = new CourseWeightSettingStatusResult();
-        TeachCourse teachCourse = this.findByExamIdCourseCodeAndUserId(examId, courseCode, userId);
-        Long teachCourseId = teachCourse.getId();
+        TeachCourse teachCourse = this.getById(teachCourseId);
+        if (Objects.isNull(teachCourse)) {
+            throw ExceptionResultEnum.ERROR.exception("教学课程不存在");
+        }
         Boolean everSettingStatus = teachCourse.getWeightSetting();
         Boolean currenSettingStatus = courseWeightService.count(
                 new QueryWrapper<CourseWeight>().lambda().eq(CourseWeight::getTeachCourseId, teachCourseId)) > 0;
@@ -524,12 +555,16 @@ public class TeachCourseServiceImpl extends ServiceImpl<TeachCourseMapper, Teach
     }
 
     @Override
-    public List<ClazzDistributedResult> findClazzDistributedStatus(Long examId, String courseCode, String clazzName) {
+    public List<ClazzDistributedResult> findClazzDistributedStatus(Long teachCourseId, String clazzName) {
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
         Long requestUserId = requestUser.getId();
         clazzName = SystemConstant.translateSpecificSign(clazzName);
 
-        TeachCourse teachCourse = this.findByExamIdCourseCodeAndUserId(examId, courseCode, requestUserId);
+        TeachCourse teachCourse = this.getById(teachCourseId);
+        if (Objects.isNull(teachCourse)) {
+            throw ExceptionResultEnum.ERROR.exception("教学课程不存在");
+        }
+
         if (!requestUserId.equals(teachCourse.getCreateId())) {
             throw ExceptionResultEnum.ERROR.exception("非课程创建人没有分配班级的权限");
         }
@@ -575,24 +610,26 @@ public class TeachCourseServiceImpl extends ServiceImpl<TeachCourseMapper, Teach
     @Override
     public void assignClazz(AssignClazzParam assignClazzParam, SysUser requestUser) {
         Long requestUserId = requestUser.getId();
-        Long examId = assignClazzParam.getExamId();
-        String courseCode = assignClazzParam.getCourseCode();
+        Long teachCourseId = assignClazzParam.getTeachCourseId();
         Long teacherId = assignClazzParam.getTeacherId();
         List<Long> basicTeachClazzIdList = assignClazzParam.getClazzIdList();
 
-        TeachCourse teachCourse = this.findByExamIdCourseCodeAndUserId(examId, courseCode, requestUserId);
+        TeachCourse teachCourse = this.getById(teachCourseId);
+        if (Objects.isNull(teachCourse)) {
+            throw ExceptionResultEnum.ERROR.exception("教学班不存在");
+        }
+        Long examId = teachCourse.getExamId();
+        String courseCode = teachCourse.getCourseCode();
         if (!teachCourse.getCreateId().equals(requestUserId)) {
             throw ExceptionResultEnum.ERROR.exception("该用户没有分配教师班级的权限");
         }
-        Long teachCourseId = teachCourse.getId();
 
         if (teacherId.equals(requestUserId)) {
             // 课程负责人分配自己的班级
             // 清除之前关联的班级
             UpdateWrapper<TeachClazz> clearUpdateWrapper = new UpdateWrapper<>();
             clearUpdateWrapper.lambda().set(TeachClazz::getBelongTeachCourseId, teachCourseId)
-                    .set(TeachClazz::getBelongTeachCourseId,null)
-                    .eq(TeachClazz::getTeachCourseId, teachCourseId);
+                    .set(TeachClazz::getBelongTeachCourseId, null).eq(TeachClazz::getTeachCourseId, teachCourseId);
             teachClazzService.update(clearUpdateWrapper);
             // 更新新关联班级
             UpdateWrapper<TeachClazz> updateWrapper = new UpdateWrapper<>();

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/service/impl/TaskLogicServiceImpl.java

@@ -683,9 +683,9 @@ public class TaskLogicServiceImpl implements TaskLogicService {
             throw ExceptionResultEnum.ERROR.exception("表格第一行为说明内容，不能为空，且必须以\"说明\"开头");
         }
         // 第二行为表头，不能为空，且校验第一列为学号
-        if (sheet.getRow(1) == null || !"学号".equals(sheet.getRow(1).getCell(0).getStringCellValue())) {
-            throw ExceptionResultEnum.ERROR.exception("表格第二行为表头，不能为空，且第一列必须为\"学号\"");
-        }
+//        if (sheet.getRow(1) == null || !"学号".equals(sheet.getRow(1).getCell(0).getStringCellValue())) {
+//            throw ExceptionResultEnum.ERROR.exception("表格第二行为表头，不能为空，且第一列必须为\"学号\"");
+//        }
         // 获取sheet行数
         int totalRows = sheet.getLastRowNum() + 1;
         // 获取sheet列数（列数从第二行开始记录，因为第一行是说明内容）

distributed-print-business/src/main/resources/mapper/TeachCourseMapper.xml

@@ -9,11 +9,15 @@
             bc.code AS courseCode,
             bc.name AS courseName,
             tc.create_id AS createId,
-            tc.create_time AS createTime
+            tc.create_time AS createTime,
+            tc.user_id AS userId,
+            su.real_name AS userName
         FROM
             teach_course tc
                 INNER JOIN
             basic_course bc ON tc.school_id = bc.school_id AND tc.course_code = bc.code AND bc.enable = TRUE
+                LEFT JOIN
+            sys_user su on tc.user_id = su.id
         <where>
             <if test="examId != null">
                 AND tc.exam_id = #{examId}
@@ -21,10 +25,18 @@
             <if test="courseName != null and courseName != ''">
                 AND bc.name LIKE CONCAT('%',#{courseName},'%')
             </if>
-            <if test="userId != null">
-                AND tc.user_id = #{userId}
-            </if>
             AND tc.enable = true
+            <if test="dpr != null">
+                <if test="dpr.requestUserId != null">
+                    AND tc.user_id = #{dpr.requestUserId}
+                </if>
+                <if test="dpr.orgIdSet != null and dpr.orgIdSet != '' and dpr.orgIdSet.size > 0">
+                    AND su.org_id IN
+                    <foreach collection="dpr.orgIdSet" item="item" index="index" open="(" separator="," close=")">
+                        #{item}
+                    </foreach>
+                </if>
+            </if>
         </where>
         ORDER BY tc.create_time DESC
     </select>

distributed-print/src/main/java/com/qmth/distributed/print/api/CourseEvaluationController.java

@@ -40,12 +40,10 @@ public class CourseEvaluationController {
     @ApiOperation(value = "评价方式管理-列表查询")
     @RequestMapping(value = "/list", method = RequestMethod.POST)
     @ApiResponses({ @ApiResponse(code = 200, message = "查询成功", response = CourseEvaluationResult.class) })
-    public Result findCourseEvaluation(@ApiParam(value = "学期id") @RequestParam(required = false) String examId,
-            @ApiParam(value = "考试id") @RequestParam(required = false) String courseCode) {
+    public Result findCourseEvaluation(@ApiParam(value = "教学课程id") @RequestParam(required = false) String teachCourseId) {
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
         return ResultUtil.ok(
-                courseEvaluationService.findCourseEvaluationList(SystemConstant.convertIdToLong(examId), courseCode,
-                        requestUser.getId()));
+                courseEvaluationService.findCourseEvaluationList(SystemConstant.convertIdToLong(teachCourseId)));
     }
 
     @ApiOperation(value = "评价方式管理-新增/编辑")
@@ -56,12 +54,11 @@ public class CourseEvaluationController {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
         }
-        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        if (Objects.nonNull(courseEvaluationParam)){
+        if (Objects.nonNull(courseEvaluationParam)) {
             // 设置为自定义评价方式
             courseEvaluationParam.setType(CourseEvaluationTypeEnum.CUSTOM);
         }
-        courseEvaluationService.saveCourseEvaluation(courseEvaluationParam, sysUser.getId());
+        courseEvaluationService.saveCourseEvaluation(courseEvaluationParam);
         return ResultUtil.ok();
     }
 

distributed-print/src/main/java/com/qmth/distributed/print/api/CourseTargetController.java

@@ -6,7 +6,6 @@ import com.qmth.distributed.print.business.bean.result.CourseDimensionTree;
 import com.qmth.distributed.print.business.bean.result.CourseTargetResult;
 import com.qmth.distributed.print.business.service.CourseDimensionService;
 import com.qmth.distributed.print.business.service.CourseTargetService;
-import com.qmth.distributed.print.business.templete.importData.SyncImportTaskTemplate;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
@@ -38,6 +37,7 @@ import java.io.IOException;
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + SystemConstant.PREFIX_URL_TEACH + "/course_target")
 public class CourseTargetController {
+
     private final static Logger log = LoggerFactory.getLogger(CourseTargetController.class);
 
     @Resource
@@ -49,20 +49,15 @@ public class CourseTargetController {
     @ApiOperation(value = "课程目标管理-列表查询")
     @RequestMapping(value = "/list", method = RequestMethod.POST)
     @ApiResponses({ @ApiResponse(code = 200, message = "查询成功", response = CourseTargetResult.class) })
-    public Result findCourseTargetList(@ApiParam(value = "学期id") @RequestParam(required = false) String examId,
-            @ApiParam(value = "考试id") @RequestParam(required = false) String courseCode) {
-        SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
-        return ResultUtil.ok(
-                courseTargetService.findCourseTargetList(SystemConstant.convertIdToLong(examId), courseCode, requestUser.getId()));
+    public Result findCourseTargetList(@ApiParam(value = "教学课程id") @RequestParam(required = false) String teachCourseId) {
+        return ResultUtil.ok(courseTargetService.findCourseTargetList(SystemConstant.convertIdToLong(teachCourseId)));
     }
 
     @ApiOperation(value = "课程目标管理-同步题库知识点")
     @RequestMapping(value = "/dimension_sync_tiku", method = RequestMethod.POST)
     @ApiResponses({ @ApiResponse(code = 200, message = "查询成功", response = Result.class) })
-    public Result syncTikuDimension(@ApiParam(value = "学期id") @RequestParam(required = false) String examId,
-            @ApiParam(value = "考试id") @RequestParam(required = false) String courseCode) {
-        SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
-        courseDimensionService.syncTikuCourseProperties(SystemConstant.convertIdToLong(examId), courseCode, requestUser.getId());
+    public Result syncTikuDimension(@ApiParam(value = "教学课程id") @RequestParam(required = false) String teachCourseId) {
+        courseDimensionService.syncTikuCourseProperties(SystemConstant.convertIdToLong(teachCourseId));
         return ResultUtil.ok();
     }
 
@@ -71,12 +66,10 @@ public class CourseTargetController {
     @ApiResponses({ @ApiResponse(code = 200, message = "返回信息", response = Result.class) })
     @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.IMPORT)
     public Result courseDimensionImportSync(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file,
-            @ApiParam(value = "考试id", required = true) @RequestParam String examId,
-            @ApiParam(value = "课程编号", required = true) @RequestParam String courseCode)
+            @ApiParam(value = "教学课程id") @RequestParam(required = false) String teachCourseId)
             throws IOException, NoSuchFieldException {
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
-        courseDimensionService.importCourseDimension(requestUser, file, SystemConstant.convertIdToLong(examId),
-                courseCode);
+        courseDimensionService.importCourseDimension(requestUser, file, SystemConstant.convertIdToLong(teachCourseId));
         return ResultUtil.ok();
     }
 
@@ -84,18 +77,14 @@ public class CourseTargetController {
     @RequestMapping(value = "/dimension_tree", method = RequestMethod.POST)
     @ApiResponses({ @ApiResponse(code = 200, message = "查询成功", response = CourseDimensionTree.class) })
     @Transactional
-    public Result findDimensionTree(@ApiParam(value = "学期id") @RequestParam(required = false) String examId,
-            @ApiParam(value = "考试id") @RequestParam(required = false) String courseCode) {
-        SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
+    public Result findDimensionTree(@ApiParam(value = "教学课程id") @RequestParam(required = false) String teachCourseId) {
         try {
-            courseDimensionService.syncTikuCourseProperties(SystemConstant.convertIdToLong(examId), courseCode,
-                    requestUser.getId());
+            courseDimensionService.syncTikuCourseProperties(SystemConstant.convertIdToLong(teachCourseId));
         } catch (Exception e) {
             log.error(e.getMessage());
         }
 
-        return ResultUtil.ok(courseTargetService.findDimensionTree(SystemConstant.convertIdToLong(examId), courseCode,
-                requestUser.getId()));
+        return ResultUtil.ok(courseTargetService.findDimensionTree(SystemConstant.convertIdToLong(teachCourseId)));
     }
 
     @ApiOperation(value = "课程目标管理-新增/编辑")

distributed-print/src/main/java/com/qmth/distributed/print/api/CourseWeightController.java

@@ -37,11 +37,8 @@ public class CourseWeightController {
     @ApiOperation(value = "课程权重管理-列表查询")
     @RequestMapping(value = "/find", method = RequestMethod.POST)
     @ApiResponses({ @ApiResponse(code = 200, message = "查询成功", response = CourseWeightDto.class) })
-    public Result findCourseWeightList(@ApiParam(value = "学期id") @RequestParam(required = false) String examId,
-            @ApiParam(value = "考试id") @RequestParam(required = false) String courseCode) {
-        SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
-        return ResultUtil.ok(courseWeightService.findCourseWeight(SystemConstant.convertIdToLong(examId), courseCode,
-                requestUser.getId()));
+    public Result findCourseWeightList(@ApiParam(value = "教学课程id") @RequestParam(required = false) String teachCourseId) {
+        return ResultUtil.ok(courseWeightService.findCourseWeight(SystemConstant.convertIdToLong(teachCourseId)));
     }
 
     @ApiOperation(value = "课程权重管理-新增/编辑")

distributed-print/src/main/java/com/qmth/distributed/print/api/TeachClazzController.java

@@ -39,12 +39,11 @@ public class TeachClazzController {
     @ApiOperation(value = "教学班级-查询")
     @RequestMapping(value = "/page", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
-    public Result findTeachClazzPage(@ApiParam(value = "考试id", required = true) @RequestParam String examId,
-                                     @ApiParam(value = "课程编号", required = true) @RequestParam String courseCode,
+    public Result findTeachClazzPage(@ApiParam(value = "教学课程id", required = true) @RequestParam String teachCourseId,
                                      @ApiParam(value = "班级名称（模糊查询）") @RequestParam(required = false) String teachClazzName,
                                      @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
                                      @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
-        return ResultUtil.ok(teachClazzService.teachClazzPage(SystemConstant.convertIdToLong(examId),courseCode, teachClazzName, pageNumber, pageSize));
+        return ResultUtil.ok(teachClazzService.teachClazzPage(SystemConstant.convertIdToLong(teachCourseId), teachClazzName, pageNumber, pageSize));
     }
 
     @ApiOperation(value = "教学班级-选择教学班")

distributed-print/src/main/java/com/qmth/distributed/print/api/TeachCourseController.java

@@ -53,10 +53,9 @@ public class TeachCourseController {
             @ApiParam(value = "课程名称（模糊查询）") @RequestParam(required = false) String courseName,
             @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
             @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
-        SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
         return ResultUtil.ok(
                 teachCourseService.teachCoursePage(SystemConstant.convertIdToLong(examId), courseName, pageNumber,
-                        pageSize, requestUser.getId()));
+                        pageSize));
     }
 
     @ApiOperation(value = "教学课程-手动添加课程")
@@ -109,8 +108,8 @@ public class TeachCourseController {
     @ApiResponses({ @ApiResponse(code = 200, message = "删除成功", response = EditResult.class) })
     @OperationLogDetail(detail = "用户根据教学课程id集合[{{idList}}]批量删除教学课程", level = LevelEnum.TERTIARY, operationType = OperationTypeEnum.DELETE, operationUnit = OperationUnitEnum.TEACH_COURSE, customizedOperationType = CustomizedOperationTypeEnum.DELETE)
     public Result deleteTeachCourse(@ApiParam(value = "选择的要删除的课程id集合", required = true) @RequestParam List<String> idList) {
-        teachCourseService.deleteTeachCourseBatch(idList.stream().map(SystemConstant::convertIdToLong).collect(
-                Collectors.toList()));
+        teachCourseService.deleteTeachCourseBatch(
+                idList.stream().map(SystemConstant::convertIdToLong).collect(Collectors.toList()));
         return ResultUtil.ok();
     }
 
@@ -131,10 +130,10 @@ public class TeachCourseController {
     @RequestMapping(value = "/select_create_teacher", method = RequestMethod.POST)
     @ApiResponses({ @ApiResponse(code = 200, message = "创建成功", response = EditResult.class) })
     @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.ADD)
-    public Result selectCreate(@ApiParam(value = "考试id", required = true) @RequestParam String examId, @ApiParam(value = "课程编号", required = true) @RequestParam String courseCode,
+    public Result selectCreate(@ApiParam(value = "考试id", required = true) @RequestParam String teachCourseId,
             @ApiParam(value = "教师id集合", required = true) @RequestParam List<String> userIdList) {
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
-        teachCourseService.selectCreateTeacher(SystemConstant.convertIdToLong(examId), courseCode,
+        teachCourseService.selectCreateTeacher(SystemConstant.convertIdToLong(teachCourseId),
                 userIdList.stream().map(SystemConstant::convertIdToLong).collect(Collectors.toList()), requestUser);
         return ResultUtil.ok();
     }
@@ -154,13 +153,12 @@ public class TeachCourseController {
     @ApiOperation(value = "教师团队-分页查询")
     @RequestMapping(value = "/teacher_team_page", method = RequestMethod.POST)
     @ApiResponses({ @ApiResponse(code = 200, message = "查询成功", response = Result.class) })
-    public Result findTeachTeamPage(@ApiParam(value = "考试id", required = true) @RequestParam String examId,
-            @ApiParam(value = "课程编号", required = true) @RequestParam String courseCode,
+    public Result findTeachTeamPage(@ApiParam(value = "教学课程id", required = true) @RequestParam String teachCourseId,
             @ApiParam(value = "用户姓名工号（模糊查询）") @RequestParam(required = false) String userInfo,
             @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
             @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         return ResultUtil.ok(
-                teachCourseService.findTeacherTeamPage(SystemConstant.convertIdToLong(examId), courseCode, userInfo,
+                teachCourseService.findTeacherTeamPage(SystemConstant.convertIdToLong(teachCourseId), userInfo,
                         pageNumber, pageSize));
     }
 
@@ -174,23 +172,18 @@ public class TeachCourseController {
     @ApiOperation(value = "教学课程-查询课程权重设置状态")
     @RequestMapping(value = "/find_course_weight_setting_status", method = RequestMethod.POST)
     @ApiResponses({ @ApiResponse(code = 200, message = "查询成功", response = Result.class) })
-    public Result findCourseWeightSettingStatus(@ApiParam(value = "考试id") @RequestParam(required = false) String examId,
-            @ApiParam(value = "课程编号") @RequestParam(required = false) String courseCode) {
-        SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
-        Long userId = requestUser.getId();
+    public Result findCourseWeightSettingStatus(@ApiParam(value = "教学课程id", required = true) @RequestParam String teachCourseId) {
         return ResultUtil.ok(
-                teachCourseService.findCourseWeightSettingStatus(SystemConstant.convertIdToLong(examId), courseCode,
-                        userId));
+                teachCourseService.findCourseWeightSettingStatus(SystemConstant.convertIdToLong(teachCourseId)));
     }
 
     @ApiOperation(value = "教师团队管理-分配班级列表查询")
     @RequestMapping(value = "/find_clazz_list", method = RequestMethod.POST)
     @ApiResponses({ @ApiResponse(code = 200, message = "查询成功", response = Result.class) })
-    public Result findClazzList(@ApiParam(value = "考试id", required = true) @RequestParam String examId,
-            @ApiParam(value = "课程编号", required = true) @RequestParam String courseCode,
+    public Result findClazzList(@ApiParam(value = "教学课程id", required = true) @RequestParam String teachCourseId,
             @ApiParam(value = "班级名称") @RequestParam(required = false) String clazzName) {
         return ResultUtil.ok(
-                teachCourseService.findClazzDistributedStatus(SystemConstant.convertIdToLong(examId), courseCode,
+                teachCourseService.findClazzDistributedStatus(SystemConstant.convertIdToLong(teachCourseId),
                         clazzName));
     }