乐团列表

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

@@ -9,21 +9,25 @@ import com.ym.mec.education.base.BaseResponse;
 import com.ym.mec.education.base.PageResponse;
 import com.ym.mec.education.entity.ClassGroup;
 import com.ym.mec.education.entity.ClassGroupTeacherMapper;
+import com.ym.mec.education.entity.CourseScheduleTeacherSalary;
 import com.ym.mec.education.entity.MusicGroup;
 import com.ym.mec.education.enums.ReturnCodeEnum;
 import com.ym.mec.education.req.MusicGroupReq;
 import com.ym.mec.education.resp.MusicGroupResp;
 import com.ym.mec.education.service.IClassGroupService;
 import com.ym.mec.education.service.IClassGroupTeacherMapperService;
+import com.ym.mec.education.service.ICourseScheduleTeacherSalaryService;
 import com.ym.mec.education.service.IMusicGroupService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 
 /**
@@ -41,11 +45,7 @@ public class MusicGroupController {
     @Autowired
     private IMusicGroupService musicGroupService;
 
-    @Autowired
-    private IClassGroupService classGroupService;
 
-    @Autowired
-    private IClassGroupTeacherMapperService classGroupTeacherMapperService;
     /**
      * 服务降级处理
      *
@@ -58,45 +58,43 @@ public class MusicGroupController {
         return response;
     }
 
+    /**
+     * 乐团列表
+     * @param req
+     * @return
+     */
     @PostMapping(value = "/groupList")
