增加包含老师的合奏班子班列表

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

@@ -340,6 +340,7 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
 
     /**
      * 获取学生端，vip课程列表
+     *
      * @param musicGroupIds
      * @return
      */
@@ -347,6 +348,7 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
 
     /**
      * 获取学生端,学员乐团课列表详情
+     *
      * @param musicGroupIds
      * @return
      */
@@ -354,9 +356,17 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
 
     /**
      * 查询对应类型所有班级列表
+     *
      * @param musicGroupId
      * @param type
      * @return
      */
     List<ClassGroup> findClassGroupByMusicGroupIdAndType(@Param("musicGroupId") String musicGroupId, @Param("type") ClassGroupTypeEnum type);
+
+    /**
+     * 根据合奏班id获取子班及老师
+     * @param mixClassGroupId
+     * @return
+     */
+    List<ClassGroupTeachersDto> findClassGroupByMixClassGroupId(@Param("mixClassGroupId") Integer mixClassGroupId);
 }

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

@@ -289,4 +289,7 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
      * @return
      */
     List<ClassGroup> highClassGroupList(String musicGroupId);
+
+
+    List<ClassGroupTeachersDto> classGroupAndTeacher(int classGroupId);
 }

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

@@ -1408,4 +1408,25 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         }
         return classGroupList;
     }
+
+    @Override
+    public List<ClassGroupTeachersDto> classGroupAndTeacher(int classGroupId) {
+        List<ClassGroupTeachersDto> classGroups = classGroupDao.findClassGroupByMixClassGroupId(classGroupId);
+        String classGroupIds = "";
+        for (ClassGroupTeachersDto classGroupTeachersDto : classGroups) {
+            classGroupIds += classGroupTeachersDto.getId() + ",";
+        }
+        classGroupIds = classGroupIds.substring(0, classGroupIds.length() - 1);
+
+        List<ClassGroupTeacherMapper> classGroupTeachers = classGroupTeacherMapperDao.findClassGroupTeachers(classGroupIds);
+        for (ClassGroupTeachersDto classGroup : classGroups) {
+            List<ClassGroupTeacherMapper> classGroupTeacherMappers = new ArrayList<>();
+            for (ClassGroupTeacherMapper classGroupTeacher : classGroupTeachers) {
+                if (!classGroup.getId().equals(classGroupTeacher.getUserId())) continue;
+                classGroupTeacherMappers.add(classGroupTeacher);
+            }
+            classGroup.setClassGroupTeacherMapperList(classGroupTeacherMappers);
+        }
+        return classGroups;
+    }
 }

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

@@ -646,4 +646,11 @@
         </if>
          AND del_flag_='0'
     </select>
+
+    <!-- 根据合奏班id获取子班及老师 -->
+    <select id="findClassGroupByMixClassGroupId" resultMap="ClassGroupTeachers">
+        SELECT * FROM class_group WHERE id_ IN
+        (SELECT sub_class_group_id_ FROM class_group_relation
+        WHERE class_group_id_ = #{mixClassGroupId}) AND del_flag_ = 0
+    </select>
 </mapper>

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

@@ -1,5 +1,6 @@
 package com.ym.mec.student.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
 import com.ym.mec.biz.dal.enums.OrderTypeEnum;
@@ -8,6 +9,8 @@ import com.ym.mec.biz.service.StudentPaymentOrderService;
 import com.ym.mec.biz.service.StudentRegistrationService;
 import com.ym.mec.biz.service.VipGroupService;
 import com.ym.mec.thirdparty.union.NotifyMsg;
+import com.ym.mec.thirdparty.yqpay.Msg;
+import com.ym.mec.thirdparty.yqpay.YqPayUtil;
 import io.swagger.annotations.Api;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -17,11 +20,15 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
 @RequestMapping("studentOrder")
 @Api(tags = "订单回调")
 @RestController
 public class StudentOrderController {
-    private static final Logger log = LoggerFactory.getLogger(StudentOrderController.class);
+    private static final Logger logger = LoggerFactory.getLogger(StudentOrderController.class);
     @Autowired
     private StudentPaymentOrderService studentPaymentOrderService;
     @Autowired
@@ -75,5 +82,4 @@ public class StudentOrderController {
     }
 
 
-    //
 }

mec-web/src/main/java/com/ym/mec/web/controller/ClassGroupController.java

@@ -225,4 +225,12 @@ public class ClassGroupController extends BaseController {
         return succeed(classGroupService.highClassGroupList(musicGroupId));
     }
 
+    @ApiOperation(value = "合奏子班列表（班级调整）")
+    @PostMapping("/classGroupAndTeacher")
+    @PreAuthorize("@pcs.hasPermissions('classGroup/classGroupAndTeacher')")
+    @ApiImplicitParams({@ApiImplicitParam(name = "classGroupId", value = "班级id", required = true, dataType = "int")})
+    public HttpResponseResult classGroupAndTeacher(int classGroupId) throws Exception {
+        return succeed(classGroupService.classGroupAndTeacher(classGroupId));
+    }
+
 }