|
@@ -403,7 +403,7 @@ public class DataSyncServiceImpl implements DataSyncService {
|
|
updateWrapper.lambda().set(ExamPrintPlan::getSyncStatus, syncStatus).eq(ExamPrintPlan::getId, examPrintPlan.getId());
|
|
updateWrapper.lambda().set(ExamPrintPlan::getSyncStatus, syncStatus).eq(ExamPrintPlan::getId, examPrintPlan.getId());
|
|
examPrintPlanService.update(updateWrapper);
|
|
examPrintPlanService.update(updateWrapper);
|
|
// 同步成功,发送短信
|
|
// 同步成功,发送短信
|
|
- if(ExamPrintPlanSyncStatusEnum.FINISH.equals(syncStatus)) {
|
|
|
|
|
|
+ if (ExamPrintPlanSyncStatusEnum.FINISH.equals(syncStatus)) {
|
|
examPrintPlanService.sendNoticeUploadStructure(examPrintPlan.getId(), sysUser);
|
|
examPrintPlanService.sendNoticeUploadStructure(examPrintPlan.getId(), sysUser);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -444,7 +444,7 @@ public class DataSyncServiceImpl implements DataSyncService {
|
|
String examNumber = examStudent.getTicketNumber();
|
|
String examNumber = examStudent.getTicketNumber();
|
|
String studentCode = examStudent.getStudentCode();
|
|
String studentCode = examStudent.getStudentCode();
|
|
String name = examStudent.getStudentName();
|
|
String name = examStudent.getStudentName();
|
|
- SysOrg sysOrg = examStudentService.getSysOrgByBelongOrgId(studentCode);
|
|
|
|
|
|
+ SysOrg sysOrg = examStudentService.getSysOrgByBelongOrgId(studentCode, schoolId);
|
|
String college = Objects.nonNull(sysOrg) && StringUtils.isNotBlank(sysOrg.getName()) ? sysOrg.getName() : "无";
|
|
String college = Objects.nonNull(sysOrg) && StringUtils.isNotBlank(sysOrg.getName()) ? sysOrg.getName() : "无";
|
|
String className = StringUtils.isBlank(examStudent.getClazzName()) ? getClassName(examStudent.getExtendFields()) : examStudent.getClazzName();
|
|
String className = StringUtils.isBlank(examStudent.getClazzName()) ? getClassName(examStudent.getExtendFields()) : examStudent.getClazzName();
|
|
String teacher = "无";
|
|
String teacher = "无";
|