课程转换

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

@@ -4319,9 +4319,10 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             throw new BizException("所选主班没有剩余课程，请重新选择");
         }
         List<Map<String, String>> classGroupStudents = (List<Map<String, String>>) JSON.parse(classGroupStudentMap);
-        Map<String, String> convertIntegerMap = MapUtil.convertIntegerMap(classGroupStudents);
-        List<Integer> classIdList = convertIntegerMap.keySet().stream().map(e->Integer.parseInt(e)).collect(Collectors.toList());
-        classIdList.add(masterClassGroupId);
+        List<Integer> classIdList = classGroupStudents.stream().map(e -> e.entrySet().stream().map(k -> Integer.parseInt(k.getKey())).findFirst().get()).collect(Collectors.toList());
+//        Map<String, String> convertMybatisMap = MapUtil.convertMybatisMap(classGroupStudents);
+//        List<Integer> classIdList = convertMybatisMap.keySet().stream().map(e->Integer.parseInt(e)).collect(Collectors.toList());
+//        classIdList.add(masterClassGroupId);
         Boolean hasConvertCourse = classGroupDao.hasConvertCourse(classIdList);
         if(hasConvertCourse != null && hasConvertCourse){
             throw new BizException("所选班级有转换课，请重新选择");

mec-biz/src/main/resources/config/mybatis/StudentBasicInfoMapper.xml

@@ -33,12 +33,10 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.StudentBasicInfo" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO student_basic_info (user_id_,user_name_,phone_,subject_id_,subject_name_,grade_,organ_id_,organ_name_,cooperation_organ_id_,cooperation_organ_name_,subject_teacher_id_,subject_teacher_name_) VALUES(#{userId},#{userName},#{phone},#{subjectId},#{subjectName},#{grade},#{organId},#{organName},#{cooperationOrganId},#{cooperationOrganName},#{subjectTeacherId},#{subjectTeacherName})
+		INSERT INTO student_basic_info (user_id_,user_name_,phone_,subject_id_,subject_name_,grade_,organ_id_,
+		                                organ_name_,cooperation_organ_id_,cooperation_organ_name_,subject_teacher_id_,subject_teacher_name_)
+		VALUES(#{userId},#{userName},#{phone},#{subjectId},#{subjectName},#{grade},#{organId},#{organName},#{cooperationOrganId},
+		       #{cooperationOrganName},#{subjectTeacherId},#{subjectTeacherName})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->