1、批量调整bug修复

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

@@ -222,4 +222,5 @@ public interface CourseScheduleTeacherSalaryDao extends BaseDAO<Long, CourseSche
 	 * @return
 	 */
 	int deleteByMusicGroupId(@Param("musicGroupId")String musicGroupId, @Param("groupType")GroupType groupType);
+
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/VipGroupCourseSchduleRecordDto.java

@@ -3,6 +3,7 @@ package com.ym.mec.biz.dal.dto;
 import com.ym.mec.biz.dal.enums.CourseStatusEnum;
 import com.ym.mec.biz.dal.enums.TeachModeEnum;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+import com.ym.mec.util.date.DateUtil;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
@@ -19,9 +20,13 @@ public class VipGroupCourseSchduleRecordDto {
     @ApiModelProperty(value = "上课时间")
     private java.util.Date startClassTime;
 
+    private String startClassTimeStr;
+
     @ApiModelProperty(value = "课程结束时间")
     private Date endClassTime;
 
+    private String endClassTimeStr;
+
     @ApiModelProperty(value = "课程状态  NOT_START未开始，SIGN_IN已签到，SIGN_OUT已签退")
     private CourseStatusEnum status;
 
@@ -38,6 +43,23 @@ public class VipGroupCourseSchduleRecordDto {
 
     private Integer schooleId;
 
+    public String getStartClassTimeStr() {
+        return startClassTimeStr;
+    }
+
+    public void setStartClassTimeStr(String startClassTimeStr) {
+        this.startClassTimeStr = startClassTimeStr;
+    }
+
+    public String getEndClassTimeStr() {
+        return endClassTimeStr;
+    }
+
+    public void setEndClassTimeStr(String endClassTimeStr) {
+        this.endClassTimeStr = endClassTimeStr;
+        this.endClassTimeStr = DateUtil.dateToString(endClassTime,"HH:mm");
+    }
+
     public Date getEndClassTime() {
         return endClassTime;
     }
@@ -76,6 +98,7 @@ public class VipGroupCourseSchduleRecordDto {
 
     public void setStartClassTime(Date startClassTime) {
         this.startClassTime = startClassTime;
+        this.startClassTimeStr = DateUtil.dateToString(startClassTime,"HH:mm");
     }
 
     public CourseStatusEnum getStatus() {

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

@@ -928,6 +928,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 					courseSchedules.get(courseStartDates.size()-1).setClassDate(courseStartTime);
 					courseSchedules.get(courseStartDates.size()-1).setStartClassTime(courseStartTime);
 					courseSchedules.get(courseStartDates.size()-1).setEndClassTime(courseEndTime);
+					int settlementNum = courseScheduleTeacherSalaryDao.checkCourseIsSettlement(courseSchedules.get(courseStartDates.size()-1).getId().intValue());
+					if(settlementNum>0){
+						throw new BizException("选择的课程中存在已结算的课程");
+					}
 					int num=studentAttendanceDao.countStudentAttendenceNum(courseSchedules.get(courseStartDates.size()-1).getId().intValue());
 					if(num>0){
 						throw new BizException("选择的课程中存在已经点名的课程");

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

@@ -382,8 +382,8 @@
 			</foreach>
 		GROUP BY course_schedule_id_
 	</select>
-	
-	<delete id="deleteByMusicGroupId" parameterType="map" >
+
+    <delete id="deleteByMusicGroupId" parameterType="map" >
 		DELETE cssp FROM course_schedule_teacher_salary cssp left join course_schedule cs on cssp.course_schedule_id_ = cs.id_ WHERE cssp.music_group_id_=#{musicGroupId} AND cssp.group_type_=#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler} and cs.status_ = 'NOT_START'
 	</delete>
 </mapper>