3.3.0 update

distributed-print/src/main/java/com/qmth/distributed/print/api/mark/MarkArbitrateController.java

@@ -3,7 +3,9 @@ package com.qmth.distributed.print.api.mark;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.teachcloud.common.bean.dto.mark.manage.MarkArbitrateDto;
+import com.qmth.teachcloud.mark.dto.mark.manage.MarkArbitrateDto;
+import com.qmth.teachcloud.mark.dto.mark.manage.MarkArbitrateMarkerDto;
+import com.qmth.teachcloud.mark.dto.mark.manage.MarkArbitrateSettingDto;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
@@ -19,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
+import java.util.List;
 
 /**
  * <p>
@@ -37,9 +40,9 @@ public class MarkArbitrateController {
     private MarkArbitrateHistoryService markArbitrateHistoryService;
 
     /**
-     * 问题试卷列表查询
+     * 仲裁列表查询
      */
-    @ApiOperation(value = "评卷质量列表")
+    @ApiOperation(value = "仲裁列表")
     @RequestMapping(value = "/list", method = RequestMethod.POST)
     public Result list(@ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
                        @ApiParam(value = "试卷编号", required = true) @RequestParam String paperNumber,
@@ -49,4 +52,48 @@ public class MarkArbitrateController {
         IPage<MarkArbitrateDto> markArbitrateDtoIPage = markArbitrateHistoryService.pageArbitrate(examId, paperNumber, groupNumber, pageNumber, pageSize);
         return ResultUtil.ok(markArbitrateDtoIPage);
     }
+
+    /**
+     * 清理锁卷缓存
+     */
+    @ApiOperation(value = "清理锁卷缓存")
+    @RequestMapping(value = "/clear", method = RequestMethod.POST)
+    public Result clear(@ApiParam(value = "仲裁历史ID") @RequestParam(required = false) Long arbitrateId) {
+        markArbitrateHistoryService.clearArbitrate(arbitrateId);
+        return ResultUtil.ok(true);
+    }
+
+    /**
+     * 左边的列表
+     */
+    @ApiOperation(value = "左边的列表")
+    @RequestMapping(value = "/getArbitrationList", method = RequestMethod.POST)
+    public Result getArbitrationList(@ApiParam(value = "仲裁历史ID", required = true) @RequestParam Long arbitrateId) {
+        List<MarkArbitrateMarkerDto> markArbitrateDtoList = markArbitrateHistoryService.listMarkerArbitrateRecord(arbitrateId);
+        return ResultUtil.ok(markArbitrateDtoList);
+    }
+
+    /**
+     * 获取配置信息
+     */
+    @ApiOperation(value = "获取配置信息")
+    @RequestMapping(value = "/getSetting", method = RequestMethod.POST)
+    public Result getSetting(@ApiParam(value = "仲裁历史ID", required = true) @RequestParam Long arbitrateId) {
+        MarkArbitrateSettingDto markArbitrateSettingDto = markArbitrateHistoryService.getArbitrateSetting(arbitrateId);
+        return ResultUtil.ok(markArbitrateSettingDto);
+    }
+
+    /**
+     * 获取单个任务
+     */
+    @ApiOperation(value = "获取单个任务")
+    @RequestMapping(value = "/getTask", method = RequestMethod.POST)
+    public Result getTask(@ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
+                          @ApiParam(value = "试卷编号", required = true) @RequestParam String paperNumber,
+                          @ApiParam(value = "分组号") @RequestParam(required = false) Integer groupNumber,
+                          @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                          @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
+        IPage<MarkArbitrateDto> markArbitrateDtoIPage = markArbitrateHistoryService.pageArbitrate(examId, paperNumber, groupNumber, pageNumber, pageSize);
+        return ResultUtil.ok(markArbitrateDtoIPage);
+    }
 }

distributed-print/src/main/java/com/qmth/distributed/print/api/mark/MarkClassController.java

@@ -3,8 +3,7 @@ package com.qmth.distributed.print.api.mark;
 
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
-import com.qmth.teachcloud.common.bean.dto.mark.setting.MarkGroupTaskDto;
-import com.qmth.teachcloud.common.bean.dto.mark.setting.MarkUserClassDto;
+import com.qmth.teachcloud.mark.dto.mark.setting.MarkUserClassDto;
 import com.qmth.teachcloud.common.bean.params.mark.setting.MarkClassUserParams;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;

distributed-print/src/main/java/com/qmth/distributed/print/api/mark/MarkEntranceController.java

@@ -3,7 +3,7 @@ package com.qmth.distributed.print.api.mark;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.teachcloud.common.bean.dto.mark.entrance.MarkEntranceDto;
+import com.qmth.teachcloud.mark.dto.mark.entrance.MarkEntranceDto;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;

distributed-print/src/main/java/com/qmth/distributed/print/api/mark/MarkGroupController.java

@@ -4,17 +4,14 @@ package com.qmth.distributed.print.api.mark;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
-import com.qmth.teachcloud.common.bean.dto.mark.manage.MarkGroupClassProgressDto;
-import com.qmth.teachcloud.common.bean.dto.mark.manage.MarkGroupSummaryProgressDto;
-import com.qmth.teachcloud.common.bean.dto.mark.setting.MarkGroupTaskDto;
+import com.qmth.teachcloud.mark.dto.mark.manage.MarkGroupClassProgressDto;
+import com.qmth.teachcloud.mark.dto.mark.manage.MarkGroupSummaryProgressDto;
+import com.qmth.teachcloud.mark.dto.mark.setting.MarkGroupTaskDto;
 import com.qmth.teachcloud.common.bean.params.mark.setting.GroupPictureConfigParams;
 import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.entity.MarkQuestion;
 import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
-import com.qmth.teachcloud.common.util.ServletUtil;
-import com.qmth.teachcloud.mark.entity.MarkGroup;
 import com.qmth.teachcloud.mark.service.MarkGroupService;
 import io.swagger.annotations.*;
 import org.springframework.web.bind.annotation.*;
