merge

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

@@ -13,6 +13,7 @@ import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
+import com.ym.mec.biz.dal.enums.StudentMusicGroupStatusEnum;
 import com.ym.mec.biz.dal.enums.school.ESchoolStaffType;
 import com.ym.mec.biz.dal.mapper.SchoolStaffMapper;
 import com.ym.mec.biz.dal.wrapper.SchoolStaffWrapper;
@@ -570,6 +571,7 @@ public class SchoolStaffServiceImpl extends ServiceImpl<SchoolStaffMapper, Schoo
         // 学校乐团统计
         int orchestraNums = musicGroupDao.countMusicGroups(paramMap);
 
+        paramMap.put("studentStatus", StudentMusicGroupStatusEnum.NORMAL);
         // 学校在读学生
         int studentNums = studentDao.countMusicGroupStudents(paramMap);
 

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

@@ -1400,6 +1400,9 @@
             <if test="schoolId != null">
                 AND t1.cooperation_organ_id_ = #{schoolId}
             </if>
+            <if test="studentStatus != null">
+                AND t2.music_group_status_ = #{studentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+            </if>
         </where>
     </select>
 </mapper>