Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -320,7 +320,7 @@
 		FROM
 			music_group_payment_calender_detail mgpcd
 		WHERE
-			mgpc.music_group_payment_calender_id_ = #{calenderId}
+			mgpcd.music_group_payment_calender_id_ = #{calenderId}
 	</select>
 
 	<select id="getUnusedPaymentCalenderWithMusicGroup" resultMap="MusicGroupPaymentCalenderDetail">

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

@@ -336,7 +336,7 @@
         WHERE
             mgpcd.music_group_payment_calender_id_ = mgpccs.music_group_payment_calender_id_
             AND mgpc.music_group_id_ = #{musicGroupId}
-            AND mgpcd.use_in_course_ = 1
+            AND mgpcd.use_in_course_ = 0
             AND mgpcd.user_id_ IN
             <foreach collection="studentIds" item="studentId" open="(" close=")" separator=",">
                 #{studentId}

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

@@ -59,7 +59,7 @@ public class MusicGroupSubjectPlanController extends BaseController {
     @ApiOperation(value = "根据科目编号和乐团编号获取乐团规划")
     @PostMapping("/findSubjectPlan")
     @PreAuthorize("@pcs.hasPermissions('musicGroupSubjectPlan/findSubjectPlan')")
-    public Object findSubjectPlan(String musicGroupId,Integer subjectId) throws Exception {
+    public Object findSubjectPlan(String musicGroupId,Integer subjectId) {
         if(StringUtils.isEmpty(musicGroupId) || subjectId == null){
             throw new BizException("参数校验失败");
         }