3.2.3 bug修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamDetailServiceImpl.java

@@ -719,7 +719,7 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
         }
 
         // 校验准考证号是否重复
-        List<String> stringList = ticketNumberCodeMap.entrySet().stream().filter(m -> m.getValue().intValue() > 1).map(m -> String.format("准考证号[%s]有%d条重复数据", m.getKey(), m.getValue().intValue())).collect(Collectors.toList());
+        List<String> stringList = ticketNumberCodeMap.entrySet().stream().filter(m -> m.getValue().intValue() > 1).map(m -> String.format("考号[%s]有%d条重复数据", m.getKey(), m.getValue().intValue())).collect(Collectors.toList());
         if (!stringList.isEmpty()) {
             throw ExceptionResultEnum.ERROR.exception(String.join(",", stringList));
         }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TBSyncTaskServiceImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.distributed.print.business.bean.dto.SyncExamTaskDto;
+import com.qmth.distributed.print.business.bean.marking.GroupInfo;
 import com.qmth.distributed.print.business.entity.TBSyncTask;
 import com.qmth.distributed.print.business.mapper.TBSyncTaskMapper;
 import com.qmth.distributed.print.business.service.*;
@@ -263,6 +264,9 @@ public class TBSyncTaskServiceImpl extends ServiceImpl<TBSyncTaskMapper, TBSyncT
             case USER_PUSH:
                 cloudUserPushService.pushCloudUser(tbSyncTask.getObjectId(), requestUser);
                 break;
+            case MARKER_PUSH:
+                asyncCloudMarkingTaskService.syncMarker(examPaperStructureService.getById(tbSyncTask.getObjectId()), JSON.parseObject(tbSyncTask.getRemark(), GroupInfo.class));
+                break;
             default:
                 break;
         }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/sync/CloudMarkingTaskUtils.java

@@ -184,7 +184,9 @@ public class CloudMarkingTaskUtils {
         map.put("password", validParam(password, null, false, "密码"));
         map.put("role", validParam(String.valueOf(roleValue), null, true, "类型：MARKER、SUBJECT_HEADER"));
         map.put("enable", validParam(enable, true, false, "是否启用"));
-        map.put("schoolCode", validParam(orgCode, null, false, "子机构编号"));
+        if(StringUtils.isNotBlank(orgCode)) {
+            map.put("schoolCode", validParam(orgCode, null, false, "子机构编号"));
+        }
 
         PushResult pushResult = new PushResult();
         boolean pushStatus = false;