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

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

@@ -143,4 +143,12 @@ public interface StudentAttendanceDao extends BaseDAO<Long, StudentAttendance> {
      * @return
      */
     StudentAttendance findByStatusAndCourseScheduleId(@Param("userId") Integer userId, @Param("courseScheduleId") int courseScheduleId);
+
+
+    /**
+     * 封装未签到学员列表
+     * @param courseScheduleId
+     * @return
+     */
+    List<StudentAttendance> queryNoSignStudentRecord(Integer courseScheduleId);
 }

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

@@ -89,10 +89,4 @@ public interface TeacherAttendanceDao extends BaseDAO<Long, TeacherAttendance> {
                                              @Param("date") Date date,
                                              @Param("signInStatus") Integer signInStatus);
 
-    /**
-     * 封装未签到学员列表
-     * @param courseScheduleId
-     * @return
-     */
-    List<StudentAttendance> queryNoSignStudentRecord(Integer courseScheduleId);
 }

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

@@ -52,6 +52,14 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
     List<Map<Integer, String>> queryNameByIds(@Param("userIds") String userIds);
 
     /**
+     * 根据用户编号列表获取手机号
+     *
+     * @param userIds
+     * @return
+     */
+    List<Map<Integer, String>> queryPhoneByIds(@Param("userIds") String userIds);
+
+    /**
      * 根据用户编号获取用户名称
      *
      * @param userId

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentVipGroupShowListDto.java

@@ -58,6 +58,17 @@ public class StudentVipGroupShowListDto {
 
     private String categoryName;
 
+    @ApiModelProperty(value = "开课时间")
+    private Date courseStartDate;
+
+    public Date getCourseStartDate() {
+        return courseStartDate;
+    }
+
+    public void setCourseStartDate(Date courseStartDate) {
+        this.courseStartDate = courseStartDate;
+    }
+
     public Integer getTeacherId() {
         return teacherId;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TeacherClassGroupDto.java

@@ -77,6 +77,17 @@ public class TeacherClassGroupDto {
     @ApiModelProperty(value = "每月平均课时")
     private double avgClassTimesOfMonth;
 
+    @ApiModelProperty(value = "开课时间")
+    private Date courseStartDate;
+
+    public Date getCourseStartDate() {
+        return courseStartDate;
+    }
+
+    public void setCourseStartDate(Date courseStartDate) {
+        this.courseStartDate = courseStartDate;
+    }
+
     public double getAvgClassTimesOfMonth() {
         return avgClassTimesOfMonth;
     }

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

@@ -6,6 +6,7 @@ import com.ym.mec.biz.dal.entity.CourseSchedule;
 import com.ym.mec.common.service.BaseService;
 
 import java.util.List;
+import java.util.Map;
 
 public interface ClassGroupTeacherMapperService extends BaseService<Long, ClassGroupTeacherMapper> {
 
@@ -33,11 +34,11 @@ public interface ClassGroupTeacherMapperService extends BaseService<Long, ClassG
     boolean classGroupTeacherMapperUpdate(List<ClassGroupTeacherMapper> classGroupTeacherMapperList) throws Exception;
 
     /**
-     * @describe 创建乐团课单节课对应课次
+     * @describe 创建乐团课单节课对应教师课酬
      * @author Joburgess
      * @date 2019/10/24
      * @param courseSchedules: 课程计划列表
      * @return void
      */
-    void createCourseScheduleTeacherSalary(List<CourseSchedule> courseSchedules);
-}
+    void createCourseScheduleTeacherSalary(List<CourseSchedule> courseSchedules, Map<Long, CourseSchedule> oldCourseSchedules);
+}

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

