update

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

@@ -1749,4 +1749,11 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
      * @return
      */
     List<CourseSchedule> findCoursesByClassGroupIdAndCourseIds(@Param("classGroupId") Long classGroupId, @Param("allLockCourseIds") List<Long> allLockCourseIds);
+
+    /**
+     * 获取班级总剩余时长
+     * @param masterClassGroupId
+     * @return
+     */
+    Integer queryTotalCourseTimes(Integer masterClassGroupId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupStudentClassAdjust.java

@@ -28,6 +28,9 @@ public class MusicGroupStudentClassAdjust {
 	@ApiModelProperty(value = "班级可排课时长", required = false)
 	private String classCourseMinute;
 
+	@ApiModelProperty(value = "主班剩余总时长", required = false)
+	private Integer masterClassCourseTimes;
+
 	@ApiModelProperty(value = "老师选择的每种类型的排课时长", required = false)
 	private String defaultCourseTypeMinute;
 
@@ -55,6 +58,14 @@ public class MusicGroupStudentClassAdjust {
 
 	private Date updateTime;
 
+	public Integer getMasterClassCourseTimes() {
+		return masterClassCourseTimes;
+	}
+
+	public void setMasterClassCourseTimes(Integer masterClassCourseTimes) {
+		this.masterClassCourseTimes = masterClassCourseTimes;
+	}
+
 	public Integer getMasterClassGroupId() {
 		return masterClassGroupId;
 	}

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

@@ -3739,6 +3739,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         musicGroupStudentClassAdjust.setOperatorId(sysUser.getId());
         musicGroupStudentClassAdjust.setClassGroupIds(JSON.toJSONString(classGroupIds));
         musicGroupStudentClassAdjust.setStudentIds(JSON.toJSONString(studentIds));
+        musicGroupStudentClassAdjust.setMasterClassCourseTimes(courseScheduleDao.queryTotalCourseTimes(masterClassGroupId));
         if (classGroupStudents != null && classGroupStudents.size() > 0) {
             musicGroupStudentClassAdjust.setClassGroupStudents(JSON.toJSONString(mergeClassSplitClassAffirmDto.getClassGroupStudents()));
         }

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

@@ -230,6 +230,8 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 						}
 					}
 				}
+			}else if(paymentType == SPAN_GROUP_CLASS_ADJUST){
+				status = musicGroupPaymentCalenderDto.getStatus();
 			}
 		}
 

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

@@ -3503,4 +3503,9 @@
         </foreach>
         ORDER BY class_date_,start_class_time_ ASC
     </select>
+    <select id="queryTotalCourseTimes" resultType="java.lang.Integer">
+        SELECT SUM(ROUND((UNIX_TIMESTAMP(CONCAT(cs.class_date_,' ',cs.end_class_time_)) - UNIX_TIMESTAMP(CONCAT(cs.class_date_,' ',cs.start_class_time_)))/60))
+        FROM course_schedule cs
+        WHERE cs.class_group_id_ = #{classGroupId} AND CONCAT(cs.class_date_,' ',cs.start_class_time_) > NOW()
+    </select>
 </mapper>

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

@@ -14,6 +14,7 @@
 		<result column="class_group_ids_" property="classGroupIds" />
 		<result column="student_ids_" property="studentIds" />
 		<result column="class_course_minute_" property="classCourseMinute" />
+		<result column="master_class_course_times_" property="masterClassCourseTimes" />
 		<result column="default_course_type_minute_" property="defaultCourseTypeMinute" />
 		<result column="all_lock_course_ids_" property="allLockCourseIds" />
 		<result column="sub_lock_course_ids_" property="subLockCourseIds" />
@@ -39,15 +40,18 @@
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupStudentClassAdjust" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO music_group_student_class_adjust (music_group_id_,batch_no_,new_class_group_json_,
 		class_group_ids_,student_ids_,class_course_minute_,all_lock_course_ids_,sub_lock_course_ids_,
-		operator_id_,student_payment_ids_,class_group_students_,default_course_type_minute_,master_class_group_id_,create_time_,update_time_)
+		operator_id_,student_payment_ids_,class_group_students_,default_course_type_minute_,master_class_group_id_,master_class_course_times_,create_time_,update_time_)
 		VALUES(#{musicGroupId},#{batchNo},#{newClassGroupJson},#{classGroupIds},#{studentIds},
 		#{classCourseMinute},#{allLockCourseIds},#{subLockCourseIds},#{operatorId},#{studentPaymentIds},#{classGroupStudents},
-			   #{defaultCourseTypeMinute},#{masterClassGroupId},NOW(),NOW())
+			   #{defaultCourseTypeMinute},#{masterClassGroupId},#{masterClassCourseTimes},NOW(),NOW())
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.MusicGroupStudentClassAdjust">
 		UPDATE music_group_student_class_adjust <set>
+		<if test="masterClassCourseTimes != null">
+			master_class_course_times_ = #{masterClassCourseTimes},
+		</if>
 		<if test="masterClassGroupId != null">
 			master_class_group_id_ = #{masterClassGroupId},
 		</if>

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

@@ -165,7 +165,7 @@
             </if>
             <if test="temporaryCourseFee != null">#{temporaryCourseFee},</if>
             <if test="surplusCourseFee != null">#{surplus_course_fee_},</if>
-            <if test="createTime!=null">#{createTime},</if>
+            <if test="createTime!=null">NOW(),</if>
             <if test="updateTime!=null">NOW(),</if>
         </trim>
     </insert>