Merge branch 'reg_progress_20210318'

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

@@ -321,7 +321,7 @@ public interface MusicGroupPaymentCalenderDao extends BaseDAO<Long, MusicGroupPa
      * @param musicGroupId
      * @return
      */
-    List<Integer> getMusicGroupCalenderBatchNoTimes(@Param("musicGroupId") String musicGroupId);
+    List<MusicGroupPaymentCalender> getMusicGroupCalenderBatchNoTimes(@Param("musicGroupId") String musicGroupId);
 
     /**
      * 获取多乐团的报名缴费项

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

@@ -1636,7 +1636,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             if (regCalender == null) {
                 return "乐团没有报名缴费项";
             }
-            List<Integer> musicGroupCalenderBatchNoTimes = musicGroupPaymentCalenderDao.getMusicGroupCalenderBatchNoTimes(musicGroup.getId());
+            List<MusicGroupPaymentCalender> musicGroupCalenderBatchNoTimes = musicGroupPaymentCalenderDao.getMusicGroupCalenderBatchNoTimes(musicGroup.getId());
             if (musicGroupCalenderBatchNoTimes.size() > 1) {
                 return "乐团已建多批次缴费";
             }

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

@@ -577,8 +577,8 @@
         </foreach>
     </select>
 
-    <select id="getMusicGroupCalenderBatchNoTimes" resultType="java.lang.Integer">
-        SELECT COUNT(*) FROM music_group_payment_calender
+    <select id="getMusicGroupCalenderBatchNoTimes" resultMap="MusicGroupPaymentCalender">
+        SELECT music_group_id_, COUNT(*) expect_num_ FROM music_group_payment_calender
         WHERE music_group_id_ = #{musicGroupId}
         AND status_ IN ('AUDITING','NO', 'OPEN', 'OVER', 'PAID')
         GROUP BY batch_no_