Merge branch 'master' of http://git.dayaedu.com/yonge/edu-saas

edu-im/edu-im-api/src/main/java/com/keao/edu/im/api/client/ImFeignService.java

@@ -5,6 +5,7 @@ import java.util.List;
 import com.keao.edu.im.api.entity.*;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -150,5 +151,6 @@ public interface ImFeignService {
 	 * @return
 	 */
 	@PostMapping(value = "room/destroyRoom")
+	@Async
 	void destroyRoom(@RequestParam("roomId") Long roomId,@RequestParam("userId") String userId);
 }

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/dao/ExamRoomStudentRelationDao.java

@@ -135,7 +135,10 @@ public interface ExamRoomStudentRelationDao extends BaseDAO<Long, ExamRoomStuden
      * @param signInTime
      * @return
      */
-    Integer sumWaitNum(@Param("examRoomId") Long examRoomId, @Param("signInTime") String signInTime, @Param("studentId") Integer studentId);
+    Integer sumWaitNum(@Param("examRoomId") Long examRoomId,
+                       @Param("signInTime") String signInTime,
+                       @Param("studentId") Integer studentId,
+                       @Param("ersrId") Long ersrId);
 
     /**
      * 获取所有参考学员编号

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/ExamCertificationServiceImpl.java

@@ -76,7 +76,7 @@ public class ExamCertificationServiceImpl extends BaseServiceImpl<Long, ExamCert
 		//等待学员数
 		String signInTime = needCheckingDetailDto.getSignInTime();
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		Integer waitNum = examRoomStudentRelationDao.sumWaitNum(needCheckingDetailDto.getExamRoomId(),signInTime,sysUser.getId());
+		Integer waitNum = examRoomStudentRelationDao.sumWaitNum(needCheckingDetailDto.getExamRoomId(),signInTime,sysUser.getId(),needCheckingDetailDto.getExamRoomStudentRelationId());
 		needCheckingDetailDto.setWaitNum(waitNum);
 		needCheckingDetailDto.setDesc(sysConfigDao.findConfigValue("exam_room_desc"));
 		return needCheckingDetailDto;

edu-user/edu-user-biz/src/main/resources/config/mybatis/ExamRoomStudentRelationMapper.xml

@@ -240,7 +240,7 @@
 		WHERE ersr.exam_room_id_ = #{examRoomId} AND ersr.sign_in_time_ IS NOT NULL
 		AND ser.is_finished_exam_ IN (0,1,2) AND ersr.student_id_ != #{studentId}
 		<if test="signInTime != null and signInTime != ''">
-			AND ersr.sign_in_time_ &lt; #{signInTime}
+			AND (ersr.sign_in_time_ &lt; #{signInTime} OR (ersr.sign_in_time_ = #{signInTime} AND ersr.id_ &lt; #{ersrId}))
 		</if>
 	</select>
     <select id="getStudentIds" resultType="java.lang.String">