Merge remote-tracking branch 'origin/master'

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

@@ -9,6 +9,7 @@ import com.ym.mec.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Set;
 
 public interface ClassGroupTeacherMapperDao extends BaseDAO<Long, ClassGroupTeacherMapper> {
 
@@ -91,4 +92,11 @@ public interface ClassGroupTeacherMapperDao extends BaseDAO<Long, ClassGroupTeac
      * @return java.util.List<com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper>
      */
     List<ClassGroupTeacherMapDto> findByClassGroupIds(@Param("classGroupIds") List<Integer> classGroupIds);
+
+    /**
+     * 修改老师
+     * @param classGroupIds
+     * @param teacherId
+     */
+    void updateTeacher(@Param("classGroupIds") Set<Integer> classGroupIds, @Param("teacherId") Integer teacherId);
 }

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

@@ -6,6 +6,7 @@ import com.ym.mec.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Set;
 
 public interface ClassGroupTeacherSalaryDao extends BaseDAO<Long, ClassGroupTeacherSalary> {
 
@@ -37,4 +38,11 @@ public interface ClassGroupTeacherSalaryDao extends BaseDAO<Long, ClassGroupTeac
      */
     ClassGroupTeacherSalary findByClassGroupAndTeacher(@Param("classGroupId") Integer classGroupId,
                                                        @Param("teacherId") Integer teacherId);
+
+    /**
+     * 修改老师
+     * @param classGroupIds
+     * @param teacherId
+     */
+    void updateTeacher(@Param("classGroupIds") Set<Integer> classGroupIds, @Param("teacherId") Integer teacherId);
 }

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

@@ -53,4 +53,11 @@ public interface PracticeGroupDao extends com.ym.mec.common.dal.BaseDAO<Long, Pr
      * @return
      */
     List<Map<Long, Integer>> countPracticeGroupOverCourse(List<String> practiceGroupIds);
+
+    /**
+     * 修改老师
+     * @param practiceGroupId
+     * @param teacherId
+     */
+    void updateUserId(@Param("practiceGroupId") String practiceGroupId, @Param("teacherId") Integer teacherId);
 }

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

@@ -7,6 +7,7 @@ import com.ym.mec.common.service.BaseService;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 public interface ClassGroupTeacherMapperService extends BaseService<Long, ClassGroupTeacherMapper> {
 
@@ -51,4 +52,11 @@ public interface ClassGroupTeacherMapperService extends BaseService<Long, ClassG
      * @return
      */
     List<ClassGroupTeacherMapper> getClassGroupTeachers(Integer classGroupId);
+
+    /**
+     * 修改班级老师
+     * @param classGroupIds
+     * @param teacherId
+     */
+    void updateTeacher(Set<Integer> classGroupIds, Integer teacherId);
 }

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

@@ -1303,6 +1303,14 @@ 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("请设置老师默认课酬");
+						}
+                    }
 
                     //对应基准课酬
                     BigDecimal baseSalary = new BigDecimal(0), classTimeDuty = new BigDecimal(0);

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

@@ -555,4 +555,9 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
     public List<ClassGroupTeacherMapper> getClassGroupTeachers(Integer classGroupId) {
         return classGroupTeacherMapperDao.findClassGroupTeachers(classGroupId.toString());
     }
+
+    @Override
+    public void updateTeacher(Set<Integer> classGroupIds, Integer teacherId) {
+        classGroupTeacherMapperDao.updateTeacher(classGroupIds,teacherId);
+    }
 }

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

@@ -84,6 +84,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
     @Autowired
     private ClassGroupTeacherSalaryDao classGroupTeacherSalaryDao;
     @Autowired
+    private PracticeGroupDao practiceGroupDao;
+    @Autowired
     private JiaRiFeignService jiaRiFeignService;
     @Autowired
     private VipGroupService vipGroupService;
@@ -2441,6 +2443,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         Set<Long> courseScheduleIds = courseSchedules.stream().map(e -> e.getId()).collect(Collectors.toSet());
         courseScheduleDao.batchUpdate(courseSchedules);
         courseScheduleTeacherSalaryDao.batchUpdateTeacher(courseScheduleIds,teacherId);
+        Set<Integer> classGroupIds = courseSchedules.stream().map(e -> e.getClassGroupId()).collect(Collectors.toSet());
+        classGroupTeacherMapperService.updateTeacher(classGroupIds,teacherId);
+        classGroupTeacherSalaryDao.updateTeacher(classGroupIds,teacherId);
+        practiceGroupDao.updateUserId(practiceGroupId,teacherId);
         Map<Integer, String> map = new HashMap<>(2);
         map.put(teacherId,teacherId.toString());
         map.put(oldTeacherId,oldTeacherId.toString());

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

@@ -79,6 +79,14 @@
         WHERE id_ = #{id}
     </update>
 
+    <update id="updateTeacher">
+        UPDATE class_group_teacher_mapper SET user_id_ = #{teacherId},update_time_ = NOW()
+        WHERE teacher_role_ = 'BISHOP' AND class_group_id_ IN
+        <foreach collection="classGroupIds" item="item" index="index" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </update>
+
     <!-- 根据主键删除一条记录 -->
     <delete id="delete">
         DELETE FROM class_group_teacher_mapper WHERE

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

@@ -110,7 +110,14 @@
     </set>
     where id_ = #{id,jdbcType=BIGINT}
   </update>
-  <!-- 分页查询 -->
+    <update id="updateTeacher">
+      UPDATE class_group_teacher_salary SET user_id_ = #{teacherId},update_time_ = NOW()
+      WHERE teacher_role_ = 'BISHOP' AND class_group_id_ IN
+      <foreach collection="classGroupIds" item="item" index="index" open="(" close=")" separator=",">
+        #{item}
+      </foreach>
+    </update>
+    <!-- 分页查询 -->
   <select id="queryPage" resultMap="ClassGroupTeacherSalary" parameterType="map">
     SELECT * FROM class_group_teacher_salary ORDER BY id_
     <include refid="global.limit"/>

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

@@ -35,6 +35,10 @@
 		<result column="subject_name_" property="subjectName" />
 		<result column="teacher_name_" property="teacherName" />
 	</resultMap>
+	<update id="updateUserId">
+		UPDATE practice_group SET user_id_ = #{teacherId},update_time_ = NOW()
+		WHERE id_ = #{practiceGroupId}
+	</update>
 
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="PracticeGroup">