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/school/page/MusicGroupQuitQueryInfo.java

@@ -5,6 +5,8 @@ import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class MusicGroupQuitQueryInfo  extends QueryInfo {
 
@@ -13,4 +15,7 @@ public class MusicGroupQuitQueryInfo  extends QueryInfo {
 
     @ApiModelProperty(value = "合作单位编号",required = true)
     private Integer coopId;
+
+    @ApiModelProperty(value = "乐团编号",required = false)
+    private List<String> musicGroupIds;
 }

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

@@ -1,8 +1,6 @@
 package com.ym.mec.biz.service.impl;
 
-import com.ym.mec.biz.dal.dao.StudentRegistrationDao;
-import com.ym.mec.biz.dal.dao.SubjectDao;
-import com.ym.mec.biz.dal.dao.TeacherDao;
+import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.SimpleUserDto;
 import com.ym.mec.biz.dal.entity.StudentRegistration;
 import com.ym.mec.biz.dal.entity.Subject;
@@ -18,7 +16,6 @@ import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.ym.mec.biz.dal.dao.MusicGroupQuitDao;
 import com.ym.mec.biz.dal.entity.MusicGroupQuit;
 import com.ym.mec.biz.service.MusicGroupQuitService;
 import com.ym.mec.common.dal.BaseDAO;
@@ -41,6 +38,8 @@ public class MusicGroupQuitServiceImpl extends BaseServiceImpl<Long, MusicGroupQ
 	private StudentRegistrationDao studentRegistrationDao;
 	@Autowired
 	private SysUserService sysUserService;
+	@Autowired
+	private MusicGroupDao musicGroupDao;
 
 	@Override
 	public BaseDAO<Long, MusicGroupQuit> getDAO() {
@@ -50,6 +49,12 @@ public class MusicGroupQuitServiceImpl extends BaseServiceImpl<Long, MusicGroupQ
     @Override
     public PageInfo<MusicGroupQuitPageDto> queryPageBySchool(MusicGroupQuitQueryInfo queryInfo) {
 		PageInfo<MusicGroupQuitPageDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+		//获取合作单位关联的所有乐团列表
+		List<String> musicGroupIds = musicGroupDao.findNormalByCooperationId(queryInfo.getCoopId());
+		if(CollectionUtils.isEmpty(musicGroupIds)){
+			return pageInfo;
+		}
+		queryInfo.setMusicGroupIds(musicGroupIds);
 		Map<String, Object> params = new HashMap<>();
 		MapUtil.populateMap(params, queryInfo);
 

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

@@ -215,10 +215,13 @@
         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_
+        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 test="musicGroupIds != null">
+                AND mgq.music_group_id_ IN
+                <foreach collection="musicGroupIds" item="groupId" open="(" close=")" separator=",">
+                    #{groupId}
+                </foreach>
             </if>
             <if test="status != null">
                 AND mgq.school_staff_audit_status_ = #{status}
@@ -234,8 +237,11 @@
         select COUNT(mgq.id_)
         from music_group_quit mgq
         <where>
-            <if test="coopId != null">
-                AND mgq.school_staff_audit_status_ = #{coopId}
+            <if test="musicGroupIds != null">
+                AND mgq.music_group_id_ IN
+                <foreach collection="musicGroupIds" item="groupId" open="(" close=")" separator=",">
+                    #{groupId}
+                </foreach>
             </if>
             <if test="status != null">
                 AND mgq.school_staff_audit_status_ = #{status}

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

@@ -19,7 +19,7 @@ import java.util.List;
 @Slf4j
 @Validated
 @RestController
-@RequestMapping("/musicGroupQuit")
+@RequestMapping("/schoolMusicGroupQuit")
 @Api(tags = "学校学员退团服务")
 public class SchoolMusicGroupQuitController extends BaseController {