Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -1579,12 +1579,12 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             params.put("offset", pageInfo.getOffset());
             dataList = classGroupDao.queryMusicGroupCourseSchedule(params);
             //获取当前合奏班班级编号列表
-            Set<Integer> mixClassGroupIds = dataList.stream().map(e -> e.getMixClassGroupId()).collect(Collectors.toSet());
-            String mixClassGroupIdsStr = StringUtils.join(mixClassGroupIds, ",");
+//            Set<Integer> mixClassGroupIds = dataList.stream().map(e -> e.getMixClassGroupId()).collect(Collectors.toSet());
+//            String mixClassGroupIdsStr = StringUtils.join(mixClassGroupIds, ",");
             //所有课程编号的列表
             List<Integer> couseScheduleIds = dataList.stream().map(MusicGroupCourseScheduleDto::getCourseScheduleId).distinct().collect(Collectors.toList());
             //获取合奏班名称
-            Map<Integer, String> classGroupNames = MapUtil.convertMybatisMap(classGroupDao.findNameById(mixClassGroupIdsStr));
+//            Map<Integer, String> classGroupNames = MapUtil.convertMybatisMap(classGroupDao.findNameById(mixClassGroupIdsStr));
 
             //主教老师
             List<CourseScheduleTeacherSalary> bishopTeachers = courseScheduleTeacherSalaryDao.findByCourseScheduleIdsAndTeacherRole(couseScheduleIds, "BISHOP");
