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

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

@@ -174,7 +174,7 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 	@Transactional(rollbackFor = Exception.class)
 	public void addExamOrganizations(List<ExamOrganizationRelation> organizationRelations, Integer selfOrganId) {
 		if(CollectionUtils.isEmpty(organizationRelations)){
-			throw new BizException("请指定考级项目");
+			throw new BizException("请选择合作单位");
 		}
 		if(Objects.isNull(organizationRelations.get(0).getExaminationBasicId())){
 			throw new BizException("请指定考级项目");

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

@@ -242,6 +242,7 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public void autoSplitStudentToRoom(Long examId, Integer selfOrganId) {
 		ExaminationBasic examinationBasic = examinationBasicDao.get(examId);
 		if(Objects.isNull(examinationBasic)){

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

@@ -286,8 +286,9 @@
 		FROM
 			exam_room_student_relation ersr
 			LEFT JOIN exam_room er ON ersr.exam_room_id_ = er.id_
-		WHERE DATE_FORMAT(er.exam_start_time_,'%Y-%m-%d') = #{day}
+		WHERE er.exam_plan_push_flag_=1 AND DATE_FORMAT(er.exam_start_time_,'%Y-%m-%d') = #{day}
 	</select>
+
     <select id="getStudentNumMap" resultType="java.util.Map">
 		SELECT ersr.exam_room_id_ 'key',COUNT(DISTINCT ersr.student_id_) 'value'
 		FROM exam_room_student_relation ersr
@@ -297,6 +298,7 @@
 		</foreach>
 		GROUP BY ersr.exam_room_id_
 	</select>
+
 	<select id="countSignInNum" resultType="java.lang.Integer">
 		SELECT COUNT(DISTINCT id_) FROM student_exam_result WHERE is_finished_exam_ = 2 AND exam_room_id_ = #{examRoomId}
 	</select>