wangwei пре 7 година
родитељ
комит
4146da3180

+ 1 - 2
examcloud-task-dao/src/main/java/cn/com/qmth/examcloud/task/dao/ExamStudentTempRepo.java

@@ -15,7 +15,6 @@ public interface ExamStudentTempRepo
 			JpaRepository<ExamStudentTempEntity, Long>,
 			JpaSpecificationExecutor<ExamStudentTempEntity> {
 
-	List<ExamStudentTempEntity> findByBatchIdAndStatusCodeIsNotNull(Long batchId,
-			Pageable pageable);
+	List<ExamStudentTempEntity> findByBatchIdAndStatusCodeIsNull(Long batchId, Pageable pageable);
 
 }

+ 5 - 3
examcloud-task-service/src/main/java/cn/com/qmth/examcloud/task/service/job/ExamStudentImportDataProcessingTask.java

@@ -149,7 +149,7 @@ public class ExamStudentImportDataProcessingTask extends AbstractTask {
 		while (true) {
 			Pageable pageable = new PageRequest(0, 100, Sort.Direction.DESC, "updateTime");
 			List<ExamStudentTempEntity> list = examStudentTempRepo
-					.findByBatchIdAndStatusCodeIsNotNull(batchId, pageable);
+					.findByBatchIdAndStatusCodeIsNull(batchId, pageable);
 			if (CollectionUtils.isEmpty(list)) {
 				break;
 			}
@@ -158,8 +158,7 @@ public class ExamStudentImportDataProcessingTask extends AbstractTask {
 				saveExamStudent(cur, failRecords);
 			}
 		}
-		
-		
+
 	}
 
 	/**
@@ -173,6 +172,7 @@ public class ExamStudentImportDataProcessingTask extends AbstractTask {
 			List<Map<String, Object>> failRecords) {
 		Long rootOrgId = entity.getRootOrgId();
 		String courseCode = entity.getCourseCode();
+		String orgCode = entity.getOrgCode();
 
 		try {
 			GetCourseReq req = new GetCourseReq();
@@ -195,6 +195,8 @@ public class ExamStudentImportDataProcessingTask extends AbstractTask {
 
 		try {
 			GetOrgReq req = new GetOrgReq();
+			req.setOrgCode(orgCode);
+			req.setRootOrgId(rootOrgId);
 			GetOrgResp resp = orgCloudService.getOrg(req);
 			OrgBean org = resp.getOrg();
 			entity.setOrgId(org.getId());