-    public PageResponse groupList(@RequestBody MusicGroupReq req){
-        PageResponse response = new PageResponse();
-        IPage page = new Page();
-        QueryWrapper<MusicGroup> queryWrapper = new QueryWrapper<>();
-        IPage<MusicGroup> queryPage =  musicGroupService.page(page,queryWrapper);
-        if(queryPage.getRecords() == null && queryPage.getRecords().isEmpty()){
-            response.setReturnCode(ReturnCodeEnum.CODE_1005.getCode());
-            return response;
+    public PageResponse groupList(@RequestBody MusicGroupReq req) {
+
+        return musicGroupService.groupList(req);
+    }
+
+    /**
+     * 乐团详情
+     * @param groupId
+     * @return
+     */
+    @GetMapping(value = "/groupDetail")
+    public BaseResponse groupDetail(@RequestBody Integer groupId) {
+
+        BaseResponse baseResponse = new BaseResponse();
+        if (groupId == null) {
+            baseResponse.setReturnCode(ReturnCodeEnum.CODE_206.getCode());
+            baseResponse.setMessage(ReturnCodeEnum.CODE_206.getValue());
+            return baseResponse;
         }
 
-        List<MusicGroup> musicGroupList  = queryPage.getRecords();
-        List<MusicGroupResp> musicGroupResps = Lists.newArrayList();
-        musicGroupList.forEach(g ->{
-            MusicGroupResp musicGroupResp = new MusicGroupResp();
-            BeanUtils.copyProperties(g,musicGroupResp);
-            QueryWrapper<ClassGroup> queryWrapper1 = new QueryWrapper<>();
-            queryWrapper1.eq("music_group_id_",g.getId());
-            List<ClassGroup> classGroups = classGroupService.list(queryWrapper1);
-            if(!CollectionUtils.isEmpty(classGroups)){
-                int studNum = classGroups.stream().mapToInt(ClassGroup::getStudentNum).sum();
-                musicGroupResp.setStudentNum(studNum);
-            }
-
-            QueryWrapper<ClassGroupTeacherMapper> queryWrapper2 = new QueryWrapper<>();
-            queryWrapper2.eq("music_group_id_",g.getId());
-            List<ClassGroupTeacherMapper> classGroupTeacherMappers = classGroupTeacherMapperService.list(queryWrapper2);
-
-            if(!CollectionUtils.isEmpty(classGroupTeacherMappers)){
-                int teachNum = classGroupTeacherMappers.size();
-                musicGroupResp.setStudentNum(teachNum);
-            }
-            musicGroupResps.add(musicGroupResp);
-        });
-        int count = musicGroupService.count(queryWrapper);
-        response.setRecords(musicGroupResps);
-        response.setReturnCode(ReturnCodeEnum.CODE_1000.getCode());
-        response.setMessage(ReturnCodeEnum.CODE_1000.getValue());
-        response.setTotal(count);
-        return  response;
+        return musicGroupService.groupDetail(groupId);
+
+    }
+    @GetMapping(value = "/classGroupList")
+    public PageResponse classGroupList(@RequestBody Integer groupId){
+
+
+
+
+        return null;
+
     }
+
 }

mec-education/src/main/java/com/ym/mec/education/enums/ReturnCodeEnum.java

@@ -6,18 +6,18 @@ package com.ym.mec.education.enums;
  * @date Date : 2019年09月25日 21:15
  */
 public enum ReturnCodeEnum {
-    CODE_1000(1000, "message.common.success"),
-    CODE_1001(1001, "message.security.unauthorized"),
-    CODE_1002(1002, "message.common.information.nonexistence"),
-    CODE_1003(1003, "message.payment.type.error"),
-    CODE_1004(1004, "message.common.server.error"),
-    CODE_1005(1005, "message.common.failed"),
-    CODE_1006(1006, "message.common.parameters.missing"),
-    CODE_1007(1007, "message.common.timeout"),
-    CODE_1008(1008, "message.common.information.already.exists"),
-    CODE_1009(1009, "message.common.session.expired"),
-    CODE_1010(1010, "message.security.authfailed"),
-    CODE_1011(1011, "message.app.sign.authfailed");
+    CODE_200(200, "操作成功"),
+    CODE_201(201, "message.security.unauthorized"),
+    CODE_202(202, "message.common.information.nonexistence"),
+    CODE_203(203, "message.payment.type.error"),
+    CODE_204(204, "服务异常"),
+    CODE_205(205, "请求失败"),
+    CODE_206(206, "参数不合法"),
+    CODE_207(207, "数据不存在"),
+    CODE_208(208, "message.common.information.already.exists"),
+    CODE_209(209, "message.common.session.expired"),
+    CODE_210(210, "message.security.authfailed"),
+    CODE_211(211, "message.app.sign.authfailed");
 
     private Integer code;
     private String value;

mec-education/src/main/java/com/ym/mec/education/enums/TeachModeEnum.java

@@ -0,0 +1,33 @@
+package com.ym.mec.education.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+public enum TeachModeEnum implements BaseEnum<String, TeachModeEnum> {
+	ONLINE("ONLINE", "线上"), OFFLINE("OFFLINE", "线下");
+
+	private String code;
+
+	private String msg;
+
+	TeachModeEnum(String code, String msg) {
+		this.code = code;
+		this.msg = msg;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getMsg() {
+		return msg;
+	}
+
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+
+	@Override
+	public String getCode() {
+		return this.code;
+	}
+}

mec-education/src/main/java/com/ym/mec/education/enums/TeachTypeEnum.java

@@ -0,0 +1,35 @@
+package com.ym.mec.education.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+//职务类型（助教、主教）
+public enum TeachTypeEnum implements BaseEnum<String, TeachTypeEnum> {
+    TEACHING("TEACHING","助教"),
+    BISHOP("BISHOP","主教");
+
+    private String code;
+
+    private String msg;
+
+    TeachTypeEnum(String code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    @Override
+    public String getCode() {
+        return this.code;
+    }
+}

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

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

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

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

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

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

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

@@ -3,6 +3,7 @@ package com.ym.mec.education.resp;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -38,10 +39,13 @@ public class MusicGroupResp implements Serializable {
      * 运营主管
      */
     private Integer teamTeacherId;
+    private String teamTeacherName;
     /**
      * 教务老师
      */
     private Integer educationalTeacherId;
+
+    private String eduTeacherName;
     /**
      * 收费类型
      */
@@ -93,4 +97,8 @@ public class MusicGroupResp implements Serializable {
 
     private Integer teacherNum;
 
+    private BigDecimal payments;
+
+    private BigDecimal income;
+
 }

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

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

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

@@ -1,7 +1,10 @@
 package com.ym.mec.education.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ym.mec.education.base.BaseResponse;
+import com.ym.mec.education.base.PageResponse;
 import com.ym.mec.education.entity.MusicGroup;
+import com.ym.mec.education.req.MusicGroupReq;
 
 /**
  * <p>
@@ -13,4 +16,10 @@ import com.ym.mec.education.entity.MusicGroup;
  */
 public interface IMusicGroupService extends IService<MusicGroup> {
 
+
+    PageResponse groupList(MusicGroupReq req);
+
+    BaseResponse groupDetail(Integer groupId);
+
+    PageResponse classGroupList(Integer groupId);
 }

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

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

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

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

mec-education/src/main/java/com/ym/mec/education/service/impl/CourseScheduleTeacherSalaryServiceImpl.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.CourseScheduleTeacherSalary;
 import com.ym.mec.education.mapper.CourseScheduleTeacherSalaryMapper;
 import com.ym.mec.education.service.ICourseScheduleTeacherSalaryService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

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

@@ -1,10 +1,24 @@
 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;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ym.mec.education.entity.MusicGroup;
+import com.google.common.collect.Lists;
+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.mapper.MusicGroupMapper;
-import com.ym.mec.education.service.IMusicGroupService;
+import com.ym.mec.education.req.MusicGroupReq;
+import com.ym.mec.education.resp.MusicGroupResp;
+import com.ym.mec.education.service.*;
+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.List;
 
 /**
  * <p>
@@ -17,4 +31,118 @@ import org.springframework.stereotype.Service;
 @Service
 public class MusicGroupServiceImpl extends ServiceImpl<MusicGroupMapper, MusicGroup> implements IMusicGroupService {
 
+    @Autowired
+    private IClassGroupService classGroupService;
+
+    @Autowired
+    private IClassGroupTeacherMapperService classGroupTeacherMapperService;
+
+    @Autowired
+    private ICourseScheduleTeacherSalaryService courseScheduleTeacherSalaryService;
+
+    @Autowired
+    private ITeacherService teacherService;
+
+    @Autowired
+    private ISysUserService sysUserService;
+    @Override
+    public PageResponse groupList(MusicGroupReq req) {
+        PageResponse response = new PageResponse();
+        IPage page = new Page();
+        QueryWrapper<MusicGroup> queryWrapper = new QueryWrapper<>();
+        IPage<MusicGroup> queryPage = this.page(page, queryWrapper);
+        if (queryPage.getRecords() == null && queryPage.getRecords().isEmpty()) {
+            response.setReturnCode(ReturnCodeEnum.CODE_206.getCode());
+            return response;
+        }
+
+        List<MusicGroup> musicGroupList = queryPage.getRecords();
+        List<MusicGroupResp> musicGroupResps = Lists.newArrayList();
+        musicGroupList.forEach(g -> {
+            MusicGroupResp musicGroupResp = new MusicGroupResp();
+            BeanUtils.copyProperties(g, musicGroupResp);
+            QueryWrapper<ClassGroup> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.eq("music_group_id_", g.getId());
+            List<ClassGroup> classGroups = classGroupService.list(queryWrapper1);
+            if (!CollectionUtils.isEmpty(classGroups)) {
+                int studNum = classGroups.stream().mapToInt(ClassGroup::getStudentNum).sum();
+                musicGroupResp.setStudentNum(studNum);
+            }else{
+                musicGroupResp.setStudentNum(0);
+            }
+
+            QueryWrapper<ClassGroupTeacherMapper> queryWrapper2 = new QueryWrapper<>();
+            queryWrapper2.eq("music_group_id_", g.getId());
+            List<ClassGroupTeacherMapper> classGroupTeacherMappers = classGroupTeacherMapperService.list(queryWrapper2);
+
+            if (!CollectionUtils.isEmpty(classGroupTeacherMappers)) {
+                int teachNum = classGroupTeacherMappers.size();
+                musicGroupResp.setTeacherNum(teachNum);
+            }else{
+                musicGroupResp.setTeacherNum(0);
+            }
+
+            //老师
+            SysUser  sysUser1 = sysUserService.getById(g.getTeamTeacherId());
+
+            SysUser  sysUser2 = sysUserService.getById(g.getTeamTeacherId());
+            if(sysUser1 != null){
+                musicGroupResp.setTeamTeacherName(sysUser1.getUsername());
+            }
+            if(sysUser2 != null){
+                musicGroupResp.setEduTeacherName(sysUser2.getUsername());
+            }
+            musicGroupResps.add(musicGroupResp);
+        });
+        int count = this.count(queryWrapper);
+        response.setRecords(musicGroupResps);
+        response.setReturnCode(ReturnCodeEnum.CODE_200.getCode());
+        response.setMessage(ReturnCodeEnum.CODE_200.getValue());
+        response.setTotal(count);
+        return response;
+    }
+
+    @Override
+    public BaseResponse groupDetail(Integer groupId) {
+        BaseResponse baseResponse = new BaseResponse();
+
+        MusicGroup musicGroup = this.getById(groupId);
+        if (musicGroup == null) {
+            baseResponse.setReturnCode(ReturnCodeEnum.CODE_207.getCode());
+            baseResponse.setMessage(ReturnCodeEnum.CODE_207.getValue());
+            return baseResponse;
+        }
+        MusicGroupResp musicGroupResp = new MusicGroupResp();
+        BeanUtils.copyProperties(musicGroup, musicGroupResp);
+        QueryWrapper<ClassGroup> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq("music_group_id_", groupId);
+        List<ClassGroup> classGroups = classGroupService.list(queryWrapper1);
+        if (!CollectionUtils.isEmpty(classGroups)) {
+            int studNum = classGroups.stream().mapToInt(ClassGroup::getStudentNum).sum();
+            musicGroupResp.setStudentNum(studNum);
+        }
+
+        return baseResponse;
+    }
+
+    @Override
+    public PageResponse classGroupList(Integer groupId) {
+
+        QueryWrapper<ClassGroup> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq("music_group_id_", groupId);
+        List<ClassGroup> classGroups = classGroupService.list(queryWrapper1);
+
+        if(!CollectionUtils.isEmpty(classGroups)){
+            classGroups.forEach(e ->{
+                //查询班级老师
+                QueryWrapper<ClassGroupTeacherMapper> queryWrapper2 = new QueryWrapper<>();
+                queryWrapper2.eq("music_group_id_",e.getId());
+                List<ClassGroupTeacherMapper> list = classGroupTeacherMapperService.list();
+
+
+            });
+        }
+
+        return null;
+    }
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/SysUserServiceImpl.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.SysUser;
 import com.ym.mec.education.mapper.SysUserMapper;
 import com.ym.mec.education.service.ISysUserService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

mec-education/src/main/java/com/ym/mec/education/service/impl/TeacherServiceImpl.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.Teacher;
 import com.ym.mec.education.mapper.TeacherMapper;
 import com.ym.mec.education.service.ITeacherService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**