@@ -1595,7 +1595,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             Map<Long, List<CourseScheduleTeacherSalary>> courseScheduleTeachingTeacherMaps = teachingTeachers.stream().collect(Collectors.groupingBy(CourseScheduleTeacherSalary::getCourseScheduleId));
 
             dataList.forEach(e -> {
-                e.setMixClassGroupName(classGroupNames.get(e.getMixClassGroupId()));
+//                e.setMixClassGroupName(classGroupNames.get(e.getMixClassGroupId()));
                 List<CourseScheduleTeacherSalary> currentBishopTeacher = courseScheduleBishopTeacherMaps.get(e.getCourseScheduleId().longValue());
                 List<CourseScheduleTeacherSalary> TeachingTeachers = new ArrayList<>();
                 if (!Objects.isNull(currentBishopTeacher) && !CollectionUtils.isEmpty(currentBishopTeacher)) {

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

@@ -64,6 +64,9 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 		if(user != null && user.getId() != null){
 			Employee employee1 = employeeDao.get(user.getId());
 			if(employee1 == null){
+				if(StringUtils.isEmpty(user.getPassword())){
+					employee.setPassword(new BCryptPasswordEncoder().encode(ParamEnum.INIT_PASSWORD.getCode().toString()));
+				}
 				employee.setOrganId(employee.getOrganIdList());
 				employee.setUserId(user.getId());
 				employeeDao.insert(employee);

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

@@ -381,7 +381,7 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
 					studentAttendance.setTeacherId(courseSchedule.getActualTeacherId());
 
 					courseSchedule.setUpdateTime(date);
-					courseSchedule.setStudentNum(courseSchedule.getStudentNum() == null?0:courseSchedule.getStudentNum() + 1);
+					courseSchedule.setStudentNum((courseSchedule.getStudentNum() == null?0:courseSchedule.getStudentNum()) + 1);
 					courseScheduleDao.update(courseSchedule);
 					studentAttendanceDao.insert(studentAttendance);
 				}

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

@@ -78,8 +78,11 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 			if(teacher1 == null || teacher1.getId() == null){
 				teacher.setId(id);
 				teacher.setDelFlag(YesOrNoEnum.NO);
-				teacherDao.updateUser(teacher);
 				teacherDao.insert(teacher);
+				if(user.getUserType() == SysUserType.SYSTEM){
+					teacher.setOrganId(null);
+				}
+				teacherDao.updateUser(teacher);
 			}else {
 				throw new Exception("用户已存在");
 			}

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

@@ -570,13 +570,11 @@
     <select id="queryMusicGroupCourseSchedule" resultMap="MusicGroupCourseScheduleDto">
         SELECT cs.id_ course_schedule_id_,cs.class_date_,cs.start_class_time_,cs.end_class_time_,cs.class_group_id_,
         cs.type_ course_schedule_type_,cs.status_ course_schedule_status_,cg.name_ course_schedule_name_,
-        IF(cgr.class_group_id_ IS NULL,cs.class_group_id_,cgr.class_group_id_) mix_class_group_id_,
         IF(ISNULL(ta.sign_in_status_),3,ta.sign_in_status_) sign_in_status_,
         IF(ISNULL(ta.sign_out_status_),3,ta.sign_out_status_) sign_out_status_
         FROM course_schedule cs
         LEFT JOIN class_group cg ON cg.id_ = cs.class_group_id_
         LEFT JOIN teacher_attendance ta ON ta.course_schedule_id_ = cs.id_ AND ta.teacher_id_ = cs.actual_teacher_id_
-        LEFT JOIN class_group_relation cgr ON cgr.sub_class_group_id_ = cs.class_group_id_
         LEFT JOIN class_group_teacher_mapper cgtm ON cgtm.class_group_id_ = cs.class_group_id_
         <include refid="queryMusicGroupCourseScheduleSql"/>
         ORDER BY cs.class_date_,cs.start_class_time_

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

@@ -309,10 +309,7 @@
 		from demo_group_courses_plan dgcp left join demo_group dg on dgcp.demo_group_id_ = dg.id_
 		<where>
             <if test="organIds != null">
-                AND
-                <foreach collection="organIds" item="item" open="(" close=")" separator=" OR ">
-                    FIND_IN_SET(#{item},dg.organ_id_list_)
-                </foreach>
+                AND INTE_ARRAY(dg.organ_id_list_,#{organIds})
             </if>
     	</where> 
 	</select>
@@ -323,10 +320,7 @@
         where cs.type_ = 'DEMO'
   		and DATE_FORMAT(cs.class_date_, '%Y%m' ) = DATE_FORMAT(CURDATE() , '%Y%m')
         <if test="organIds != null">
-            AND
-            <foreach collection="organIds" item="item" open="(" close=")" separator=" OR ">
-                FIND_IN_SET(#{item},vg.organ_id_list_)
-            </foreach>
+            AND INTE_ARRAY(vg.organ_id_list_,#{organIds})
         </if>
     </select>
 </mapper>

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

@@ -185,10 +185,7 @@
         <where>
             su.user_type_ = 'SYSTEM'
             <if test="organIds != null">
-                AND
-                <foreach collection="organIds" item="item" open="(" close=")" separator=" OR ">
-                    FIND_IN_SET(#{item},e.organ_id_list_)
-                </foreach>
+                AND INTE_ARRAY(e.organ_id_list_,#{organIds})
             </if>
             <if test="search != null">
                 AND (su.real_name_ LIKE CONCAT('%',#{search},'%') OR su.phone_ LIKE CONCAT('%',#{search},'%'))
@@ -206,10 +203,7 @@
         <where>
             su.user_type_ = 'SYSTEM'
             <if test="organIds != null">
-                AND
-                <foreach collection="organIds" item="item" open="(" close=")" separator=" OR ">
-                    FIND_IN_SET(#{item},e.organ_id_list_)
-                </foreach>
+                AND INTE_ARRAY(e.organ_id_list_,#{organIds})
             </if>
             <if test="search != null">
                 AND (su.real_name_ LIKE CONCAT('%',#{search},'%') OR su.phone_ LIKE CONCAT('%',#{search},'%'))

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

@@ -368,10 +368,7 @@
 			#{item}
 		</foreach>
 		<if test="organIds != null">
-			AND
-			<foreach collection="organIds" item="item" open="(" close=")" separator=" OR ">
-				FIND_IN_SET(#{item},e.organ_id_list_)
-			</foreach>
+			AND INTE_ARRAY(e.organ_id_list_,#{organIds})
 		</if>
 	</select>
 	<select id="queryTeacherIdMap" resultType="java.util.Map">

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

@@ -231,7 +231,7 @@
             AND FIND_IN_SET(#{subjectId},t.subject_id_)
         </if>
         <if test="organId != null">
-            AND FIND_IN_SET(su.organ_id_,#{organId})
+            AND FIND_IN_SET(t.organ_id_,#{organId})
         </if>
         <if test="search != null">
             AND (su.real_name_ LIKE CONCAT('%',#{search},'%') OR su.phone_ LIKE CONCAT('%',#{search},'%'))