@@ -22,7 +19,6 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
-import java.util.List;
 
 /**
  * <p>

distributed-print/src/main/java/com/qmth/distributed/print/api/mark/MarkProblemController.java

@@ -3,7 +3,7 @@ package com.qmth.distributed.print.api.mark;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.teachcloud.common.bean.dto.mark.manage.MarkProblemDto;
+import com.qmth.teachcloud.mark.dto.mark.manage.MarkProblemDto;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;

distributed-print/src/main/java/com/qmth/distributed/print/api/mark/MarkQualityController.java

@@ -3,8 +3,8 @@ package com.qmth.distributed.print.api.mark;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.teachcloud.common.bean.dto.mark.manage.MarkQualityChartDto;
-import com.qmth.teachcloud.common.bean.dto.mark.manage.MarkQualityDto;
+import com.qmth.teachcloud.mark.dto.mark.manage.MarkQualityChartDto;
+import com.qmth.teachcloud.mark.dto.mark.manage.MarkQualityDto;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;

distributed-print/src/main/java/com/qmth/distributed/print/api/mark/MarkSettingController.java

@@ -4,8 +4,8 @@ package com.qmth.distributed.print.api.mark;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
-import com.qmth.teachcloud.common.bean.dto.mark.manage.MarkManageDto;
-import com.qmth.teachcloud.common.bean.dto.mark.setting.MarkSettingDto;
+import com.qmth.teachcloud.mark.dto.mark.manage.MarkManageDto;
+import com.qmth.teachcloud.common.bean.dto.mark.MarkSettingDto;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.MarkPaper;
 import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;

distributed-print/src/main/java/com/qmth/distributed/print/api/mark/MarkUserGroupController.java

@@ -3,7 +3,7 @@ package com.qmth.distributed.print.api.mark;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.teachcloud.common.bean.dto.mark.manage.MarkUserGroupProgressDto;
+import com.qmth.teachcloud.mark.dto.mark.manage.MarkUserGroupProgressDto;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.util.Result;

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/mark/setting/MarkSettingDto.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/mark/MarkSettingDto.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.common.bean.dto.mark.setting;
+package com.qmth.teachcloud.common.bean.dto.mark;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/mark/setting/MarkUser.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/mark/MarkUser.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.common.bean.dto.mark.setting;
+package com.qmth.teachcloud.common.bean.dto.mark;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/mark/setting/PictureConfig.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/mark/PictureConfig.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.common.bean.dto.mark.setting;
+package com.qmth.teachcloud.common.bean.dto.mark;
 
 public class PictureConfig {
 

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/params/mark/setting/GroupPictureConfigParams.java

@@ -1,6 +1,6 @@
 package com.qmth.teachcloud.common.bean.params.mark.setting;
 
-import com.qmth.teachcloud.common.bean.dto.mark.setting.PictureConfig;
+import com.qmth.teachcloud.common.bean.dto.mark.PictureConfig;
 
 import java.io.Serializable;
 import java.util.List;

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/params/mark/setting/MarkClassUserParams.java

@@ -1,7 +1,6 @@
 package com.qmth.teachcloud.common.bean.params.mark.setting;
 
-import com.qmth.teachcloud.common.bean.dto.mark.setting.MarkUser;
-import com.qmth.teachcloud.common.entity.MarkQuestion;
+import com.qmth.teachcloud.common.bean.dto.mark.MarkUser;
 
 import java.io.Serializable;
 import java.util.List;

teachcloud-common/src/main/java/com/qmth/teachcloud/common/mapper/MarkPaperMapper.java

@@ -3,9 +3,8 @@ package com.qmth.teachcloud.common.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qmth.teachcloud.common.bean.dto.mark.setting.MarkSettingDto;
+import com.qmth.teachcloud.common.bean.dto.mark.MarkSettingDto;
 import com.qmth.teachcloud.common.entity.MarkPaper;
-import com.qmth.teachcloud.common.enums.mark.MarkPaperStatus;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/MarkPaperService.java

@@ -1,7 +1,7 @@
 package com.qmth.teachcloud.common.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.qmth.teachcloud.common.bean.dto.mark.setting.MarkSettingDto;
+import com.qmth.teachcloud.common.bean.dto.mark.MarkSettingDto;
 import com.qmth.teachcloud.common.entity.MarkPaper;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.teachcloud.common.enums.mark.MarkPaperStatus;

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/MarkPaperServiceImpl.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 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.teachcloud.common.bean.dto.mark.setting.MarkSettingDto;
+import com.qmth.teachcloud.common.bean.dto.mark.MarkSettingDto;
 import com.qmth.teachcloud.common.entity.MarkPaper;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.mark.MarkPaperStatus;

teachcloud-common/src/main/resources/mapper/MarkPaperMapper.xml

@@ -28,7 +28,7 @@
         <result column="open_mark_class" property="openMarkClass" />
         <result column="status" property="status" />
     </resultMap>
-    <select id="listPaperSetting" resultType="com.qmth.teachcloud.common.bean.dto.mark.setting.MarkSettingDto">
+    <select id="listPaperSetting" resultType="com.qmth.teachcloud.common.bean.dto.mark.MarkSettingDto">
         SELECT
             mp.exam_id examId,
             mp.course_code courseCode,

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/mark/entrance/MarkEntranceDto.java → teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/dto/mark/entrance/MarkEntranceDto.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.common.bean.dto.mark.entrance;
+package com.qmth.teachcloud.mark.dto.mark.entrance;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/mark/manage/MarkArbitrateDto.java → teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/dto/mark/manage/MarkArbitrateDto.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.common.bean.dto.mark.manage;
+package com.qmth.teachcloud.mark.dto.mark.manage;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/dto/mark/manage/MarkArbitrateMarkerDto.java

@@ -0,0 +1,63 @@
+package com.qmth.teachcloud.mark.dto.mark.manage;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+public class MarkArbitrateMarkerDto {
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long userId;
+    private String userLoginName;
+    private String userName;
+    private Long markTime;
+    private String scoreList;
+    private Double totalScore;
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getUserLoginName() {
+        return userLoginName;
+    }
+
+    public void setUserLoginName(String userLoginName) {
+        this.userLoginName = userLoginName;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public Long getMarkTime() {
+        return markTime;
+    }
+
+    public void setMarkTime(Long markTime) {
+        this.markTime = markTime;
+    }
+
+    public String getScoreList() {
+        return scoreList;
+    }
+
+    public void setScoreList(String scoreList) {
+        this.scoreList = scoreList;
+    }
+
+    public Double getTotalScore() {
+        return totalScore;
+    }
+
+    public void setTotalScore(Double totalScore) {
+        this.totalScore = totalScore;
+    }
+}

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/dto/mark/manage/MarkArbitrateSettingDto.java

@@ -0,0 +1,77 @@
+package com.qmth.teachcloud.mark.dto.mark.manage;
+
+public class MarkArbitrateSettingDto {
+
+    private String markMode;
+    private String courseCode;
+    private String courseName;
+    private String paperNumber;
+    private String paperUrl;
+    private String answerUrl;
+    private String userLoginName;
+    private String userName;
+
+    public String getMarkMode() {
+        return markMode;
+    }
+
+    public void setMarkMode(String markMode) {
+        this.markMode = markMode;
+    }
+
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public String getPaperNumber() {
+        return paperNumber;
+    }
+
+    public void setPaperNumber(String paperNumber) {
+        this.paperNumber = paperNumber;
+    }
+
+    public String getPaperUrl() {
+        return paperUrl;
+    }
+
+    public void setPaperUrl(String paperUrl) {
+        this.paperUrl = paperUrl;
+    }
+
+    public String getAnswerUrl() {
+        return answerUrl;
+    }
+
+    public void setAnswerUrl(String answerUrl) {
+        this.answerUrl = answerUrl;
+    }
+
+    public String getUserLoginName() {
+        return userLoginName;
+    }
+
+    public void setUserLoginName(String userLoginName) {
+        this.userLoginName = userLoginName;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/mark/manage/MarkGroupClassProgressDto.java → teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/dto/mark/manage/MarkGroupClassProgressDto.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.common.bean.dto.mark.manage;
+package com.qmth.teachcloud.mark.dto.mark.manage;
 
 public class MarkGroupClassProgressDto {
 

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/mark/manage/MarkGroupProgressDto.java → teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/dto/mark/manage/MarkGroupProgressDto.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.common.bean.dto.mark.manage;
+package com.qmth.teachcloud.mark.dto.mark.manage;
 
 public class MarkGroupProgressDto {
 

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/mark/manage/MarkGroupSummaryProgressDto.java → teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/dto/mark/manage/MarkGroupSummaryProgressDto.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.common.bean.dto.mark.manage;
+package com.qmth.teachcloud.mark.dto.mark.manage;
 
 import java.util.List;
 

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/mark/manage/MarkGroupTotalProgressDto.java → teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/dto/mark/manage/MarkGroupTotalProgressDto.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.common.bean.dto.mark.manage;
+package com.qmth.teachcloud.mark.dto.mark.manage;
 
 public class MarkGroupTotalProgressDto {
 

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/mark/manage/MarkManageDto.java → teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/dto/mark/manage/MarkManageDto.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.common.bean.dto.mark.manage;
+package com.qmth.teachcloud.mark.dto.mark.manage;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/mark/manage/MarkProblemDto.java → teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/dto/mark/manage/MarkProblemDto.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.common.bean.dto.mark.manage;
+package com.qmth.teachcloud.mark.dto.mark.manage;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/mark/manage/MarkQualityChartDto.java → teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/dto/mark/manage/MarkQualityChartDto.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.common.bean.dto.mark.manage;
+package com.qmth.teachcloud.mark.dto.mark.manage;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/mark/manage/MarkQualityDto.java → teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/dto/mark/manage/MarkQualityDto.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.common.bean.dto.mark.manage;
+package com.qmth.teachcloud.mark.dto.mark.manage;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/dto/mark/manage/MarkStepDTO.java

@@ -0,0 +1,169 @@
+package com.qmth.teachcloud.mark.dto.mark.manage;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+public class MarkStepDTO implements Serializable {
+
+    private static final long serialVersionUID = 3542801746602688750L;
+
+    private int groupNumber;
+
+    private int mainNumber;
+
+    private String subNumber;
+
+    private String questionName;
+
+    private double intervalScore;
+
+    private double defaultScore;
+
+    private String title;
+
+    private Double score;
+
+    private double maxScore;
+
+    private double minScore;
+
+    private boolean uncalculate;
+
+    private Integer selectiveIndex;
+
+    private boolean rejected;
+
+    private List<TrackDTO> trackList = new ArrayList<TrackDTO>();
+
+    private List<TrackDTO> headerTrack = new ArrayList<TrackDTO>();
+
+    public int getMainNumber() {
+        return mainNumber;
+    }
+
+    public void setMainNumber(int mainNumber) {
+        this.mainNumber = mainNumber;
+    }
+
+    public String getSubNumber() {
+        return subNumber;
+    }
+
+    public void setSubNumber(String subNumber) {
+        this.subNumber = subNumber;
+    }
+
+    public double getIntervalScore() {
+        return intervalScore;
+    }
+
+    public void setIntervalScore(double intervalScore) {
+        this.intervalScore = intervalScore;
+    }
+
+    public double getMaxScore() {
+        return maxScore;
+    }
+
+    public void setMaxScore(double maxScore) {
+        this.maxScore = maxScore;
+    }
+
+    public double getMinScore() {
+        return minScore;
+    }
+
+    public void setMinScore(double minScore) {
+        this.minScore = minScore;
+    }
+
+    public double getDefaultScore() {
+        return defaultScore;
+    }
+
+    public void setDefaultScore(double defaultScore) {
+        this.defaultScore = defaultScore;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public List<TrackDTO> getTrackList() {
+        return trackList;
+    }
+
+    public void setTrackList(List<TrackDTO> trackList) {
+        this.trackList = trackList;
+    }
+
+    public void addTrack(TrackDTO track) {
+        this.trackList.add(track);
+    }
+
+    public int getGroupNumber() {
+        return groupNumber;
+    }
+
+    public void setGroupNumber(int groupNumber) {
+        this.groupNumber = groupNumber;
+    }
+
+    public Double getScore() {
+        return score;
+    }
+
+    public void setScore(Double score) {
+        this.score = score;
+    }
+
+    public boolean isUncalculate() {
+        return uncalculate;
+    }
+
+    public void setUncalculate(boolean uncalculate) {
+        this.uncalculate = uncalculate;
+    }
+
+    public Integer getSelectiveIndex() {
+        return selectiveIndex;
+    }
+
+    public void setSelectiveIndex(Integer selectiveIndex) {
+        this.selectiveIndex = selectiveIndex;
+    }
+
+    public String getQuestionName() {
+        return questionName;
+    }
+
+    public void setQuestionName(String questionName) {
+        this.questionName = questionName;
+    }
+
+    public boolean isRejected() {
+        return rejected;
+    }
+
+    public void setRejected(boolean rejected) {
+        this.rejected = rejected;
+    }
+
+    public List<TrackDTO> getHeaderTrack() {
+        return headerTrack;
+    }
+
+    public void setHeaderTrack(List<TrackDTO> headerTrack) {
+        this.headerTrack = headerTrack;
+    }
+
+    public void addHeaderTrack(TrackDTO trackDTO) {
+        this.headerTrack.add(trackDTO);
+    }
+
+}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/mark/manage/MarkUserGroupProgressDto.java → teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/dto/mark/manage/MarkUserGroupProgressDto.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.common.bean.dto.mark.manage;
+package com.qmth.teachcloud.mark.dto.mark.manage;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/mark/manage/MarkerInfoDto.java → teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/dto/mark/manage/MarkerInfoDto.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.common.bean.dto.mark.manage;
+package com.qmth.teachcloud.mark.dto.mark.manage;
 
 import com.qmth.teachcloud.common.annotation.ExcelProperty;
 

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/dto/mark/manage/Task.java

@@ -0,0 +1,269 @@
+package com.qmth.teachcloud.mark.dto.mark.manage;
+
+import com.qmth.teachcloud.common.entity.MarkPaper;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+public class Task implements Serializable {
+
+    private static final long serialVersionUID = 4912665442008033200L;
+
+    /**
+     * 评卷任务编号
+     */
+    private Integer libraryId;
+
+    /**
+     * 考生编号
+     */
+    private Integer studentId;
+
+    /**
+     * 显示考生密号
+     */
+    private String secretNumber;
+
+    /**
+     * 考生名称
+     */
+    private String studentName;
+
+    /**
+     * 学号
+     */
+    private String studentCode;
+
+    /**
+     * 准考证号
+     */
+    private String examNumber;
+
+    /**
+     * 科目
+     */
+    private MarkPaper markPaper;
+
+    /**
+     * 多媒体地址
+     */
+    private String jsonUrl;
+
+    /**
+     * 给分步骤
+     */
+    private List<MarkStepDTO> questionList;
+
+    /**
+     * 特殊标记列表
+     */
+//    private SpecialTagDTO[] specialTagList;
+
+    /**
+     * 组长特殊标记列表
+     */
+//    private SpecialTagDTO[] headerTagList;
+
+    /**
+     * 题卡原图地址
+     */
+    private List<String> sheetUrls;
+
+    /**
+     * 客观题总分
+     */
+    private Double objectiveScore;
+
+    /**
+     * 评分
+     */
+    private Double markerScore;
+
+    /**
+     * 评卷时间
+     */
+    private Date markerTime;
+
+    /**
+     * 是否自评
+     */
+    private boolean isSelf;
+
+    /**
+     * 是否回评
+     */
+    private boolean isPrevious;
+
+    /**
+     * 是否打回
+     */
+    private boolean isRejected;
+
+    /**
+     * 评卷员登录名
+     */
+    private String markerName;
+
+    /**
+     * 复核时间
+     */
+    private Date inspectTime;
+
+    /**
+     * 错误信息
+     */
+    private String message;
+
+    public Integer getLibraryId() {
+        return libraryId;
+    }
+
+    public void setLibraryId(Integer libraryId) {
+        this.libraryId = libraryId;
+    }
+
+    public Integer getStudentId() {
+        return studentId;
+    }
+
+    public void setStudentId(Integer studentId) {
+        this.studentId = studentId;
+    }
+
+    public String getSecretNumber() {
+        return secretNumber;
+    }
+
+    public void setSecretNumber(String secretNumber) {
+        this.secretNumber = secretNumber;
+    }
+
+    public String getStudentName() {
+        return studentName;
+    }
+
+    public void setStudentName(String studentName) {
+        this.studentName = studentName;
+    }
+
+    public String getStudentCode() {
+        return studentCode;
+    }
+
+    public void setStudentCode(String studentCode) {
+        this.studentCode = studentCode;
+    }
+
+    public String getExamNumber() {
+        return examNumber;
+    }
+
+    public void setExamNumber(String examNumber) {
+        this.examNumber = examNumber;
+    }
+
+    public MarkPaper getMarkPaper() {
+        return markPaper;
+    }
+
+    public void setMarkPaper(MarkPaper markPaper) {
+        this.markPaper = markPaper;
+    }
+
+    public String getJsonUrl() {
+        return jsonUrl;
+    }
+
+    public void setJsonUrl(String jsonUrl) {
+        this.jsonUrl = jsonUrl;
+    }
+
+    public List<MarkStepDTO> getQuestionList() {
+        return questionList;
+    }
+
+    public void setQuestionList(List<MarkStepDTO> questionList) {
+        this.questionList = questionList;
+    }
+
+    public List<String> getSheetUrls() {
+        return sheetUrls;
+    }
+
+    public void setSheetUrls(List<String> sheetUrls) {
+        this.sheetUrls = sheetUrls;
+    }
+
+    public Double getObjectiveScore() {
+        return objectiveScore;
+    }
+
+    public void setObjectiveScore(Double objectiveScore) {
+        this.objectiveScore = objectiveScore;
+    }
+
+    public Double getMarkerScore() {
+        return markerScore;
+    }
+
+    public void setMarkerScore(Double markerScore) {
+        this.markerScore = markerScore;
+    }
+
+    public Date getMarkerTime() {
+        return markerTime;
+    }
+
+    public void setMarkerTime(Date markerTime) {
+        this.markerTime = markerTime;
+    }
+
+    public boolean isSelf() {
+        return isSelf;
+    }
+
+    public void setSelf(boolean isSelf) {
+        this.isSelf = isSelf;
+    }
+
+    public boolean isPrevious() {
+        return isPrevious;
+    }
+
+    public void setPrevious(boolean isPrevious) {
+        this.isPrevious = isPrevious;
+    }
+
+    public boolean isRejected() {
+        return isRejected;
+    }
+
+    public void setRejected(boolean isRejected) {
+        this.isRejected = isRejected;
+    }
+
+    public String getMarkerName() {
+        return markerName;
+    }
+
+    public void setMarkerName(String markerName) {
+        this.markerName = markerName;
+    }
+
+    public Date getInspectTime() {
+        return inspectTime;
+    }
+
+    public void setInspectTime(Date inspectTime) {
+        this.inspectTime = inspectTime;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/dto/mark/manage/TrackDTO.java

@@ -0,0 +1,189 @@
+package com.qmth.teachcloud.mark.dto.mark.manage;
+
+import com.qmth.teachcloud.mark.entity.MarkTask;
+import com.qmth.teachcloud.mark.entity.MarkTrack;
+import com.qmth.teachcloud.mark.entity.MarkUserGroup;
+
+import java.io.Serializable;
+
+/**
+ * 阅卷轨迹交换类
+ *
+ * @author luoshi
+ */
+public class TrackDTO implements Serializable {
+
+    private static final long serialVersionUID = 4336042741848228793L;
+
+    private Integer mainNumber;
+
+    private String subNumber;
+
+    private int number;
+
+    private double score;
+
+    private double positionX;
+
+    private double positionY;
+
+    private int offsetIndex;
+
+    private int offsetX;
+
+    private int offsetY;
+
+    private boolean unanswered;
+
+    public TrackDTO() {
+
+    }
+
+    public TrackDTO(MarkTrack track) {
+        String questionNumber = track.getQuestionNumber();
+        String str[] = questionNumber.split("\\.");
+        setMainNumber(Integer.parseInt(str[0]));
+        setSubNumber(str[1]);
+        setNumber(track.getNumber());
+        setScore(track.getScore());
+        setPositionX(track.getPositionX());
+        setPositionY(track.getPositionY());
+        setOffsetIndex(track.getOffsetIndex());
+        setOffsetX(track.getOffsetX());
+        setOffsetY(track.getOffsetY());
+    }
+
+    /*public TrackDTO(HeaderTrack track) {
+        String questionNumber = track.getQuestionNumber();
+        String str[] = questionNumber.split("\\.");
+        setMainNumber(Integer.parseInt(str[0]));
+        setSubNumber(str[1]);
+        setNumber(track.getNumber());
+        setScore(track.getScore());
+        setPositionX(track.getPositionX());
+        setPositionY(track.getPositionY());
+        setOffsetIndex(track.getOffsetIndex());
+        setOffsetX(track.getOffsetX());
+        setOffsetY(track.getOffsetY());
+        setUnanswered(track.isUnanswered());
+    }*/
+
+    public MarkTrack transform(MarkTask markTask, MarkUserGroup markUserGroup) {
+        MarkTrack track = new MarkTrack();
+        track.setTaskId(markTask.getId());
+        track.setQuestionNumber(getMainNumber() + "." + getSubNumber());
+        track.setNumber(getNumber());
+        track.setStudentId(markTask.getStudentId());
+        track.setExamId(markTask.getExamId());
+        track.setPaperNumber(markTask.getPaperNumber());
+        track.setGroupNumber(markTask.getGroupNumber());
+        track.setUserId(markUserGroup.getUserId());
+        track.setScore(getScore());
+        track.setPositionX(getPositionX());
+        track.setPositionY(getPositionY());
+        track.setOffsetIndex(getOffsetIndex());
+        track.setOffsetX(getOffsetX());
+        track.setOffsetY(getOffsetY());
+        return track;
+    }
+
+    /*public HeaderTrack transform(ArbitrateHistory library) {
+        HeaderTrack track = new HeaderTrack();
+        track.setQuestionNumber(getMainNumber() + "." + getSubNumber());
+        track.setNumber(getNumber());
+        track.setStudentId(library.getStudentId());
+        track.setExamId(library.getExamId());
+        track.setSubjectCode(library.getSubjectCode());
+        track.setGroupNumber(library.getGroupNumber());
+        track.setUserId(library.getUserId());
+        track.setScore(getScore());
+        track.setPositionX(getPositionX());
+        track.setPositionY(getPositionY());
+        track.setOffsetIndex(getOffsetIndex());
+        track.setOffsetX(getOffsetX());
+        track.setOffsetY(getOffsetY());
+        track.setUnanswered(isUnanswered());
+        return track;
+    }*/
+
+    public Integer getMainNumber() {
+        return mainNumber;
+    }
+
+    public void setMainNumber(Integer mainNumber) {
+        this.mainNumber = mainNumber;
+    }
+
+    public String getSubNumber() {
+        return subNumber;
+    }
+
+    public void setSubNumber(String subNumber) {
+        this.subNumber = subNumber;
+    }
+
+    public int getNumber() {
+        return number;
+    }
+
+    public void setNumber(int number) {
+        this.number = number;
+    }
+
+    public double getScore() {
+        return score;
+    }
+
+    public void setScore(double score) {
+        this.score = score;
+    }
+
+    public double getPositionX() {
+        return positionX;
+    }
+
+    public void setPositionX(double positionX) {
+        this.positionX = positionX;
+    }
+
+    public double getPositionY() {
+        return positionY;
+    }
+
+    public void setPositionY(double positionY) {
+        this.positionY = positionY;
+    }
+
+    public int getOffsetIndex() {
+        return offsetIndex;
+    }
+
+    public void setOffsetIndex(int offsetIndex) {
+        this.offsetIndex = offsetIndex;
+    }
+
+    public int getOffsetX() {
+        return offsetX;
+    }
+
+    public void setOffsetX(int offsetX) {
+        this.offsetX = offsetX;
+    }
+
+    public int getOffsetY() {
+        return offsetY;
+    }
+
+    public void setOffsetY(int offsetY) {
+        this.offsetY = offsetY;
+    }
+
+    public boolean isUnanswered() {
+        return unanswered;
+    }
+
+    public void setUnanswered(boolean unanswered) {
+        this.unanswered = unanswered;
+    }
+
+}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/mark/setting/MarkGroupDto.java → teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/dto/mark/setting/MarkGroupDto.java

@@ -1,5 +1,7 @@
-package com.qmth.teachcloud.common.bean.dto.mark.setting;
+package com.qmth.teachcloud.mark.dto.mark.setting;
 
+import com.qmth.teachcloud.common.bean.dto.mark.MarkUser;
+import com.qmth.teachcloud.common.bean.dto.mark.PictureConfig;
 import com.qmth.teachcloud.common.entity.MarkQuestion;
 
 import java.util.List;

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/mark/setting/MarkGroupTaskDto.java → teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/dto/mark/setting/MarkGroupTaskDto.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.common.bean.dto.mark.setting;
+package com.qmth.teachcloud.mark.dto.mark.setting;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/mark/setting/MarkUserClassDto.java → teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/dto/mark/setting/MarkUserClassDto.java

@@ -1,4 +1,6 @@
-package com.qmth.teachcloud.common.bean.dto.mark.setting;
+package com.qmth.teachcloud.mark.dto.mark.setting;
+
+import com.qmth.teachcloud.common.bean.dto.mark.MarkUser;
 
 import java.util.List;
 

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/mapper/MarkArbitrateHistoryMapper.java

@@ -2,7 +2,7 @@ package com.qmth.teachcloud.mark.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qmth.teachcloud.common.bean.dto.mark.manage.MarkArbitrateDto;
+import com.qmth.teachcloud.mark.dto.mark.manage.MarkArbitrateDto;
 import com.qmth.teachcloud.mark.entity.MarkArbitrateHistory;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/mapper/MarkProblemHistoryMapper.java

@@ -2,7 +2,7 @@ package com.qmth.teachcloud.mark.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qmth.teachcloud.common.bean.dto.mark.manage.MarkProblemDto;
+import com.qmth.teachcloud.mark.dto.mark.manage.MarkProblemDto;
 import com.qmth.teachcloud.mark.entity.MarkProblemHistory;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/mapper/MarkTaskMapper.java

@@ -3,8 +3,8 @@ package com.qmth.teachcloud.mark.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qmth.teachcloud.common.bean.dto.mark.manage.MarkManageDto;
-import com.qmth.teachcloud.common.bean.dto.mark.manage.MarkerInfoDto;
+import com.qmth.teachcloud.mark.dto.mark.manage.MarkManageDto;
+import com.qmth.teachcloud.mark.dto.mark.manage.MarkerInfoDto;
 import com.qmth.teachcloud.mark.entity.MarkTask;
 import org.apache.ibatis.annotations.Param;
 

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/mapper/MarkUserClassMapper.java

@@ -3,8 +3,8 @@ package com.qmth.teachcloud.mark.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qmth.teachcloud.common.bean.dto.mark.manage.MarkGroupClassProgressDto;
-import com.qmth.teachcloud.common.bean.dto.mark.setting.MarkUser;
+import com.qmth.teachcloud.mark.dto.mark.manage.MarkGroupClassProgressDto;
+import com.qmth.teachcloud.common.bean.dto.mark.MarkUser;
 import com.qmth.teachcloud.mark.entity.MarkUserClass;
 import org.apache.ibatis.annotations.Param;
 

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/mapper/MarkUserGroupMapper.java

@@ -2,10 +2,10 @@ package com.qmth.teachcloud.mark.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qmth.teachcloud.common.bean.dto.mark.entrance.MarkEntranceDto;
-import com.qmth.teachcloud.common.bean.dto.mark.manage.MarkQualityDto;
-import com.qmth.teachcloud.common.bean.dto.mark.manage.MarkUserGroupProgressDto;
-import com.qmth.teachcloud.common.bean.dto.mark.setting.MarkUser;
+import com.qmth.teachcloud.mark.dto.mark.entrance.MarkEntranceDto;
+import com.qmth.teachcloud.mark.dto.mark.manage.MarkQualityDto;
+import com.qmth.teachcloud.mark.dto.mark.manage.MarkUserGroupProgressDto;
+import com.qmth.teachcloud.common.bean.dto.mark.MarkUser;
 import com.qmth.teachcloud.mark.entity.MarkUserGroup;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/MarkArbitrateHistoryService.java

@@ -1,10 +1,14 @@
 package com.qmth.teachcloud.mark.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.qmth.teachcloud.common.bean.dto.mark.manage.MarkArbitrateDto;
+import com.qmth.teachcloud.mark.dto.mark.manage.MarkArbitrateDto;
+import com.qmth.teachcloud.mark.dto.mark.manage.MarkArbitrateMarkerDto;
+import com.qmth.teachcloud.mark.dto.mark.manage.MarkArbitrateSettingDto;
 import com.qmth.teachcloud.mark.entity.MarkArbitrateHistory;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 仲裁记录表 服务类
@@ -16,4 +20,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface MarkArbitrateHistoryService extends IService<MarkArbitrateHistory> {
 
     IPage<MarkArbitrateDto> pageArbitrate(Long examId, String paperNumber, Integer groupNumber, Integer pageNumber, Integer pageSize);
+
+    void clearArbitrate(Long arbitrateId);
+
+    List<MarkArbitrateMarkerDto> listMarkerArbitrateRecord(Long arbitrateId);
+
+    MarkArbitrateSettingDto getArbitrateSetting(Long arbitrateId);
 }

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/MarkGroupService.java

@@ -2,9 +2,9 @@ package com.qmth.teachcloud.mark.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.teachcloud.common.bean.dto.mark.manage.MarkGroupClassProgressDto;
-import com.qmth.teachcloud.common.bean.dto.mark.manage.MarkGroupSummaryProgressDto;
-import com.qmth.teachcloud.common.bean.dto.mark.setting.MarkGroupTaskDto;
+import com.qmth.teachcloud.mark.dto.mark.manage.MarkGroupClassProgressDto;
+import com.qmth.teachcloud.mark.dto.mark.manage.MarkGroupSummaryProgressDto;
+import com.qmth.teachcloud.mark.dto.mark.setting.MarkGroupTaskDto;
 import com.qmth.teachcloud.common.bean.params.mark.setting.GroupPictureConfigParams;
 import com.qmth.teachcloud.mark.entity.MarkGroup;
 

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/MarkProblemHistoryService.java

@@ -1,7 +1,7 @@
 package com.qmth.teachcloud.mark.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.qmth.teachcloud.common.bean.dto.mark.manage.MarkProblemDto;
+import com.qmth.teachcloud.mark.dto.mark.manage.MarkProblemDto;
 import com.qmth.teachcloud.common.enums.mark.MarkProblemStatus;
 import com.qmth.teachcloud.mark.entity.MarkProblemHistory;
 import com.baomidou.mybatisplus.extension.service.IService;

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/MarkSyncService.java

@@ -1,6 +1,5 @@
 package com.qmth.teachcloud.mark.service;
 
-import com.qmth.teachcloud.common.bean.dto.mark.setting.MarkUser;
 import com.qmth.teachcloud.mark.entity.MarkUserGroup;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/MarkTaskService.java

@@ -1,7 +1,7 @@
 package com.qmth.teachcloud.mark.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.qmth.teachcloud.common.bean.dto.mark.manage.MarkManageDto;
+import com.qmth.teachcloud.mark.dto.mark.manage.MarkManageDto;
 import com.qmth.teachcloud.mark.entity.MarkTask;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.teachcloud.mark.enums.MarkTaskStatus;
@@ -40,4 +40,6 @@ public interface MarkTaskService extends IService<MarkTask> {
     int countByExamIdAndPaperNumberAndGroupNumberAndStatusIn(Long examId, String paperNumber, Integer groupNumber, List<MarkTaskStatus> statusList);
 
     MarkTask getLastOneByUserIdAndStatus(Long examId, String paperNumber, Integer groupNumber, Long userId, MarkTaskStatus status);
+
+    List<MarkTask> listByExamIdAndPaperNumberAndGroupNumberAndStudentId(Long examId, String paperNumber, Integer groupNumber, Long studentId);
 }

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/MarkUserClassService.java

@@ -2,9 +2,9 @@ package com.qmth.teachcloud.mark.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qmth.teachcloud.common.bean.dto.mark.manage.MarkGroupClassProgressDto;
-import com.qmth.teachcloud.common.bean.dto.mark.setting.MarkUser;
-import com.qmth.teachcloud.common.bean.dto.mark.setting.MarkUserClassDto;
+import com.qmth.teachcloud.mark.dto.mark.manage.MarkGroupClassProgressDto;
+import com.qmth.teachcloud.common.bean.dto.mark.MarkUser;
+import com.qmth.teachcloud.mark.dto.mark.setting.MarkUserClassDto;
 import com.qmth.teachcloud.common.bean.params.mark.setting.MarkClassUserParams;
 import com.qmth.teachcloud.mark.entity.MarkUserClass;
 import com.baomidou.mybatisplus.extension.service.IService;

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/MarkUserGroupService.java

@@ -1,11 +1,11 @@
 package com.qmth.teachcloud.mark.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.qmth.teachcloud.common.bean.dto.mark.entrance.MarkEntranceDto;
-import com.qmth.teachcloud.common.bean.dto.mark.manage.MarkQualityChartDto;
-import com.qmth.teachcloud.common.bean.dto.mark.manage.MarkQualityDto;
-import com.qmth.teachcloud.common.bean.dto.mark.manage.MarkUserGroupProgressDto;
-import com.qmth.teachcloud.common.bean.dto.mark.setting.MarkUser;
+import com.qmth.teachcloud.mark.dto.mark.entrance.MarkEntranceDto;
+import com.qmth.teachcloud.mark.dto.mark.manage.MarkQualityChartDto;
+import com.qmth.teachcloud.mark.dto.mark.manage.MarkQualityDto;
+import com.qmth.teachcloud.mark.dto.mark.manage.MarkUserGroupProgressDto;
+import com.qmth.teachcloud.common.bean.dto.mark.MarkUser;
 import com.qmth.teachcloud.mark.entity.MarkUserGroup;
 import com.baomidou.mybatisplus.extension.service.IService;
 

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkArbitrateHistoryServiceImpl.java

@@ -3,16 +3,27 @@ package com.qmth.teachcloud.mark.service.impl;
 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.teachcloud.common.bean.dto.mark.manage.MarkArbitrateDto;
+import com.qmth.teachcloud.mark.dto.mark.manage.MarkArbitrateDto;
+import com.qmth.teachcloud.mark.dto.mark.manage.MarkArbitrateMarkerDto;
+import com.qmth.teachcloud.mark.dto.mark.manage.MarkArbitrateSettingDto;
+import com.qmth.teachcloud.common.entity.MarkPaper;
 import com.qmth.teachcloud.common.entity.MarkStudent;
-import com.qmth.teachcloud.common.service.MarkQuestionService;
-import com.qmth.teachcloud.common.service.MarkStudentService;
+import com.qmth.teachcloud.common.entity.SysUser;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.service.*;
+import com.qmth.teachcloud.common.util.ServletUtil;
 import com.qmth.teachcloud.mark.entity.MarkArbitrateHistory;
+import com.qmth.teachcloud.mark.entity.MarkTask;
+import com.qmth.teachcloud.mark.entity.MarkUserGroup;
 import com.qmth.teachcloud.mark.mapper.MarkArbitrateHistoryMapper;
 import com.qmth.teachcloud.mark.service.MarkArbitrateHistoryService;
+import com.qmth.teachcloud.mark.service.MarkTaskService;
+import com.qmth.teachcloud.mark.service.MarkUserGroupService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.*;
 
 /**
  * <p>
@@ -25,10 +36,23 @@ import javax.annotation.Resource;
 @Service
 public class MarkArbitrateHistoryServiceImpl extends ServiceImpl<MarkArbitrateHistoryMapper, MarkArbitrateHistory> implements MarkArbitrateHistoryService {
 
+    // 并发处理互斥锁
+    private Map<Long, Integer> currentTaskMap = new HashMap<>();
+
+    @Resource
+    private MarkPaperService markPaperService;
     @Resource
     private MarkQuestionService markQuestionService;
     @Resource
     private MarkStudentService markStudentService;
+    @Resource
+    private MarkTaskService markTaskService;
+    @Resource
+    private MarkUserGroupService markUserGroupService;
+    @Resource
+    private SysUserService sysUserService;
+    @Resource
+    private TeachcloudCommonService teachcloudCommonService;
 
     @Override
     public IPage<MarkArbitrateDto> pageArbitrate(Long examId, String paperNumber, Integer groupNumber, Integer pageNumber, Integer pageSize) {
@@ -47,4 +71,83 @@ public class MarkArbitrateHistoryServiceImpl extends ServiceImpl<MarkArbitrateHi
         }
         return markArbitrateDtoIPage;
     }
+
+    @Override
+    public void clearArbitrate(Long arbitrateId) {
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+        if (arbitrateId != null) {
+            releaseTask(arbitrateId);
+        } else {
+            releaseByUser(sysUser.getId());
+        }
+    }
+
+    @Override
+    public List<MarkArbitrateMarkerDto> listMarkerArbitrateRecord(Long arbitrateId) {
+        MarkArbitrateHistory markArbitrateHistory = this.getById(arbitrateId);
+        List<MarkTask> markTaskList = markTaskService.listByExamIdAndPaperNumberAndGroupNumberAndStudentId(markArbitrateHistory.getExamId(), markArbitrateHistory.getPaperNumber(), markArbitrateHistory.getGroupNumber(), markArbitrateHistory.getStudentId());
+        List<MarkArbitrateMarkerDto> markArbitrateMarkerDtoList = new ArrayList<>();
+        for (MarkTask markTask : markTaskList) {
+            MarkArbitrateMarkerDto markArbitrateMarkerDto = new MarkArbitrateMarkerDto();
+            MarkUserGroup markUserGroup = markUserGroupService.getByExamIdAndPaperNumberAndGroupNumberAndUserId(markTask.getExamId(), markTask.getPaperNumber(), markTask.getGroupNumber(), markTask.getUserId());
+            if (markUserGroup != null) {
+                markArbitrateMarkerDto.setUserId(markTask.getUserId());
+                SysUser sysUser = sysUserService.getById(markTask.getUserId());
+                if (sysUser != null) {
+                    markArbitrateMarkerDto.setUserLoginName(sysUser.getLoginName());
+                    markArbitrateMarkerDto.setUserName(sysUser.getRealName());
+                }
+                markArbitrateMarkerDto.setMarkTime(markTask.getMarkerTime());
+                markArbitrateMarkerDto.setScoreList(markTask.getMarkerScoreList());
+                markArbitrateMarkerDto.setTotalScore(markTask.getMarkerScore());
+            }
+            markArbitrateMarkerDtoList.add(markArbitrateMarkerDto);
+        }
+        return markArbitrateMarkerDtoList;
+    }
+
+    @Override
+    public MarkArbitrateSettingDto getArbitrateSetting(Long arbitrateId) {
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+        MarkArbitrateHistory markArbitrateHistory = this.getById(arbitrateId);
+        if (markArbitrateHistory == null) {
+            throw ExceptionResultEnum.ERROR.exception("仲裁数据异常");
+        }
+        MarkPaper markPaper = markPaperService.getByExamIdAndPaperNumber(markArbitrateHistory.getExamId(), markArbitrateHistory.getPaperNumber());
+        MarkArbitrateSettingDto markArbitrateSettingDto = new MarkArbitrateSettingDto();
+        if (markPaper != null) {
+            markArbitrateSettingDto.setMarkMode(markPaper.getMarkMode().name());
+            markArbitrateSettingDto.setCourseCode(markPaper.getCourseCode());
+            markArbitrateSettingDto.setCourseName(markPaper.getCourseName());
+            markArbitrateSettingDto.setPaperNumber(markPaper.getPaperNumber());
+            markArbitrateSettingDto.setUserLoginName(sysUser.getLoginName());
+            markArbitrateSettingDto.setUserName(sysUser.getRealName());
+            if (StringUtils.isNotBlank(markPaper.getPaperFilePath())) {
+                markArbitrateSettingDto.setPaperUrl(teachcloudCommonService.filePreview(markPaper.getPaperFilePath()));
+            }
+            if (StringUtils.isNotBlank(markPaper.getAnswerFilePath())) {
+                markArbitrateSettingDto.setAnswerUrl(teachcloudCommonService.filePreview(markPaper.getAnswerFilePath()));
+            }
+        }
+        return markArbitrateSettingDto;
+    }
+
+    private void releaseTask(Long taskId) {
+        synchronized (currentTaskMap) {
+            currentTaskMap.remove(taskId);
+        }
+    }
+
+    private void releaseByUser(Long userId) {
+        Set<Long> taskIds = new HashSet<>();
+        taskIds.addAll(currentTaskMap.keySet());
+        synchronized (currentTaskMap) {
+            for (Long taskId : taskIds) {
+                Integer value = currentTaskMap.get(taskId);
+                if (value != null && value.equals(userId)) {
+                    currentTaskMap.remove(taskId);
+                }
+            }
+        }
+    }
 }

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkGroupServiceImpl.java

@@ -6,14 +6,14 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 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.teachcloud.common.bean.dto.mark.manage.MarkGroupClassProgressDto;
-import com.qmth.teachcloud.common.bean.dto.mark.manage.MarkGroupProgressDto;
-import com.qmth.teachcloud.common.bean.dto.mark.manage.MarkGroupSummaryProgressDto;
-import com.qmth.teachcloud.common.bean.dto.mark.manage.MarkGroupTotalProgressDto;
-import com.qmth.teachcloud.common.bean.dto.mark.setting.MarkGroupDto;
-import com.qmth.teachcloud.common.bean.dto.mark.setting.MarkGroupTaskDto;
-import com.qmth.teachcloud.common.bean.dto.mark.setting.MarkUser;
-import com.qmth.teachcloud.common.bean.dto.mark.setting.PictureConfig;
+import com.qmth.teachcloud.mark.dto.mark.manage.MarkGroupClassProgressDto;
+import com.qmth.teachcloud.mark.dto.mark.manage.MarkGroupProgressDto;
+import com.qmth.teachcloud.mark.dto.mark.manage.MarkGroupSummaryProgressDto;
+import com.qmth.teachcloud.mark.dto.mark.manage.MarkGroupTotalProgressDto;
+import com.qmth.teachcloud.mark.dto.mark.setting.MarkGroupDto;
+import com.qmth.teachcloud.mark.dto.mark.setting.MarkGroupTaskDto;
+import com.qmth.teachcloud.common.bean.dto.mark.MarkUser;
+import com.qmth.teachcloud.common.bean.dto.mark.PictureConfig;
 import com.qmth.teachcloud.common.bean.params.mark.setting.GroupPictureConfigParams;
 import com.qmth.teachcloud.common.entity.MarkPaper;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkProblemHistoryServiceImpl.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 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.teachcloud.common.bean.dto.mark.manage.MarkProblemDto;
+import com.qmth.teachcloud.mark.dto.mark.manage.MarkProblemDto;
 import com.qmth.teachcloud.common.entity.MarkStudent;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.mark.MarkProblemStatus;

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkTaskServiceImpl.java

@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 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.teachcloud.common.bean.dto.mark.manage.MarkManageDto;
-import com.qmth.teachcloud.common.bean.dto.mark.manage.MarkerInfoDto;
+import com.qmth.teachcloud.mark.dto.mark.manage.MarkManageDto;
+import com.qmth.teachcloud.mark.dto.mark.manage.MarkerInfoDto;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.service.MarkQuestionService;
 import com.qmth.teachcloud.common.util.ExcelUtil;
@@ -153,4 +153,14 @@ public class MarkTaskServiceImpl extends ServiceImpl<MarkTaskMapper, MarkTask> i
     public MarkTask getLastOneByUserIdAndStatus(Long examId, String paperNumber, Integer groupNumber, Long userId, MarkTaskStatus status) {
         return this.baseMapper.getLastOneByUserIdAndStatus(examId, paperNumber, groupNumber, userId, status.name());
     }
+
+    @Override
+    public List<MarkTask> listByExamIdAndPaperNumberAndGroupNumberAndStudentId(Long examId, String paperNumber, Integer groupNumber, Long studentId) {
+        QueryWrapper<MarkTask> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(MarkTask::getExamId, examId)
+                .eq(MarkTask::getPaperNumber, paperNumber)
+                .eq(MarkTask::getGroupNumber, groupNumber)
+                .eq(MarkTask::getStudentId, studentId);
+        return this.list(queryWrapper);
+    }
 }

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkUserClassServiceImpl.java

@@ -5,10 +5,10 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 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.teachcloud.common.bean.dto.mark.manage.MarkGroupClassProgressDto;
-import com.qmth.teachcloud.common.bean.dto.mark.setting.MarkGroupDto;
-import com.qmth.teachcloud.common.bean.dto.mark.setting.MarkUser;
-import com.qmth.teachcloud.common.bean.dto.mark.setting.MarkUserClassDto;
+import com.qmth.teachcloud.mark.dto.mark.manage.MarkGroupClassProgressDto;
+import com.qmth.teachcloud.mark.dto.mark.setting.MarkGroupDto;
+import com.qmth.teachcloud.common.bean.dto.mark.MarkUser;
+import com.qmth.teachcloud.mark.dto.mark.setting.MarkUserClassDto;
 import com.qmth.teachcloud.common.bean.params.mark.setting.MarkClassUserParams;
 import com.qmth.teachcloud.common.service.MarkQuestionService;
 import com.qmth.teachcloud.common.service.MarkStudentService;

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkUserGroupServiceImpl.java

@@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 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.teachcloud.common.bean.dto.mark.entrance.MarkEntranceDto;
-import com.qmth.teachcloud.common.bean.dto.mark.manage.MarkQualityChartDto;
-import com.qmth.teachcloud.common.bean.dto.mark.manage.MarkQualityDto;
-import com.qmth.teachcloud.common.bean.dto.mark.manage.MarkUserGroupProgressDto;
-import com.qmth.teachcloud.common.bean.dto.mark.setting.MarkUser;
+import com.qmth.teachcloud.mark.dto.mark.entrance.MarkEntranceDto;
+import com.qmth.teachcloud.mark.dto.mark.manage.MarkQualityChartDto;
+import com.qmth.teachcloud.mark.dto.mark.manage.MarkQualityDto;
+import com.qmth.teachcloud.mark.dto.mark.manage.MarkUserGroupProgressDto;
+import com.qmth.teachcloud.common.bean.dto.mark.MarkUser;
 import com.qmth.teachcloud.common.entity.MarkPaper;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;

teachcloud-mark/src/main/resources/mapper/MarkArbitrateHistoryMapper.xml

@@ -18,7 +18,7 @@
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
     </resultMap>
-    <select id="pageArbitrate" resultType="com.qmth.teachcloud.common.bean.dto.mark.manage.MarkArbitrateDto">
+    <select id="pageArbitrate" resultType="com.qmth.teachcloud.mark.dto.mark.manage.MarkArbitrateDto">
         SELECT
             mah.id,
             mah.exam_id examId,

teachcloud-mark/src/main/resources/mapper/MarkProblemHistoryMapper.xml

@@ -21,7 +21,7 @@
         <result column="update_time" property="updateTime" />
         <result column="remark" property="remark" />
     </resultMap>
-    <select id="pageProblem" resultType="com.qmth.teachcloud.common.bean.dto.mark.manage.MarkProblemDto">
+    <select id="pageProblem" resultType="com.qmth.teachcloud.mark.dto.mark.manage.MarkProblemDto">
         SELECT
             id,
             task_id taskId,

teachcloud-mark/src/main/resources/mapper/MarkTaskMapper.xml

@@ -25,7 +25,7 @@
         <result column="header_score" property="headerScore" />
         <result column="header_score_list" property="headerScoreList" />
     </resultMap>
-    <select id="listPaperManage" resultType="com.qmth.teachcloud.common.bean.dto.mark.manage.MarkManageDto">
+    <select id="listPaperManage" resultType="com.qmth.teachcloud.mark.dto.mark.manage.MarkManageDto">
         SELECT
             exam_id examId,
             course_code courseCode,
@@ -59,7 +59,7 @@
         </if>
     </select>
     <select id="listUserMarkedCount"
-            resultType="com.qmth.teachcloud.common.bean.dto.mark.manage.MarkerInfoDto">
+            resultType="com.qmth.teachcloud.mark.dto.mark.manage.MarkerInfoDto">
         SELECT
             mt.exam_id examId,
             mt.course_code courseCode,

teachcloud-mark/src/main/resources/mapper/MarkUserClassMapper.xml

@@ -12,7 +12,7 @@
         <result column="class_name" property="className" />
     </resultMap>
     <select id="listClassMarkerByExamIdAndPaperNumberAndGroupNumberAndClassName"
-            resultType="com.qmth.teachcloud.common.bean.dto.mark.setting.MarkUser">
+            resultType="com.qmth.teachcloud.common.bean.dto.mark.MarkUser">
         SELECT
             su.id userId,
             su.login_name loginName,
@@ -31,7 +31,7 @@
           AND muc.class_name = #{className}
     </select>
     <select id="pageClassByExamIdAndPaperNumber"
-            resultType="com.qmth.teachcloud.common.bean.dto.mark.manage.MarkGroupClassProgressDto">
+            resultType="com.qmth.teachcloud.mark.dto.mark.manage.MarkGroupClassProgressDto">
         SELECT
             class_name className,
             GROUP_CONCAT(group_number) groupNumbers

teachcloud-mark/src/main/resources/mapper/MarkUserGroupMapper.xml

@@ -20,7 +20,7 @@
         <result column="avg_speed" property="avgSpeed" />
         <result column="stdev_score" property="stdevScore" />
     </resultMap>
-    <select id="listEntranceGroup" resultType="com.qmth.teachcloud.common.bean.dto.mark.entrance.MarkEntranceDto">
+    <select id="listEntranceGroup" resultType="com.qmth.teachcloud.mark.dto.mark.entrance.MarkEntranceDto">
         SELECT
             mg.exam_id examId,
             mg.number groupNumber,
@@ -48,7 +48,7 @@
         </where>
     </select>
     <select id="listGroupUserByExamIdAndPaperNumberAndGroupNumber"
-            resultType="com.qmth.teachcloud.common.bean.dto.mark.setting.MarkUser">
+            resultType="com.qmth.teachcloud.common.bean.dto.mark.MarkUser">
         SELECT
             su.id userId,
             su.login_name loginName,
@@ -66,7 +66,7 @@
             AND mug.group_number = #{groupNumber}
     </select>
     <select id="pageGroupUserByExamIdAndPaperNumberAndGroupNumber"
-            resultType="com.qmth.teachcloud.common.bean.dto.mark.manage.MarkUserGroupProgressDto">
+            resultType="com.qmth.teachcloud.mark.dto.mark.manage.MarkUserGroupProgressDto">
         SELECT
             mug.id markUserGroupId,
             mug.group_number groupNumber,
@@ -91,7 +91,7 @@
             </if>
         </where>
     </select>
-    <select id="pageQuality" resultType="com.qmth.teachcloud.common.bean.dto.mark.manage.MarkQualityDto">
+    <select id="pageQuality" resultType="com.qmth.teachcloud.mark.dto.mark.manage.MarkQualityDto">
         SELECT
             user_id userId,
             group_number groupNumber,