yonge %!s(int64=5) %!d(string=hai) anos
pai
achega
dfce45a005

+ 1 - 4
mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -337,7 +337,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
             String courseScheduleName = subjectList.stream().map(subject -> subject.getName()).collect(Collectors.joining("/"));
 
-            while (true) {
+            while (highClassGroup.getCourseTimes() >= times) {
                 int dayOfWeek = now.getDayOfWeek().getValue();
                 if (highClassGroup.getDayOfWeek().equals(dayOfWeek)) {
                     CourseSchedule courseSchedule = new CourseSchedule();
@@ -365,9 +365,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     times++;
                 }
                 now = now.plusDays(1);
-                if (highClassGroup.getCourseTimes().equals(times)) {
-                    break;
-                }
             }
             //检测新排课冲突
             courseScheduleService.checkNewCourseSchedules(courseScheduleList, false);

+ 2 - 2
mec-biz/src/main/resources/config/mybatis/ClassGroupMapper.xml

@@ -777,12 +777,12 @@
     </select>
 
     <!-- 根据主键批量删除班级-->
-    <delete id="batchSoftDelete">
+    <update id="batchSoftDelete">
         UPDATE class_group SET del_flag_ = 1 WHERE id_ IN
         <foreach collection="classGroupIds" item="classGroupId" open="(" close=")" separator=",">
             #{classGroupId}
         </foreach>
-    </delete>
+    </update>
 
     <select id="findClassGroupByType" resultMap="ClassGroupTeachers">
         SELECT * FROM class_group WHERE music_group_id_=#{musicGroupId}