缴费名单H5改版,乐团修改教学点--打卡地点对应更改,乐团调整0元收费跳过收费

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

@@ -703,4 +703,12 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
      */
     Integer countCurrentTimes(@Param("classGroupId") Integer classGroupId,
                               @Param("currentCourseDate") Date currentCourseDate);
+
+    /**
+     * 修改未上课程教学点
+     * @param groupType
+     * @param musicGroupId
+     * @param schoolId
+     */
+    void updateCourseScheduleSchool(@Param("groupType") String groupType,@Param("musicGroupId") String musicGroupId,@Param("schoolId") Integer schoolId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/page/queryMusicGroupStudentQueryInfo.java

@@ -10,6 +10,16 @@ public class queryMusicGroupStudentQueryInfo extends QueryInfo {
 
     private Integer subjectId;
 
+    private String paymentStatus;
+
+    public String getPaymentStatus() {
+        return paymentStatus;
+    }
+
+    public void setPaymentStatus(String paymentStatus) {
+        this.paymentStatus = paymentStatus;
+    }
+
     public String getMusicGroupId() {
         return musicGroupId;
     }

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

@@ -1527,10 +1527,14 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             throw new Exception("用户信息获取失败");
         }
         String musicGroupId = subFeeSettingDto.getMusicGroup().getId();
-        if(musicGroupDao.get(musicGroupId) == null){
+        MusicGroup group = musicGroupDao.get(musicGroupId);
+        MusicGroup musicGroup = subFeeSettingDto.getMusicGroup();
+        if(group == null){
             throw new Exception("乐团信息不存在");
+        }else if(group.getSchoolId() != musicGroup.getSchoolId()){
+            //如果已生成课表，那么修改未上课时教学点
+            courseScheduleDao.updateCourseScheduleSchool("MUSIC",musicGroupId,musicGroup.getSchoolId());
         }
-        MusicGroup musicGroup = subFeeSettingDto.getMusicGroup();
 
         Date date = new Date();
         List<Integer> months = subFeeSettingDto.getMonths();

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

@@ -957,6 +957,10 @@
         UPDATE course_schedule SET status_ = #{status}
         WHERE id_=#{courseScheduleId}
     </update>
+    <update id="updateCourseScheduleSchool">
+        UPDATE course_schedule cs SET cs.schoole_id_ = #{schoolId} WHERE cs.music_group_id_ = #{musicGroupId}
+        AND cs.group_type_ = 'MUSIC' AND NOW() &lt; CONCAT(cs.class_date_," ",cs.start_class_time_);
+    </update>
 
     <select id="queryNoSignInListByBeforeMinutes" resultMap="CourseSchedule">
         SELECT cs.* FROM course_schedule cs left join teacher_attendance ta on ta.course_schedule_id_ = cs.id_ WHERE ta.sign_in_time_ is null and SUBTIME(start_class_time_, CONCAT(#{minutes},'00')) &lt; CURRENT_TIME()

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

@@ -460,6 +460,9 @@
             <if test="subjectId != null">
                 AND sr.actual_subject_id_ = #{subjectId}
             </if>
+            <if test="paymentStatus != null">
+                AND sr.payment_status_ = #{paymentStatus}
+            </if>
         </where>
     </sql>
     <select id="countMusicGroupStudentApply" resultType="java.lang.Integer">