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

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

@@ -104,6 +104,8 @@ public interface CourseScheduleTeacherSalaryDao extends BaseDAO<Long, CourseSche
 	 */
 	int batchUpdateTeacherExpectSalarys(@Param("courseScheduleTeacherSalaries") List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaries);
 
+	int batchUpdate(@Param("courseScheduleTeacherSalaries") List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaries);
+
 	/**
 	 * @describe 根据课程编号与老师编号删除对应教师课酬记录
 	 * @author Joburgess
@@ -170,6 +172,8 @@ public interface CourseScheduleTeacherSalaryDao extends BaseDAO<Long, CourseSche
 	 */
 	List<CourseScheduleTeacherSalary> findByCourseSchedules(@Param("courseScheduleIds") List<Long> courseScheduleIds);
 
+	List<CourseScheduleTeacherSalary> findByCourseSchedule(@Param("courseScheduleId") Long courseScheduleId);
+
 	/**
 	 * @param courseScheduleIds: 课程编号列表
 	 * @return java.util.List<com.ym.mec.biz.dal.entity.CourseScheduleTeacherSalary>

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

@@ -3618,17 +3618,15 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             }
             courseScheduleTeacherSalaryDao.batchUpdateTeacher(courseScheduleIds,teacherId);
         }else{
-            List<CourseSchedule> groupNotStartCourses = courseScheduleDao.findGroupNotStartCourses(practiceGroup.getId().toString(), GroupType.PRACTICE);
-            if(!CollectionUtils.isEmpty(groupNotStartCourses)){
+			List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaries = courseScheduleTeacherSalaryDao.findByCourseSchedule(courseScheduleId);
+			if(!CollectionUtils.isEmpty(courseScheduleTeacherSalaries)){
                 SysConfig practiceCourseSalaryConfig = sysConfigService.findByParamName(SysConfigService.PRACTICE_COURSE_SALARY);
-                BigDecimal teacherSalary = new BigDecimal(practiceCourseSalaryConfig.getParanValue());
-                List<Long> courseIds = groupNotStartCourses.stream().map(CourseSchedule::getId).collect(Collectors.toList());
-                List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaries = courseScheduleTeacherSalaryDao.findByCourseSchedules(courseIds);
+                BigDecimal teacherSalary = new BigDecimal(practiceCourseSalaryConfig.getParanValue());;
                 for (CourseScheduleTeacherSalary courseScheduleTeacherSalary : courseScheduleTeacherSalaries) {
                     courseScheduleTeacherSalary.setUserId(teacherId);
                     courseScheduleTeacherSalary.setExpectSalary(teacherSalary);
                 }
-                courseScheduleTeacherSalaryDao.batchUpdateTeacherExpectSalarys(courseScheduleTeacherSalaries);
+                courseScheduleTeacherSalaryDao.batchUpdate(courseScheduleTeacherSalaries);
             }
         }
 
@@ -3708,7 +3706,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                     courseScheduleTeacherSalary.setUserId(teacherId);
                     courseScheduleTeacherSalary.setExpectSalary(teacherSalary);
                 }
-                courseScheduleTeacherSalaryDao.batchUpdateTeacherExpectSalarys(courseScheduleTeacherSalaries);
+                courseScheduleTeacherSalaryDao.batchUpdate(courseScheduleTeacherSalaries);
             }
         }
         teacherAttendanceDao.batchUpdateTeacher(courseScheduleIds,teacherId);

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

@@ -101,6 +101,23 @@
 				id_ = #{courseScheduleTeacherSalary.id}
 		</foreach>
 	</update>
+
+    <update id="batchUpdate">
+        <foreach collection="courseScheduleTeacherSalaries" item="courseScheduleTeacherSalary" separator=";">
+            UPDATE course_schedule_teacher_salary
+            <set>
+                <if test="courseScheduleTeacherSalary.expectSalary">
+                    expect_salary_ = #{courseScheduleTeacherSalary.expectSalary},
+                </if>
+                <if test="courseScheduleTeacherSalary.userId">
+                    user_id_ = #{courseScheduleTeacherSalary.userId},
+                </if>
+                update_time_ = NOW()
+            </set>
+            WHERE
+            id_ = #{courseScheduleTeacherSalary.id}
+        </foreach>
+    </update>
 	
 	<!-- 根据主键删除一条记录 -->
 	<delete id="delete" >
@@ -310,6 +327,10 @@
 			#{courseScheduleId}
 		</foreach>
 	</select>
+
+	<select id="findByCourseSchedule" resultMap="CourseScheduleTeacherSalary">
+		SELECT * FROM  course_schedule_teacher_salary WHERE course_schedule_id_=#{courseScheduleId}
+	</select>
 	<select id="findByCourseSchedulesWithNoSettlement" resultMap="CourseScheduleTeacherSalary">
 		SELECT * FROM  course_schedule_teacher_salary WHERE course_schedule_id_ IN
 		<foreach collection="courseScheduleIds" item="courseScheduleId" open="(" close=")" separator=",">