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

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

@@ -51,6 +51,6 @@ public interface ClassGroupTeacherMapperDao extends BaseDAO<Long, ClassGroupTeac
      * @param musicGroupId:
      * @return java.util.List<com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper>
      */
-    List<ClassGroupTeacherMapper> findByMusicGroup(Long musicGroupId);
+    List<ClassGroupTeacherMapper> findByMusicGroup(String musicGroupId);
 
 }

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

@@ -285,6 +285,15 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
     List<TeacherClassCourseSchudeleDto> queryTeacherClassCourseSchedule(Map<String,Object> params);
 
     /**
+     * @describe 查询老师指定班级历史排课信息
+     * @author Joburgess
+     * @date 2019/10/19
+     * @param params:
+     * @return java.util.List<com.ym.mec.biz.dal.dto.TeacherClassCourseSchudeleDto>
+     */
+    List<TeacherClassCourseSchudeleDto> queryTeacherHistoryClassCourseSchedule(Map<String,Object> params);
+
+    /**
      * @describe 统计老师指定班级的排课数量
      * @author Joburgess
      * @date 2019/10/18
@@ -294,11 +303,20 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
     int countTeacherClassCourseSchedule(Map<String,Object> params);
 
     /**
+     * @describe 统计历史老师指定班级的排课数量
+     * @author Joburgess
+     * @date 2019/10/19
+     * @param params:
+     * @return int
+     */
+    int countTeacherHistoryClassCourseSchedule(Map<String,Object> params);
+
+    /**
      * @describe 统计乐团下班级的排课数
      * @author Joburgess
      * @date 2019/10/18
      * @param musicGroupId:
      * @return java.util.List<java.util.Map<java.lang.Long,java.lang.Integer>>
      */
-    List<Map<Long,Integer>> countClassCourseNumByMusicGroup(Long musicGroupId);
+    List<Map<Integer,Long>> countClassCourseNumByMusicGroup(Long musicGroupId);
 }

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

@@ -4,9 +4,12 @@ import com.ym.mec.biz.dal.dto.VipGroupSalaryDto;
 import com.ym.mec.biz.dal.entity.CourseScheduleTeacherSalary;
 import com.ym.mec.common.dal.BaseDAO;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.ibatis.annotations.Param;
+
 public interface CourseScheduleTeacherSalaryDao extends BaseDAO<Long, CourseScheduleTeacherSalary> {
 
     /**
@@ -38,10 +41,21 @@ public interface CourseScheduleTeacherSalaryDao extends BaseDAO<Long, CourseSche
     List<CourseScheduleTeacherSalary> findSomeDayAgoTeacherCourseSalaryNoSettlement(Integer days);
 
     /**
-     * 查询老师指定课程的课酬
-     * @param courseScheduleId
-     * @param teacherId
-     * @return
-     */
-    CourseScheduleTeacherSalary queryByCourseScheduleIdAndUserId(Long courseScheduleId,Integer teacherId);
+	 * 查询老师指定课程的课酬
+	 * @param courseScheduleId
+	 * @param teacherId
+	 * @return
+	 */
+	CourseScheduleTeacherSalary queryByCourseScheduleIdAndUserId(@Param("courseScheduleId") Long courseScheduleId, @Param("teacherId") Integer teacherId);
+	
+	/**
+	 * 批量更新指定老师所教学班级的报酬（课酬、补贴）
+	 * @param classGrpupId 班级编号
+	 * @param userId 老师编号
+	 * @param salary 课酬
+	 * @param subsidy 补贴
+	 * @return
+	 */
+	int batchUpdateWages(@Param("classGrpupId") Integer classGrpupId, @Param("userId") Integer userId, @Param("salary") BigDecimal salary,
+			@Param("subsidy") BigDecimal subsidy);
 }

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

@@ -2,12 +2,9 @@ package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.BasicUserDto;
-import com.ym.mec.biz.dal.dto.NamesDto;
 import com.ym.mec.biz.dal.dto.TeacherCloseDto;
 import com.ym.mec.biz.dal.entity.Teacher;
 import com.ym.mec.common.dal.BaseDAO;
-
-import com.ym.mec.common.entity.ImGroupModel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -75,4 +72,13 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
      * @return
      */
     List<TeacherCloseDto> queryCloses(Map<String, Object> params);
+
+    /**
+     * @describe 获取指定乐团下的所有老师
+     * @author Joburgess
+     * @date 2019/10/19
+     * @param musicGroupId: 乐团编号
+     * @return java.util.List<com.ym.mec.biz.dal.dto.BasicUserDto>
+     */
+    List<BasicUserDto> findTeacherByMusicGroup(Long musicGroupId);
 }

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

