Browse Source

课程转换

zouxuan 2 years ago
parent
commit
55fc2b61f6

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

@@ -4322,7 +4322,10 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         Map<String, String> convertIntegerMap = MapUtil.convertIntegerMap(classGroupStudents);
         List<Integer> classIdList = convertIntegerMap.keySet().stream().map(e->Integer.parseInt(e)).collect(Collectors.toList());
         classIdList.add(masterClassGroupId);
-        Boolean hasConverCourse = classGroupDao.hasConvertCourse(classIdList);
+        Boolean hasConvertCourse = classGroupDao.hasConvertCourse(classIdList);
+        if(hasConvertCourse != null && hasConvertCourse){
+            throw new BizException("所选班级有转换课,请重新选择");
+        }
         //主班
         //获取学员列表
         Map<Integer, String> userNames = MapUtil.convertMybatisMap(teacherDao.queryUsernameByIds(studentIds));

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

@@ -1625,6 +1625,10 @@
     </select>
     <select id="hasConvertCourse" resultType="java.lang.Boolean">
         select COUNT(0) from course_schedule cs
-        where cs.class_group_id_ IN (1) AND cs.convert_flag_ = 1 AND cs.status_ = 'NOT_START' AND cs.del_flag_ = 0 AND cs.is_lock_ = 0
+        where cs.class_group_id_ IN
+        <foreach collection="classIdList" separator="," open="(" close=")" item="id">
+            #{id}
+        </foreach>
+        AND cs.convert_flag_ = 1 AND cs.status_ = 'NOT_START' AND cs.del_flag_ = 0 AND cs.is_lock_ = 0
     </select>
 </mapper>