Merge branch 'feature/0427-school' of http://git.dayaedu.com/yonge/mec into feature/0427-school

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

@@ -4,20 +4,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.CourseScheduleStatistics;
 import org.apache.ibatis.annotations.Param;
 
-import com.ym.mec.biz.dal.dto.ClassGroupTeachersDto;
-import com.ym.mec.biz.dal.dto.ConditionDto;
-import com.ym.mec.biz.dal.dto.CourseListDto;
-import com.ym.mec.biz.dal.dto.HighClassGroupDto;
-import com.ym.mec.biz.dal.dto.Mapper;
-import com.ym.mec.biz.dal.dto.MusicGroupClassGroupDto;
-import com.ym.mec.biz.dal.dto.MusicGroupCourseScheduleDto;
-import com.ym.mec.biz.dal.dto.StudentPayInfoDto;
-import com.ym.mec.biz.dal.dto.SuperClassGroupDto;
-import com.ym.mec.biz.dal.dto.TeacherClassGroupDto;
-import com.ym.mec.biz.dal.dto.TeacherMusicClassInfoDto;
 import com.ym.mec.biz.dal.entity.ClassGroup;
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
@@ -874,4 +864,6 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
     int teachingPointRemind(@Param("cooperationOrganId") Integer cooperationOrganId);
 
     void updateTeachingPointById(@Param("param") ClassGroup classGroup);
+
+    List<BaseMapDto> queryClassGroup(@Param("coopId") Integer coopId);
 }

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

@@ -603,4 +603,13 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
      * @param classIds 班级id列表
      */
     List<ClassGroup> queryByIds(List<Integer> classIds);
+
+    /**
+    * @description: 根据合作单位获取班级列表
+     * @param coopId
+    * @return java.util.List<com.ym.mec.biz.dal.dto.BaseMapDto>
+    * @author zx
+    * @date 2023/5/9 14:09
+    */
+    List<BaseMapDto> queryClassGroup(Integer coopId);
 }

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

@@ -3441,6 +3441,11 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     }
 
     @Override
+    public List<BaseMapDto> queryClassGroup(Integer coopId) {
+        return classGroupDao.queryClassGroup(coopId);
+    }
+
+    @Override
     public PageInfo<MusicGroupCourseScheduleDto> queryMusicGroupCourseScheduleDetail(queryMusicGroupCourseScheduleQueryInfo queryInfo) {
         PageInfo<MusicGroupCourseScheduleDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
         Map<String, Object> params = new HashMap<>();

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

@@ -1665,6 +1665,13 @@
         and mg.del_flag_ = 0
         and (cg.teaching_point_ is null or cg.teaching_point_ = '')
     </select>
+    <select id="queryClassGroup" resultType="com.ym.mec.biz.dal.dto.BaseMapDto">
+        SELECT cg.id_ 'key',cg.name_ 'value'
+        from  class_group cg
+        left join music_group mg on mg.id_ = cg.music_group_id_
+        where mg.cooperation_organ_id_ = #{coopId}
+        and cg.del_flag_ = 0 and mg.del_flag_ = 0
+    </select>
 
     <update id="updateTeachingPointById">
         update class_group set teaching_point_ = #{param.teachingPoint} where id_ = #{param.id}

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

@@ -0,0 +1,42 @@
+package com.ym.mec.web.controller.school;
+
+import com.ym.mec.biz.dal.dto.BaseMapDto;
+import com.ym.mec.biz.dal.entity.ClassGroup;
+import com.ym.mec.biz.dal.school.dto.ClassesForDayDto;
+import com.ym.mec.biz.dal.school.dto.CourseStudentDto;
+import com.ym.mec.biz.dal.school.dto.DailySummaryOfClassesForTheCurrentSemesterDto;
+import com.ym.mec.biz.dal.school.dto.SummaryOfCurrentSemesterCoursesDto;
+import com.ym.mec.biz.service.ClassGroupService;
+import com.ym.mec.biz.service.CourseScheduleService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("schoolClassGroup")
+@Api(tags = "学校端班级服务")
+public class SchoolClassGroupController extends BaseController {
+
+    @Autowired
+    private ClassGroupService classGroupService;
+
+    @ApiOperation(value = "获取合作单位所有班级列表")
+    @GetMapping("/queryClassGroup")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "coopId", dataType = "Integer", required = true, value = "合作单位"),
+    })
+    public HttpResponseResult<List<BaseMapDto>> queryClassGroup(Integer coopId) {
+        return succeed(classGroupService.queryClassGroup(coopId));
+    }
+}