老师列表查询

mec-education/src/main/java/com/ym/mec/education/controller/TeacherController.java

@@ -48,8 +48,8 @@ public class TeacherController {
      * @param req
      * @return
      */
-    @PostMapping(value = "/workList")
-    public PageResponse workList(@RequestBody TeacherReq req) {
+    @PostMapping(value = "/teacherList")
+    public PageResponse teacherList(@RequestBody TeacherReq req) {
 
         return teacherService.teacherList(req);
     }

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

@@ -37,4 +37,8 @@ public class HomeWrokResp implements Serializable {
 
     private String attachments;
 
+
+    private Long id;
+
+    private Long courseHomeworkId;
 }

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

@@ -14,10 +14,12 @@ import java.util.List;
 @ToString
 public class TeacherResp {
 
-    private String userId;
+    private Integer userId;
 
     private String name;
 
+    private String avatar;
+
     private List<String> subjectName;
 
     private List<String> className;

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

@@ -76,14 +76,15 @@ public class StudentCourseHomeworkServiceImpl extends ServiceImpl<StudentCourseH
 
         List<HomeWrokResp> homeWrokRespList = new ArrayList<>();
         if(!CollectionUtils.isEmpty(courseHomeworkList)){
-            List<SysUser> finalUserList = userList;
             courseHomeworkList.forEach(e ->{
                 HomeWrokResp homeWrokResp = new HomeWrokResp();
                 BeanUtils.copyProperties(e,homeWrokResp);
-                Optional<SysUser> optional = finalUserList.stream().filter(u -> u.getId().equals(e.getUserId())).findFirst();
-                if(optional.isPresent()){
-                    homeWrokResp.setAvatar(optional.get().getAvatar());
-                    homeWrokResp.setName(optional.get().getRealName());
+                homeWrokResp.setId(e.getId());
+                homeWrokResp.setCourseHomeworkId(e.getCourseHomeworkId());
+                SysUser sysUser = sysUserService.getById(e.getUserId());
+                if(sysUser != null){
+                    homeWrokResp.setAvatar(sysUser.getAvatar());
+                    homeWrokResp.setName(sysUser.getRealName());
                 }
                 homeWrokRespList.add(homeWrokResp);
             });

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

@@ -5,15 +5,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ym.mec.education.base.PageResponse;
-import com.ym.mec.education.entity.Subject;
-import com.ym.mec.education.entity.SysUser;
-import com.ym.mec.education.entity.Teacher;
+import com.ym.mec.education.entity.*;
+import com.ym.mec.education.enums.ReturnCodeEnum;
 import com.ym.mec.education.mapper.TeacherMapper;
 import com.ym.mec.education.req.TeacherReq;
 import com.ym.mec.education.resp.TeacherResp;
-import com.ym.mec.education.service.ISubjectService;
-import com.ym.mec.education.service.ISysUserService;
-import com.ym.mec.education.service.ITeacherService;
+import com.ym.mec.education.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -41,6 +38,11 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherMapper, Teacher> impl
     @Autowired
     private ISubjectService subjectService;
 
+    @Autowired
+    private IClassGroupService classGroupService;
+    @Autowired
+    private IClassGroupTeacherMapperService classGroupTeacherMapperService;
+
     @Override
     public PageResponse teacherList(TeacherReq req) {
         PageResponse response = new PageResponse();
@@ -73,12 +75,36 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherMapper, Teacher> impl
                 List<Subject> subjectList = subjectService.list(queryWrapperSub);
                 if (!CollectionUtils.isEmpty(subjectList)) {
                     List<String> subName = subjectList.stream().map(Subject::getName).collect(Collectors.toList());
+                    teacherResp.setSubjectName(subName);
                 }
+                teacherResp.setUserId(e.getId());
+                SysUser sysUser = sysUserService.getById(e.getId());
+                if(sysUser != null){
+                    teacherResp.setAvatar(sysUser.getAvatar());
+                    teacherResp.setName(sysUser.getRealName());
+                }
+                QueryWrapper<ClassGroupTeacherMapper> queryWrapper1 = new QueryWrapper<>();
+                queryWrapper1.eq("user_id_",e.getId());
+                List<ClassGroupTeacherMapper> classGroupTeacherMappers = classGroupTeacherMapperService.list(queryWrapper1);
+                if(!CollectionUtils.isEmpty(classGroupTeacherMappers)){
+                    List<Integer> classId = classGroupTeacherMappers.stream().map(ClassGroupTeacherMapper::getClassGroupId).collect(Collectors.toList());
+                    QueryWrapper<ClassGroup> groupQueryWrapper = new QueryWrapper<>();
+                    groupQueryWrapper.eq("id_",classId);
+                    List<ClassGroup> classGroups = classGroupService.list(groupQueryWrapper);
+                    if(!CollectionUtils.isEmpty(classGroups)){
+                        List<String> className = classGroups.stream().map(ClassGroup::getName).collect(Collectors.toList());
 
+                        teacherResp.setClassName(className);
+                    }
+                }
+                teacherRespList.add(teacherResp);
             });
 
         }
-
+        response.setReturnCode(ReturnCodeEnum.CODE_200.getCode());
+        response.setMessage(ReturnCodeEnum.CODE_200.getValue());
+        response.setRecords(teacherRespList);
+        response.setTotal(Math.toIntExact(teacherIPage.getTotal()));
         return null;
     }
 }