Merge branch 'online1' of http://git.dayaedu.com/yonge/mec into system_fee_update

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

@@ -489,7 +489,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
             EduOrganStudentDataDto organStudentVipData = new EduOrganStudentDataDto();
             organStudentVipData.setTotalStudentNum(studentDao.getOrganStudentNum(queryInfo.getOrganId()));
             organStudentVipData.setVipStudentNum(cloudTeacherDao.getOrganVipStudentNum(queryInfo.getOrganId()));
-            organStudentVipData.seteVipStudentNum(studentDao.getOrganEVipStudentNum(queryInfo.getOrganId()));
+//            organStudentVipData.seteVipStudentNum(studentDao.getOrganEVipStudentNum(queryInfo.getOrganId()));
             organStudentVipData.setCloudStudyUseStudentNum(studentDao.getCloudStudyStudentNum(queryInfo.getOrganId()));
             organStudentVipData.setCloudStudyLivelyStudentNum(studentDao.getCloudStudyLivelyStudentNum(queryInfo.getOrganId()));
             organStudentVipData.setNewCloudStudyStudentNum(sysMusicCompareRecordDao.getOrganNewCloudStudyNum(queryInfo.getOrganId()));
@@ -521,11 +521,11 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
         if(!CollectionUtils.isEmpty(organsVipStudentNumMapList)){
             organsVipStudentNumMap = MapUtil.convertIntegerMap(organsVipStudentNumMapList);
         }
-        List<Map<Integer, Integer>> organsEVipStudentNumMapList = studentDao.getOrgansEVipStudentNum(organIds);
-        Map<String, Long> organsEVipStudentNumMap = new HashMap<>();
-        if(!CollectionUtils.isEmpty(organsEVipStudentNumMapList)){
-            organsEVipStudentNumMap = MapUtil.convertIntegerMap(organsEVipStudentNumMapList);
-        }
+//        List<Map<Integer, Integer>> organsEVipStudentNumMapList = studentDao.getOrgansEVipStudentNum(organIds);
+//        Map<String, Long> organsEVipStudentNumMap = new HashMap<>();
+//        if(!CollectionUtils.isEmpty(organsEVipStudentNumMapList)){
+//            organsEVipStudentNumMap = MapUtil.convertIntegerMap(organsEVipStudentNumMapList);
+//        }
         List<Map<Integer, Integer>> organCloudStudyStudentNumMapList = studentDao.getOrganCloudStudyStudentNum(organIds);
         Map<String, Long> organCloudStudyStudentNumMap = new HashMap<>();
         if(!CollectionUtils.isEmpty(organCloudStudyStudentNumMapList)){
@@ -554,9 +554,9 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
             if(organsVipStudentNumMap.containsKey(organ.getId().toString())){
                 organStudentVipData.setVipStudentNum(organsVipStudentNumMap.get(organ.getId().toString()).intValue());
             }
-            if(organsEVipStudentNumMap.containsKey(organ.getId().toString())){
-                organStudentVipData.seteVipStudentNum(organsEVipStudentNumMap.get(organ.getId().toString()).intValue());
-            }
+//            if(organsEVipStudentNumMap.containsKey(organ.getId().toString())){
+//                organStudentVipData.seteVipStudentNum(organsEVipStudentNumMap.get(organ.getId().toString()).intValue());
+//            }
             if(organCloudStudyStudentNumMap.containsKey(organ.getId().toString())){
                 organStudentVipData.setCloudStudyUseStudentNum(organCloudStudyStudentNumMap.get(organ.getId().toString()).intValue());
             }

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

@@ -835,13 +835,7 @@
         FROM student_registration sr
         LEFT JOIN sys_user su ON sr.user_id_=su.id_
         WHERE su.del_flag_=0
-        AND sr.music_group_status_='NORMAL'
-        <if test="organIds!=null and organIds.size()>0">
-            AND su.organ_id_ IN
-            <foreach collection="organIds" item="organId" open="(" close=")" separator=",">
-                #{organId}
-            </foreach>
-        </if>)
+        AND sr.music_group_status_='NORMAL')
         UNION ALL
         (SELECT
         su.organ_id_,cssp.user_id_
@@ -852,13 +846,14 @@
         WHERE
         cssp.group_type_ IN ('VIP', 'PRACTICE')
         AND cs.status_='NOT_START'
-        AND su.del_flag_ = 0
+        AND su.del_flag_ = 0)) t
+        WHERE 1=1
         <if test="organIds!=null and organIds.size()>0">
-            AND su.organ_id_ IN
+            AND t.organ_id_ IN
             <foreach collection="organIds" item="organId" open="(" close=")" separator=",">
                 #{organId}
             </foreach>
-        </if>)) t
+        </if>
         GROUP BY t.organ_id_
     </select>
 
@@ -1052,7 +1047,7 @@
                  LEFT JOIN cloud_teacher_order cto ON stu.user_id_=cto.student_id_
                  LEFT JOIN sys_user su ON su.id_=stu.user_id_
         WHERE su.del_flag_=0 AND stu.experience_member_rank_setting_id_ IS NOT NULL
-        AND NOT EXISTS (SELECT student_id_ FROM cloud_teacher_order WHERE student_id_=stu.user_id_ AND status_ IN (1,2))
+        AND NOT IN (SELECT DISTINCT student_id_ FROM cloud_teacher_order WHERE status_ IN (1,2))
         <if test="organIds!=null and organIds.size()>0">
             AND su.organ_id_ IN
             <foreach collection="organIds" item="organId" open="(" close=")" separator=",">