Merge remote-tracking branch 'origin/master'

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

@@ -396,7 +396,7 @@
             WHERE class_group_id_=#{classGroupId}
     </select>
     <select id="findByStatusAndCourseScheduleId" resultMap="StudentAttendance">
-        SELECT * FROM student_attendance sa WHERE course_schedule_id_ = #{courseScheduleId} AND user_id_ = #{userId} LIMIT 1
+        SELECT * FROM student_attendance sa WHERE course_schedule_id_ = #{courseScheduleId} AND user_id_ = #{userId} LIMIT 1 FOR UPDATE
     </select>
 
     <select id="queryNoSignStudentRecord" resultMap="StudentAttendance">

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

@@ -1175,7 +1175,11 @@ public class RoomServiceImpl implements RoomService {
 
             if (userRole == RoleEnum.RoleTeacher.getValue() || userRole == RoleEnum.RoleAssistant.getValue()) {
                 if (isUserDisplay(roomList.get(0), userId)) {
-                    updateDisplay(roomId, userId, "", 0);
+                    try {
+                        updateDisplay(roomId, userId, "", 0);
+                    }catch (Exception e){
+                        log.error(e.getMessage());
+                    }
                     log.info("clear display cause speaker leave: roomId={}", roomId);
                 } else {
                     log.info("don't update current display: room={}, role={}", roomList.get(0), RoleEnum.getEnumByValue(userRole));

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

@@ -104,9 +104,9 @@ public class ExportController extends BaseController {
         }
         List<StudentBuyPracticeDto> rows = practiceGroupService.studentBuys(queryInfo).getRows();
         try {
-            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"学员编号", "学员名称", "所属分部", "联系电话", "购买网管课",
+            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"学员编号", "学员名称", "所属分部", "购买网管课",
                     "免费课结束日期", "首次购买日期", "时间差"}, new String[]{
-                    "studentId", "studentName", "organName", "phone", "buyPractice.msg",
+                    "studentId", "studentName", "organName", "buyPractice.msg",
                     "lastClassDate", "firstBuyTime", "intervalDay"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");