0810

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

@@ -1151,28 +1151,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         MapUtil.populateMap(params, queryInfo);
 		params.put("organIds", organIds);
 
-//        params.put("musicGroupStatus", null);
-//        params.put("vipGroupStatus", null);
-//        List<Group> groups = groupDao.searchGroups(params);
-//        if(!CollectionUtils.isEmpty(groups)){
-//            Map<GroupType, List<Group>> groupTypeGroupsMap = groups.stream().collect(Collectors.groupingBy(Group::getGroupType));
-//            List<Integer> classGroupIds=new ArrayList<>();
-//            for (Map.Entry<GroupType, List<Group>> groupTypeListEntry : groupTypeGroupsMap.entrySet()) {
-//                List<String> groupIds = groupTypeListEntry.getValue().stream().map(Group::getId).collect(Collectors.toList());
-//                List<ClassGroup> classGroups = classGroupDao.findByMusicGroupsAndType(groupIds, groupTypeListEntry.getKey().getCode());
-//                if(!CollectionUtils.isEmpty(classGroups)){
-//                    List<Integer> tempClassGroupIds=classGroups.stream().map(ClassGroup::getId).collect(Collectors.toList());
-//                    classGroupIds.addAll(tempClassGroupIds);
-//                }
-//            }
-//            if(CollectionUtils.isEmpty(classGroupIds)){
-//                return pageInfo;
-//            }
-//            params.put("classGroupIds", classGroupIds);
-//        }else{
-//            return pageInfo;
-//        }
-
         List<CourseScheduleDto> dataList = null;
         int count = courseScheduleDao.countCourseSchedulesWithDate(params);
         if (count > 0) {

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

@@ -582,6 +582,9 @@
             <if test="type!=null">
                 AND cs.group_type_ = #{type}
             </if>
+            <if test="search != null and search != ''">
+                AND (cs.id_ = #{search} OR cs.name_ LIKE CONCAT('%',${search},'%'))
+            </if>
             <if test="musicGroupId!=null">
                 AND cs.music_group_id_=#{musicGroupId} AND cs.group_type_='MUSIC'
             </if>
@@ -622,6 +625,9 @@
                 #{classGroupId}
             </foreach>
         </if>
+        <if test="search != null and search != ''">
+            AND (cs.id_ = #{search} OR cs.name_ LIKE CONCAT('%',${search},'%'))
+        </if>
         <if test="musicGroupId!=null">
             AND cs.music_group_id_=#{musicGroupId} AND cs.group_type_='MUSIC'
         </if>