查询列表

mec-education/src/main/java/com/ym/mec/education/mapper/SubjectMapper.java

@@ -1,7 +1,7 @@
 package com.ym.mec.education.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ym.mec.education.entity.Subject;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/resp/ClassTeacherResp.java

@@ -30,4 +30,9 @@ public class ClassTeacherResp implements Serializable {
 
     private List<String> className;
 
+    /**
+     * 老师技能
+     */
+    private List<String> techSubject;
+
 }

mec-education/src/main/java/com/ym/mec/education/service/ISubjectService.java

@@ -1,7 +1,7 @@
 package com.ym.mec.education.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ym.mec.education.entity.Subject;
-import com.baomidou.mybatisplus.service.IService;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/service/impl/MusicGroupServiceImpl.java

@@ -1,5 +1,4 @@
 package com.ym.mec.education.service.impl;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -58,6 +57,9 @@ public class MusicGroupServiceImpl extends ServiceImpl<MusicGroupMapper, MusicGr
     @Autowired
     private IStudentAttendanceService studentAttendanceService;
 
+    @Autowired
+    private ISubjectService subjectService;
+
 
     @Override
     public PageResponse groupList(MusicGroupReq req) {
@@ -316,9 +318,9 @@ public class MusicGroupServiceImpl extends ServiceImpl<MusicGroupMapper, MusicGr
                 List<ClassGroupTeacherMapper> list = classGroupTeacherMapperService.list(queryWrapper2);
                 if(!CollectionUtils.isEmpty(list)){
 
-                    list.forEach(stud ->{
+                    list.forEach(tech ->{
                         ClassTeacherResp classTeacherResp = new ClassTeacherResp();
-                        List<ClassTeacherResp> removeList = classTeacherResps.stream().filter(c ->c.getUserId().equals(stud.getUserId()) && c.getClassGroupId().equals(stud.getClassGroupId())).collect(Collectors.toList());
+                        List<ClassTeacherResp> removeList = classTeacherResps.stream().filter(c ->c.getUserId().equals(tech.getUserId()) && c.getClassGroupId().equals(tech.getClassGroupId())).collect(Collectors.toList());
                         HashSet set = new HashSet<>();
                         if(!CollectionUtils.isEmpty(removeList)){
 
@@ -327,16 +329,31 @@ public class MusicGroupServiceImpl extends ServiceImpl<MusicGroupMapper, MusicGr
                             set.add(e.getName());
                             classTeacherResp.setClassName(new ArrayList<>(set));
                         }else{
-                            SysUser sysUser = sysUserService.getById(stud.getUserId());
+                            SysUser sysUser = sysUserService.getById(tech.getUserId());
                             if(sysUser != null){
                                 classTeacherResp.setName(sysUser.getRealName());
                                 classTeacherResp.setAvatar(sysUser.getAvatar());
                             }
-                            classTeacherResp.setUserId(stud.getUserId());
-                            classTeacherResp.setClassGroupId(stud.getClassGroupId());
+                            classTeacherResp.setUserId(tech.getUserId());
+                            classTeacherResp.setClassGroupId(tech.getClassGroupId());
 
                             set.add(e.getName());
                             classTeacherResp.setClassName(new ArrayList<>(set));
+
+                            //查询老师技能
+                            Teacher  teacher =  teacherService.getById(tech.getUserId());
+                            if(teacher != null && !StringUtils.isEmpty(teacher.getSubjectId())){
+                                String ids[] = teacher.getSubjectId().split(",");
+                                List<String> stringB = Arrays.asList(ids);
+                                QueryWrapper<Subject> queryWrapper = new QueryWrapper<>();
+                                queryWrapper.in("id_",stringB);
+                                List<Subject> subjectList =  subjectService.list(queryWrapper);
+                                if(!CollectionUtils.isEmpty(subjectList)){
+                                    List<String> subName = subjectList.stream().map(Subject::getName).collect(Collectors.toList());
+                                    classTeacherResp.setTechSubject(subName);
+                                }
+                            }
+
                             classTeacherResps.add(classTeacherResp);
                         }
 

mec-education/src/main/java/com/ym/mec/education/service/impl/SubjectServiceImpl.java

@@ -1,9 +1,9 @@
 package com.ym.mec.education.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ym.mec.education.entity.Subject;
 import com.ym.mec.education.mapper.SubjectMapper;
 import com.ym.mec.education.service.ISubjectService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**