Merge remote-tracking branch 'origin/cloud_teacher_active_2021_09' into cloud_teacher_active_2021_09

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentDao.java

@@ -388,5 +388,5 @@ public interface StudentDao extends com.ym.mec.common.dal.BaseDAO<Integer, Stude
     /**
      * 标记进行中乐团在读学员+VIP、网管有课的学员
      */
-    void remarkCountFlag();
+    void remarkCountFlag(@Param("studentIds") List<Integer> studentIds);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentRegistrationDao.java

@@ -681,4 +681,10 @@ public interface StudentRegistrationDao extends BaseDAO<Long, StudentRegistratio
      * @return
      */
     List<Integer> findStudentIds();
+
+    /**
+     * 获取有会员团的学员
+     * @return
+     */
+    List<Integer> queryHasMemberGroupStudent();
 }

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

@@ -792,7 +792,9 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
         //清除标记
         studentDao.cleanCountFlag();
         //打标记
-        studentDao.remarkCountFlag();
+        //获取在会员团的学员
+        List<Integer> studentIds = studentRegistrationDao.queryHasMemberGroupStudent();
+        studentDao.remarkCountFlag(studentIds);
     }
 
     @Override
@@ -856,7 +858,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
         result.put("head",resultMap);
         String sort = queryInfo.getSort();
         if(StringUtils.isEmpty(sort)){
-            sort = "totalAmount";
+            sort = "targetFinishScale";
         }
         String order = queryInfo.getOrder();
         switch (sort){

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

@@ -1290,7 +1290,7 @@
         FROM student_registration sr
         LEFT JOIN music_group mg ON sr.music_group_id_=mg.id_
         WHERE mg.status_='PROGRESS'
-        AND sr.music_group_status_='NORMAL' AND mg.cloud_teacher_type_ != 2)
+        AND sr.music_group_status_='NORMAL')
         UNION ALL
         (SELECT
         cssp.user_id_
@@ -1302,5 +1302,11 @@
         AND cs.status_='NOT_START')) t
         LEFT JOIN sys_user su ON t.user_id_=su.id_
         WHERE su.del_flag_=0 AND t.user_id_ NOT IN (SELECT user_id_ FROM student WHERE subject_id_list_ REGEXP '21|25|26|27|28|29'))c)
+        <if test="studentIds != null and studentIds.size > 0">
+            AND user_id_ NOT IN
+            <foreach collection="studentIds" separator="," item="userId" open="(" close=")">
+                #{userId}
+            </foreach>
+        </if>
     </update>
 </mapper>

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

@@ -1697,4 +1697,9 @@
       WHERE cs.`group_type_` = 'MUSIC' AND cs.`status_` = 'OVER' AND mg.`status_` = 'PROGRESS'
       GROUP BY cssp.`user_id_` HAVING COUNT(cs.`id_`) > 4) AND sr.user_id_ NOT IN (SELECT user_id_ FROM student WHERE subject_id_list_ REGEXP '21|25|26|27|28|29')
     </select>
+    <select id="queryHasMemberGroupStudent" resultType="java.lang.Integer">
+        SELECT DISTINCT sr.user_id_ FROM student_registration sr
+        LEFT JOIN music_group mg ON mg.id_ = sr.music_group_id_
+        WHERE sr.music_group_status_ != 'QUIT' AND mg.ststus_ NOT IN ('CANCELED','CLOSE')
+    </select>
 </mapper>