Merge remote-tracking branch 'origin/master'

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

@@ -3642,12 +3642,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         Map<String, Object> params = new HashMap<>(16);
         MapUtil.populateMap(params, queryInfo);
 
-		List<Group> groups = groupDao.searchGroups(params);
-
-        if(groups.size() <= 0){
-            return pageInfo;
-        }
-        params.put("classGroupIds", groups.stream().map(Group::getClassGroupId).collect(Collectors.toSet()));
         List<CourseScheduleEndDto> results = new ArrayList<>();
         int count = courseScheduleDao.endCountCourseSchedules(params);
         if(queryInfo.getIsExport() && count > 50000){
@@ -3670,19 +3664,11 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			List<Map<Long, String>> coursesSettlementTimeMaps = courseScheduleTeacherSalaryDao.getCoursesSettlementTime(courseScheduleIds);
 			Map<Long, String> coursesSettlementTimeMap = MapUtil.convertIntegerMap(coursesSettlementTimeMaps);
 
-			Map<Integer, Group> classGroupIdGroupMap = groups.stream().collect(Collectors.toMap(Group::getClassGroupId, e -> e));
-
 			//获取班级声部名称
             List<Map<Integer, String>> classGroupSubjectNameMaps = classGroupDao.findClassGroupSubjectNameMaps(courseScheduleIds);
             Map<Integer, String> classGroupSubjectNameMap = MapUtil.convertIntegerMap(classGroupSubjectNameMaps);
 			for (CourseScheduleEndDto result : results) {
-				Group group = classGroupIdGroupMap.get(result.getClassGroupId());
 				result.setTeacher(null);
-				if(Objects.nonNull(group)){
-					result.setGroupName(group.getGroupName());
-					result.setOrganName(group.getOrganName());
-					result.setClassGroupName(group.getClassGroupName());
-				}
 				result.setTeacherName(nameIdMap.get(result.getActualTeacherId()));
 				result.setSubjectName(classGroupSubjectNameMap.get(result.getId()));
 				result.setStudentId(studentIdMap.get(result.getId()));

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

@@ -45,6 +45,7 @@
         <result column="course_start_time_" property="startClassTime"/>
         <result column="course_end_time_" property="endClassTime"/>
         <result column="settlement_time_" property="settlementTime"/>
+        <result column="organ_name_" property="organName"/>
     </resultMap>
 
     <resultMap type="com.ym.mec.biz.dal.dto.CourseScheduleDto" id="courseScheduleDto" extends="CourseSchedule">
@@ -2238,12 +2239,6 @@
         <where>
             (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
             <include refid="queryVipCourseScheduleIds"/>
-            <if test="classGroupIds != null">
-                AND cs.class_group_id_ IN
-                <foreach collection="classGroupIds" item="classGroupId" open="(" close=")" separator=",">
-                    #{classGroupId}
-                </foreach>
-            </if>
         </where>
     </sql>
 
@@ -2261,10 +2256,12 @@
             cs.teach_mode_,
             cs.type_,
             cs.schoole_id_,
-            s.name_ schoole_name_
+            s.name_ schoole_name_,
+            o.name_ organ_name_
         FROM
             course_schedule cs
             LEFT JOIN school s ON cs.schoole_id_=s.id_
+            LEFT JOIN organization o ON cs.organ_id_=o.id_
         <include refid="endFindCourseSchedulesCondition"/>
         ORDER BY course_start_time_,cs.id_
         <include refid="global.limit"/>
@@ -2374,6 +2371,12 @@
         <if test="teacherIdList != null">
             AND cs.actual_teacher_id_=#{teacherIdList}
         </if>
+        <if test="organIdList!=null">
+            AND FIND_IN_SET(cs.organ_id_,#{organIdList})
+        </if>
+        <if test="search!=null">
+            AND (cs.music_group_id_=#{search} OR cs.id_=#{search} OR cs.name_ LIKE CONCAT( '%', #{search}, '%' ))
+        </if>
     </sql>
     <select id="queryPracticeCourseScheduleIds" resultType="java.lang.Integer">
         SELECT cs.id_ FROM course_schedule cs