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

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

@@ -1,9 +1,6 @@
 package com.ym.mec.biz.service;
 
-import com.ym.mec.biz.dal.dto.CourseAttendanceDetailHeadInfoDto;
-import com.ym.mec.biz.dal.dto.CourseScheduleDto;
-import com.ym.mec.biz.dal.dto.TeacherAttendanceDto;
-import com.ym.mec.biz.dal.dto.VipGroupCourseAdjustInfoDto;
+import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.CourseSchedule;
 import com.ym.mec.biz.dal.entity.CourseScheduleComplaints;
 import com.ym.mec.biz.dal.enums.AuditStatusEnum;
@@ -84,7 +81,7 @@ public interface CourseScheduleService extends BaseService<Long, CourseSchedule>
 	 * @param courseSchedules: 课程计划列表
 	 * @return void
 	 */
-	void createCourseSchedules(List<CourseSchedule> courseSchedules);
+	void createCourseSchedules(CreateCourseScheduleDto createCourseScheduleDto);
 
 	/**
 	 * @Author: Joburgess

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

@@ -1041,7 +1041,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
         if (musicGroup == null) {
             throw new BizException("乐团不存在");
-        }Date entryDate = DateUtil.stringToDate(sysConfigDao.findByParamName(SysConfigService.TEACHER_ENTRY_DATE).getParanValue());
+        }
+        Date entryDate = DateUtil.stringToDate(sysConfigDao.findByParamName(SysConfigService.TEACHER_ENTRY_DATE).getParanValue(),"yyyy-MM-dd");
         Integer schoolId = musicGroup.getSchoolId();
 
         List<Integer> studentIdList = classGroup4MixDto.getStudents();
@@ -1294,7 +1295,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         }
         Integer courseTimes = classGroup4MixDto.getCourseTimes();
 
-        Date entryDate = DateUtil.stringToDate(sysConfigDao.findByParamName(SysConfigService.TEACHER_ENTRY_DATE).getParanValue());
+        Date entryDate = DateUtil.stringToDate(sysConfigDao.findByParamName(SysConfigService.TEACHER_ENTRY_DATE).getParanValue(),"yyyy-MM-dd");
 
         if (classGroup4MixDto.getCourseAddType().equals("renew")) {
             List<CourseSchedule> noStartCourses = courseScheduleService.findNoStartCoursesByClassGroupId(classGroup.getId());
@@ -1533,7 +1534,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         }
         Integer schoolId = musicGroup.getSchoolId();
 
-        Date entryDate = DateUtil.stringToDate(sysConfigDao.findByParamName(SysConfigService.TEACHER_ENTRY_DATE).getParanValue());
+        Date entryDate = DateUtil.stringToDate(sysConfigDao.findByParamName(SysConfigService.TEACHER_ENTRY_DATE).getParanValue(),"yyyy-MM-dd");
 
         List<Integer> studentIdList = classGroup4MixDto.getStudents();
 

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

@@ -157,7 +157,7 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
 
     public boolean classGroupTeacherMapperUpdate(List<ClassGroupTeacherMapper> classGroupTeacherMapperList) throws Exception {
         Date date = new Date();
-        Date entryDate = DateUtil.stringToDate(sysConfigDao.findByParamName(SysConfigService.TEACHER_ENTRY_DATE).getParanValue());
+        Date entryDate = DateUtil.stringToDate(sysConfigDao.findByParamName(SysConfigService.TEACHER_ENTRY_DATE).getParanValue(),"yyyy-MM-dd");
         List<Integer> classGroupIds = classGroupTeacherMapperList.stream().map(classGroupTeacherMapper -> classGroupTeacherMapper.getClassGroupId()).collect(Collectors.toList());
 
         List<CourseSchedule> classGroupNoStartCourseSchedules = courseScheduleService.findClassGroupNoStartCourseSchedules(classGroupIds, GroupType.MUSIC);
@@ -269,7 +269,7 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
     public void createMusicGroupTeacherMapper(List<CourseSchedule> courseSchedules, String musicGroupId) {
         Date date = new Date();
         MusicGroup musicGroup = musicGroupService.get(musicGroupId);
-        Date entryDate = DateUtil.stringToDate(sysConfigDao.findByParamName(SysConfigService.TEACHER_ENTRY_DATE).getParanValue());
+        Date entryDate = DateUtil.stringToDate(sysConfigDao.findByParamName(SysConfigService.TEACHER_ENTRY_DATE).getParanValue(),"yyyy-MM-dd");
         List<Integer> teacherUserIds = courseSchedules.stream()
                                         .map(CourseSchedule::getActualTeacherId)
                                         .collect(Collectors.toList());
@@ -369,7 +369,7 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
     @Transactional(rollbackFor = Exception.class)
     public void createCourseScheduleTeacherSalary(List<CourseSchedule> courseSchedules, Map<Long, CourseSchedule> oldCourseSchedules) {
         List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaryList = new ArrayList<>();
-        Date entryDate = DateUtil.stringToDate(sysConfigDao.findByParamName(SysConfigService.TEACHER_ENTRY_DATE).getParanValue());
+        Date entryDate = DateUtil.stringToDate(sysConfigDao.findByParamName(SysConfigService.TEACHER_ENTRY_DATE).getParanValue(),"yyyy-MM-dd");
 
         //课程编号列表
         List<Long> courseScheduleIds = courseSchedules.stream().map(CourseSchedule::getId).collect(Collectors.toList());

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

@@ -84,6 +84,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 	private JiaRiFeignService jiaRiFeignService;
 	@Autowired
 	private VipGroupService vipGroupService;
+	@Autowired
+	private MusicGroupService musicGroupService;
 
 	@Override
 	public BaseDAO<Long, CourseSchedule> getDAO() {
@@ -184,7 +186,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void createCourseSchedules(List<CourseSchedule> courseSchedules) {
+	public void createCourseSchedules(CreateCourseScheduleDto createCourseScheduleDto) {
+		List<CourseSchedule> courseSchedules=createCourseScheduleDto.getCourseSchedules();
 		//添加课程计划
 		batchAddCourseSchedule(courseSchedules);
 		//更新课次
@@ -193,6 +196,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         //创建学生单节课的缴费记录，乐团课的缴费为0
 		courseScheduleStudentPaymentService.createCourseScheduleStudentPaymentByCourseSchedules(courseSchedules);
 
+		MusicGroup musicGroup = musicGroupService.get(createCourseScheduleDto.getMusicGroupID());
+
+		if(musicGroup.getStatus().equals(MusicGroupStatusEnum.PROGRESS)){
+			classGroupTeacherMapperService.createMusicGroupTeacherMapper(createCourseScheduleDto.getCourseSchedules(),musicGroup.getId());
+		}
+
 	}
 
 	@Override
@@ -731,15 +740,18 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		}
 
 		String groupName="";
-		if(courseSchedule.getType().equals(CourseSchedule.CourseScheduleType.VIP)){
-			VipGroup vipGroup=vipGroupDao.get(Long.valueOf(courseSchedule.getMusicGroupId()));
-			if(Objects.nonNull(vipGroup)){
-				groupName=vipGroup.getName();
-			}
-		}else{
-			MusicGroup musicGroup = musicGroupDao.get(courseSchedule.getMusicGroupId());
-			if(Objects.nonNull(musicGroup)){
-				groupName=musicGroup.getName();
+
+		if(Objects.nonNull(courseSchedule.getId())){
+			if(courseSchedule.getType().equals(CourseSchedule.CourseScheduleType.VIP)){
+				VipGroup vipGroup=vipGroupDao.get(Long.valueOf(courseSchedule.getMusicGroupId()));
+				if(Objects.nonNull(vipGroup)){
+					groupName=vipGroup.getName();
+				}
+			}else{
+				MusicGroup musicGroup = musicGroupDao.get(courseSchedule.getMusicGroupId());
+				if(Objects.nonNull(musicGroup)){
+					groupName=musicGroup.getName();
+				}
 			}
 		}
 

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

@@ -346,7 +346,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
         Date yesterday = DateUtil.addDays1(now, -1);
         Integer settlementClassMinutes = Integer.parseInt(sysConfigDao.findByParamName(SysConfigService.MUSIC_GROUP_SETTLEMENT_CLASS_MINUTES).getParanValue());
         Integer singleClassTime = Integer.parseInt(sysConfigDao.findByParamName(SysConfigService.MUSIC_GROUP_SETTLEMENT_SINGLE_CLASS_MINUTES).getParanValue());
-        Date entryDate = DateUtil.stringToDate(sysConfigDao.findByParamName(SysConfigService.TEACHER_ENTRY_DATE).getParanValue());
+        Date entryDate = DateUtil.stringToDate(sysConfigDao.findByParamName(SysConfigService.TEACHER_ENTRY_DATE).getParanValue(),"yyyy-MM-dd");
         //获取昨天的课程计划
         List<CourseSchedule> yesterdayCourseSchedules = courseScheduleDao.findCourseScheduleWithDate(yesterday);
         //课程编号列表

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

@@ -273,8 +273,8 @@
         LEFT JOIN music_group mg ON cg.music_group_id_=mg.id_
         LEFT JOIN school s ON cs.schoole_id_=s.id_
         LEFT JOIN sys_user su ON cs.actual_teacher_id_=su.id_
-        LEFT JOIN teacher_attendance ta ON cs.id_=ta.course_schedule_id_
-        WHERE cs.id_= #{courseID} AND ta.teacher_id_=#{teacherId}
+        LEFT JOIN teacher_attendance ta ON cs.id_=ta.course_schedule_id_ AND ta.teacher_id_=#{teacherId}
+        WHERE cs.id_= #{courseID} LIMIT 1
     </select>
 
     <select id="getTeacherCourseByDateSpeed"

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

@@ -552,7 +552,7 @@
         </where>
     </select>
 
-    <select id="findByTeacherIds" resultType="com.ym.mec.biz.dal.entity.Teacher">
+    <select id="findByTeacherIds" resultMap="Teacher">
         SELECT * FROM teacher WHERE id_ IN
         <foreach collection="teacherIds" item="teacherId" open="(" close=")" separator=",">
             #{teacherId}

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

@@ -89,11 +89,7 @@ public class CourseScheduleController extends BaseController {
             courseSchedule.setTeachMode(TeachModeEnum.OFFLINE);
         });
 
-        scheduleService.createCourseSchedules(createCourseScheduleDto.getCourseSchedules());
-
-        if(musicGroup.getStatus().equals(MusicGroupStatusEnum.PROGRESS)){
-            classGroupTeacherMapperService.createMusicGroupTeacherMapper(createCourseScheduleDto.getCourseSchedules(),musicGroup.getId());
-        }
+        scheduleService.createCourseSchedules(createCourseScheduleDto);
         return succeed();
     }