|
|
@@ -19,6 +19,7 @@ import cn.com.qmth.stmms.admin.utils.UpyunConfig;
|
|
|
import cn.com.qmth.stmms.biz.exam.model.DataSync;
|
|
|
import cn.com.qmth.stmms.biz.exam.model.Exam;
|
|
|
import cn.com.qmth.stmms.biz.exam.model.ExamStudent;
|
|
|
+import cn.com.qmth.stmms.biz.exam.model.ExamSubject;
|
|
|
import cn.com.qmth.stmms.biz.exam.service.DataSyncService;
|
|
|
import cn.com.qmth.stmms.biz.exam.service.ExamService;
|
|
|
import cn.com.qmth.stmms.biz.exam.service.ExamStudentService;
|
|
|
@@ -109,13 +110,14 @@ public class DataSyncThread implements Runnable {
|
|
|
JSONObject subject = subjectArray.getJSONObject(i);
|
|
|
String subjectCode = subject.getString(SUBJECT_CODE);
|
|
|
String subjectName = subject.getString(SUBJECT_NAME);
|
|
|
- if (null != sync.getSubjectCode() && !subjectCode.equals(sync.getSubjectCode())) {
|
|
|
- continue;
|
|
|
- }
|
|
|
Long startId = 0L;
|
|
|
if (null != sync.getNextId()) {
|
|
|
startId = sync.getNextId();
|
|
|
}
|
|
|
+ ExamSubject examSubject = subjectService.find(exam.getId(), subjectCode);
|
|
|
+ if (examSubject != null && !subjectCode.equals(sync.getSubjectCode())) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
while (startId != null) {
|
|
|
datas.put(SUBJECT_CODE, subjectCode);
|
|
|
datas.put(START_ID, startId);
|
