|
@@ -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);
|
|
|
|