fix:去掉基础配置 课程管理中授课班级 授课老师相关代码

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

@@ -141,14 +141,7 @@ public class BasicCourseController {
     @Transactional
     public Result basicCourseImportAsync(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file)
             throws Exception {
-        List<BasicCourseParams> basicCourseParamsList = basicCourseService.executeImportBasicCourseLogic(file);
-        if (!CollectionUtils.isEmpty(basicCourseParamsList)) {
-            for (BasicCourseParams basicCourseParams : basicCourseParamsList) {
-                if (!CollectionUtils.isEmpty(basicCourseParams.getTeachIdSet())) {
-                    teachCourseService.updateByCourseIdAndTeacherList(basicCourseParams.getId(), basicCourseParams.getTeachIdSet());
-                }
-            }
-        }
+        basicCourseService.executeImportBasicCourseLogic(file);
         return ResultUtil.ok();
     }
 

distributed-print/src/test/java/com/qmth/distributed/print/ImportTest.java

@@ -59,25 +59,11 @@ public class ImportTest {
                         String courseCode = basicCourseImportDto.getCourseCode();
                         String courseName = basicCourseImportDto.getCourseName();
                         String teachingRoomName = basicCourseImportDto.getTeachingRoomName();
-                        String clazz = basicCourseImportDto.getClazz();
-
-                        if (courseMap.containsKey(courseCode)){
-                            BasicCourseImportDto old = courseMap.get(courseCode);
-                            String oldClazz = old.getClazz();
-                            oldClazz = oldClazz + "," + clazz;
-                            old.setClazz(oldClazz);
-                        } else {
-                            courseMap.put(courseCode,basicCourseImportDto);
-                        }
-
                     }
                 }
             }
         }
         List<BasicCourseImportDto> basicCourseImportDtoList = new ArrayList<>();
-        for (String courseCode : courseMap.keySet()) {
-            basicCourseImportDtoList.add(courseMap.get(courseCode));
-        }
         System.out.println(JSON.toJSONString(basicCourseImportDtoList));
 
         File outfile = new File("E:" + File.separator + "导入导出" + File.separator + "新课程导入模板.xlsx");

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/BasicCourseExportDto.java

