Merge remote-tracking branch 'origin/master'

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysUserServiceImpl.java

@@ -129,7 +129,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 	@Override
 	public void updateBaseInfo(SysUser sysUser) {
 		sysUserDao.update(sysUser);
-		imFeignService.update(new ImUserModel(sysUser.getId().toString(),sysUser.getRealName()==null?sysUser.getUsername():sysUser.getRealName(),null));
+		imFeignService.update(new ImUserModel(sysUser.getId().toString(),sysUser.getRealName()==null?sysUser.getUsername():sysUser.getRealName(),sysUser.getAvatar()));
 	}
 
 	@Override

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

@@ -1651,7 +1651,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
     @Transactional(rollbackFor = Exception.class)
     public void batchAppendVipGroupCourses(VipGroupCourseAdjustInfoDto vipGroupCourseAdjustInfo) {
         if (Objects.isNull(vipGroupCourseAdjustInfo.getVipGroupId())) {
-            throw new BizException("请指定课程");
+            throw new BizException("请指定小课");
         }
         if (Objects.isNull(vipGroupCourseAdjustInfo.getCourseCreateStartTime())) {
             throw new BizException("请指定排课起始时间;");
@@ -1672,32 +1672,17 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         if (courseCreateStartTime.before(today)) {
             throw new BizException("排课起始时间不能小于当前时间");
         }
-        int singleClassMinutes = 0;
-        Integer schoolId = null;
-        String groupId;
-        switch (vipGroupCourseAdjustInfo.getGroupType()){
-            case PRACTICE:
-                PracticeGroup practiceGroup = practiceGroupDao.get(vipGroupCourseAdjustInfo.getVipGroupId().longValue());
-                if (Objects.isNull(practiceGroup)) {
-                    throw new BizException("指定课程不存在");
-                }
-                singleClassMinutes = practiceGroup.getSingleClassMinutes();
-                groupId = practiceGroup.getId().toString();
-                break;
-            default:
-                VipGroup vipGroup = vipGroupDao.get(vipGroupCourseAdjustInfo.getVipGroupId().longValue());
-                if (Objects.isNull(vipGroup)) {
-                    throw new BizException("指定课程不存在");
-                }
-                schoolId = vipGroup.getTeacherSchoolId();
-                groupId = vipGroup.getId().toString();
-                singleClassMinutes = vipGroup.getSingleClassMinutes();
-                if (vipGroup.getStatus().equals(VipGroupStatusEnum.APPLYING)) {
-                    throw new BizException("报名中的课程不能加课");
-                }
+
+        VipGroup vipGroup = vipGroupDao.get(vipGroupCourseAdjustInfo.getVipGroupId().longValue());
+        if (Objects.isNull(vipGroup)) {
+            throw new BizException("指定课程不存在");
         }
 
-        ClassGroup classGroup = classGroupDao.findByGroupAndType(vipGroupCourseAdjustInfo.getVipGroupId().toString(), vipGroupCourseAdjustInfo.getGroupType().getCode());
+        if (vipGroup.getStatus().equals(VipGroupStatusEnum.APPLYING)) {
+            throw new BizException("报名中的课程不能加课");
+        }
+
+        ClassGroup classGroup = classGroupDao.findByGroupAndType(vipGroupCourseAdjustInfo.getVipGroupId().toString(), GroupType.VIP.getCode());
         if (Objects.isNull(classGroup)) {
             throw new BizException("对应班级不存在");
         }
@@ -1746,15 +1731,15 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                     String dateYmdStr = DateUtil.dateToString(calendar.getTime(), DateUtil.ISO_EXPANDED_DATE_FORMAT);
                     dateYmdStr = dateYmdStr + " " + courseTime.getStartClassTime();
                     Date courseStartTime = DateUtil.stringToDate(dateYmdStr, "yyyy-MM-dd HH:mm");
-                    Date courseEndTime = DateUtil.addMinutes(courseStartTime, singleClassMinutes);
+                    Date courseEndTime = DateUtil.addMinutes(courseStartTime, vipGroup.getSingleClassMinutes());
                     CourseSchedule courseSchedule = new CourseSchedule();
                     courseSchedule.setGroupType(GroupType.VIP);
-                    courseSchedule.setMusicGroupId(groupId);
+                    courseSchedule.setMusicGroupId(vipGroup.getId().toString());
                     courseSchedule.setClassGroupId(classGroup.getId());
                     courseSchedule.setClassDate(courseStartTime);
                     courseSchedule.setStartClassTime(courseStartTime);
                     courseSchedule.setEndClassTime(courseEndTime);
-                    courseSchedule.setSchoolId(schoolId);
+                    courseSchedule.setSchoolId(vipGroup.getTeacherSchoolId());
                     courseSchedule.setStatus(CourseStatusEnum.NOT_START);
                     courseSchedule.setTeachMode(vipGroupCourseAdjustInfo.getTeachMode());
                     courseSchedules.add(courseSchedule);
@@ -1772,7 +1757,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 //		courseScheduleDao.batchUpdate(courseSchedules);
         VipGroupApplyDto vipGroupApplyDto = new VipGroupApplyDto();
         VipGroupApplyBaseInfoDto vipGroupApplyBaseInfoDto = new VipGroupApplyBaseInfoDto();
-        vipGroupApplyBaseInfoDto.setId(Long.parseLong(groupId));
+        vipGroupApplyBaseInfoDto.setId(vipGroup.getId());
         vipGroupApplyDto.setVipGroupApplyBaseInfo(vipGroupApplyBaseInfoDto);
         vipGroupApplyDto.setCourseSchedules(courseSchedules);
         vipGroupApplyDto.setSingleClassPrice(vipGroupCourseAdjustInfo.getSingleClassPrice());

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

@@ -925,7 +925,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 throw new BizException("课酬未确认");
             }
         }
-        updateTeamTeacher(musicGroup, musicGroup);
+//        updateTeamTeacher(musicGroup, musicGroup);
         //生成学员费用表
         List<MusicGroupStudentFee> musicGroupStudentFees = musicGroupStudentFeeDao.initMusicGroupStudentFee(musicGroupId);
         if (musicGroupStudentFees != null && musicGroupStudentFees.size() > 0) {
@@ -1926,7 +1926,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             //如果已生成课表，那么修改未上课时教学点
             courseScheduleDao.updateCourseScheduleSchool("MUSIC", musicGroupId, musicGroup.getSchoolId());
         }
-        updateTeamTeacher(musicGroup, group);
+        updateTeamTeacher(group,musicGroup);
         List<Integer> months = subFeeSettingDto.getMonths();
 
         Date date = new Date();

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

@@ -69,6 +69,8 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
     @Autowired
     private CourseScheduleDao courseScheduleDao;
     @Autowired
+    private StudentAttendanceDao studentAttendanceDao;
+    @Autowired
     private CourseScheduleTeacherSalaryDao courseScheduleTeacherSalaryDao;
     @Autowired
     private CourseScheduleStudentPaymentDao courseScheduleStudentPaymentDao;
@@ -2116,6 +2118,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                     .distinct().collect(Collectors.toList());
             List<Map<Long, Integer>> courseSettlementMaps = courseScheduleTeacherSalaryDao.checkCoursesIsSettlement(courseScheduleIds);
             Map<Long, Long> courseSettlementMap = MapUtil.convertIntegerMap(courseSettlementMaps);
+            Map<Integer, Long> studentNumCourseMap = MapUtil.convertIntegerMap(studentAttendanceDao.countStudentAttendancesByCourses(courseScheduleIds));
             //获取课程实际上课老师姓名
             Map<Long, String> teacherNames = MapUtil.convertIntegerMap(courseScheduleDao.queryTeacherName(courseScheduleIds));
             dataList.forEach(e -> {
@@ -2127,6 +2130,12 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                 } else {
                     e.setIsSettlement(1);
                 }
+                Long studentNum = studentNumCourseMap.get(e.getId());
+                if (Objects.nonNull(studentNum)) {
+                    e.setIsCallNames(studentNum > 0 ? YesOrNoEnum.YES : YesOrNoEnum.NO);
+                } else {
+                    e.setIsCallNames(YesOrNoEnum.NO);
+                }
             });
         }
         pageInfo.setRows(dataList);