Merge remote-tracking branch 'origin/master'

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

@@ -158,7 +158,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 	@Override
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
 	public boolean create(ClassGroup classGroup) {
-		
+
 		if(classGroup.getType() == null){
 			throw new BizException("班级类型不能为空");
 		}
@@ -168,7 +168,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         String userIds = classGroup.getUserIds();
 
         Set<String> userIdStrSet = new HashSet<String>();
-        
+
         if(StringUtils.isNotBlank(userIds)){
         	userIdStrSet = new HashSet<>(Arrays.asList(userIds.split(",")));
         }
@@ -179,7 +179,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         classGroup.setStudentNum(userIdStrSet.size());
         //创建班级
         insert(classGroup);
-        
+
         //设置班级上的老师
         List<ClassGroupTeacherMapper> teacherMapperList = classGroup.getTeacherMapperList();
         for(ClassGroupTeacherMapper tm : teacherMapperList){
@@ -189,7 +189,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         	tm.setCreateTime(date);
         	tm.setUpdateTime(date);
         }
-        
+
         if(teacherMapperList.size() > 0){
         	classGroupTeacherMapperDao.classGroupTeachersInsert(teacherMapperList);
         }
@@ -1537,19 +1537,21 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     Map<CourseSchedule.CourseScheduleType, TeacherDefaultMusicGroupSalary> collect = teacherSalaryList.stream().collect(Collectors.toMap(TeacherDefaultMusicGroupSalary::getCourseScheduleType, teacherDefaultMusicGroupSalary -> teacherDefaultMusicGroupSalary));
 
                     TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalary = collect.get(classGroup4MixDto.getCourseType());
-                    if(teacherDefaultMusicGroupSalary != null){
-						if (teacherDefaultMusicGroupSalary.getAssistantTeacher30MinSalary() == null
-								|| teacherDefaultMusicGroupSalary.getAssistantTeacher90MinSalary() == null
-								|| teacherDefaultMusicGroupSalary.getMainTeacher30MinSalary() == null
-								|| teacherDefaultMusicGroupSalary.getMainTeacher90MinSalary() == null) {
-							throw new BizException("请设置老师默认课酬");
-						}
+                    Teacher teacher = teacherMap.get(classGroupTeacherMapper.getUserId());
+                    if(teacherDefaultMusicGroupSalary == null){
+                        throw new BizException("请设置"+teacher.getRealName()+"老师的"+classGroup4MixDto.getCourseType().getMsg()+"课酬");
+                    }
+                    if (teacherDefaultMusicGroupSalary.getAssistantTeacher30MinSalary() == null
+                            || teacherDefaultMusicGroupSalary.getAssistantTeacher90MinSalary() == null
+                            || teacherDefaultMusicGroupSalary.getMainTeacher30MinSalary() == null
+                            || teacherDefaultMusicGroupSalary.getMainTeacher90MinSalary() == null
+                            || teacherDefaultMusicGroupSalary.getSalaryRuleJson() == null) {
+                        throw new BizException("请设置"+teacher.getRealName()+"老师的"+classGroup4MixDto.getCourseType().getMsg()+"课酬");
                     }
 
                     //对应基准课酬
                     BigDecimal baseSalary = new BigDecimal(0), classTimeDuty = new BigDecimal(0);
 
-                    Teacher teacher = teacherMap.get(classGroupTeacherMapper.getUserId());
                     SalarySettlementTypeEnum settlementType = musicGroup.getSettlementType();
                     if(Objects.nonNull(teacher.getEntryDate())
                             &&(teacher.getEntryDate().after(entryDate)||teacher.getEntryDate().getTime()==entryDate.getTime())){

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

@@ -699,7 +699,9 @@
     </select>
 
     <select id="findByTeacherIds" resultMap="Teacher">
-        SELECT * FROM teacher WHERE id_ IN
+        SELECT t.*,su.real_name_ FROM teacher t
+        LEFT JOIN sys_user su ON su.id_ = t.id_
+        WHERE t.id_ IN
         <foreach collection="teacherIds" item="teacherId" open="(" close=")" separator=",">
             #{teacherId}
         </foreach>