update

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

@@ -37,5 +37,5 @@ public interface ExaminationBasicDao extends BaseDAO<Long, ExaminationBasic> {
     List<ExaminationBasic> getNeedUpdateStatusExams();
 
     List<ExaminationBasicDto> getExams(@Param("examIds") List<Long> examIds);
-	
+
 }

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

@@ -7,6 +7,8 @@ import com.keao.edu.user.entity.ExaminationBasic;
 import com.keao.edu.user.enums.ExamStatusEnum;
 import com.keao.edu.user.page.ExaminationQueryInfo;
 
+import java.util.Map;
+
 public interface ExaminationBasicService extends BaseService<Long, ExaminationBasic> {
 
     /**
@@ -81,4 +83,13 @@ public interface ExaminationBasicService extends BaseService<Long, ExaminationBa
      */
     ExaminationBasic getInfo(Integer examId);
 
+    /**
+     * @describe 获取首页进行中项目
+     * @author Joburgess
+     * @date 2020.08.12
+     * @param organId:
+     * @return java.util.Map<java.lang.String,java.lang.Object>
+     */
+    Map<String, Object> getHomePageExams(Integer organId);
+
 }

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

@@ -266,6 +266,7 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public ExamRoom updateExamRoom(ExamRoom examRoom) {
 		if(Objects.isNull(examRoom.getId())){
 			throw new BizException("请指定考场");
@@ -363,8 +364,10 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 				throw new BizException("考试地址不存在");
 			}
 			List<ExamRoomStudentRelation> examRoomStudents = examRoomStudentRelationDao.findStudentsWithExamRoom(examRoom.getId());
-			List<Long> registIds = examRoomStudents.stream().map(ExamRoomStudentRelation::getExamRegistrationId).collect(Collectors.toList());
-			examCertificationDao.updateExamAddress(examLocation.getAddress(), registIds);
+			if(!CollectionUtils.isEmpty(examRoomStudents)){
+				List<Long> registIds = examRoomStudents.stream().map(ExamRoomStudentRelation::getExamRegistrationId).collect(Collectors.toList());
+				examCertificationDao.updateExamAddress(examLocation.getAddress(), registIds);
+			}
 		}
 		return examRoom;
 	}

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

@@ -440,4 +440,11 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
         }
         return examinationBasic;
     }
+
+    @Override
+    public Map<String, Object> getHomePageExams(Integer organId) {
+        List<Integer> childOrganIds = organizationService.getChildOrganIds(organId, true);
+//        examinationBasicDao.getExaminationBasic()
+        return null;
+    }
 }