|
@@ -9,16 +9,21 @@ import com.ym.mec.education.base.BaseResponse;
|
|
|
import com.ym.mec.education.base.PageResponse;
|
|
|
import com.ym.mec.education.entity.*;
|
|
|
import com.ym.mec.education.enums.ReturnCodeEnum;
|
|
|
+import com.ym.mec.education.enums.TeachTypeEnum;
|
|
|
import com.ym.mec.education.mapper.MusicGroupMapper;
|
|
|
import com.ym.mec.education.req.MusicGroupReq;
|
|
|
+import com.ym.mec.education.resp.ClassGroupResp;
|
|
|
import com.ym.mec.education.resp.MusicGroupResp;
|
|
|
import com.ym.mec.education.service.*;
|
|
|
+import io.swagger.models.auth.In;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.util.CollectionUtils;
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* <p>
|
|
@@ -125,24 +130,68 @@ public class MusicGroupServiceImpl extends ServiceImpl<MusicGroupMapper, MusicGr
|
|
|
return baseResponse;
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 班级列表
|
|
|
+ * @param groupId
|
|
|
+ * @return
|
|
|
+ */
|
|
|
@Override
|
|
|
public PageResponse classGroupList(Integer groupId) {
|
|
|
|
|
|
+ PageResponse response = new PageResponse();
|
|
|
+ IPage page = new Page();
|
|
|
QueryWrapper<ClassGroup> queryWrapper1 = new QueryWrapper<>();
|
|
|
queryWrapper1.eq("music_group_id_", groupId);
|
|
|
- List<ClassGroup> classGroups = classGroupService.list(queryWrapper1);
|
|
|
+ IPage<ClassGroup> classGroupPage = classGroupService.page(page,queryWrapper1);
|
|
|
+ int count = classGroupService.count(queryWrapper1);
|
|
|
+ if (classGroupPage.getRecords() == null && classGroupPage.getRecords().isEmpty()) {
|
|
|
+ response.setReturnCode(ReturnCodeEnum.CODE_206.getCode());
|
|
|
+ return response;
|
|
|
+ }
|
|
|
|
|
|
+ List<ClassGroup> classGroups = classGroupPage.getRecords();
|
|
|
+
|
|
|
+ List<ClassGroupResp> groupRespList = new ArrayList<>();
|
|
|
if(!CollectionUtils.isEmpty(classGroups)){
|
|
|
classGroups.forEach(e ->{
|
|
|
+
|
|
|
+ ClassGroupResp classGroupResp = new ClassGroupResp();
|
|
|
//查询班级老师
|
|
|
+ BeanUtils.copyProperties(e,classGroupResp);
|
|
|
QueryWrapper<ClassGroupTeacherMapper> queryWrapper2 = new QueryWrapper<>();
|
|
|
- queryWrapper2.eq("music_group_id_",e.getId());
|
|
|
+ queryWrapper2.eq("music_group_id_",e.getId()).eq("teacher_role_", TeachTypeEnum.BISHOP.getCode());
|
|
|
List<ClassGroupTeacherMapper> list = classGroupTeacherMapperService.list();
|
|
|
|
|
|
+ if(!CollectionUtils.isEmpty(list)){
|
|
|
+ List<Integer> firstId = list.stream().map(ClassGroupTeacherMapper::getUserId).collect(Collectors.toList());
|
|
|
+ QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
|
|
|
+ queryWrapper.in("id_",firstId);
|
|
|
+ List<SysUser> sysUserList = sysUserService.list(queryWrapper);
|
|
|
+ if(!CollectionUtils.isEmpty(sysUserList)){
|
|
|
+ classGroupResp.setFirstTehNameList(sysUserList.stream().map(SysUser::getUsername).collect(Collectors.toList()));
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ queryWrapper2.eq("music_group_id_",e.getId()).eq("teacher_role_", TeachTypeEnum.TEACHING.getCode());
|
|
|
+ List<ClassGroupTeacherMapper> list2 = classGroupTeacherMapperService.list();
|
|
|
+ if(!CollectionUtils.isEmpty(list2)){
|
|
|
+ List<Integer> secdId = list2.stream().map(ClassGroupTeacherMapper::getUserId).collect(Collectors.toList());
|
|
|
+ QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
|
|
|
+ queryWrapper.in("id_",secdId);
|
|
|
+ List<SysUser> sysUserList = sysUserService.list(queryWrapper);
|
|
|
+ if(!CollectionUtils.isEmpty(sysUserList)){
|
|
|
+ classGroupResp.setSecdTehNameList(sysUserList.stream().map(SysUser::getUsername).collect(Collectors.toList()));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ groupRespList.add(classGroupResp);
|
|
|
|
|
|
});
|
|
|
}
|
|
|
|
|
|
+ response.setRecords(groupRespList);
|
|
|
+ response.setReturnCode(ReturnCodeEnum.CODE_200.getCode());
|
|
|
+ response.setMessage(ReturnCodeEnum.CODE_200.getValue());
|
|
|
+ response.setTotal(count);
|
|
|
return null;
|
|
|
}
|
|
|
}
|