管乐迷评测记录详情

mec-application/src/main/java/com/ym/mec/web/controller/education/EduCooperationOrganController.java

@@ -43,10 +43,7 @@ public class EduCooperationOrganController extends BaseController {
 
     @ApiOperation(value = "合作单位的乐团")
     @GetMapping("/musicGroupPage")
-    public HttpResponseResult<List<MusicGroup>> musicGroupPage(@RequestHeader Integer coopId) {
-        if (coopId == null) {
-            return succeed();
-        }
-        return succeed(cooperationOrganService.musicGroupPage(coopId));
+    public HttpResponseResult<List<MusicGroup>> musicGroupPage(String organId,String coopId) {
+        return succeed(cooperationOrganService.musicGroupPage(organizationService.getEmployeeOrgan(organId),coopId));
     }
 }

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

@@ -0,0 +1,33 @@
+package com.ym.mec.web.controller.school;
+
+import com.ym.mec.biz.dal.entity.MusicGroup;
+import com.ym.mec.biz.service.CooperationOrganService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@RequestMapping("${app-config.url.web:}/schoolCooperationOrgan")
+@Api(tags = "合作单位(教学点)服务")
+@RestController
+public class SchoolCooperationOrganController extends BaseController {
+
+    @Resource
+    private CooperationOrganService cooperationOrganService;
+
+    @ApiOperation(value = "合作单位的乐团")
+    @GetMapping("/musicGroupPage")
+    public HttpResponseResult<List<MusicGroup>> musicGroupPage(@RequestHeader Integer coopId) {
+        if (coopId == null) {
+            return succeed();
+        }
+        return succeed(cooperationOrganService.musicGroupPage(coopId));
+    }
+}

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

@@ -412,6 +412,8 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
      */
     List<MusicGroup> findByCooperationId(@Param("cooperationId") Integer cooperationOrganId);
 
+    List<MusicGroup> findByCoopIdAndOrganId(@Param("organIds") String organIds, @Param("coopId") String coopId);
+
     /**
      * 批量修改乐团主管
      *

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

@@ -43,4 +43,6 @@ public interface CooperationOrganService extends BaseService<Integer, Cooperatio
     Map<Integer,CooperationOrgan> getMapByIds(List<Integer> cooperationIds);
 
     List<MusicGroup> musicGroupPage(Integer id);
+
+    List<MusicGroup> musicGroupPage(String organIds,String coopId);
 }

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

@@ -236,9 +236,20 @@ public class CooperationOrganServiceImpl extends BaseServiceImpl<Integer, Cooper
     }
 
     @Override
-    public List<MusicGroup> musicGroupPage(Integer id) {
+    public List<MusicGroup> musicGroupPage(Integer coopId) {
 
-        List<MusicGroup> musicGroupList = musicGroupDao.findByCooperationId(id);
+        List<MusicGroup> musicGroupList = musicGroupDao.findByCooperationId(coopId);
+
+        if (CollectionUtils.isEmpty(musicGroupList)) {
+            return Collections.emptyList();
+        }
+        return musicGroupList.stream().filter(o -> o.getStatus().equals(MusicGroupStatusEnum.PROGRESS)).collect(Collectors.toList());
+    }
+
+    @Override
+    public List<MusicGroup> musicGroupPage(String organIds,String coopId) {
+
+        List<MusicGroup> musicGroupList = musicGroupDao.findByCoopIdAndOrganId(organIds,coopId);
 
         if (CollectionUtils.isEmpty(musicGroupList)) {
             return Collections.emptyList();

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

@@ -925,6 +925,16 @@
           AND del_flag_ = 0
     </select>
 
+    <select id="findByCoopIdAndOrganId" resultMap="MusicGroup">
+        SELECT *
+        FROM music_group
+        WHERE FIND_IN_SET(organ_id_,#{organIds})
+        <if test="coopId != null and coopId != ''">
+            AND FIND_IN_SET(cooperation_organ_id_,#{coopId})
+        </if>
+        AND del_flag_ = 0
+    </select>
+
     <select id="getStudentLastMusicGroup" resultMap="MusicGroup">
         SELECT mg.*
         FROM music_group mg