Merge branch 'dev_v3.2.4' into dev_v3.2.5

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

@@ -504,7 +504,7 @@ public class DataSyncServiceImpl implements DataSyncService {
                     SysConfig sysConfig = sysConfigService.getByKey("sys.user.initPassword");
                     cloudMarkingTaskUtils.syncUser(SpecialPrivilegeEnum.SUBJECT_HEADER.getPrefix() + markerUser.getLoginName(), markerUser.getRealName(), sysConfig.getConfigValue(), SpecialPrivilegeEnum.SUBJECT_HEADER.getValue(), markerUser.getEnable(), schoolId, orgCode);
 
-                    cloudMarkingTaskUtils.saveMarkLeader(schoolId, subjectCode, object.getString("loginName"));
+                    cloudMarkingTaskUtils.saveMarkLeader(schoolId, subjectCode, object.getString("loginName"), orgCode);
                 }
             }
             result = TaskResultEnum.SUCCESS;

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

@@ -157,7 +157,7 @@ public class TBSyncTaskServiceImpl extends ServiceImpl<TBSyncTaskMapper, TBSyncT
     public IPage<SyncListResult> query(Long schoolId, TaskStatusEnum status, PushTypeEnum type, TaskResultEnum result, int pageNumber, int pageSize) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
-        DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(schoolId,requestUser.getId(),ServletUtil.getRequest().getServletPath());
+        DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(schoolId, requestUser.getId(), ServletUtil.getRequest().getServletPath());
 
         IPage<SyncListResult> page = this.baseMapper.query(new Page<>(pageNumber, pageSize), schoolId, status, type, result, dpr);
         List<SyncListResult> list = page.getRecords();
@@ -267,6 +267,9 @@ public class TBSyncTaskServiceImpl extends ServiceImpl<TBSyncTaskMapper, TBSyncT
             case MARKER_PUSH:
                 asyncCloudMarkingTaskService.syncMarker(examPaperStructureService.getById(tbSyncTask.getObjectId()), JSON.parseObject(tbSyncTask.getRemark(), GroupInfo.class));
                 break;
+            case MARK_LEADER_PUSH:
+                asyncCloudMarkingTaskService.syncMarkLeader(examPaperStructureService.getById(tbSyncTask.getObjectId()));
+                break;
             default:
                 break;
         }

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

@@ -184,7 +184,7 @@ 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, "是否启用"));
-        if(StringUtils.isNotBlank(orgCode)) {
+        if (StringUtils.isNotBlank(orgCode)) {
             map.put("schoolCode", validParam(orgCode, null, false, "子机构编号"));
         }
 
@@ -524,7 +524,7 @@ public class CloudMarkingTaskUtils {
      * @param subjectCode 科目代码
      * @param loginName   用户名
      */
-    public boolean saveMarkLeader(Long schoolId, String subjectCode, String loginName) {
+    public boolean saveMarkLeader(Long schoolId, String subjectCode, String loginName, String orgCode) {
         SysConfig sysConfig = commonCacheService.addSysConfigCache(schoolId, SystemConstant.CLOUDMARK_HOST_URL);
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置云阅卷地址"));
         String hostUrl = sysConfig.getConfigValue();
@@ -536,6 +536,9 @@ public class CloudMarkingTaskUtils {
             Map<String, Object> map = new HashMap<>();
             map.put("subjectCode", validParam(subjectCode, null, true, "科目代码"));
             map.put("account", SpecialPrivilegeEnum.SUBJECT_HEADER.getPrefix() + validParam(loginName, null, true, "用户名"));
+            if (StringUtils.isNotBlank(orgCode)) {
+                map.put("schoolCode", validParam(orgCode, null, false, "子机构编号"));
+            }
 
             String result = HttpKit.sendPost(postUrl, getHeaders(schoolId, markLeaderSaveUrl), map, null, null, null);
             JSONObject jsonObject = JSONObject.parseObject(result);