学校端待办事项

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupQuitDao.java

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.entity.MusicGroupQuit;
+import com.ym.mec.biz.dal.school.dto.MusicGroupQuitPageDto;
 import com.ym.mec.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
 
@@ -50,4 +51,22 @@ public interface MusicGroupQuitDao extends BaseDAO<Long, MusicGroupQuit> {
      * @return
      */
     List<Map<Integer, Long>> queryQuitMapByStudentId(@Param("studentIds") Set<Long> studentIds, @Param("musicGroupId") String musicGroupId);
+
+    /**
+    * @description: 获取学校端退团审批列表
+     * @param params
+    * @return int
+    * @author zx
+    * @date 2023/5/11 09:38
+    */
+    int countBySchool(Map<String, Object> params);
+
+    /**
+    * @description: 获取学校端退团审批列表
+     * @param params
+    * @return java.util.List<com.ym.mec.biz.dal.school.dto.MusicGroupQuitPageDto>
+    * @author zx
+    * @date 2023/5/11 09:39
+    */
+    List<MusicGroupQuitPageDto> queryPageBySchool(Map<String, Object> params);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/school/dto/ClassesForDayDto.java

@@ -54,4 +54,10 @@ public class ClassesForDayDto {
 
     @ApiModelProperty(value = "教学模式",required = false)
     private TeachModeEnum teachMode;
+
+    @ApiModelProperty(value = "作业类型,HOMEWORK,LESSON",required = false)
+    private String homeworkType;
+
+    @ApiModelProperty(value = "作业编号",required = false)
+    private Long homeworkId;
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/school/dto/MusicGroupQuitPageDto.java

@@ -0,0 +1,35 @@
+package com.ym.mec.biz.dal.school.dto;
+
+import com.ym.mec.biz.dal.enums.school.EQuitGroupAuditStatusEnum;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class MusicGroupQuitPageDto {
+
+    @ApiModelProperty(value = "审核状态",required = true)
+    private EQuitGroupAuditStatusEnum status;
+
+    @ApiModelProperty(value = "提交时间",required = true)
+    private Date createTime;
+
+    @ApiModelProperty(value = "学员编号",required = true)
+    private Integer studentId;
+
+    @ApiModelProperty(value = "学员名称",required = true)
+    private String studentName;
+
+    @ApiModelProperty(value = "学员头像",required = true)
+    private String studentAvatar;
+
+    @ApiModelProperty(value = "声部",required = true)
+    private Integer subjectId;
+
+    @ApiModelProperty(value = "声部",required = true)
+    private String subjectName;
+
+    @ApiModelProperty(value = "退团id",required = true)
+    private Integer musicGroupQuitId;
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/school/page/MusicGroupQuitQueryInfo.java

@@ -0,0 +1,16 @@
+package com.ym.mec.biz.dal.school.page;
+
+import com.ym.mec.biz.dal.enums.school.EQuitGroupAuditStatusEnum;
+import com.ym.mec.common.page.QueryInfo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class MusicGroupQuitQueryInfo  extends QueryInfo {
+
+    @ApiModelProperty(value = "审核状态",required = true)
+    private EQuitGroupAuditStatusEnum status;
+
+    @ApiModelProperty(value = "合作单位编号",required = true)
+    private Integer coopId;
+}

mec-biz/src/main/java/com/ym/mec/biz/service/CourseHomeworkService.java

@@ -70,4 +70,13 @@ public interface CourseHomeworkService extends BaseService<Long, CourseHomework>
      * @param extraId 作业id
      */
     CourseHomeworkWrapper.CourseHomeworkList findCourseExtraHomeworkDetail(Integer extraId);
+
+	/**
+	* @description: 获取课程关联的课后作业
+	 * @param courseIds
+	* @return java.util.List<com.ym.mec.biz.dal.entity.CourseHomework>
+	* @author zx
+	* @date 2023/5/11 11:30
+	*/
+	List<CourseHomework> findHomeworkByCourse(List<Long> courseIds);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/MusicGroupQuitService.java

@@ -1,8 +1,21 @@
 package com.ym.mec.biz.service;
 
 import com.ym.mec.biz.dal.entity.MusicGroupQuit;
+import com.ym.mec.biz.dal.school.dto.MusicGroupQuitPageDto;
+import com.ym.mec.biz.dal.school.page.MusicGroupQuitQueryInfo;
+import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
 
+import java.util.List;
+
 public interface MusicGroupQuitService extends BaseService<Long, MusicGroupQuit> {
 
+    /**
+    * @description: 学校端退团审批列表
+     * @param queryInfo
+    * @return java.util.List<com.ym.mec.biz.dal.school.dto.MusicGroupQuitPageDto>
+    * @author zx
+    * @date 2023/5/10 19:03
+    */
+    PageInfo<MusicGroupQuitPageDto> queryPageBySchool(MusicGroupQuitQueryInfo queryInfo);
 }

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

@@ -306,4 +306,9 @@ public class CourseHomeworkServiceImpl extends BaseServiceImpl<Long, CourseHomew
         courseHomeworkList.setTrainingDetailList(baseLessonTrainingDetail);
         return courseHomeworkList;
     }
+
+	@Override
+	public List<CourseHomework> findHomeworkByCourse(List<Long> courseIds) {
+		return courseHomeworkDao.findByCourseSchedules(courseIds);
+	}
 }

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

@@ -178,15 +178,14 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 	private StudentTeacherMapperService studentTeacherMapperService;
     @Autowired
 	private CourseScheduleConvertDao courseScheduleConvertDao;
-
     @Autowired
     private CourseSchedulePlusMapper courseSchedulePlusMapper;
-
     @Autowired
     private TeacherService teacherService;
-
     @Autowired
     private TeacherAttendanceService teacherAttendanceService;
+    @Autowired
+    private LessonExaminationService lessonExaminationService;
 
     private final Logger LOGGER = LoggerFactory
             .getLogger(this.getClass());
@@ -6205,6 +6204,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			List<Integer> studentIds = courseStudentDtos.stream().map(e -> e.getStudentId()).collect(Collectors.toList());
 			List<SimpleUserDto> usersSimpleInfo = teacherDao.getUsersSimpleInfo(studentIds);
 			Map<Integer, SimpleUserDto> simpleUserDtoMap = usersSimpleInfo.stream().collect(Collectors.groupingBy(e -> e.getUserId(), Collectors.collectingAndThen(Collectors.toList(), v -> v.get(0))));
+			//获取
 			for (CourseStudentDto dto : courseStudentDtos) {
 				SimpleUserDto userDto = simpleUserDtoMap.get(dto.getStudentId());
 				if(Objects.nonNull(userDto)){
@@ -6229,6 +6229,18 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			List<Long> courseIds = listClassesForDay.stream().map(e -> e.getCourseId()).collect(Collectors.toList());
 			List<ClassesForDayDto> dtoList = studentAttendanceDao.statisticalAttendanceInformation(courseIds);
 			Map<Long, ClassesForDayDto> dtoMap = dtoList.stream().collect(Collectors.groupingBy(e -> e.getCourseId(), Collectors.collectingAndThen(Collectors.toList(), v -> v.get(0))));
+			//获取课程关联的作业
+			List<CourseHomework> homeworks = courseHomeworkService.findHomeworkByCourse(courseIds);
+			Map<Long, Long> homeworkMap = new HashMap<>();
+			if(CollectionUtils.isNotEmpty(homeworks)){
+				homeworkMap = homeworks.stream().collect(Collectors.groupingBy(e -> e.getCourseScheduleId(), Collectors.collectingAndThen(Collectors.toList(), v -> v.get(0).getId())));
+			}
+			//获取课程关联的测评
+			List<LessonExamination> lessonExaminations = lessonExaminationService.lambdaQuery().in(LessonExamination::getCourseScheduleId, courseIds).list();
+			Map<Long, Long> examinationMap = new HashMap<>();
+			if(CollectionUtils.isNotEmpty(lessonExaminations)){
+				examinationMap = lessonExaminations.stream().collect(Collectors.groupingBy(e -> e.getCourseScheduleId(), Collectors.collectingAndThen(Collectors.toList(), v -> v.get(0).getId())));
+			}
 			for (ClassesForDayDto dto : listClassesForDay) {
 				SimpleUserDto userDto = simpleUserDtoMap.get(dto.getTeacherId());
 				if(Objects.nonNull(userDto)){
@@ -6245,6 +6257,16 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 					dto.setAttendanceTruantNum(dayDto.getAttendanceTruantNum());
 					dto.setAttendanceDropNum(dayDto.getAttendanceDropNum());
 				}
+				Long homeworkId = homeworkMap.get(dayDto.getCourseId());
+				if(homeworkId != null){
+					dto.setHomeworkType("HOMEWORK");
+					dto.setHomeworkId(homeworkId);
+				}
+				Long lessonId = examinationMap.get(dayDto.getCourseId());
+				if(lessonId != null){
+					dto.setHomeworkType("LESSON");
+					dto.setHomeworkId(lessonId);
+				}
 			}
 		}
 	}

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

@@ -1,5 +1,14 @@
 package com.ym.mec.biz.service.impl;
 
+import com.ym.mec.biz.dal.dao.SubjectDao;
+import com.ym.mec.biz.dal.dao.TeacherDao;
+import com.ym.mec.biz.dal.dto.SimpleUserDto;
+import com.ym.mec.biz.dal.entity.Subject;
+import com.ym.mec.biz.dal.school.dto.MusicGroupQuitPageDto;
+import com.ym.mec.biz.dal.school.page.MusicGroupQuitQueryInfo;
+import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.util.collection.MapUtil;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -9,15 +18,56 @@ import com.ym.mec.biz.service.MusicGroupQuitService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 
+import java.util.*;
+import java.util.stream.Collectors;
+
 @Service
 public class MusicGroupQuitServiceImpl extends BaseServiceImpl<Long, MusicGroupQuit>  implements MusicGroupQuitService {
 	
 	@Autowired
 	private MusicGroupQuitDao musicGroupQuitDao;
+	@Autowired
+	private TeacherDao teacherDao;
+	@Autowired
+	private SubjectDao subjectDao;
 
 	@Override
 	public BaseDAO<Long, MusicGroupQuit> getDAO() {
 		return musicGroupQuitDao;
 	}
-	
+
+    @Override
+    public PageInfo<MusicGroupQuitPageDto> queryPageBySchool(MusicGroupQuitQueryInfo queryInfo) {
+		PageInfo<MusicGroupQuitPageDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+		Map<String, Object> params = new HashMap<>();
+		MapUtil.populateMap(params, queryInfo);
+
+		List<MusicGroupQuitPageDto> dataList = null;
+		int count = musicGroupQuitDao.countBySchool(params);
+		if (count > 0) {
+			pageInfo.setTotal(count);
+			params.put("offset", pageInfo.getOffset());
+			dataList = musicGroupQuitDao.queryPageBySchool(params);
+			if(CollectionUtils.isNotEmpty(dataList)){
+				List<Integer> studentIds = dataList.stream().map(e -> e.getStudentId()).collect(Collectors.toList());
+				List<SimpleUserDto> usersSimpleInfo = teacherDao.getUsersSimpleInfo(studentIds);
+				Map<Integer, SimpleUserDto> simpleUserDtoMap = usersSimpleInfo.stream().collect(Collectors.groupingBy(e -> e.getUserId(), Collectors.collectingAndThen(Collectors.toList(), v -> v.get(0))));
+				List<Integer> subjectIds = dataList.stream().map(e -> e.getSubjectId()).distinct().collect(Collectors.toList());
+				Map<Integer, String> subjectNameMap = subjectDao.findBySubjectIds(subjectIds).stream().collect(Collectors.groupingBy(e -> e.getId(), Collectors.collectingAndThen(Collectors.toList(), v -> v.get(0).getName())));
+				for (MusicGroupQuitPageDto dto : dataList) {
+					dto.setSubjectName(subjectNameMap.get(dto.getSubjectId()));
+					SimpleUserDto userDto = simpleUserDtoMap.get(dto.getStudentId());
+					if(Objects.nonNull(userDto)){
+						dto.setStudentAvatar(userDto.getAvatar());
+						dto.setStudentName(userDto.getNickName());
+					}
+				}
+			}
+		}
+		if (count == 0) {
+			dataList = new ArrayList<>();
+		}
+		pageInfo.setRows(dataList);
+		return pageInfo;
+    }
 }

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

@@ -1130,18 +1130,18 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 			info.setStartTerm(monday);
 			info.setEndTerm(sunday);
 			info.setMusicGroupIds(queryInfo.getMusicGroupIds());
-			Map<Integer,Integer> weekCount = MapUtil.convertIntegerMap(teacherAttendanceDao.queryTeacherAttendanceForWeek(info));
+			Map<Integer,Long> weekCount = MapUtil.convertIntegerMap(teacherAttendanceDao.queryTeacherAttendanceForWeek(info));
 			for (TeacherAttendanceSumDto dto : dtoList) {
 				SimpleUserDto userDto = simpleUserDtoMap.get(dto.getTeacherId());
 				if(Objects.nonNull(userDto)){
 					dto.setTeacherName(userDto.getUserName());
 					dto.setTeacherAvatar(userDto.getAvatar());
 				}
-				Integer errCourseNum = weekCount.get(dto.getTeacherId());
+				Long errCourseNum = weekCount.get(dto.getTeacherId());
 				if(errCourseNum == null){
 					dto.setTeacherAttendanceStatus(TeacherAttendanceQueryInfo.TeacherAttendanceEnum.NO_COURSE);
 				}else {
-					if(errCourseNum > 0){
+					if(errCourseNum > 0L){
 						dto.setTeacherAttendanceStatus(TeacherAttendanceQueryInfo.TeacherAttendanceEnum.ERR);
 					}else {
 						dto.setTeacherAttendanceStatus(TeacherAttendanceQueryInfo.TeacherAttendanceEnum.NORMAL);

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

@@ -21,6 +21,8 @@
         <result column="fee_json_" property="feeJson"/>
         <result column="current_approve_role_" property="currentApproveRole"/>
         <result column="apply_user_id_" property="applyUserId"/>
+        <result column="audit_school_staff_" property="auditSchoolStaff"/>
+        <result column="school_staff_audit_status_" property="schoolStaffAuditStatus"/>
         <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <association property="musicGroup" javaType="com.ym.mec.biz.dal.entity.MusicGroup">
             <result column="music_group_name_" property="name"/>
@@ -51,10 +53,11 @@
             useGeneratedKeys="true" keyColumn="id" keyProperty="id">
         INSERT INTO music_group_quit
         (id_,user_id_,music_group_id_,join_date_,quit_date_,create_time_,reason_,user_comment_,status_,
-         apply_user_id_,is_visit_,visit_time_,fee_json_,current_approve_role_,return_total_fee_,tenant_id_,reason_enum_)
+         apply_user_id_,is_visit_,visit_time_,fee_json_,current_approve_role_,return_total_fee_,tenant_id_,reason_enum_,audit_school_staff_,school_staff_audit_status_)
         VALUES(#{id},#{userId},#{musicGroupId},#{joinDate},#{quitDate},#{createTime},#{reason},#{userComment},
         #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{applyUserId},#{isVisit},#{visitTime},
-               #{feeJson},#{currentApproveRole},#{returnTotalFee},#{tenantId},#{reasonEnum,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
+               #{feeJson},#{currentApproveRole},#{returnTotalFee},#{tenantId},#{reasonEnum,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+               #{auditSchoolStaff},#{schoolStaffAuditStatus})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -67,6 +70,12 @@
             <if test="userId != null">
                 user_id_ = #{userId},
             </if>
+            <if test="auditSchoolStaff != null">
+                audit_school_staff_ = #{auditSchoolStaff},
+            </if>
+            <if test="schoolStaffAuditStatus != null">
+                school_staff_audit_status_ = #{schoolStaffAuditStatus},
+            </if>
             <if test="joinDate != null">
                 join_date_ = #{joinDate},
             </if>
@@ -197,4 +206,37 @@
         AND music_group_id_ = #{musicGroupId} AND status_ = 'PROCESSING'
         GROUP BY user_id_
     </select>
+    <select id="queryPageBySchool" resultType="com.ym.mec.biz.dal.school.dto.MusicGroupQuitPageDto">
+        select mgq.user_id_ studentId,mgq.create_time_ createTime,mgq.school_staff_audit_status_ status,
+               sr.actual_subject_id_ subjectId,mgq.id_ musicGroupQuitId
+        from music_group_quit mgq
+                 left join student_registration sr ON sr.music_group_id_ = mgq.music_group_id_ AND sr.user_id_ = mgq.user_id_
+        <where>
+            <if test="coopId != null">
+                AND mgq.school_staff_audit_status_ = #{coopId}
+            </if>
+            <if test="status != null">
+                AND mgq.school_staff_audit_status_ = #{status}
+            </if>
+            <if test="status == null">
+                AND mgq.school_staff_audit_status_ IN ('PASS','REJECT')
+            </if>
+        </where>
+        <include refid="global.limit"/>
+    </select>
+    <select id="countBySchool" resultType="java.lang.Integer">
+        select COUNT(mgq.id_)
+        from music_group_quit mgq
+        <where>
+            <if test="coopId != null">
+                AND mgq.school_staff_audit_status_ = #{coopId}
+            </if>
+            <if test="status != null">
+                AND mgq.school_staff_audit_status_ = #{status}
+            </if>
+            <if test="status == null">
+                AND mgq.school_staff_audit_status_ IN ('PASS','REJECT')
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -13,6 +13,7 @@ import com.ym.mec.biz.dal.enums.DealStatusEnum;
 import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
 import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum;
 import com.ym.mec.biz.dal.enums.PaymentStatusEnum;
+import com.ym.mec.biz.dal.enums.school.EQuitGroupAuditStatusEnum;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
@@ -211,6 +212,7 @@ public class MusicGroupController extends BaseController {
         musicGroupQuit.setReasonEnum(reasonEnum);
 		musicGroupQuit.setStatus(ApprovalStatus.PROCESSING);
         musicGroupQuit.setOperatorId(userId);
+        musicGroupQuit.setSchoolStaffAuditStatus(EQuitGroupAuditStatusEnum.ING);
         return succeed(musicGroupService.applyQuitMusicGroup(null, musicGroupQuit));
     }
 

mec-web/src/main/java/com/ym/mec/web/controller/school/SchoolClassGroupController.java

@@ -17,6 +17,7 @@ import io.swagger.annotations.ApiOperation;
 import org.snaker.engine.model.BaseModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -33,10 +34,7 @@ public class SchoolClassGroupController extends BaseController {
 
     @ApiOperation(value = "获取合作单位所有班级列表")
     @GetMapping("/queryClassGroup")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "coopId", dataType = "Integer", required = true, value = "合作单位"),
-    })
-    public HttpResponseResult<List<BaseMapDto>> queryClassGroup(Integer coopId) {
+    public HttpResponseResult<List<BaseMapDto>> queryClassGroup(@RequestHeader Integer coopId) {
         return succeed(classGroupService.queryClassGroup(coopId));
     }
 }

mec-web/src/main/java/com/ym/mec/web/controller/school/SchoolCourseScheduleController.java

@@ -13,6 +13,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -29,29 +30,22 @@ public class SchoolCourseScheduleController extends BaseController {
 
     @ApiOperation(value = "课时顶部统计接口---获取当前学期课程汇总")
     @GetMapping("/getSummaryOfCurrentSemesterCourses")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "coopId", dataType = "Integer", required = true, value = "合作单位"),
-    })
-    public HttpResponseResult<List<SummaryOfCurrentSemesterCoursesDto>> getSummaryOfCurrentSemesterCourses(Integer coopId) {
+    public HttpResponseResult<List<SummaryOfCurrentSemesterCoursesDto>> getSummaryOfCurrentSemesterCourses(@RequestHeader Integer coopId) {
         return succeed(courseScheduleService.getSummaryOfCurrentSemesterCourses(coopId));
     }
 
     @ApiOperation(value = "课时每周分组数据接口----获取当前学期每天课程汇总")
     @GetMapping("/getDailySummaryOfClassesForTheCurrentSemester")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "coopId", dataType = "Integer", required = true, value = "合作单位"),
-    })
-    public HttpResponseResult<Map<String, List<DailySummaryOfClassesForTheCurrentSemesterDto>>> getDailySummaryOfClassesForTheCurrentSemester(Integer coopId) {
+    public HttpResponseResult<Map<String, List<DailySummaryOfClassesForTheCurrentSemesterDto>>> getDailySummaryOfClassesForTheCurrentSemester(@RequestHeader Integer coopId) {
         return succeed(courseScheduleService.getDailySummaryOfClassesForTheCurrentSemester(coopId));
     }
 
     @ApiImplicitParams({
             @ApiImplicitParam(name = "classDate", dataType = "String", required = true, value = "上课时间（年月日）"),
-            @ApiImplicitParam(name = "coopId", dataType = "Integer", required = true, value = "合作单位"),
     })
     @ApiOperation(value = "课时每天课程数据详情----获取当天课程列表")
     @GetMapping("/queryListClassesForDay")
-    public HttpResponseResult<List<ClassesForDayDto>> queryListClassesForDay(Integer coopId,String classDate) {
+    public HttpResponseResult<List<ClassesForDayDto>> queryListClassesForDay(String classDate,@RequestHeader Integer coopId) {
         return succeed(courseScheduleService.getListClassesForDay(coopId,classDate));
     }
 

mec-web/src/main/java/com/ym/mec/web/controller/school/SchoolMusicGroupQuitController.java

@@ -0,0 +1,35 @@
+package com.ym.mec.web.controller.school;
+
+import com.ym.mec.biz.dal.school.dto.MusicGroupQuitPageDto;
+import com.ym.mec.biz.dal.school.page.MusicGroupQuitQueryInfo;
+import com.ym.mec.biz.service.MusicGroupQuitService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.page.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Slf4j
+@Validated
+@RestController
+@RequestMapping("/musicGroupQuit")
+@Api(tags = "学校学员退团服务")
+public class SchoolMusicGroupQuitController extends BaseController {
+
+    @Autowired
+    private MusicGroupQuitService musicGroupQuitService;
+
+
+	@ApiOperation(value = "分页查询")
+    @PostMapping("/queryPage")
+    public HttpResponseResult<PageInfo<MusicGroupQuitPageDto>> detail(@RequestBody MusicGroupQuitQueryInfo queryInfo,@RequestHeader Integer coopId) {
+        queryInfo.setCoopId(coopId);
+        return succeed(musicGroupQuitService.queryPageBySchool(queryInfo));
+	}
+}

mec-web/src/main/java/com/ym/mec/web/controller/school/SchoolTeacherAttendanceController.java

@@ -14,10 +14,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -31,15 +28,16 @@ public class SchoolTeacherAttendanceController extends BaseController {
 
     @ApiOperation(value = "首页教师考勤列表查询----获取本学期课程关联的老师列表，以及老师考勤状况汇总")
     @PostMapping("/queryTeacherAttendance")
-    public HttpResponseResult<List<TeacherAttendanceSumDto>> queryTeacherAttendance(TeacherAttendanceQueryInfo queryInfo){
+    public HttpResponseResult<List<TeacherAttendanceSumDto>> queryTeacherAttendance(@RequestBody TeacherAttendanceQueryInfo queryInfo,@RequestHeader Integer coopId){
+        queryInfo.setCoopId(coopId);
         return succeed(teacherAttendanceService.queryTeacherAttendance(queryInfo));
     }
 
     @ApiOperation(value = "获取单个老师本学期考勤汇总")
     @PostMapping("/getTeacherAttendance")
-    public HttpResponseResult<TeacherAttendanceSumDto> getTeacherAttendance(TeacherAttendanceQueryDto queryDto){
+    public HttpResponseResult<TeacherAttendanceSumDto> getTeacherAttendance(@RequestBody TeacherAttendanceQueryDto queryDto,@RequestHeader Integer coopId){
         TeacherAttendanceQueryInfo queryInfo = new TeacherAttendanceQueryInfo();
-        queryInfo.setCoopId(queryDto.getCoopId());
+        queryInfo.setCoopId(coopId);
         queryInfo.setTeacherId(queryDto.getTeacherId());
         queryInfo.setClassGroupId(queryDto.getClassGroupId());
         List<TeacherAttendanceSumDto> sumDtos = teacherAttendanceService.queryTeacherAttendance(queryInfo);