Merge branch 'reg_progress_20210318'

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

@@ -578,7 +578,7 @@
     </select>
 
     <select id="getMusicGroupCalenderBatchNoTimes" resultMap="MusicGroupPaymentCalender">
-        SELECT music_group_id_, COUNT(*) expect_num_ FROM music_group_payment_calender
+        SELECT batch_no_, 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_
@@ -593,13 +593,13 @@
     </select>
 
     <select id="getMusicGroupCalenderBatchNoByIds" resultMap="MusicGroupPaymentCalender">
-        SELECT music_group_id_, COUNT(*) expect_num_ FROM music_group_payment_calender
+        SELECT music_group_id_,batch_no_, COUNT(*) expect_num_ FROM music_group_payment_calender
         WHERE music_group_id_ IN
         <foreach collection="ids" item="id" open="(" close=")" separator=",">
             #{id}
         </foreach>
         AND status_ IN ('AUDITING','NO', 'OPEN', 'OVER', 'PAID')
         AND batch_no_ IS NOT NULL
-        GROUP BY batch_no_
+        GROUP BY music_group_id_,batch_no_
     </select>
 </mapper>