班级课程导入调整

src/main/java/com/xjrsoft/module/base/controller/BaseClassCourseController.java

@@ -248,7 +248,6 @@ public class BaseClassCourseController {
                         Long baseSemesterId = semesterMap.get(vo.getSemester());
 
                         if (baseClassCourseService.checkExits(classId, courseId, textbookId)) {
-                            duplicateLogs.add(String.format("[输入的信息重复添加] 班级: %s, 课程: %s, 教材: %s", vo.getClassName(), vo.getCourseName(), vo.getTextbookName()));
                             continue;
                         }
 
@@ -272,6 +271,9 @@ public class BaseClassCourseController {
                 Long classId = classMap.get(vo.getClassName());
                 Long courseId = courseSubjectMap.get(vo.getCourseName());
                 Long baseSemesterId = semesterMap.get(vo.getSemester());
+                if (baseClassCourseService.checkExitsWithoutTextbook(classId, courseId)) {
+                    continue;
+                }
 
                 BaseClassCourse baseClassCourse = new BaseClassCourse();
                 baseClassCourse.setClassId(classId);

src/main/java/com/xjrsoft/module/base/mapper/BaseClassCourseMapper.java

@@ -39,4 +39,6 @@ public interface BaseClassCourseMapper extends MPJBaseMapper<BaseClassCourse> {
     Long getBookIdByName(String name);
     Long getBaseSemesterIdByName(String name);
     boolean checkExits(Long classId,Long courseId,Long textbookId);
+
+    boolean checkExitsWithoutTextbook(Long classId, Long courseId);
 }

src/main/java/com/xjrsoft/module/base/service/IBaseClassCourseService.java

@@ -47,4 +47,6 @@ public interface IBaseClassCourseService extends MPJBaseService<BaseClassCourse>
     Long GetBaseSemesterIdByName(String name);
 
     boolean checkExits(Long classId, Long courseId, Long textbookId);
+
+    boolean checkExitsWithoutTextbook(Long classId, Long courseId);
 }

src/main/java/com/xjrsoft/module/base/service/impl/BaseClassCourseServiceImpl.java

@@ -198,4 +198,9 @@ public class BaseClassCourseServiceImpl extends MPJBaseServiceImpl<BaseClassCour
     public boolean checkExits(Long classId,Long courseId,Long textbookId){
         return baseClassCourseMapper.checkExits(classId, courseId, textbookId);
     }
+
+    @Override
+    public boolean checkExitsWithoutTextbook(Long classId, Long courseId) {
+        return this.baseMapper.checkExitsWithoutTextbook(classId, courseId);
+    }
 }

src/main/java/com/xjrsoft/module/student/service/impl/StudentManagerServiceImpl.java

@@ -1032,7 +1032,7 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
         );
         List<Department> departmentList =baseDeparmentService.list(
                 new QueryWrapper<Department>().lambda().eq(Department::getDeleteMark, DeleteMark.NODELETE.getCode())
-                        .eq(Department::getParentId,"1684107782861680008")
+                        .eq(Department::getIsMajor,1)
         );
         departmentList.forEach((node) -> {
             voList.add(new BaseDepMajorGradeClassStudenTreeVo(){{

src/main/resources/mapper/base/BaseClassCourse.xml

@@ -188,8 +188,14 @@
     <select id="checkExits" resultType="java.lang.Boolean">
         SELECT COUNT(1)
         from base_class_course
-        WHERE class_id = #{classId}
+        WHERE delete_mark = 0 and class_id = #{classId}
           AND course_id = #{courseId}
           AND textbook_id = #{textbookId}
     </select>
+    <select id="checkExitsWithoutTextbook" resultType="java.lang.Boolean">
+        SELECT COUNT(1)
+        from base_class_course
+        WHERE delete_mark = 0 and class_id = #{classId}
+          AND course_id = #{courseId}
+    </select>
 </mapper>