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

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

@@ -179,4 +179,15 @@ public interface ClassGroupStudentMapperDao extends BaseDAO<Long, ClassGroupStud
      */
     Integer countClassGroupExitStudentNum(@Param("classGroupId") Integer classGroupId,
                                           @Param("userIds") List<Integer> userIds);
+
+    /**
+     * @describe 统计用户对应加入乐团/小课/试听课的数量
+     * @author Joburgess
+     * @date 2019/11/29
+     * @param userId: 用户编号
+     * @param groupType: 乐团编号
+     * @return java.lang.Integer
+     */
+    Integer countUserGroups(@Param("userId") Integer userId,
+                            @Param("groupType") String groupType);
 }

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

@@ -636,6 +636,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 	@Override
 	public void courseAdjust(List<CourseSchedule> newCourseSchedules) {
+		Date now=new Date();
 		//课程信息处理
 		List<Long> courseScheduleIds = newCourseSchedules.stream()
 				.map(CourseSchedule::getId)
@@ -662,6 +663,15 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			if(Objects.isNull(newCourseSchedule.getTeachMode())){
 				newCourseSchedule.setTeachMode(oldCourseSchedule.getTeachMode());
 			}
+			if(newCourseSchedule.getStartClassTime().after(now)){
+				newCourseSchedule.setStatus(CourseStatusEnum.NOT_START);
+			}
+			if(newCourseSchedule.getStartClassTime().before(now)&&newCourseSchedule.getEndClassTime().after(now)){
+				newCourseSchedule.setStatus(CourseStatusEnum.UNDERWAY);
+			}
+			if(newCourseSchedule.getEndClassTime().before(now)){
+				newCourseSchedule.setStatus(CourseStatusEnum.OVER);
+			}
 		});
 		//课程冲突检测
 		checkNewCourseSchedules(newCourseSchedules,false);
@@ -708,6 +718,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			oldCourseSchedule.setClassDate(newCourseSchedule.getClassDate());
 			oldCourseSchedule.setStartClassTime(newCourseSchedule.getStartClassTime());
 			oldCourseSchedule.setEndClassTime(newCourseSchedule.getEndClassTime());
+			oldCourseSchedule.setStatus(newCourseSchedule.getStatus());
 
 			//被修改的教师编号列表，需要将预计薪水置零
 			List<Integer> beReplaceTeacherIds=new ArrayList<>();

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

@@ -710,7 +710,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         MusicCardDto musicCardDto = musicGroupDao.queryPersonalMusicGroups(userId);
         if(musicCardDto != null){
             musicCardDto.setMusicGroupNum(musicGroupDao.countUserMusicGroups(userId));
-            musicCardDto.setVipClassNum(musicGroupDao.countCourseByType(userId, ClassGroupTypeEnum.VIP));
+            musicCardDto.setVipClassNum(classGroupStudentMapperDao.countUserGroups(userId, ClassGroupTypeEnum.VIP.getCode()));
             return musicCardDto;
         }
         return new MusicCardDto();

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

@@ -229,4 +229,7 @@
                 #{userId}
             </foreach>
     </select>
+    <select id="countUserGroups" resultType="int">
+      SELECT COUNT(1) FROM class_group_student_mapper WHERE user_id_=#{userId} AND group_type_=#{groupType} AND status_!='QUIT'
+    </select>
 </mapper>

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

@@ -476,8 +476,8 @@
             csts.teacher_role_,
             cs.schoole_id_,
             s.name_ school_name_,
-            if(ta.sign_in_status_ IS NULL,3,ta.sign_in_status_) sign_in_status_,
-            if(ta.sign_out_status_ IS NULL,3,ta.sign_out_status_) sign_out_status_,
+            if(ta.sign_in_status_ IS NULL,0,1) sign_in_status_,
+            if(ta.sign_out_status_ IS NULL,0,1) sign_out_status_,
             cs.teach_mode_
         FROM
             course_schedule_teacher_salary csts

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

@@ -11,6 +11,7 @@ import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.enums.AuditStatusEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
+import com.ym.mec.biz.dal.enums.TeachModeEnum;
 import com.ym.mec.biz.dal.page.StudentAttendanceQueryInfo;
 import com.ym.mec.biz.dal.page.VipGroupQueryInfo;
 import com.ym.mec.biz.service.*;
@@ -84,6 +85,7 @@ public class CourseScheduleController extends BaseController {
             courseSchedule.setSchoolId(musicGroup.getSchoolId());
             courseSchedule.setMusicGroupId(musicGroup.getId());
             courseSchedule.setGroupType(GroupType.MUSIC);
+            courseSchedule.setTeachMode(TeachModeEnum.OFFLINE);
         });
 
         scheduleService.createCourseSchedules(createCourseScheduleDto.getCourseSchedules());