update routeList

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

@@ -662,14 +662,13 @@
     </select>
 
     <select id="findUserMusicGroupCooperationOrgan" resultMap="com.ym.mec.biz.dal.dao.CooperationOrganDao.CooperationOrgan">
-        SELECT co.name_,s.name_ linkman_
+        SELECT co.name_
         FROM music_group mg
         LEFT JOIN student_registration sr ON sr.music_group_id_ = mg.id_
         LEFT JOIN cooperation_organ co ON co.id_ = mg.cooperation_organ_id_
-        LEFT JOIN school s ON s.id_ = mg.school_id_
         WHERE sr.user_id_ = #{userId}
-        AND mg.status_ = 'PROGRESS'
-        AND sr.music_group_status_ = 'NORMAL'
+        AND mg.status_ IN ('PREPARE','PROGRESS','PAUSE','CLOSE')
+        AND sr.payment_status_ = 2
         ORDER BY sr.id_ ASC
         LIMIT 1
     </select>

mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -1210,10 +1210,6 @@ public class ExportController extends BaseController {
                 if (cooperationOrgan != null) {
                     row.setCooperationOrganName(cooperationOrgan.getName());
                 }
-                if (row.getSchoolName() == null && cooperationOrgan != null) {
-                    //linkman 赋予教学点值
-                    row.setSchoolName(cooperationOrgan.getLinkman());
-                }
             }
             if (row.getMusicGroupId() != null && row.getMusicGroupId().equals("null")) {
                 row.setMusicGroupId("");
@@ -2348,10 +2344,6 @@ public class ExportController extends BaseController {
                 if (cooperationOrgan != null) {
                     row.setCooperationOrganName(cooperationOrgan.getName());
                 }
-                if (row.getSchoolName() == null && cooperationOrgan != null) {
-                    //linkman 赋予教学点值
-                    row.setSchoolName(cooperationOrgan.getLinkman());
-                }
             }
             if (row.getMusicGroupId() != null && row.getMusicGroupId().equals("null")) {
                 row.setMusicGroupId("");