3.0.1-归档管理

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

@@ -53,5 +53,4 @@ public interface TeachCourseService extends IService<TeachCourse> {
      */
     Boolean deleteTeachCourseBatch(List<Long> idList);
 
-    List<TeachCourse> listBySchoolIdAndBasicCourseId(Long schoolId, List<Long> basicCourseIds);
 }

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

@@ -123,10 +123,4 @@ public class TeachCourseServiceImpl extends ServiceImpl<TeachCourseMapper, Teach
         return this.removeByIds(idList);
     }
 
-    @Override
-    public List<TeachCourse> listBySchoolIdAndBasicCourseId(Long schoolId, List<Long> basicCourseIds) {
-        QueryWrapper<TeachCourse> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(TeachCourse::getSchoolId, schoolId).in(TeachCourse::getBasicCourseId, basicCourseIds);
-        return this.baseMapper.selectList(queryWrapper);
-    }
 }

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

@@ -675,29 +675,22 @@ public class SysController {
                     return dictionaryResult;
                 }).collect(Collectors.toList());
 
-                if (resultBasicClazzList.size() > 0) {
-                    dictionaryResultList.addAll(resultBasicClazzList);
-
-                    List<Long> basicCourseIds = resultBasicClazzList.stream().map(DictionaryResult::getId).collect(Collectors.toList());
-                    List<TeachCourse> teachCourses = teachCourseService.listBySchoolIdAndBasicCourseId(schoolId, basicCourseIds);
-                    if (teachCourses != null && teachCourses.size() > 0) {
-                        List<Long> teachCourseIds = teachCourses.stream().map(TeachCourse::getId).collect(Collectors.toList());
-                        // 教学班
-                        QueryWrapper<TeachClazz> teachClazzQueryWrapper = new QueryWrapper<>();
-                        teachClazzQueryWrapper.lambda().in(TeachClazz::getTeachCourseId, teachCourseIds);
-                        List<TeachClazz> teachClazzList = teachClazzService.list(teachClazzQueryWrapper);
-                        List<DictionaryResult> resultTeachClazzList = teachClazzList.stream().map(e -> {
-                            DictionaryResult dictionaryResult = new DictionaryResult();
-                            dictionaryResult.setId(e.getId());
-                            dictionaryResult.setCode(e.getTeachClazzCode());
-                            dictionaryResult.setName(e.getTeachClazzName());
-                            return dictionaryResult;
-                        }).collect(Collectors.toList());
-
-                        if (resultTeachClazzList.size() > 0) {
-                            dictionaryResultList.addAll(resultTeachClazzList);
-                        }
-                    }
+                dictionaryResultList.addAll(resultBasicClazzList);
+
+                // 教学班
+                QueryWrapper<TeachClazz> teachClazzQueryWrapper = new QueryWrapper<>();
+                teachClazzQueryWrapper.lambda().in(TeachClazz::getSchoolId, schoolId);
+                List<TeachClazz> teachClazzList = teachClazzService.list(teachClazzQueryWrapper);
+                List<DictionaryResult> resultTeachClazzList = teachClazzList.stream().map(e -> {
+                    DictionaryResult dictionaryResult = new DictionaryResult();
+                    dictionaryResult.setId(e.getId());
+                    dictionaryResult.setCode(e.getTeachClazzCode());
+                    dictionaryResult.setName(e.getTeachClazzName());
+                    return dictionaryResult;
+                }).collect(Collectors.toList());
+
+                if (resultTeachClazzList.size() > 0) {
+                    dictionaryResultList.addAll(resultTeachClazzList);
                 }
                 break;
             case STUDENT: