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