@@ -9,15 +9,15 @@ import java.util.List;
  * @Date 2019/10/18
  */
 public class CreateCourseScheduleDto {
-    private Long musicGroupID;
+    private String musicGroupID;
 
     private List<CourseSchedule> courseSchedules;
 
-    public Long getMusicGroupID() {
+    public String getMusicGroupID() {
         return musicGroupID;
     }
 
-    public void setMusicGroupID(Long musicGroupID) {
+    public void setMusicGroupID(String musicGroupID) {
         this.musicGroupID = musicGroupID;
     }
 

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

@@ -74,6 +74,28 @@ public class TeacherAttendanceDto {
     @ApiModelProperty(value = "只能正常签到")
     private YesOrNoEnum onlyNormal;
 
+    @ApiModelProperty(value = "总统课次",required = false)
+    private Integer totalClassTimes;
+
+    @ApiModelProperty(value = "当前课次",required = false)
+    private Integer currentClassTimes;
+
+    public Integer getTotalClassTimes() {
+        return totalClassTimes;
+    }
+
+    public void setTotalClassTimes(Integer totalClassTimes) {
+        this.totalClassTimes = totalClassTimes;
+    }
+
+    public Integer getCurrentClassTimes() {
+        return currentClassTimes;
+    }
+
+    public void setCurrentClassTimes(Integer currentClassTimes) {
+        this.currentClassTimes = currentClassTimes;
+    }
+
     public YesOrNoEnum getOnlyNormal() {
         return onlyNormal;
     }

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

@@ -48,6 +48,40 @@ public class TeacherClassCourseSchudeleDto {
     @ApiModelProperty(value = "请假人数")
     private Integer leaveStudentNum;
 
+    @ApiModelProperty(value = "当前课时")
+    private Integer currentClassTimes;
+
+    @ApiModelProperty(value = "总课次",required = true)
+    private Integer totalClassTimes;
+
+    @ApiModelProperty(value = "上课学生名称")
+    private String studentNames;
+
+
+    public String getStudentNames() {
+        return studentNames;
+    }
+
+    public void setStudentNames(String studentNames) {
+        this.studentNames = studentNames;
+    }
+
+    public Integer getCurrentClassTimes() {
+        return currentClassTimes;
+    }
+
+    public void setCurrentClassTimes(Integer currentClassTimes) {
+        this.currentClassTimes = currentClassTimes;
+    }
+
+    public Integer getTotalClassTimes() {
+        return totalClassTimes;
+    }
+
+    public void setTotalClassTimes(Integer totalClassTimes) {
+        this.totalClassTimes = totalClassTimes;
+    }
+
     public Integer getStudentNum() {
         return studentNum;
     }

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

@@ -65,6 +65,39 @@ public class TeacherClassGroupDto {
     @ApiModelProperty(value = "班级学生名称")
     private String studentNames;
 
+    @ApiModelProperty(value = "线上课数")
+    private Integer onlineClassesNum;
+
+    @ApiModelProperty(value = "线下课数")
+    private Integer offLineClassesNum;
+
+    @ApiModelProperty(value = "教学形式")
+    private Integer classMode;
+
+    public Integer getClassMode() {
+        return classMode;
+    }
+
+    public void setClassMode(Integer classMode) {
+        this.classMode = classMode;
+    }
+
+    public Integer getOnlineClassesNum() {
+        return onlineClassesNum;
+    }
+
+    public void setOnlineClassesNum(Integer onlineClassesNum) {
+        this.onlineClassesNum = onlineClassesNum;
+    }
+
+    public Integer getOffLineClassesNum() {
+        return offLineClassesNum;
+    }
+
+    public void setOffLineClassesNum(Integer offLineClassesNum) {
+        this.offLineClassesNum = offLineClassesNum;
+    }
+
     public String getStudentNames() {
         return studentNames;
     }

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

@@ -104,6 +104,8 @@ public class CourseSchedule {
 
 	@ApiModelProperty(value = "请假人数")
 	private Integer leaveStudentNum;
+	
+	private Integer schoolId;
 
 	public String getStartClassTimeStr() {
 		return startClassTimeStr;
@@ -277,6 +279,14 @@ public class CourseSchedule {
 		this.name = name;
 	}
 
+	public Integer getSchoolId() {
+		return schoolId;
+	}
+
+	public void setSchoolId(Integer schoolId) {
+		this.schoolId = schoolId;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -31,6 +31,8 @@ public class CourseScheduleStudentPayment {
 	/** 结算时间 */
 	private java.util.Date settlementTime;
 	
+	private Integer classGroupId;
+	
 	public void setId(Long id){
 		this.id = id;
 	}
@@ -95,6 +97,14 @@ public class CourseScheduleStudentPayment {
 		return this.settlementTime;
 	}
 			
+	public Integer getClassGroupId() {
+		return classGroupId;
+	}
+
+	public void setClassGroupId(Integer classGroupId) {
+		this.classGroupId = classGroupId;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -27,7 +27,7 @@ public class CourseScheduleTeacherSalary {
 	private java.util.Date createTime;
 	
 	/**  */
-	private java.util.Date createUpdate;
+	private java.util.Date updateTime;
 	
 	/** 补贴 */
 	private java.math.BigDecimal subsidy;
@@ -38,6 +38,8 @@ public class CourseScheduleTeacherSalary {
 	/** 结算时间 */
 	private java.util.Date settlementTime;
 	
+	private Integer classGroupId;
+	
 	public void setId(Long id){
 		this.id = id;
 	}
@@ -86,14 +88,14 @@ public class CourseScheduleTeacherSalary {
 		return this.createTime;
 	}
 			
-	public void setCreateUpdate(java.util.Date createUpdate){
-		this.createUpdate = createUpdate;
+	public java.util.Date getUpdateTime() {
+		return updateTime;
 	}
-	
-	public java.util.Date getCreateUpdate(){
-		return this.createUpdate;
+
+	public void setUpdateTime(java.util.Date updateTime) {
+		this.updateTime = updateTime;
 	}
-			
+
 	public void setSubsidy(java.math.BigDecimal subsidy){
 		this.subsidy = subsidy;
 	}
@@ -118,6 +120,14 @@ public class CourseScheduleTeacherSalary {
 		return this.settlementTime;
 	}
 			
+	public Integer getClassGroupId() {
+		return classGroupId;
+	}
+
+	public void setClassGroupId(Integer classGroupId) {
+		this.classGroupId = classGroupId;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -50,7 +50,7 @@ public class VipGroup {
 
 	/** 教学点 */
 	@ApiModelProperty(value = "教学点", required = false)
-	private Long teacherSchoolId;
+	private Integer teacherSchoolId;
 
 	/** 线上课课时数 */
 	@ApiModelProperty(value = "线上课课时数", required = false)
@@ -101,8 +101,6 @@ public class VipGroup {
 	
 	private Integer organId;
 	
-	private Integer schoolId;
-
 	public String getVipGroupActivityName() {
 		return vipGroupActivityName;
 	}
@@ -263,11 +261,11 @@ public class VipGroup {
 		return this.updateTime;
 	}
 
-	public void setTeacherSchoolId(Long teacherSchoolId) {
+	public void setTeacherSchoolId(Integer teacherSchoolId) {
 		this.teacherSchoolId = teacherSchoolId;
 	}
 
-	public Long getTeacherSchoolId() {
+	public Integer getTeacherSchoolId() {
 		return this.teacherSchoolId;
 	}
 
@@ -319,14 +317,6 @@ public class VipGroup {
 		this.organId = organId;
 	}
 
-	public Integer getSchoolId() {
-		return schoolId;
-	}
-
-	public void setSchoolId(Integer schoolId) {
-		this.schoolId = schoolId;
-	}
-
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -20,12 +20,23 @@ public class StudentAttendanceQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "班级ID")
     private Long classGroupId;
 
+    @ApiModelProperty(value = "课程ID")
+    private Long courseScheduleId;
+
     @ApiModelProperty(value = "状态（正常、旷课、请假、休学）",required = false)
     private StudentAttendanceStatusEnum status;
 
     @ApiModelProperty(value = "过滤状态")
     private StudentAttendanceStatusEnum filterStatus;
 
+    public Long getCourseScheduleId() {
+        return courseScheduleId;
+    }
+
+    public void setCourseScheduleId(Long courseScheduleId) {
+        this.courseScheduleId = courseScheduleId;
+    }
+
     public StudentAttendanceStatusEnum getFilterStatus() {
         return filterStatus;
     }

mec-biz/src/main/java/com/ym/mec/biz/service/TeacherService.java

@@ -2,14 +2,11 @@ package com.ym.mec.biz.service;
 
 import com.ym.mec.biz.dal.dto.BasicUserDto;
 import com.ym.mec.biz.dal.dto.TeacherCloseDto;
-import com.ym.mec.biz.dal.dto.TeacherUserDto;
 import com.ym.mec.biz.dal.entity.Teacher;
-import com.ym.mec.biz.dal.entity.TeacherDefaultMusicGroupSalary;
 import com.ym.mec.biz.dal.page.TeacherCloseQueryInfo;
 import com.ym.mec.biz.dal.page.TeacherQueryInfo;
 import com.ym.mec.common.entity.ImGroupModel;
 import com.ym.mec.common.page.PageInfo;
-import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.BaseService;
 import org.apache.ibatis.annotations.Param;
 
@@ -86,4 +83,13 @@ public interface TeacherService extends BaseService<Integer, Teacher> {
      * @return
      */
     PageInfo<TeacherCloseDto> queryCloses(TeacherCloseQueryInfo queryInfo);
+
+    /**
+     * @describe 获取乐团下的老师
+     * @author Joburgess
+     * @date 2019/10/19
+     * @param musicGroupId:
+     * @return java.util.List<com.ym.mec.biz.dal.dto.BasicUserDto>
+     */
+    List<BasicUserDto> queryMusicGroupTeacher(Long musicGroupId);
 }

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

@@ -187,7 +187,18 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     @Override
     @Transactional(rollbackFor = Exception.class)
     public List<HighClassGroupDto> addHighClassGroup(List<HighClassGroupDto> highClassGroupList) throws Exception {
+    	
+    	Integer schoolId = null;
+    	
         for (HighClassGroupDto highClassGroup : highClassGroupList) {
+        	
+			if (schoolId == null) {
+				MusicGroup musicGroup = musicGroupDao.get(highClassGroup.getMusicGroupId());
+				if (musicGroup != null) {
+					schoolId = musicGroup.getSchoolId();
+				}
+			}
+        	
             //1、插入班级信息
             Date date;
             date = new Date();
@@ -221,6 +232,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     String startClassTime = DateUtil.getDate(classDate) + " " + highClassGroup.getStartClassTime();
                     String endClassTime = DateUtil.getDate(classDate) + " " + highClassGroup.getEndClassTime();
 
+                    courseSchedule.setSchoolId(schoolId);
                     courseSchedule.setClassGroupId(highClassGroup.getUserId());
                     courseSchedule.setStatus(CourseStatusEnum.NOT_START);
                     courseSchedule.setClassDate(classDate);
@@ -555,6 +567,15 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             if(teacherClassGroupDto.getType()==ClassGroupTypeEnum.VIP){
                 String[] studentNums = classGroupStudentMapperDao.findStudentNumByClassGroupId(teacherClassGroupDto.getClassGroupId());
                 teacherClassGroupDto.setStudentNames(StringUtils.join(studentNums,","));
+                if(teacherClassGroupDto.getOffLineClassesNum()>0&&teacherClassGroupDto.getOffLineClassesNum()<=0){
+                    teacherClassGroupDto.setClassMode(1);
+                }else if(teacherClassGroupDto.getOffLineClassesNum()>0&&teacherClassGroupDto.getOffLineClassesNum()>0){
+                    teacherClassGroupDto.setClassMode(3);
+                }else if(teacherClassGroupDto.getOnlineClassesNum()<0&&teacherClassGroupDto.getOffLineClassesNum()>=0){
+                    teacherClassGroupDto.setClassMode(2);
+                }else{
+                    teacherClassGroupDto.setClassMode(0);
+                }
             }
             String subjectIdList=teacherClassGroupDto.getSubjectIdList();
             if(StringUtils.isNotEmpty(subjectIdList)){

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

@@ -1,26 +1,28 @@
 package com.ym.mec.biz.service.impl;
 
-import com.ym.mec.biz.dal.dao.CourseScheduleTeacherSalaryDao;
-import com.ym.mec.biz.dal.entity.*;
-import com.ym.mec.biz.dal.enums.SalarySettlementTypeEnum;
-import com.ym.mec.biz.dal.enums.TeachTypeEnum;
-import com.ym.mec.biz.service.CourseScheduleService;
-import com.ym.mec.biz.service.CourseScheduleTeacherSalaryService;
-import com.ym.mec.util.date.DateUtil;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import com.ym.mec.biz.dal.dao.ClassGroupTeacherMapperDao;
+import com.ym.mec.biz.dal.dao.CourseScheduleTeacherSalaryDao;
+import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
+import com.ym.mec.biz.dal.entity.ClassGroupTeacherSalary;
+import com.ym.mec.biz.dal.entity.CourseSchedule;
+import com.ym.mec.biz.dal.entity.CourseScheduleTeacherSalary;
+import com.ym.mec.biz.dal.entity.TeacherDefaultMusicGroupSalary;
+import com.ym.mec.biz.dal.enums.SalarySettlementTypeEnum;
+import com.ym.mec.biz.dal.enums.TeachTypeEnum;
 import com.ym.mec.biz.service.ClassGroupTeacherMapperService;
+import com.ym.mec.biz.service.CourseScheduleService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import com.ym.mec.util.date.DateUtil;
 
 @Service
 public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, ClassGroupTeacherMapper> implements ClassGroupTeacherMapperService {
@@ -108,7 +110,8 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
                 courseScheduleTeacherSalary.setUserId(classGroupTeacherMapper.getUserId());
                 courseScheduleTeacherSalary.setExpectSalary(salary);
                 courseScheduleTeacherSalary.setCreateTime(date);
-                courseScheduleTeacherSalary.setCreateUpdate(date);
+                courseScheduleTeacherSalary.setUpdateTime(date);
+                courseScheduleTeacherSalary.setClassGroupId(classGroupTeacherMapper.getClassGroupId());
                 courseScheduleTeacherSalaryList.add(courseScheduleTeacherSalary);
             }
         }

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

@@ -566,11 +566,20 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		MapUtil.populateMap(params, queryInfo);
 
 		List dataList = null;
-		int count = courseScheduleDao.countTeacherClassCourseSchedule(params);
+		int count = 0;
+		if(Objects.isNull(queryInfo.getOnlyHistory())||queryInfo.getOnlyHistory()==0){
+			count = courseScheduleDao.countTeacherClassCourseSchedule(params);
+		}else{
+			count= courseScheduleDao.countTeacherHistoryClassCourseSchedule(params);
+		}
 		if (count > 0) {
 			pageInfo.setTotal(count);
 			params.put("offset", pageInfo.getOffset());
-			dataList = courseScheduleDao.queryTeacherClassCourseSchedule(params);
+			if(Objects.isNull(queryInfo.getOnlyHistory())||queryInfo.getOnlyHistory()==0){
+				dataList = courseScheduleDao.queryTeacherClassCourseSchedule(params);
+			}else{
+				dataList = courseScheduleDao.queryTeacherHistoryClassCourseSchedule(params);
+			}
 		}
 		if (count == 0) {
 			dataList = new ArrayList<>();
@@ -584,9 +593,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		if(Objects.isNull(musicGroupId)){
 			throw new BizException("请指定乐团");
 		}
-		List<Map<Long, Integer>> maps = courseScheduleDao.countClassCourseNumByMusicGroup(musicGroupId);
-		Map<Long,Integer> classCourseNumMap = MapUtil.convertMybatisMap(maps);
-		for (Long key:classCourseNumMap.keySet()){
+		List<Map<Integer, Long>> maps = courseScheduleDao.countClassCourseNumByMusicGroup(musicGroupId);
+		Map<Integer,Long> classCourseNumMap = MapUtil.convertMybatisMap(maps);
+		for (Integer key:classCourseNumMap.keySet()){
 			if(classCourseNumMap.get(key)<=0){
 				throw new BizException("存在未排课的班级");
 			}

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

@@ -64,6 +64,7 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
 				//创建学生课程应缴费记录
 				CourseScheduleStudentPayment courseScheduleStudentPayment = new CourseScheduleStudentPayment();
 				courseScheduleStudentPayment.setCourseScheduleId(courseSchedules.get(i).getId());
+				courseScheduleStudentPayment.setClassGroupId(courseSchedules.get(i).getClassGroupId());
 
 				if (teachModeEnum == TeachModeEnum.ONLINE) {
 					//学生线上单节课应缴费计算

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

@@ -75,6 +75,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
 				courseScheduleTeacherSalary.setCourseScheduleId(courseSchedules.get(i).getId());
 				courseScheduleTeacherSalary.setTeacherRole(TeachTypeEnum.BISHOP);
 				courseScheduleTeacherSalary.setUserId(vipGroup.getUserId());
+				courseScheduleTeacherSalary.setClassGroupId(courseSchedules.get(i).getClassGroupId());
 
 				if(teachModeEnum==TeachModeEnum.ONLINE){
 					if(vipGroupActivity.getType()== VipGroupActivityTypeEnum.GIVE_CLASS

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

@@ -19,6 +19,7 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.ChargeTypeDao;
 import com.ym.mec.biz.dal.dao.ClassGroupStudentMapperDao;
 import com.ym.mec.biz.dal.dao.CourseScheduleDao;
+import com.ym.mec.biz.dal.dao.CourseScheduleTeacherSalaryDao;
 import com.ym.mec.biz.dal.dao.MusicGroupBuildLogDao;
 import com.ym.mec.biz.dal.dao.MusicGroupDao;
 import com.ym.mec.biz.dal.dao.MusicGroupPaymentCalenderDao;
@@ -35,6 +36,7 @@ import com.ym.mec.biz.dal.dto.MusicCardDto;
 import com.ym.mec.biz.dal.dto.SubFeeSettingDto;
 import com.ym.mec.biz.dal.entity.ApprovalStatus;
 import com.ym.mec.biz.dal.entity.CourseSchedule;
+import com.ym.mec.biz.dal.entity.CourseScheduleTeacherSalary;
 import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.MusicGroupBuildLog;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
@@ -117,6 +119,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 	
 	@Autowired
 	private CourseScheduleDao courseScheduleDao;
+	
+	@Autowired
+	private CourseScheduleTeacherSalaryDao courseScheduleTeacherSalaryDao;
 
 	@Autowired
 	private PayService payService;
@@ -429,22 +434,32 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 	@Override
 	@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
 	public boolean updateTeacherCoursesSalary(Long courseScheduleId, Integer teacherId, BigDecimal salary, BigDecimal subsidy, String scope) {
-		
+
 		CourseSchedule courseSchedule = courseScheduleDao.get(courseScheduleId);
-		if(courseSchedule == null){
+		if (courseSchedule == null) {
 			throw new BizException("课程信息不存在");
 		}
-		
-		if("all".equals(scope)){
+
+		if ("all".equals(scope)) {
 			Integer classGrpupId = courseSchedule.getClassGroupId();
-			//未结算的课酬都修改
-		}else{
-			//判断当前课程是否结算
-			
+			// 未结算的课酬都修改
+			courseScheduleTeacherSalaryDao.batchUpdateWages(classGrpupId, teacherId, salary, subsidy);
+		} else {
+			CourseScheduleTeacherSalary courseScheduleTeacherSalary = courseScheduleTeacherSalaryDao.queryByCourseScheduleIdAndUserId(courseScheduleId,
+					teacherId);
+			if (courseScheduleTeacherSalary == null) {
+				throw new BizException("课程结算信息不存在");
+			}
+			// 判断当前课程是否结算
+			if (courseScheduleTeacherSalary.getSettlementTime() != null) {
+				throw new BizException("课程已结算");
+			}
+			courseScheduleTeacherSalary.setExpectSalary(salary);
+			courseScheduleTeacherSalary.setSubsidy(subsidy);
+			courseScheduleTeacherSalary.setUpdateTime(new Date());
+			courseScheduleTeacherSalaryDao.update(courseScheduleTeacherSalary);
 		}
-		//更新所有课酬、补贴
-		
-		return false;
+		return true;
 	}
 
 	@Override

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

@@ -1,15 +1,5 @@
 package com.ym.mec.biz.service.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.ym.mec.biz.dal.dao.ClassGroupStudentMapperDao;
 import com.ym.mec.biz.dal.dao.CourseScheduleDao;
 import com.ym.mec.biz.dal.dao.MusicGroupStudentFeeDao;
@@ -32,6 +22,12 @@ import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.util.*;
 
 @Service
 public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentAttendance>  implements StudentAttendanceService {
@@ -53,6 +49,9 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
 
 	@Override
 	public void addStudentAttendances(List<StudentAttendance> studentAttendances) {
+		if(CollectionUtils.isEmpty(studentAttendances)){
+			throw new BizException("无点名信息");
+		}
 		int classTimes=courseScheduleDao.countClassTimes(studentAttendances.get(0).getClassGroupId().longValue());
 		studentAttendances.forEach(studentAttendance -> {
 			studentAttendance.setCurrentClassTimes(classTimes);

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

@@ -89,12 +89,10 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 			isAttendance=true;
 		}
 
-		CourseSchedule courseSchedule=new CourseSchedule();
 		TeacherAttendanceDto currentCourseDetail = courseScheduleDao.getCurrentCourseDetail(teacherSignOutDto.getTeacherAttendanceInfo().getCourseScheduleId());
 		if(Objects.isNull(currentCourseDetail)){
 			throw new BizException("课程不存在");
 		}
-		courseSchedule.setId(currentCourseDetail.getCourseScheduleId());
 
 		teacherAttendance.setMusicGroupId(currentCourseDetail.getMusicGroupId());
 		teacherAttendance.setClassGroupId(currentCourseDetail.getClassId());

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

@@ -1,31 +1,10 @@
 package com.ym.mec.biz.service.impl;
 
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.auth.api.enums.SysUserType;
 import com.ym.mec.auth.api.enums.YesOrNoEnum;
-import com.ym.mec.biz.dal.dao.ClassGroupDao;
-import com.ym.mec.biz.dal.dao.DemoGroupDao;
-import com.ym.mec.biz.dal.dao.MusicGroupDao;
-import com.ym.mec.biz.dal.dao.OrganizationDao;
-import com.ym.mec.biz.dal.dao.SchoolDao;
-import com.ym.mec.biz.dal.dao.SubjectDao;
-import com.ym.mec.biz.dal.dao.TeacherDao;
+import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.BasicUserDto;
 import com.ym.mec.biz.dal.dto.TeacherCloseDto;
 import com.ym.mec.biz.dal.entity.MusicGroup;
@@ -38,10 +17,19 @@ import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.entity.ImGroupModel;
 import com.ym.mec.common.entity.ImResult;
 import com.ym.mec.common.entity.ImUserModel;
+import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.im.ImFeignService;
 import com.ym.mec.util.collection.MapUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  implements TeacherService {
@@ -193,6 +181,15 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 	}
 
 	@Override
+	public List<BasicUserDto> queryMusicGroupTeacher(Long musicGroupId) {
+		if(Objects.isNull(musicGroupId)){
+			throw new BizException("请指定乐团");
+		}
+		List<BasicUserDto> teacherByMusicGroup = teacherDao.findTeacherByMusicGroup(musicGroupId);
+		return teacherByMusicGroup;
+	}
+
+	@Override
 	public PageInfo<Teacher> queryPageDetail(TeacherQueryInfo queryInfo) {
 		PageInfo<Teacher> pageInfo = queryPage(queryInfo);
 		List<Teacher> rows = pageInfo.getRows();

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

@@ -189,6 +189,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                 &&courseSchedule.getStartClassTime().before(vipGroupActivity.getCoursesStartTime())){
 		        throw new BizException("课时安排时间超出范围!");
             }
+		    courseSchedule.setSchoolId(vipGroup.getVipGroupApplyBaseInfo().getTeacherSchoolId());
 		    courseSchedule.setTeacherId(vipGroupApplyBaseInfoDto.getUserId().longValue());
 			courseSchedule.setStatus(CourseStatusEnum.NOT_START);
 		    courseSchedule.setType(CourseSchedule.CourseScheduleType.VIP);

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

@@ -19,6 +19,7 @@
         <result column="expect_student_num_" property="expectStudentNum"/>
         <result column="total_class_times_" property="totalClassTimes"/>
         <result column="img_" property="img"/>
+        <result column="current_class_times_" property="currentClassTimes"/>
         <!--<association property="musicGroupId" javaType="com.ym.mec.biz.dal.entity.MusicGroup" >-->
         <!--<result column="name_" property="name"/>-->
         <!--<result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>-->

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

@@ -23,6 +23,7 @@
         <result column="name_" property="name"/>
         <result column="student_num_" property="studentNum"/>
         <result column="leave_student_num_" property="leaveStudentNum"/>
+        <result column="schoole_id_" property="schoolId"/>
     </resultMap>
 
     <resultMap type="com.ym.mec.biz.dal.dto.CourseScheduleDto" id="courseScheduleDto" extends="CourseSchedule">
@@ -72,17 +73,17 @@
         </selectKey>
         -->
         INSERT INTO course_schedule
-        (id_,class_group_id_,status_,subsidy_,class_date_,start_class_time_,end_class_time_,teacher_id_,actual_teacher_id_,create_time_,update_time_,type_,name_,teach_mode_,student_num_,leave_student_num_)
-        VALUES(#{id},#{classGroupId},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{subsidy},#{classDate},#{startClassTime},#{endClassTime},#{teacherId},#{teacherId},now(),now(),#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{name},#{teachMode,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{studentNum},#{leaveStudentNum})
+        (id_,class_group_id_,status_,subsidy_,class_date_,start_class_time_,end_class_time_,teacher_id_,actual_teacher_id_,create_time_,update_time_,type_,name_,teach_mode_,student_num_,leave_student_num_,schoole_id_)
+        VALUES(#{id},#{classGroupId},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{subsidy},#{classDate},#{startClassTime},#{endClassTime},#{teacherId},#{teacherId},now(),now(),#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{name},#{teachMode,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{studentNum},#{leaveStudentNum},#{schoolId})
     </insert>
 
     <insert id="batchAddCourseSchedules" parameterType="java.util.List" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
         INSERT INTO course_schedule
-        (id_,class_group_id_,status_,subsidy_,class_date_,start_class_time_,end_class_time_,teacher_id_,actual_teacher_id_,create_time_,update_time_,type_,name_,teach_mode_,student_num_,leave_student_num_)
+        (id_,class_group_id_,status_,subsidy_,class_date_,start_class_time_,end_class_time_,teacher_id_,actual_teacher_id_,create_time_,update_time_,type_,name_,teach_mode_,student_num_,leave_student_num_,schoole_id_)
         VALUE
         <foreach collection="list" item="course" separator=",">
-            (#{course.id},#{course.classGroupId},#{course.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{course.subsidy},#{course.classDate},#{course.startClassTime},#{course.endClassTime},#{course.teacherId},#{course.teacherId},now(),now(),#{course.type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{course.name},#{course.teachMode,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{course.studentNum},#{course.leaveStudentNum})
+            (#{course.id},#{course.classGroupId},#{course.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{course.subsidy},#{course.classDate},#{course.startClassTime},#{course.endClassTime},#{course.teacherId},#{course.teacherId},now(),now(),#{course.type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{course.name},#{course.teachMode,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{course.studentNum},#{course.leaveStudentNum},#{course.schoolId})
         </foreach>
     </insert>
 
@@ -126,6 +127,9 @@
             <if test="leaveStudentNum != null">
                 leave_student_num_ = #{leaveStudentNum},
             </if>
+            <if test="schoolId != null">
+                school_id_ = #{schoolId},
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>
@@ -174,6 +178,8 @@
         <result property="longitudeAndLatitude" column="longitude_latitude_"/>
         <result property="teacherName" column="teacher_name_"/>
         <result property="signInTime" column="sign_in_time_"/>
+        <result column="total_class_times_" property="totalClassTimes"/>
+        <result column="current_class_times_" property="currentClassTimes"/>
     </resultMap>
 
     <select id="getCurrentCourseDetail"
@@ -187,6 +193,8 @@
         cs.status_ course_status_,
         cg.id_ class_id,
         cg.name_ class_name,
+        cg.total_class_times_,
+        cg.current_class_times_,
         cs.type_ class_type,
         mg.id_ music_group_id,
         mg.name_ music_group_name,
@@ -731,6 +739,9 @@
             <if test="item.leaveStudentNum != null">
                 leave_student_num_ = #{item.leaveStudentNum},
             </if>
+            <if test="item.schoolId != null">
+                school_id_ = #{item.choolId},
+            </if>
         </set>
         WHERE id_ = #{item.id}
         </foreach>
@@ -744,7 +755,7 @@
         <result property="classGroupId" column="class_group_id_"/>
         <result property="courseScheduleId" column="course_schedule_id_"/>
         <result property="courseScheduleName" column="course_schedule_name_"/>
-        <result property="status" column="status_"/>
+        <result property="status" column="status_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result property="classDate" column="class_date_"/>
         <result property="startClassTime" column="start_class_time_"/>
         <result property="endClassTime" column="end_class_time_"/>
@@ -753,6 +764,9 @@
         <result property="type" column="type_"/>
         <result property="studentNum" column="student_num_"/>
         <result property="leaveStudentNum" column="leave_student_num_"/>
+        <result property="currentClassTimes" column="current_class_times_"/>
+        <result property="totalClassTimes" column="total_class_times_"/>
+        <result property="studentNames" column="student_names_"/>
     </resultMap>
 
     <sql id="teacherClassCourseScheduleQueryCondition">
@@ -779,16 +793,47 @@
             cs.type_,
             cs.status_,
             cs.actual_teacher_id_,
-            su.username_
+            su.username_,
+            cg.total_class_times_
         FROM
             course_schedule_teacher_salary csts
             LEFT JOIN course_schedule cs ON cs.id_ = csts.course_schedule_id_
+            LEFT JOIN class_group cg ON  cs.class_group_id_=cg.id_
             LEFT JOIN sys_user su ON cs.actual_teacher_id_ = su.id_
         <include refid="teacherClassCourseScheduleQueryCondition"/>
         ORDER BY cs.id_
         <include refid="global.limit"/>
     </select>
 
+    <select id="queryTeacherHistoryClassCourseSchedule" resultMap="teacherClassCourseSchedule">
+        SELECT
+            cs.class_group_id_,
+            cs.id_ course_schedule_id_,
+            cs.class_date_,
+            CONCAT( cs.class_date_, ' ', cs.start_class_time_ ) start_class_time_,
+            CONCAT( cs.class_date_, ' ', cs.end_class_time_ ) end_class_time_,
+            cs.name_ course_schedule_name_,
+            cs.student_num_,
+            cs.leave_student_num_,
+            cs.type_,
+            cs.status_,
+            cs.actual_teacher_id_,
+            su.username_,
+            cg.total_class_times_,
+            GROUP_CONCAT(ssu.username_) student_names_,
+            MAX(sa.current_class_times_) current_class_times_
+        FROM
+          student_attendance sa
+        LEFT JOIN course_schedule cs ON cs.id_ = sa.course_schedule_id_
+        LEFT JOIN class_group cg ON cs.class_group_id_=cg.id_
+        LEFT JOIN sys_user su ON cs.actual_teacher_id_ = su.id_
+        LEFT JOIN sys_user ssu ON sa.user_id_=ssu.id_
+        WHERE sa.class_group_id_=#{classGroupId} AND sa.teacher_id_=#{userId}
+        GROUP BY sa.course_schedule_id_
+        ORDER BY cs.id_
+        <include refid="global.limit"/>
+    </select>
+
     <select id="countTeacherClassCourseSchedule" resultType="int">
         SELECT
             COUNT(cs.id_)
@@ -797,10 +842,17 @@
           LEFT JOIN course_schedule cs ON cs.id_ = csts.course_schedule_id_
         <include refid="teacherClassCourseScheduleQueryCondition"/>
     </select>
+    <select id="countTeacherHistoryClassCourseSchedule" resultType="int">
+        SELECT
+            COUNT(DISTINCT sa.class_group_id_)
+        FROM
+            student_attendance sa
+        WHERE sa.class_group_id_=#{classGroupId} AND sa.teacher_id_=#{userId}
+    </select>
     <select id="countClassCourseNumByMusicGroup" resultType="java.util.Map">
         SELECT
-            cg.id_,
-            COUNT(cs.id_)
+            cg.id_ as 'key',
+            COUNT(cs.id_) as 'value'
         FROM
             class_group cg
             LEFT JOIN course_schedule cs ON cg.id_=cs.class_group_id_

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

@@ -15,6 +15,7 @@
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 		<result column="settlement_time_" property="settlementTime" />
+		<result column="class_group_id_" property="classGroupId" />
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -34,44 +35,48 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO course_schedule_student_payment (id_,course_schedule_id_,user_id_,expect_price_,actual_price_,create_time_,update_time_,settlement_time_) VALUES(#{id},#{courseScheduleId},#{userId},#{expectPrice},#{actualPrice},#{createTime},#{updateTime},#{settlementTime})
+		INSERT INTO course_schedule_student_payment (id_,course_schedule_id_,user_id_,expect_price_,actual_price_,create_time_,update_time_,settlement_time_,class_group_id_) VALUES(#{id},#{courseScheduleId},#{userId},#{expectPrice},#{actualPrice},#{createTime},#{updateTime},#{settlementTime},#{classGroupId})
 	</insert>
     <insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id_">
-		INSERT INTO course_schedule_student_payment (id_,course_schedule_id_,user_id_,expect_price_,actual_price_,create_time_,update_time_,settlement_time_)
+		INSERT INTO course_schedule_student_payment (id_,course_schedule_id_,user_id_,expect_price_,actual_price_,create_time_,update_time_,settlement_time_,class_group_id_)
 		VALUE
 		<foreach collection="list" item="data" separator=",">
-			(#{data.id},#{data.courseScheduleId},#{data.userId},#{data.expectPrice},#{data.actualPrice},now(),now(),#{data.settlementTime})
+			(#{data.id},#{data.courseScheduleId},#{data.userId},#{data.expectPrice},#{data.actualPrice},now(),now(),#{data.settlementTime},#{data.classGroupId})
 		</foreach>
     </insert>
 
     <!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.CourseScheduleStudentPayment">
-		UPDATE course_schedule_student_payment <set>
-<if test="userId != null">
-user_id_ = #{userId},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="courseScheduleId != null">
-course_schedule_id_ = #{courseScheduleId},
-</if>
-<if test="updateTime != null">
-update_time_ = #{updateTime},
-</if>
-<if test="settlementTime != null">
-settlement_time_ = #{settlementTime},
-</if>
-<if test="expectPrice != null">
-expect_price_ = #{expectPrice},
-</if>
-<if test="actualPrice != null">
-actual_price_ = #{actualPrice},
-</if>
-<if test="createTime != null">
-create_time_ = #{createTime},
-</if>
-</set> WHERE id_ = #{id} 
+		UPDATE course_schedule_student_payment 
+		<set>
+			<if test="userId != null">
+			user_id_ = #{userId},
+			</if>
+			<if test="id != null">
+			id_ = #{id},
+			</if>
+			<if test="courseScheduleId != null">
+			course_schedule_id_ = #{courseScheduleId},
+			</if>
+			<if test="updateTime != null">
+			update_time_ = #{updateTime},
+			</if>
+			<if test="settlementTime != null">
+			settlement_time_ = #{settlementTime},
+			</if>
+			<if test="expectPrice != null">
+			expect_price_ = #{expectPrice},
+			</if>
+			<if test="actualPrice != null">
+			actual_price_ = #{actualPrice},
+			</if>
+			<if test="createTime != null">
+			create_time_ = #{createTime},
+			</if>
+			<if test="classGroupId != null">
+			class_group_id_ = #{classGroupId},
+			</if>
+		</set> WHERE id_ = #{id} 
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -88,6 +93,7 @@ create_time_ = #{createTime},
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM course_schedule_student_payment
 	</select>
+	
     <select id="findByCourseScheduleIds" resultMap="CourseScheduleStudentPayment">
 		SELECT * FROM course_schedule_student_payment WHERE course_schedule_id_ IN
 		<foreach collection="ids" item="id" open="(" close=")" separator=",">

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

@@ -13,10 +13,11 @@
 		<result column="user_id_" property="userId" />
 		<result column="expect_salary_" property="expectSalary" />
 		<result column="create_time_" property="createTime" />
-		<result column="create_update_" property="createUpdate" />
+		<result column="update_time_" property="updateTime" />
 		<result column="subsidy_" property="subsidy" />
 		<result column="actual_salary_" property="actualSalary" />
 		<result column="settlement_time_" property="settlementTime" />
+		<result column="class_group_id_" property="classGroupId" />
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -36,50 +37,54 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO course_schedule_teacher_salary (id_,course_schedule_id_,teacher_role_,user_id_,expect_salary_,create_time_,create_update_,subsidy_,actual_salary_,settlement_time_) VALUES(#{id},#{courseScheduleId},#{teacherRole},#{userId},#{expectSalary},#{createTime},#{createUpdate},#{subsidy},#{actualSalary},#{settlementTime})
+		INSERT INTO course_schedule_teacher_salary (id_,course_schedule_id_,teacher_role_,user_id_,expect_salary_,create_time_,update_time_,subsidy_,actual_salary_,settlement_time_,class_group_id_) VALUES(#{id},#{courseScheduleId},#{teacherRole},#{userId},#{expectSalary},#{createTime},#{updateTime},#{subsidy},#{actualSalary},#{settlementTime},#{classGroupId})
 	</insert>
     <insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id_">
-		INSERT INTO course_schedule_teacher_salary (id_,course_schedule_id_,teacher_role_,user_id_,expect_salary_,create_time_,create_update_,subsidy_,actual_salary_,settlement_time_)
+		INSERT INTO course_schedule_teacher_salary (id_,course_schedule_id_,teacher_role_,user_id_,expect_salary_,create_time_,update_time_,subsidy_,actual_salary_,settlement_time_,class_group_id_)
 		VALUES
 		<foreach collection="list" item="data" separator=",">
-			(#{data.id},#{data.courseScheduleId},#{data.teacherRole},#{data.userId},#{data.expectSalary},now(),now(),#{data.subsidy},#{data.actualSalary},#{data.settlementTime})
+			(#{data.id},#{data.courseScheduleId},#{data.teacherRole},#{data.userId},#{data.expectSalary},now(),now(),#{data.subsidy},#{data.actualSalary},#{data.settlementTime},#{data.classGroupId})
 		</foreach>
     </insert>
 
     <!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.CourseScheduleTeacherSalary">
-		UPDATE course_schedule_teacher_salary <set>
-<if test="userId != null">
-user_id_ = #{userId},
-</if>
-<if test="subsidy != null">
-subsidy_ = #{subsidy},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="expectSalary != null">
-expect_salary_ = #{expectSalary},
-</if>
-<if test="courseScheduleId != null">
-course_schedule_id_ = #{courseScheduleId},
-</if>
-<if test="settlementTime != null">
-settlement_time_ = #{settlementTime},
-</if>
-<if test="teacherRole != null">
-teacher_role_ = #{teacherRole},
-</if>
-<if test="createUpdate != null">
-create_update_ = #{createUpdate},
-</if>
-<if test="actualSalary != null">
-actual_salary_ = #{actualSalary},
-</if>
-<if test="createTime != null">
-create_time_ = #{createTime},
-</if>
-</set> WHERE id_ = #{id} 
+		UPDATE course_schedule_teacher_salary 
+		<set>
+			<if test="userId != null">
+			user_id_ = #{userId},
+			</if>
+			<if test="subsidy != null">
+			subsidy_ = #{subsidy},
+			</if>
+			<if test="id != null">
+			id_ = #{id},
+			</if>
+			<if test="expectSalary != null">
+			expect_salary_ = #{expectSalary},
+			</if>
+			<if test="courseScheduleId != null">
+			course_schedule_id_ = #{courseScheduleId},
+			</if>
+			<if test="settlementTime != null">
+			settlement_time_ = #{settlementTime},
+			</if>
+			<if test="teacherRole != null">
+			teacher_role_ = #{teacherRole},
+			</if>
+			<if test="updateTime != null">
+			update_time_ = #{updateTime},
+			</if>
+			<if test="actualSalary != null">
+			actual_salary_ = #{actualSalary},
+			</if>
+			<if test="createTime != null">
+			create_time_ = #{createTime},
+			</if>
+			<if test="classGroupId != null">
+			class_group_id_ = #{classGroupId},
+			</if>
+		</set> WHERE id_ = #{id} 
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -148,4 +153,17 @@ create_time_ = #{createTime},
 		CONCAT( cs.class_date_, ' ', cs.start_class_time_ ) &lt;= DATE_ADD( NOW( ), INTERVAL - 7 DAY )
 		AND csts.settlement_time_ IS NULL
     </select>
+    
+    <select id="queryByCourseScheduleIdAndUserId" resultMap="CourseScheduleTeacherSalary" parameterType="map">
+		SELECT * FROM course_schedule_teacher_salary where user_id_ = #{teacherId} and course_schedule_id_ = #{courseScheduleId}
+    </select>
+    
+    <update id="batchUpdateWages" parameterType="map">
+		UPDATE course_schedule_teacher_salary set
+			subsidy_ = #{subsidy},
+			expect_salary_ = #{expectSalary},
+			teacher_role_ = #{teacherRole},
+			update_time_ = now()
+		WHERE user_id_ = #{userId} and class_group_id_ = #{classGroupId}
+	</update>
 </mapper>

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

@@ -293,6 +293,18 @@
         <include refid="queryCloses"/>
         <include refid="global.limit"/>
     </select>
+
+    <select id="findTeacherByMusicGroup" resultMap="com.ym.mec.biz.dal.dao.MusicGroupDao.BasicUserDto">
+        SELECT
+            su.id_ user_id_,
+            su.username_
+        FROM
+            class_group_teacher_mapper cgtm
+            LEFT JOIN class_group cg ON cg.id_=cgtm.class_group_id_
+            LEFT JOIN sys_user su ON cgtm.user_id_=su.id_
+            WHERE cg.music_group_id_=#{musicGroupId}
+    </select>
+
     <sql id="queryCloses">
         <where>
             <if test="teacherId != null">

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

@@ -34,7 +34,6 @@
         <result column="vip_group_category_id_" property="vipGroupCategoryId"/>
         <result column="give_teach_mode_" property="giveTeachMode" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="organ_id_" property="organId"/>
-        <result column="schoole_id_" property="schoolId"/>
     </resultMap>
     
     <resultMap type="com.ym.mec.biz.dal.entity.School" id="School">
@@ -163,8 +162,8 @@
         </selectKey>
         -->
         INSERT INTO vip_group
-        (id_,user_id_,single_class_minutes_,payment_expire_date_,courses_expire_date_,create_time_,update_time_,teacher_school_id_,online_classes_num_,offline_classes_num_,registration_start_time_,name_,organ_id_list_,vip_group_activity_id_,status_,online_classes_unit_price_,offline_classes_unit_price_,total_price_,give_teach_mode_,vip_group_category_id_,schoole_id_,organ_id_)
-        VALUES(#{id},#{userId},#{singleClassMinutes},#{paymentExpireDate},#{coursesExpireDate},now(),now(),#{teacherSchoolId},#{onlineClassesNum},#{offlineClassesNum},#{registrationStartTime},#{name},#{organIdList},#{vipGroupActivityId},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{onlineClassesUnitPrice},#{offlineClassesUnitPrice},#{totalPrice},#{giveTeachMode},#{vipGroupCategoryId},#{schoolId},#{organId})
+        (id_,user_id_,single_class_minutes_,payment_expire_date_,courses_expire_date_,create_time_,update_time_,teacher_school_id_,online_classes_num_,offline_classes_num_,registration_start_time_,name_,organ_id_list_,vip_group_activity_id_,status_,online_classes_unit_price_,offline_classes_unit_price_,total_price_,give_teach_mode_,vip_group_category_id_,organ_id_)
+        VALUES(#{id},#{userId},#{singleClassMinutes},#{paymentExpireDate},#{coursesExpireDate},now(),now(),#{teacherSchoolId},#{onlineClassesNum},#{offlineClassesNum},#{registrationStartTime},#{name},#{organIdList},#{vipGroupActivityId},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{onlineClassesUnitPrice},#{offlineClassesUnitPrice},#{totalPrice},#{giveTeachMode},#{vipGroupCategoryId},#{organId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -228,9 +227,6 @@
             <if test="organId!=null">
                 organ_id_=#{organId}
             </if>
-            <if test="schoolId!=null">
-                schoole_id_=#{schoolId}
-            </if>
         </set>
         WHERE id_ = #{id}
     </update>

mec-student/src/main/java/com/ym/mec/student/controller/CourseController.java

@@ -1,5 +1,7 @@
 package com.ym.mec.student.controller;
 
+import java.math.BigDecimal;
+
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.page.StudentPayLogQueryInfo;
@@ -7,8 +9,10 @@ import com.ym.mec.biz.service.ClassGroupService;
 import com.ym.mec.biz.service.MusicGroupService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.page.QueryInfo;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -72,4 +76,15 @@ public class CourseController extends BaseController {
         studentPayLogQueryInfo.setUserId(sysUser.getId());
         return succeed(classGroupService.queryStudentPayLog(studentPayLogQueryInfo));
     }
+
+	@ApiOperation(value = "课酬调整")
+	@PostMapping("/updateTeacherCoursesSalary")
+	public Object updateTeacherCoursesSalary(Long courseScheduleId, Integer teacherId, BigDecimal salary, BigDecimal subsidy, String scope) {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if (sysUser == null || sysUser.getId() == null) {
+			return failed("获取用户失败");
+		}
+		musicGroupService.updateTeacherCoursesSalary(courseScheduleId, teacherId, salary, subsidy, scope);
+		return succeed();
+	}
 }

mec-teacher/src/main/java/com/ym/mec/teacher/controller/ClassGroupController.java

@@ -23,7 +23,7 @@ public class ClassGroupController extends BaseController {
     @Autowired
     private ClassGroupService classGroupService;
 
-    @ApiOperation(value = "教师课程获取")
+    @ApiOperation(value = "教师关联班级获取")
     @GetMapping("/findTeacherClassGroups")
     public Object findTeacherClassGroups(@ApiParam(value = "课程类型：MUSIC_GROUP，VIP", required = true)String type){
         return succeed(classGroupService.findTeacherClassGroups(type));

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherAttendanceController.java

@@ -49,7 +49,7 @@ public class TeacherAttendanceController extends BaseController {
         return succeed(studentAttendanceService.getCurrentCourseStudents(queryInfo));
     }
 
-    @ApiOperation(value = "点名完成")
+    @ApiOperation(value = "点名")
     @PostMapping("/addStudentAttendances")
     public Object addStudentAttendances(@RequestBody List<StudentAttendance> studentAttendances){
         studentAttendanceService.addStudentAttendances(studentAttendances);

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

@@ -1,30 +1,40 @@
 package com.ym.mec.web.controller;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.ym.mec.biz.dal.dao.ClassGroupTeacherMapperDao;
 import com.ym.mec.biz.dal.dto.ClassDateAdjustDto;
 import com.ym.mec.biz.dal.dto.CreateCourseScheduleDto;
 import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
 import com.ym.mec.biz.dal.entity.CourseSchedule;
 import com.ym.mec.biz.dal.entity.CourseScheduleComplaints;
+import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.page.StudentAttendanceQueryInfo;
 import com.ym.mec.biz.service.CourseScheduleService;
+import com.ym.mec.biz.service.MusicGroupService;
 import com.ym.mec.biz.service.StudentAttendanceService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.exception.BizException;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
 
 /**
  * @Author Joburgess
@@ -41,6 +51,9 @@ public class CourseScheduleController extends BaseController {
     private StudentAttendanceService studentAttendanceService;
     @Autowired
     private ClassGroupTeacherMapperDao classGroupTeacherMapperDao;
+    
+    @Autowired
+    private MusicGroupService musicGroupService;
 
     @ApiOperation(value = "排课")
     @PostMapping("/batchAddCourseSchedule")
@@ -49,6 +62,12 @@ public class CourseScheduleController extends BaseController {
         if(Objects.isNull(createCourseScheduleDto.getMusicGroupID())){
             throw new BizException("请指定乐团");
         }
+        
+        MusicGroup musicGroup = musicGroupService.get(createCourseScheduleDto.getMusicGroupID());
+        if(musicGroup == null){
+        	return failed("乐团信息不存在");
+        }
+        
         List<ClassGroupTeacherMapper> byMusicGroup = classGroupTeacherMapperDao.findByMusicGroup(createCourseScheduleDto.getMusicGroupID());
         Map<Integer, List<ClassGroupTeacherMapper>> teacherByClassGroup = byMusicGroup.stream().collect(Collectors.groupingBy(ClassGroupTeacherMapper::getClassGroupId));
 
@@ -58,6 +77,7 @@ public class CourseScheduleController extends BaseController {
                 throw new BizException("乐团老师设置有误");
             }
             courseSchedule.setTeacherId(classGroupTeacherMappers.get(0).getUserId().longValue());
+            courseSchedule.setSchoolId(musicGroup.getSchoolId());
         });
 
         scheduleService.batchAddCourseSchedule(createCourseScheduleDto.getCourseSchedules());
@@ -128,6 +148,7 @@ public class CourseScheduleController extends BaseController {
 
     @ApiOperation(value = "检测乐团下所有的班级是否都已排课")
     @PostMapping(value = "/checkMusicGroupClassCourse")
+    @PreAuthorize("@pcs.hasPermissions('courseSchedule/checkMusicGroupClassCourse')")
     public Object checkMusicGroupClassCourse(Long musicGroupId){
         scheduleService.checkMusicGroupClassCourse(musicGroupId);
         return succeed();

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

@@ -32,4 +32,10 @@ public class TeacherController extends BaseController {
         return succeed(teacherService.findTeachers(organId));
     }
 
+    @ApiOperation(value = "获取乐团所有老师")
+    @GetMapping("/findMusicGoupTeachers")
+    public HttpResponseResult findMusicGoupTeachers(Long musicGroupId){
+        return succeed(teacherService.queryMusicGroupTeacher(musicGroupId));
+    }
+
 }