浏览代码

1.处理分享时,查乐团的时候要过滤报名和退团的

yuanliang 2 年之前
父节点
当前提交
d3fcb0f892

+ 3 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseShareServiceImpl.java

@@ -16,6 +16,7 @@ import com.ym.mec.biz.dal.entity.CourseShare;
 import com.ym.mec.biz.dal.entity.Organization;
 import com.ym.mec.biz.dal.entity.Student;
 import com.ym.mec.biz.dal.enums.JoinCourseType;
+import com.ym.mec.biz.dal.enums.StudentMusicGroupStatusEnum;
 import com.ym.mec.biz.dal.page.CourseShareQueryInfo;
 import com.ym.mec.biz.service.CourseShareService;
 import com.ym.mec.biz.service.SysUserService;
@@ -116,6 +117,7 @@ public class CourseShareServiceImpl extends BaseServiceImpl<Integer, CourseShare
         }
         HashMap<String, Object> params = new HashMap<>();
         MapUtil.populateMap(params, courseShareDto);
+        params.put("musicGroupStatusList", Collections.singletonList(StudentMusicGroupStatusEnum.NORMAL.getCode()));
         List<StudentManageListDto> studentList = courseShareDao.selectStudentByParam(params);
         List<Integer> userIdList = studentList.stream()
                 .map(StudentManageListDto::getUserId).distinct().collect(Collectors.toList());
@@ -143,6 +145,7 @@ public class CourseShareServiceImpl extends BaseServiceImpl<Integer, CourseShare
         Map<String, Object> param = new HashMap<>();
         MapUtil.populateMap(param, shareQueryInfo);
         param.put(TENANT_ID, courseSchedule.getTenantId());
+        param.put("musicGroupStatusList", Collections.singletonList(StudentMusicGroupStatusEnum.NORMAL.getCode()));
         Page<StudentManageListDto> pageInfo = PageUtil.getPageInfo(param);
         return PageUtil.pageInfo(courseShareDao.selectStudentByParam(pageInfo, param));
     }

+ 7 - 0
mec-biz/src/main/resources/config/mybatis/CourseShareMapper.xml

@@ -114,6 +114,7 @@
         LEFT JOIN organization o ON o.id_ = su.organ_id_
         LEFT JOIN `subject` sb ON sb.id_ = s.subject_id_list_
         LEFT JOIN cooperation_organ co on co.id_ = s.cooperation_organ_id_
+        left join student_registration sr on s.user_id_ = sr.user_id_
         <choose>
             <when test="param.teamIds != null and param.teamIds.trim != ''">
                 INNER JOIN
@@ -161,6 +162,12 @@
                 or su.username_ like concat('%',#{param.search},'%')
                 )
             </if>
+            <if test="param.musicGroupStatusList != null and param.musicGroupStatusList.size() > 0">
+               AND sr.music_group_status_ IN
+                <foreach collection="param.musicGroupStatusList" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
         </where>
     </select>