@@ -20,29 +20,12 @@ public class BasicCourseExportDto {
     @ExcelProperty(name = "课程名称", width = 20, index = 1)
     private String courseName;
 
-    @ExcelProperty(name = "课程编码", width = 20, index = 2)
+    @ExcelProperty(name = "课程代码", width = 20, index = 2)
     private String courseCode;
 
     @ExcelProperty(name = "开课学院", width = 20, index = 3)
     private String teachingRoomName;
 
-    @ApiModelProperty(value = "班级信息集合")
-    private List<ClazzDatasourceResult> clazzList;
-
-    @ExcelProperty(name = "授课班级", width = 20, index = 4)
-    private String clazzName = "";
-
-    @ExcelProperty(name = "授课老师", width = 20, index = 5)
-    private String teachName = "";
-
-    public String getTeachName() {
-        return teachName;
-    }
-
-    public void setTeachName(String teachName) {
-        this.teachName = teachName;
-    }
-
     public Long getId() {
         return id;
     }
@@ -74,20 +57,4 @@ public class BasicCourseExportDto {
     public void setTeachingRoomName(String teachingRoomName) {
         this.teachingRoomName = teachingRoomName;
     }
-
-    public List<ClazzDatasourceResult> getClazzList() {
-        return clazzList;
-    }
-
-    public void setClazzList(List<ClazzDatasourceResult> clazzList) {
-        this.clazzList = clazzList;
-    }
-
-    public String getClazzName() {
-        return clazzName;
-    }
-
-    public void setClazzName(String clazzName) {
-        this.clazzName = clazzName;
-    }
 }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/excel/BasicCourseImportDto.java

@@ -21,8 +21,8 @@ public class BasicCourseImportDto implements Serializable {
     @NotNull
     private String courseName;
 
-    @ExcelNote(value = "课程编码")
-    @ExcelProperty(name = "课程编码", width = 30, index = 2)
+    @ExcelNote(value = "课程代码")
+    @ExcelProperty(name = "课程代码", width = 30, index = 2)
     @NotNull
     private String courseCode;
 
@@ -31,37 +31,9 @@ public class BasicCourseImportDto implements Serializable {
     @NotNull
     private String teachingRoomName;
 
-    @ExcelNote(value = "授课班级")
-    @ExcelProperty(name = "授课班级", width = 30, index = 4)
-    private String clazz;
-
-    @ExcelNote(value = "姓名")
-    @ExcelProperty(name = "姓名", width = 30, index = 5)
-    private String name;
-
-    @ExcelNote(value = "用户名/工号")
-    @ExcelProperty(name = "用户名/工号", width = 30, index = 6)
-    private String code;
-
     @ApiModelProperty("行索引")
     private Integer rowIndex;
 
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
     public String getCourseName() {
         return courseName;
     }
@@ -86,14 +58,6 @@ public class BasicCourseImportDto implements Serializable {
         this.teachingRoomName = teachingRoomName;
     }
 
-    public String getClazz() {
-        return clazz;
-    }
-
-    public void setClazz(String clazz) {
-        this.clazz = clazz;
-    }
-
     public Integer getRowIndex() {
         return rowIndex;
     }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/params/BasicCourseParams.java

@@ -38,26 +38,10 @@ public class BasicCourseParams {
     @Range(min = 1L, message = "请选择所属教研室")
     private Long teachingRoomId;
 
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "授课班级集合")
-    private Set<Long> clazzIdSet;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "授课老师集合")
-    private Set<Long> teachIdSet;
-
     public Long getId() {
         return id;
     }
 
-    public Set<Long> getTeachIdSet() {
-        return teachIdSet;
-    }
-
-    public void setTeachIdSet(Set<Long> teachIdSet) {
-        this.teachIdSet = teachIdSet;
-    }
-
     public void setId(Long id) {
         this.id = id;
     }
@@ -85,12 +69,4 @@ public class BasicCourseParams {
     public void setTeachingRoomId(Long teachingRoomId) {
         this.teachingRoomId = teachingRoomId;
     }
-
-    public Set<Long> getClazzIdSet() {
-        return clazzIdSet;
-    }
-
-    public void setClazzIdSet(Set<Long> clazzIdSet) {
-        this.clazzIdSet = clazzIdSet;
-    }
 }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/BasicCourseServiceImpl.java

@@ -20,7 +20,6 @@ import com.qmth.teachcloud.common.bean.result.TeachCourseSelectResult;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.*;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.enums.RoleTypeEnum;
 import com.qmth.teachcloud.common.mapper.BasicCourseMapper;
 import com.qmth.teachcloud.common.service.*;
 import com.qmth.teachcloud.common.util.ExcelUtil;
@@ -76,9 +75,6 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
     @Resource
     private SysUserService sysUserService;
 
-    @Resource
-    private SysUserRoleService sysUserRoleService;
-
     @Override
     public List<BasicCourse> listCoursesByUserId(Long userId) {
         return this.baseMapper.listCoursesByUserId(userId);
@@ -160,9 +156,6 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
         BasicCourse editBasicCourse = this.editEntityHelp(basicCourseParamsList, sysUser).get(0);
         try {
             this.saveOrUpdate(editBasicCourse);
-
-            basicTeachCourseService.updateByCourseIdAndTeacherList(basicCourseParams.getId(), basicCourseParams.getTeachIdSet());
-
             // 同步更新命题任务中的课程名称
             this.baseMapper.updateCourseNameFormExamTask(sysUser.getSchoolId(), editBasicCourse.getCode(),
                     editBasicCourse.getName());
@@ -273,9 +266,7 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
                             String courseName = basicCourseImportDto.getCourseName();
                             String courseCode = basicCourseImportDto.getCourseCode();
                             String teachingRoomName = basicCourseImportDto.getTeachingRoomName();
-                            String clazz = basicCourseImportDto.getClazz();
-                            String name = basicCourseImportDto.getName();
-                            String code = basicCourseImportDto.getCode();
+
                             String emptyCheckError = ExcelUtil.checkExcelField(basicCourseImportDto);
                             if (SystemConstant.strNotNull(emptyCheckError)) {
                                 if (errorMap.containsKey(y + 1)) {
@@ -298,11 +289,6 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
                                         String cellException = "课程编码[" + courseCode + "],存在不同的开课学院";
                                         this.updateErrorInfoMap(errorMap, y + 1, cellException);
                                     }
-                                    String primaryClazz = primaryCell.getClazz();
-                                    if (SystemConstant.strNotNull(clazz)) {
-                                        primaryClazz = primaryClazz + SystemConstant.COMMA + clazz;
-                                        primaryCell.setClazz(primaryClazz);
-                                    }
                                     duplicateData.add(basicCourseImportDto);
                                 } else {
                                     courseDtoMap.put(courseCode, basicCourseImportDto);
@@ -375,7 +361,7 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
                 String courseName = basicCourseImportDto.getCourseName();
                 String courseCode = basicCourseImportDto.getCourseCode();
                 String teachingRoomName = basicCourseImportDto.getTeachingRoomName();
-                String clazz = basicCourseImportDto.getClazz();
+
                 // 原始excel中的行索引
                 Integer rowIndex = basicCourseImportDto.getRowIndex();
 
@@ -386,56 +372,11 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
                     continue;
                 }
                 Long teachingRoomId = sysOrg.getId();
-                LinkedHashSet<Long> clazzIdSet = new LinkedHashSet<>(), teachIdSet = new LinkedHashSet<>();
-                if (SystemConstant.strNotNull(clazz)) {
-                    String[] clazzList = clazz.split(SystemConstant.COMMA);
-                    for (String clzName : clazzList) {
-                        BasicClazz basicClazz = basicClazzService.getOne(
-                                new QueryWrapper<BasicClazz>().lambda().eq(BasicClazz::getEnable, true).eq(BasicClazz::getSchoolId, schoolId).eq(BasicClazz::getClazzName, clzName));
-                        if (Objects.isNull(basicClazz)) {
-                            this.updateErrorInfoMap(errorMap, rowIndex, "所选择班级[" + clzName + "]不存在");
-                            continue;
-                        }
-                        clazzIdSet.add(basicClazz.getId());
-                    }
-                }
-                if (SystemConstant.strNotNull(basicCourseImportDto.getName())) {
-                    String[] nameList = basicCourseImportDto.getName().split(SystemConstant.COMMA);
-                    String[] codeList = null;
-                    if (SystemConstant.strNotNull(basicCourseImportDto.getCode())) {
-                        codeList = basicCourseImportDto.getCode().split(SystemConstant.COMMA);
-                    }
-                    if (Objects.nonNull(codeList) && codeList.length != nameList.length) {
-                        this.updateErrorInfoMap(errorMap, rowIndex, "姓名和工号长度不匹配");
-                        continue;
-                    }
-                    for (int k = 0; k < nameList.length; k++) {
-                        String name = nameList[k].trim();
-                        String code = codeList[k].trim();
-                        SysUser sysUserDb = sysUserService.getOne(
-                                new QueryWrapper<SysUser>().lambda().eq(SysUser::getEnable, true).eq(SysUser::getSchoolId, schoolId).eq(SysUser::getRealName, name)
-                                        .eq(SysUser::getCode, code));
-                        if (Objects.isNull(sysUserDb)) {
-                            this.updateErrorInfoMap(errorMap, rowIndex, "姓名[" + name + "],工号[" + code + "]不存在");
-                            continue;
-                        }
-
-                        List<SysRole> sysRoleList = sysUserRoleService.listRoleByUserId(sysUserDb.getId());
-                        sysRoleList = sysRoleList.stream().filter(s -> s.getType() == RoleTypeEnum.SCHOOL_TEACHER).collect(Collectors.toList());
-                        if (CollectionUtils.isEmpty(sysRoleList)) {
-                            this.updateErrorInfoMap(errorMap, rowIndex, "姓名[" + name + "]，工号[" + code + "]没有老师角色");
-                            continue;
-                        }
-                        teachIdSet.add(sysUserDb.getId());
-                    }
-                }
 
                 BasicCourseParams basicCourseParams = new BasicCourseParams();
                 basicCourseParams.setCourseCode(courseCode);
                 basicCourseParams.setCourseName(courseName);
                 basicCourseParams.setTeachingRoomId(teachingRoomId);
-                basicCourseParams.setClazzIdSet(clazzIdSet);
-                basicCourseParams.setTeachIdSet(teachIdSet);
                 BasicCourse old = this.getOne(
                         new QueryWrapper<BasicCourse>().lambda().eq(BasicCourse::getSchoolId, schoolId).eq(BasicCourse::getEnable, true).eq(BasicCourse::getCode, courseCode));
                 if (Objects.nonNull(old)) {
@@ -498,31 +439,6 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
         if (courseExportDtos.isEmpty()) {
             throw ExceptionResultEnum.ERROR.exception("没有可导出数据");
         }
-        for (BasicCourseExportDto basicCourseExportDto : courseExportDtos) {
-            Long courseId = basicCourseExportDto.getId();
-            List<BasicUserCourse> basicUserCourseList = basicUserCourseService.list(
-                    new QueryWrapper<BasicUserCourse>().lambda().eq(BasicUserCourse::getCourseId, courseId));
-            Set<Long> clazzIdSet = basicUserCourseList.stream().map(BasicUserCourse::getClazzId).collect(Collectors.toSet());
-            if (clazzIdSet.size() > 0) {
-                List<BasicClazz> clazzList = basicClazzService.list(
-                        new QueryWrapper<BasicClazz>().lambda().in(BasicClazz::getId, clazzIdSet).orderByAsc(BasicClazz::getCreateTime));
-                if (!clazzList.isEmpty()) {
-                    List<String> clazzNameList = clazzList.stream().map(BasicClazz::getClazzName).collect(Collectors.toList());
-                    basicCourseExportDto.setClazzName(String.join(",", clazzNameList));
-                }
-            }
-
-            List<BasicTeachCourse> basicTeachCourseList = basicTeachCourseService.list(
-                    new QueryWrapper<BasicTeachCourse>().lambda().eq(BasicTeachCourse::getCourseId, courseId));
-            Set<Long> teachIdSet = basicTeachCourseList.stream().map(BasicTeachCourse::getUserId).collect(Collectors.toSet());
-            if (!CollectionUtils.isEmpty(teachIdSet)) {
-                List<SysUserResult> sysUserResultList = sysUserService.findCourseSysUserResultByTeachIdSet(teachIdSet);
-                if (!CollectionUtils.isEmpty(sysUserResultList)) {
-                    List<String> teachNameList = sysUserResultList.stream().map(s -> s.getRealName() + "(" + s.getOrgName() + ")").collect(Collectors.toList());
-                    basicCourseExportDto.setTeachName(String.join(",", teachNameList));
-                }
-            }
-        }
         ExcelUtil.excelExport("课程数据", BasicCourseExportDto.class, courseExportDtos, response);
     }
 
@@ -584,7 +500,6 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
             //                throw ExceptionResultEnum.ERROR.exception("所选教研室不存在");
             //            }
             // 校验班级
-            Set<Long> clazzIdSet = basicCourseParams.getClazzIdSet();
 
             //基础数据组装
             Long orgId;
@@ -617,12 +532,6 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
             basicCourseParams.setId(basicCourse.getId());
             basicCourse.setOrgId(orgId);
 
-            // 根据课程id和授课班级集合更新'basic_user_course'表
-            basicUserCourseService.updateByCourseIdAndClazzList(id, clazzIdSet, sysUser, orgId);
-            if (!CollectionUtils.isEmpty(basicCourseParams.getTeachIdSet())) {
-                basicTeachCourseService.updateByCourseIdAndTeacherList(id, basicCourseParams.getTeachIdSet());
-            }
-
             basicCourseList.add(basicCourse);
         }
         return basicCourseList;