Merge remote-tracking branch 'origin/master'

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

@@ -4,6 +4,8 @@ import com.ym.mec.biz.dal.entity.CourseSchedule;
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
 import com.ym.mec.biz.dal.enums.CourseStatusEnum;
 import com.ym.mec.biz.dal.enums.StudentAttendanceStatusEnum;
+import com.ym.mec.biz.dal.enums.TeachModeEnum;
+
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
@@ -48,6 +50,9 @@ public class StudentManageCourseListDto {
     
     @ApiModelProperty(value = "课程编号",required = false)
     private Long courseScheduleId;
+    
+    @ApiModelProperty(value = "教学模式（线上/线下）",required = false)
+    private TeachModeEnum teachMode;
 
     public CourseSchedule.CourseScheduleType getCourseScheduleType() {
         return courseScheduleType;
@@ -144,4 +149,12 @@ public class StudentManageCourseListDto {
 	public void setCourseScheduleId(Long courseScheduleId) {
 		this.courseScheduleId = courseScheduleId;
 	}
+
+	public TeachModeEnum getTeachMode() {
+		return teachMode;
+	}
+
+	public void setTeachMode(TeachModeEnum teachMode) {
+		this.teachMode = teachMode;
+	}
 }

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

@@ -17,6 +17,7 @@
         <result property="totalClassTimes" column="total_class_times_" />
         <result property="attendanceStatus" column="status_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result property="courseStatus" column="courseStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result property="teachMode" column="teach_mode_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>
 
     <resultMap id="studentManageAccountBaseInfo" type="com.ym.mec.biz.dal.dto.StudentManageAccountBaseInfoDto">
@@ -244,7 +245,8 @@
             cg.type_ class_group_type_,
             CONCAT(cs.class_date_," ",cs.start_class_time_) course_date_,
             cs.status_ course_status_,
-            su.real_name_ teacher_name_
+            su.real_name_ teacher_name_,
+            cs.teach_mode_
         FROM class_group cg
             LEFT JOIN class_group_student_mapper cgsm ON cg.id_=cgsm.class_group_id_
             LEFT JOIN course_schedule cs ON cg.id_=cs.class_group_id_
@@ -302,7 +304,8 @@
             IF(sa.status_ IS NULL,'TRUANT',sa.status_) status_,
             sa.current_class_times_,
             cg.total_class_times_,
-            cs.status_ courseStatus
+            cs.status_ courseStatus,
+            cs.teach_mode_
         FROM course_schedule_student_payment cssp
             LEFT JOIN student_attendance sa ON cssp.course_schedule_id_ = sa.course_schedule_id_ AND cssp.user_id_ = sa.user_id_
             LEFT JOIN class_group cg ON cssp.class_group_id_ = cg.id_

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

@@ -1238,13 +1238,14 @@ public class RoomServiceImpl implements RoomService {
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class,isolation = Isolation.READ_COMMITTED)
     public boolean statusSync(String roomId,String userId) throws Exception {
         log.info("statusSync: roomId={}, userId={}", roomId, userId);
         List<RoomMember> byRidAndUid = roomMemberDao.findByRidAndUid(roomId, userId);
         if(byRidAndUid.size() > 0){
 //            SysUser sysUser = sysUserFeignService.queryUserById(Integer.parseInt(userId));
             SysUser sysUser = teacherDao.getUser(Integer.parseInt(userId));
+            studentDao.lockUser(Integer.parseInt(userId));
             Teacher teacher = teacherDao.get(sysUser.getId());
             CourseSchedule courseSchedule = courseScheduleDao.get(Long.parseLong(roomId.substring(1)));
             log.info("statusSyncLevelRoom: roomId={}, userId={}", roomId, userId);