Merge remote-tracking branch 'origin/master'

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamRoomStudentRelationController.java

@@ -42,6 +42,13 @@ public class ExamRoomStudentRelationController extends BaseController {
         return succeed();
     }*/
 
+    @ApiOperation("签到")
+    @PostMapping(value = "/signIn")
+    public HttpResponseResult signIn(Long examRegistrationId) {
+        examRoomStudentRelationService.signIn(examRegistrationId);
+        return succeed();
+    }
+
     @ApiOperation("下一位")
     @PostMapping(value = "/nextBit")
     public HttpResponseResult nextBit(Long nextExamRoomStudentRelationId,Long examRoomStudentRelationId,Integer examStatus) {

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/ExamRoomStudentRelationService.java

@@ -89,4 +89,10 @@ public interface ExamRoomStudentRelationService extends BaseService<Long, ExamRo
      * @return
      */
     Map<String,Object> queryNeedCheckingList(Long roomId);
+
+    /**
+     * 签到
+     * @param examRegistrationId
+     */
+    void signIn(Long examRegistrationId);
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamRoomStudentRelationServiceImpl.java

@@ -312,4 +312,12 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
 		resultMap.put("surplusNum",examRoomStudentRelationDao.querySurplusNum(roomId));
 		return resultMap;
 	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void signIn(Long examRegistrationId) {
+		ExamRoomStudentRelation studentExamRoom = examRoomStudentRelationDao.getStudentExamRoom(examRegistrationId);
+		studentExamRoom.setSignInTime(new Date());
+		examRoomStudentRelationDao.update(studentExamRoom);
+	}
 }