@@ -164,7 +164,7 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void createCourseScheduleTeacherSalary(List<CourseSchedule> courseSchedules) {
+    public void createCourseScheduleTeacherSalary(List<CourseSchedule> courseSchedules, Map<Long, CourseSchedule> oldCourseSchedules) {
         List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaryList = new ArrayList<>();
 
         BigDecimal teacherSalaryTimeUnit = new BigDecimal(sysConfigDao.findConfigValue(SysConfigService.TEACHER_SALARY_TIME_UNIT));
@@ -194,7 +194,7 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
 
         courseSchedules.forEach(courseSchedule -> {
             if (Objects.isNull(courseSchedule.getType())) {
-                throw new BizException("存在未指定课程类型的课程");
+                courseSchedule.setType(oldCourseSchedules.get(courseSchedule.getId()).getType());
             }
 
             //获取结算方式

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.*;
@@ -65,6 +66,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 	private ClassGroupService classGroupService;
 	@Autowired
 	private ClassGroupDao classGroupDao;
+	@Autowired
+	private TeacherDao teacherDao;
 
 	@Override
 	public BaseDAO<Long, CourseSchedule> getDAO() {
@@ -465,7 +468,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 		//课程对应助教集合
 		List<CourseScheduleTeacherSalary> teachingTeacherSalarys = courseScheduleDao.findTeachingTeachers(newCourseScheduleIds);
-		Map<Long, List<CourseScheduleTeacherSalary>> courseTeachingTeacherMaps = teachingTeacherSalarys.stream().collect(Collectors.groupingBy(CourseScheduleTeacherSalary::getCourseScheduleId));
+		Map<Long,List<CourseScheduleTeacherSalary>> courseTeachingTeacherMaps = teachingTeacherSalarys.stream().collect(Collectors.groupingBy(CourseScheduleTeacherSalary::getCourseScheduleId));
 
 		Map<Long, CourseSchedule> oldCourseSchedules = oldCourseScheduleList.stream().collect(Collectors.toMap(CourseSchedule::getId,courseSchedule -> courseSchedule));
 		newCourseSchedules.forEach(newCourseSchedule -> {
@@ -480,26 +483,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                 throw new BizException("不能调整今天及以前的课程");
             }
 
-			ArrayList<Date> dates = new ArrayList<>();
-			dates.add(newCourseSchedule.getClassDate());
-			List<CourseSchedule> coursesByDates = courseScheduleDao.findOverLapCoursesInDay(dates,newCourseSchedule.getStartClassTime(),newCourseSchedule.getEndClassTime());
-			//判断是否存在同时间上课的班级
-			if(null==coursesByDates||coursesByDates.size()<=0){
-				courseScheduleDao.update(newCourseSchedule);
-			}else{
-				coursesByDates.forEach(courseSchedule -> {
-					if(courseSchedule.getActualTeacherId().equals(newCourseSchedule.getActualTeacherId())){
-						//存在时间重叠，需要前端重新调整
-						throw new BizException("所选教师在当天课程安排上存在重叠!");
-					}
-				});
-				List<Integer> repeatClassGroupIds = coursesByDates.stream().map(CourseSchedule::getClassGroupId).collect(Collectors.toList());
-				checkStudentIsRepeat(repeatClassGroupIds);
-				oldCourseSchedule.setClassDate(newCourseSchedule.getClassDate());
-				oldCourseSchedule.setStartClassTime(newCourseSchedule.getStartClassTime());
-				oldCourseSchedule.setEndClassTime(newCourseSchedule.getEndClassTime());
-				courseScheduleDao.update(oldCourseSchedule);
-			}
+			oldCourseSchedule.setClassDate(newCourseSchedule.getClassDate());
+			oldCourseSchedule.setStartClassTime(newCourseSchedule.getStartClassTime());
+			oldCourseSchedule.setEndClassTime(newCourseSchedule.getEndClassTime());
+			courseScheduleDao.update(oldCourseSchedule);
 
 			//被修改的教师编号列表，需要将预计薪水置零
 			List<Integer> beReplaceTeacherIds=new ArrayList<>();
@@ -511,7 +498,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 					VipGroup byCourseSchedule = vipGroupDao.findByCourseSchedule(newCourseSchedule.getId().intValue());
 					TeacherDefaultVipGroupSalary byTeacherAndCategory = teacherDefaultVipGroupSalaryDao.findByTeacherAndCategory(newCourseSchedule.getActualTeacherId(), byCourseSchedule.getVipGroupCategoryId());
 					List<CourseSchedule> courseSchedules=new ArrayList<>();
-					coursesByDates.add(newCourseSchedule);
 					courseScheduleTeacherSalaryService.createCourseScheduleTeacherVipSalary(byCourseSchedule,
 							courseSchedules,
 							byTeacherAndCategory.getOnlineClassesSalary(),
@@ -568,14 +554,35 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		});
 		//生成修改后的教师课酬
 		if(!CollectionUtils.isEmpty(needCreateCourseScheduleTeacherSalaryCourse)){
-			classGroupTeacherMapperService.createCourseScheduleTeacherSalary(needCreateCourseScheduleTeacherSalaryCourse);
+			classGroupTeacherMapperService.createCourseScheduleTeacherSalary(needCreateCourseScheduleTeacherSalaryCourse,oldCourseSchedules);
+		}
+		//推送课时调整
+		Set<Integer> teacherIds = newCourseSchedules.stream().map(e -> e.getActualTeacherId()).collect(Collectors.toSet());
+		if(teacherIds == null){
+			teacherIds = new HashSet<>();
+		}
+		teacherIds.addAll(oldCourseScheduleList.stream().map(e -> e.getActualTeacherId()).collect(Collectors.toSet()));
+		HashMap<Integer,String> map = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertMybatisMap(teacherDao.queryPhoneByIds(StringUtils.join(teacherIds, ",")))), HashMap.class);
+		if(map != null && map.size() > 0){
+			sysMessageService.batchSendMessage(MessageSender.YIMEI,MessageTypeEnum.TEACHER_PUSH_COURSE_SCHEDULE_CHANGE_RESULT,
+					map,null,0,"","");
 		}
 	}
 
 	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public void courseSwap(Long courseScheduleId1, Long courseScheduleId2) {
+		if(courseScheduleId1.equals(courseScheduleId2)){
+			throw new BizException("请选择不同的课程");
+		}
+		CourseSchedule courseSchedule1 = courseScheduleDao.get(courseScheduleId1);
+		CourseSchedule courseSchedule2 = courseScheduleDao.get(courseScheduleId2);
+
+		courseSchedule1.setId(courseScheduleId2);
+		courseSchedule2.setId(courseScheduleId1);
+
 		List<CourseSchedule> courseSchedules = courseScheduleDao.findCourseSchedulesByIds(new Long[]{courseScheduleId1, courseScheduleId2});
+
 		CourseSchedule temp=new CourseSchedule();
 		BeanUtils.copyProperties(courseSchedules.get(0),temp);
 		courseSchedules.get(0).setClassDate(courseSchedules.get(1).getClassDate());

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

@@ -220,7 +220,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 				teacherAttendanceDao.update(teacherAttendance);
 				//教师签退后，给未签到学员添加旷课记录
 				//封装未签到学员签到列表
-				List<StudentAttendance> studentAttendances = teacherAttendanceDao.queryNoSignStudentRecord(courseScheduleId);
+				List<StudentAttendance> studentAttendances = studentAttendanceDao.queryNoSignStudentRecord(courseScheduleId);
 				if(studentAttendances != null && studentAttendances.size() > 0){
 					studentAttendances.forEach(e->{
 						e.setTeacherId(userId);

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

@@ -1,15 +1,20 @@
 package com.ym.mec.biz.service.impl;
 
+import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.biz.dal.dao.TeacherLeaveRecordDao;
 import com.ym.mec.biz.dal.entity.CourseSchedule;
+import com.ym.mec.biz.dal.entity.Teacher;
 import com.ym.mec.biz.dal.entity.TeacherLeaveRecord;
 import com.ym.mec.biz.dal.entity.TeacherLeaveRecord.CoursesScheduleHistory;
 import com.ym.mec.biz.dal.enums.AuditStatusEnum;
+import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.service.CourseScheduleService;
+import com.ym.mec.biz.service.SysMessageService;
 import com.ym.mec.biz.service.TeacherLeaveRecordService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
 import com.ym.mec.util.date.DateUtil;
 import com.ym.mec.util.json.JsonUtil;
 import org.apache.commons.lang3.StringUtils;
@@ -19,10 +24,7 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -30,10 +32,15 @@ public class TeacherLeaveRecordServiceImpl extends BaseServiceImpl<Long, Teacher
 
 	@Autowired
 	private TeacherLeaveRecordDao teacherLeaveRecordDao;
+	@Autowired
+	private TeacherDao teacherDao;
 
 	@Autowired
 	private CourseScheduleService courseScheduleService;
 
+	@Autowired
+	private SysMessageService sysMessageService;
+
 	@Override
 	public BaseDAO<Long, TeacherLeaveRecord> getDAO() {
 		return teacherLeaveRecordDao;
@@ -110,7 +117,12 @@ public class TeacherLeaveRecordServiceImpl extends BaseServiceImpl<Long, Teacher
 				courseScheduleService.classStartDateAdjust(list);
 			}
 		}
-
+		//教师请假结果通知
+		Map<Integer,String> map = new HashMap<>(1);
+		Teacher teacher = teacherDao.get(teacherLeaveRecord.getUserId());
+		map.put(teacher.getId(),teacher.getPhone());
+		sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.TEACHER_PUSH_LEAVE_RESULT,
+				map,null,0,"",status.getCode());
 		return true;
 	}
 

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

@@ -315,7 +315,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		if(!CollectionUtils.isEmpty(updateCourseSchedules)){
 			//需要删除的课程编号列表
 			List<Long> deleteCourseScheduleIds = vipGroupCourseSchedules.stream()
-					.filter(courseSchedule -> updateCourseScheduleIds.contains(courseSchedule.getId()))
+					.filter(courseSchedule -> !updateCourseScheduleIds.contains(courseSchedule.getId()))
 					.map(CourseSchedule::getId)
 					.collect(Collectors.toList());
 			//删除对应的课程及相关信息
@@ -634,7 +634,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			switch (vipGroupSalarySettlementDto.getOnlineSalarySettlement().getSalarySettlementType()){
 				case TEACHER_DEFAULT:
 					if(vipGroup instanceof VipGroupApplyBaseInfoDto&&!useDefaultTeacherSalary
-							&&vipGroupActivity.getSalaryReadonlyFlag().equals("0")){
+							&&vipGroupActivity.getSalaryReadonlyFlag().equals("1")){
 						teacherOnlineSalary=((VipGroupApplyBaseInfoDto) vipGroup).getOnlineTeacherSalary();
 					}
 
@@ -663,7 +663,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			switch (vipGroupSalarySettlementDto.getOfflineSalarySettlement().getSalarySettlementType()){
 				case TEACHER_DEFAULT:
 					if(vipGroup instanceof VipGroupApplyBaseInfoDto&&!useDefaultTeacherSalary
-							&&vipGroupActivity.getSalaryReadonlyFlag().equals("0")){
+							&&vipGroupActivity.getSalaryReadonlyFlag().equals("1")){
 						teacherOfflineSalary=((VipGroupApplyBaseInfoDto) vipGroup).getOfflineTeacherSalary();
 					}
 					if(Objects.isNull(teacherOfflineSalary)){

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

@@ -397,6 +397,7 @@
         <result column="online_classes_num_" property="onlineClassesNum"/>
         <result column="offline_classes_num_" property="offLineClassesNum"/>
         <result property="type" column="type_"/>
+        <result property="courseStartDate" column="courses_start_date"/>
     </resultMap>
 
     <select id="findTeacherMusicClassGroup" resultMap="TeacherClassGroupDto">
@@ -436,6 +437,7 @@
             vg.payment_expire_date_,
             vg.courses_expire_date_,
             vg.single_class_minutes_,
+            vg.courses_start_date,
             IF(vg.online_classes_num_ IS NULL,0,vg.online_classes_num_) online_classes_num_,
             IF(vg.offline_classes_num_ IS NULL,0,vg.offline_classes_num_) offline_classes_num_,
             cg.total_class_times_,

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

@@ -297,4 +297,11 @@
     <select id="findByStatusAndCourseScheduleId" resultMap="StudentAttendance">
         SELECT * FROM student_attendance sa WHERE course_schedule_id_ = #{courseScheduleId} AND user_id_ = #{userId} LIMIT 1
     </select>
+
+    <select id="queryNoSignStudentRecord" resultMap="StudentAttendance">
+        SELECT cg.music_group_id_,cg.id_ class_group_id_,cssp.course_schedule_id_,cssp.user_id_,cg.current_class_times_
+        FROM course_schedule_student_payment cssp LEFT JOIN class_group cg ON cg.id_ = cssp.class_group_id_
+        WHERE cssp.user_id_ NOT IN (SELECT DISTINCT sa.user_id_ FROM student_attendance sa WHERE course_schedule_id_ = #{courseScheduleId})
+        AND cssp.course_schedule_id_ = #{courseScheduleId}
+    </select>
 </mapper>

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

@@ -235,10 +235,4 @@
     <select id="queryNoSignOutListByOverMinutes" resultMap="Mapper">
         SELECT ta.teacher_id_ key_,u.real_name_ value_ FROM course_schedule cs right join teacher_attendance ta on ta.course_schedule_id_ = cs.id_ left join sys_user u on ta.teacher_id_ = u.id_ WHERE ta.sign_out_status_ = 0 and date(cs.class_date_) = date(now()) and SUBTIME(cs.end_class_time_, CONCAT(#{minutes},'00')) &lt; CURRENT_TIME()
     </select>
-    <select id="queryNoSignStudentRecord" resultMap="TeacherAttendance">
-        SELECT cg.music_group_id_,cg.id_ class_group_id_,cssp.course_schedule_id_,cssp.user_id_,cg.current_class_times_
-        FROM course_schedule_student_payment cssp LEFT JOIN class_group cg ON cg.id_ = cssp.class_group_id_
-        WHERE cssp.user_id_ NOT IN (SELECT DISTINCT sa.user_id_ FROM student_attendance sa WHERE course_schedule_id_ = #{courseScheduleId})
-        AND cssp.course_schedule_id_ = #{courseScheduleId}
-    </select>
 </mapper>

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

@@ -118,6 +118,9 @@
 			<if test="leaveCategoryId != null">
 				AND tlr.leave_category_id_ = #{leaveCategoryId}
 			</if>
+			<if test="teacherId != null">
+				AND tlr.user_id_ = #{teacherId}
+			</if>
 		</where>
 	</sql>
 

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

@@ -255,6 +255,10 @@
         select id_ `key`,real_name_ `value` FROM sys_user s WHERE FIND_IN_SET(id_,#{userIds})
     </select>
 
+    <select id="queryPhoneByIds" resultType="java.util.Map" parameterType="list">
+        select id_ `key`,phone_ `value` FROM sys_user s WHERE FIND_IN_SET(id_,#{userIds}) AND s.phone_ IS NOT NULL
+    </select>
+
     <select id="findTeachers" resultMap="Teacher">
         SELECT su.* FROM teacher t
         LEFT JOIN sys_user su on t.id_ = su.id_ WHERE 1=1

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

@@ -93,6 +93,7 @@
         <result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="attribute1_" property="attribute1" />
         <result column="category_name_" property="categoryName"/>
+        <result property="courseStartDate" column="courses_start_date"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -297,6 +298,7 @@
             vg.single_class_minutes_,
             vg.payment_expire_date_,
             vg.courses_expire_date_,
+            vg.courses_start_date,
             vg.online_classes_num_,
             vg.offline_classes_num_,
             vg.total_price_,

mec-im/src/main/java/com/ym/service/Impl/HereWhiteServiceImpl.java

@@ -31,7 +31,7 @@ public class HereWhiteServiceImpl implements HereWhiteService {
         JSONObject json = new JSONObject();
         json.put("name",name);
         json.put("limit",userNum);
-        json.put("mode","transitory");
+        json.put("mode","persistent");
         String url = "/room?token=" + hereWhiteToken;
         JSONObject jsonObject = JSONObject.parseObject(requestParam(json, url));
         if(jsonObject.getString("code").equals("200")){

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

@@ -139,6 +139,9 @@ public class CourseScheduleController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('courseSchedule/courseSwap')")
     @GetMapping(value = "/courseSwap",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public Object courseSwap(Long courseScheduleId1,Long courseScheduleId2){
+        if(Objects.isNull(courseScheduleId1)||Objects.isNull(courseScheduleId2)){
+            return failed("请指定课程");
+        }
         scheduleService.courseSwap(courseScheduleId1,courseScheduleId2);
         return succeed();
     }