3.4.4 update-20250226，删除不用的文件

distributed-print/install/mysql/upgrade/3.4.4.sql

@@ -88,7 +88,7 @@ ALTER TABLE `mark_user_paper`
 
 ALTER TABLE `mark_task`
     ADD COLUMN `main_number` INT NULL COMMENT '大题号' AFTER `question_id`,
-ADD COLUMN `sub_nubmer` INT NULL COMMENT '小题号' AFTER `main_number`;
+ADD COLUMN `sub_number` INT NULL COMMENT '小题号' AFTER `main_number`;
 
 ALTER TABLE `mark_paper`
     CHANGE COLUMN `open_mark_class` `class_mark` TINYINT NULL DEFAULT '0' COMMENT '是否开启分班阅' AFTER `paper_type`;

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/entity/MarkHeaderSubjectiveScore.java

@@ -1,161 +0,0 @@
-package com.qmth.teachcloud.mark.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * <p>
- * 主观题得分明细表
- * </p>
- *
- * @author xf
- * @since 2023-09-22
- */
-@TableName("mark_header_subjective_score")
-@ApiModel(value="MarkHeaderSubjectiveScore对象", description="主观题得分明细表")
-public class MarkHeaderSubjectiveScore implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "考生ID")
-    @MppMultiId(value = "student_id")
-    private Long studentId;
-
-    @ApiModelProperty(value = "大题号")
-    @MppMultiId(value = "main_number")
-    private Integer mainNumber;
-
-    @ApiModelProperty(value = "小题号")
-    @MppMultiId(value = "sub_number")
-    private String subNumber;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "考试ID")
-    private Long examId;
-
-    @ApiModelProperty(value = "课程代码")
-    private String paperNumber;
-
-    @ApiModelProperty(value = "分组序号")
-    private Integer groupNumber;
-
-    @ApiModelProperty(value = "分组得分")
-    private Double groupScore;
-
-    @ApiModelProperty(value = "大题得分")
-    private Double mainScore;
-
-    @ApiModelProperty(value = "小题得分")
-    private Double score;
-
-    @ApiModelProperty(value = "是否合分")
-    private Integer uncalculate;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "科组长ID")
-    private Long userId;
-
-    public Long getStudentId() {
-        return studentId;
-    }
-
-    public void setStudentId(Long studentId) {
-        this.studentId = studentId;
-    }
-    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 Long getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Long examId) {
-        this.examId = examId;
-    }
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-    public Integer getGroupNumber() {
-        return groupNumber;
-    }
-
-    public void setGroupNumber(Integer groupNumber) {
-        this.groupNumber = groupNumber;
-    }
-    public Double getGroupScore() {
-        return groupScore;
-    }
-
-    public void setGroupScore(Double groupScore) {
-        this.groupScore = groupScore;
-    }
-    public Double getMainScore() {
-        return mainScore;
-    }
-
-    public void setMainScore(Double mainScore) {
-        this.mainScore = mainScore;
-    }
-    public Double getScore() {
-        return score;
-    }
-
-    public void setScore(Double score) {
-        this.score = score;
-    }
-    public Integer getUncalculate() {
-        return uncalculate;
-    }
-
-    public void setUncalculate(Integer uncalculate) {
-        this.uncalculate = uncalculate;
-    }
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    @Override
-    public String toString() {
-        return "MarkHeaderSubjectiveScore{" +
-            "studentId=" + studentId +
-            ", mainNumber=" + mainNumber +
-            ", subNumber=" + subNumber +
-            ", examId=" + examId +
-            ", paperNumber=" + paperNumber +
-            ", groupNumber=" + groupNumber +
-            ", groupScore=" + groupScore +
-            ", mainScore=" + mainScore +
-            ", score=" + score +
-            ", uncalculate=" + uncalculate +
-            ", userId=" + userId +
-        "}";
-    }
-}

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/entity/MarkTask.java

@@ -53,6 +53,12 @@ public class MarkTask implements Serializable {
     @ApiModelProperty(value = "题目ID")
     private Long questionId;
 
+    @ApiModelProperty(value = "大题号")
+    private Integer mainNumber;
+
+    @ApiModelProperty(value = "小题号")
+    private Integer subNumber;
+
     @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "考生ID")
     private Long studentId;
@@ -292,6 +298,22 @@ public class MarkTask implements Serializable {
         this.questionId = questionId;
     }
 
+    public Integer getMainNumber() {
+        return mainNumber;
+    }
+
+    public void setMainNumber(Integer mainNumber) {
+        this.mainNumber = mainNumber;
+    }
+
+    public Integer getSubNumber() {
+        return subNumber;
+    }
+
+    public void setSubNumber(Integer subNumber) {
+        this.subNumber = subNumber;
+    }
+
     public String getMarkerTrackList() {
         return markerTrackList;
     }
@@ -340,6 +362,21 @@ public class MarkTask implements Serializable {
         return markSpecialTagList;
     }
 
+    public List<MarkHeaderTrack> listHeaderTrack() {
+        List<MarkHeaderTrack> markHeaderTrackList = new ArrayList<>();
+        if (StringUtils.isNotBlank(headerTrackList)) {
+            markHeaderTrackList = JSON.parseArray(headerTrackList, MarkHeaderTrack.class);
+        }
+        return markHeaderTrackList;
+    }
+
+    public List<MarkHeaderTag> listHeaderTag() {
+        List<MarkHeaderTag> headerSpecialTagList = new ArrayList<>();
+        if (StringUtils.isNotBlank(headerTagList)) {
+            headerSpecialTagList = JSON.parseArray(headerTagList, MarkHeaderTag.class);
+        }
+        return headerSpecialTagList;
+    }
 
     @Override
     public String toString() {

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

@@ -1,16 +0,0 @@
-package com.qmth.teachcloud.mark.mapper;
-
-import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-import com.qmth.teachcloud.mark.entity.MarkHeaderSubjectiveScore;
-
-/**
- * <p>
- * 主观题得分明细表 Mapper 接口
- * </p>
- *
- * @author xf
- * @since 2023-09-22
- */
-public interface MarkHeaderSubjectiveScoreMapper extends MppBaseMapper<MarkHeaderSubjectiveScore> {
-
-}

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

@@ -1,16 +0,0 @@
-package com.qmth.teachcloud.mark.mapper;
-
-import com.qmth.teachcloud.mark.entity.MarkHeaderTag;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 组长特殊标记表 Mapper 接口
- * </p>
- *
- * @author xf
- * @since 2023-11-01
- */
-public interface MarkHeaderTagMapper extends BaseMapper<MarkHeaderTag> {
-
-}

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

@@ -1,16 +0,0 @@
-package com.qmth.teachcloud.mark.mapper;
-
-import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-import com.qmth.teachcloud.mark.entity.MarkHeaderTrack;
-
-/**
- * <p>
- * 组长轨迹给分表 Mapper 接口
- * </p>
- *
- * @author xf
- * @since 2023-09-22
- */
-public interface MarkHeaderTrackMapper extends MppBaseMapper<MarkHeaderTrack> {
-
-}

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

@@ -1,20 +0,0 @@
-package com.qmth.teachcloud.mark.mapper;
-
-import com.qmth.teachcloud.mark.entity.MarkSpecialTag;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 特殊标记表 Mapper 接口
- * </p>
- *
- * @author xf
- * @since 2023-11-01
- */
-public interface MarkSpecialTagMapper extends BaseMapper<MarkSpecialTag> {
-
-    void deleteByStudentId(@Param("studentId") Long studentId);
-
-    void deleteByExamIdAndPaperNumberAndGroupNumber(@Param("examId") Long examId, @Param("paperNumber") String paperNumber, @Param("groupNumber") Integer groupNumber);
-}

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

@@ -1,16 +0,0 @@
-package com.qmth.teachcloud.mark.mapper;
-
-import com.qmth.teachcloud.mark.entity.MarkTrack;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 轨迹给分表 Mapper 接口
- * </p>
- *
- * @author xf
- * @since 2023-09-22
- */
-public interface MarkTrackMapper extends BaseMapper<MarkTrack> {
-
-}

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

@@ -1,16 +0,0 @@
-package com.qmth.teachcloud.mark.service;
-
-import com.qmth.teachcloud.mark.entity.MarkHeaderSubjectiveScore;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 主观题得分明细表 服务类
- * </p>
- *
- * @author xf
- * @since 2023-09-22
- */
-public interface MarkHeaderSubjectiveScoreService extends IService<MarkHeaderSubjectiveScore> {
-
-}

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

@@ -1,27 +0,0 @@
-package com.qmth.teachcloud.mark.service;
-
-import com.qmth.teachcloud.mark.entity.MarkHeaderTag;
-
-import java.util.List;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 组长特殊标记表 服务类
- * </p>
- *
- * @author xf
- * @since 2023-11-01
- */
-public interface MarkHeaderTagService extends IService<MarkHeaderTag> {
-
-    void deleteByStudentIdAndGroupNumber(Long studentId, Integer groupNumber);
-
-    void deleteByExamIdAndPaperNumberAndGroupNumber(Long examId, String paperNumber, Integer number);
-
-	List<MarkHeaderTag> findByStudentId(Long studentId);
-
-	void deleteByExamIdAndPaperNumberAndGroupNumberAndStudentId(Long examId, String paperNumber, Integer groupNumber,
-			Long studentId);
-}

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

@@ -1,28 +0,0 @@
-package com.qmth.teachcloud.mark.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.github.jeffreyning.mybatisplus.service.IMppService;
-import com.qmth.teachcloud.mark.entity.MarkHeaderTrack;
-
-import java.util.List;
-
-/**
- * <p>
- * 组长轨迹给分表 服务类
- * </p>
- *
- * @author xf
- * @since 2023-09-22
- */
-public interface MarkHeaderTrackService extends IMppService<MarkHeaderTrack> {
-
-    List<MarkHeaderTrack> listByExamAndPaperNumberAndGroupNumberAndStudentId(Long examId, String paperNumber, Integer groupNumber, Long studentId);
-
-    List<MarkHeaderTrack> listByStudentIdAndQuestionNumber(Long studentId, String questionNumber);
-
-    void deleteByExamIdAndPaperNumberAndGroupNumberAndStudentId(Long examId, String paperNumber, Integer groupNumber, Long studentId);
-
-    void deleteByStudentId(Long studentId);
-
-    void deleteByExamIdAndPaperNumberAndGroupNumberAndStudentIdAndQuestionNumber(Long examId, String paperNumber, Integer groupNumber, Long studentId, String questionNumber);
-}

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

@@ -1,26 +0,0 @@
-package com.qmth.teachcloud.mark.service;
-
-import com.qmth.teachcloud.mark.entity.MarkSpecialTag;
-
-import java.util.List;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 特殊标记表 服务类
- * </p>
- *
- * @author xf
- * @since 2023-11-01
- */
-public interface MarkSpecialTagService extends IService<MarkSpecialTag> {
-
-    void deleteByTaskId(Long taskId);
-
-    void deleteByStudentId(Long studentId);
-
-    void deleteByExamIdAndPaperNumberAndGroupNumber(Long examId, String paperNumber, Integer groupNumber);
-
-	List<MarkSpecialTag> findByTaskId(Long taskId);
-}

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

@@ -1,31 +0,0 @@
-package com.qmth.teachcloud.mark.service;
-
-import com.qmth.teachcloud.mark.entity.MarkTrack;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 轨迹给分表 服务类
- * </p>
- *
- * @author xf
- * @since 2023-09-22
- */
-public interface MarkTrackService extends IService<MarkTrack> {
-
-    void deleteByTaskId(Long taskId);
-
-    List<MarkTrack> listByTaskIdAndQuestionNumber(Long taskId, String questionNumber);
-
-    void deleteByStudentId(Long studentId);
-
-    void deleteByExamIdAndPaperNumberAndGroupNumber(Long examId, String paperNumber, Integer groupNumber);
-    
-    List<MarkTrack> listByTaskId(Long taskId);
-
-	List<MarkTrack> findByStudentIdAndQuestionNumber(Long studentId, String questionNumber);
-
-    List<MarkTrack> listByStudentId(Long studentId);
-}

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

@@ -1,20 +0,0 @@
-package com.qmth.teachcloud.mark.service.impl;
-
-import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
-import com.qmth.teachcloud.mark.entity.MarkHeaderSubjectiveScore;
-import com.qmth.teachcloud.mark.mapper.MarkHeaderSubjectiveScoreMapper;
-import com.qmth.teachcloud.mark.service.MarkHeaderSubjectiveScoreService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 主观题得分明细表 服务实现类
- * </p>
- *
- * @author xf
- * @since 2023-09-22
- */
-@Service
-public class MarkHeaderSubjectiveScoreServiceImpl extends MppServiceImpl<MarkHeaderSubjectiveScoreMapper, MarkHeaderSubjectiveScore> implements MarkHeaderSubjectiveScoreService {
-
-}

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

@@ -1,65 +0,0 @@
-package com.qmth.teachcloud.mark.service.impl;
-
-import java.util.List;
-
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.teachcloud.mark.entity.MarkHeaderTag;
-import com.qmth.teachcloud.mark.mapper.MarkHeaderTagMapper;
-import com.qmth.teachcloud.mark.service.MarkHeaderTagService;
-
-/**
- * <p>
- * 组长特殊标记表 服务实现类
- * </p>
- *
- * @author xf
- * @since 2023-11-01
- */
-@Service
-public class MarkHeaderTagServiceImpl extends ServiceImpl<MarkHeaderTagMapper, MarkHeaderTag>
-		implements MarkHeaderTagService {
-
-	@Override
-	public void deleteByStudentIdAndGroupNumber(Long studentId, Integer groupNumber) {
-		UpdateWrapper<MarkHeaderTag> updateWrapper = new UpdateWrapper<>();
-		LambdaUpdateWrapper<MarkHeaderTag> lambdaUpdateWrapper = updateWrapper.lambda();
-		lambdaUpdateWrapper.eq(MarkHeaderTag::getStudentId, studentId);
-		if (groupNumber != null) {
-			lambdaUpdateWrapper.eq(MarkHeaderTag::getGroupNumber, groupNumber);
-		}
-		this.remove(updateWrapper);
-	}
-
-	@Override
-	public void deleteByExamIdAndPaperNumberAndGroupNumber(Long examId, String paperNumber, Integer number) {
-		UpdateWrapper<MarkHeaderTag> updateWrapper = new UpdateWrapper<>();
-		LambdaUpdateWrapper<MarkHeaderTag> lambdaUpdateWrapper = updateWrapper.lambda();
-		lambdaUpdateWrapper.eq(MarkHeaderTag::getExamId, examId).eq(MarkHeaderTag::getPaperNumber, paperNumber)
-				.eq(MarkHeaderTag::getGroupNumber, number);
-		this.remove(updateWrapper);
-	}
-
-	@Override
-	public List<MarkHeaderTag> findByStudentId(Long studentId) {
-		QueryWrapper<MarkHeaderTag> queryWrapper = new QueryWrapper<>();
-		queryWrapper.lambda().eq(MarkHeaderTag::getStudentId, studentId);
-		return this.list(queryWrapper);
-	}
-
-	@Override
-	public void deleteByExamIdAndPaperNumberAndGroupNumberAndStudentId(Long examId, String paperNumber,
-			Integer groupNumber, Long studentId) {
-		UpdateWrapper<MarkHeaderTag> updateWrapper = new UpdateWrapper<>();
-		LambdaUpdateWrapper<MarkHeaderTag> lambdaUpdateWrapper = updateWrapper.lambda();
-		lambdaUpdateWrapper.eq(MarkHeaderTag::getExamId, examId);
-		lambdaUpdateWrapper.eq(MarkHeaderTag::getStudentId, studentId);
-		lambdaUpdateWrapper.eq(MarkHeaderTag::getPaperNumber, paperNumber);
-		lambdaUpdateWrapper.eq(MarkHeaderTag::getGroupNumber, groupNumber);
-		this.remove(updateWrapper);
-	}
-}

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

@@ -1,77 +0,0 @@
-package com.qmth.teachcloud.mark.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
-import com.qmth.teachcloud.mark.entity.MarkHeaderTrack;
-import com.qmth.teachcloud.mark.mapper.MarkHeaderTrackMapper;
-import com.qmth.teachcloud.mark.service.MarkHeaderTrackService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 组长轨迹给分表 服务实现类
- * </p>
- *
- * @author xf
- * @since 2023-09-22
- */
-@Service
-public class MarkHeaderTrackServiceImpl extends MppServiceImpl<MarkHeaderTrackMapper, MarkHeaderTrack> implements MarkHeaderTrackService {
-
-    @Override
-    public List<MarkHeaderTrack> listByExamAndPaperNumberAndGroupNumberAndStudentId(Long examId, String paperNumber, Integer groupNumber, Long studentId) {
-        QueryWrapper<MarkHeaderTrack> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(MarkHeaderTrack::getExamId, examId)
-                .eq(MarkHeaderTrack::getPaperNumber, paperNumber)
-                .eq(MarkHeaderTrack::getGroupNumber, groupNumber)
-                .eq(MarkHeaderTrack::getStudentId, studentId)
-                .orderByAsc(MarkHeaderTrack::getNumber);
-        return this.list(queryWrapper);
-    }
-
-    @Override
-    public List<MarkHeaderTrack> listByStudentIdAndQuestionNumber(Long studentId, String questionNumber) {
-        QueryWrapper<MarkHeaderTrack> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(MarkHeaderTrack::getStudentId, studentId)
-                .eq(MarkHeaderTrack::getQuestionNumber, questionNumber)
-                .orderByAsc(MarkHeaderTrack::getNumber);
-        return this.list(queryWrapper);
-    }
-
-    @Override
-    public void deleteByExamIdAndPaperNumberAndGroupNumberAndStudentId(Long examId, String paperNumber, Integer groupNumber, Long studentId) {
-        UpdateWrapper<MarkHeaderTrack> updateWrapper = new UpdateWrapper<>();
-        LambdaUpdateWrapper<MarkHeaderTrack> lambdaUpdateWrapper = updateWrapper.lambda();
-        lambdaUpdateWrapper.eq(MarkHeaderTrack::getExamId, examId)
-                .eq(MarkHeaderTrack::getPaperNumber, paperNumber)
-                .eq(MarkHeaderTrack::getGroupNumber, groupNumber);
-        if (studentId != null) {
-            lambdaUpdateWrapper.eq(MarkHeaderTrack::getStudentId, studentId);
-        }
-        this.remove(updateWrapper);
-    }
-
-    @Override
-    public void deleteByStudentId(Long studentId) {
-        UpdateWrapper<MarkHeaderTrack> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.lambda().eq(MarkHeaderTrack::getStudentId, studentId);
-        this.remove(updateWrapper);
-    }
-
-    @Override
-    public void deleteByExamIdAndPaperNumberAndGroupNumberAndStudentIdAndQuestionNumber(Long examId, String paperNumber, Integer groupNumber, Long studentId, String questionNumber) {
-        UpdateWrapper<MarkHeaderTrack> updateWrapper = new UpdateWrapper<>();
-        LambdaUpdateWrapper<MarkHeaderTrack> lambdaUpdateWrapper = updateWrapper.lambda();
-        lambdaUpdateWrapper.eq(MarkHeaderTrack::getExamId, examId)
-                .eq(MarkHeaderTrack::getPaperNumber, paperNumber)
-                .eq(MarkHeaderTrack::getGroupNumber, groupNumber)
-                .eq(MarkHeaderTrack::getStudentId, studentId)
-                .eq(MarkHeaderTrack::getQuestionNumber, questionNumber);
-        this.remove(updateWrapper);
-    }
-
-}

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

@@ -73,9 +73,6 @@ public class MarkServiceImpl implements MarkService {
     @Resource
     private MarkTaskService markTaskService;
 
-    @Resource
-    private MarkTrackService markTrackService;
-
     @Resource
     private MarkStudentService markStudentService;
 
@@ -87,16 +84,6 @@ public class MarkServiceImpl implements MarkService {
 
     @Resource
     private MarkSubjectiveScoreService markSubjectiveScoreService;
-
-    @Resource
-    private MarkHeaderTrackService markHeaderTrackService;
-
-    @Resource
-    private MarkSpecialTagService markSpecialTagService;
-
-    @Resource
-    private MarkHeaderTagService markHeaderTagService;
-
     @Resource
     LockService lockService;
 
@@ -460,7 +447,7 @@ public class MarkServiceImpl implements MarkService {
                     markTask.setStatus(MarkTaskStatus.WAITING);
                     taskList.add(markTask);
                     // 开启双评时需要判断是否生成第二份评卷任务
-                    if (markQuestion.getDoubleRate() > 0) {
+                    if (markQuestion.getDoubleRate() != null && markQuestion.getDoubleRate() > 0) {
                         boolean needDouble;
                         if (markQuestion.getDoubleRate() == 100) {
                             needDouble = true;

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

@@ -1,49 +0,0 @@
-package com.qmth.teachcloud.mark.service.impl;
-
-import java.util.List;
-
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.teachcloud.mark.entity.MarkSpecialTag;
-import com.qmth.teachcloud.mark.mapper.MarkSpecialTagMapper;
-import com.qmth.teachcloud.mark.service.MarkSpecialTagService;
-
-/**
- * <p>
- * 特殊标记表 服务实现类
- * </p>
- *
- * @author xf
- * @since 2023-11-01
- */
-@Service
-public class MarkSpecialTagServiceImpl extends ServiceImpl<MarkSpecialTagMapper, MarkSpecialTag>
-		implements MarkSpecialTagService {
-
-	@Override
-	public void deleteByTaskId(Long taskId) {
-		UpdateWrapper<MarkSpecialTag> updateWrapper = new UpdateWrapper<>();
-		updateWrapper.lambda().eq(MarkSpecialTag::getTaskId, taskId);
-		this.remove(updateWrapper);
-	}
-
-	@Override
-	public void deleteByStudentId(Long studentId) {
-		this.baseMapper.deleteByStudentId(studentId);
-	}
-
-	@Override
-	public void deleteByExamIdAndPaperNumberAndGroupNumber(Long examId, String paperNumber, Integer groupNumber) {
-		this.baseMapper.deleteByExamIdAndPaperNumberAndGroupNumber(examId, paperNumber, groupNumber);
-	}
-
-	@Override
-	public List<MarkSpecialTag> findByTaskId(Long taskId) {
-		QueryWrapper<MarkSpecialTag> queryWrapper = new QueryWrapper<>();
-		queryWrapper.lambda().eq(MarkSpecialTag::getTaskId, taskId);
-		return this.list(queryWrapper);
-	}
-}

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

@@ -128,31 +128,20 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
 
     @Resource
     private ConcurrentService concurrentService;
-
     @Resource
     private MarkService markService;
-
     @Resource
     private LockService lockService;
-
     @Resource
     private TaskService taskService;
-
     @Resource
     private BasicRoleDataPermissionService basicRoleDataPermissionService;
-
     @Resource
     private MarkSubjectiveScoreService markSubjectiveScoreService;
-
     @Resource
     private MarkSyncService markSyncService;
-
     @Resource
     private FileUploadService fileUploadService;
-
-    @Resource
-    private MarkTrackService markTrackService;
-
     @Resource
     private MarkTaskService markTaskService;
     @Resource
@@ -2018,7 +2007,11 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
                             continue;
                         }
                         List<FilePathVo> vos = JSON.parseArray(s.getSheetPath(), FilePathVo.class);
-                        List<MarkTrack> trackList = markTrackService.listByStudentId(s.getId());
+                        List<MarkTrack> trackList = new ArrayList<>();
+                        List<MarkTask> markTaskList = markTaskService.listByStudentId(s.getId());
+                        for (MarkTask markTask : markTaskList) {
+                            trackList.addAll(markTask.listMarkerTrack());
+                        }
                         Document document = new Document(new Rectangle(PageSize.A3.getHeight(), PageSize.A3.getWidth()));
                         // 本地保存目录
                         File tempFile = SystemConstant.getFileTempParentDirVar(SystemConstant.TEMP_PREFIX);

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

@@ -401,7 +401,9 @@ public class MarkTaskServiceImpl extends ServiceImpl<MarkTaskMapper, MarkTask> i
     @Override
     public List<MarkTask> listByStudentId(Long studentId) {
         QueryWrapper<MarkTask> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(MarkTask::getStudentId, studentId);
+        queryWrapper.lambda().eq(MarkTask::getStudentId, studentId)
+                .orderByAsc(MarkTask::getMainNumber)
+                .orderByAsc(MarkTask::getSubNumber);
         return this.list(queryWrapper);
     }
 

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

@@ -1,79 +0,0 @@
-package com.qmth.teachcloud.mark.service.impl;
-
-import java.util.List;
-
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.teachcloud.mark.entity.MarkTrack;
-import com.qmth.teachcloud.mark.mapper.MarkTrackMapper;
-import com.qmth.teachcloud.mark.service.MarkTrackService;
-
-/**
- * <p>
- * 轨迹给分表 服务实现类
- * </p>
- *
- * @author xf
- * @since 2023-09-22
- */
-@Service
-public class MarkTrackServiceImpl extends ServiceImpl<MarkTrackMapper, MarkTrack> implements MarkTrackService {
-
-    @Override
-    public void deleteByTaskId(Long taskId) {
-        UpdateWrapper<MarkTrack> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.lambda().eq(MarkTrack::getTaskId, taskId);
-        this.remove(updateWrapper);
-    }
-
-    @Override
-    public List<MarkTrack> listByTaskIdAndQuestionNumber(Long taskId, String questionNumber) {
-        QueryWrapper<MarkTrack> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(MarkTrack::getTaskId, taskId)
-                .eq(MarkTrack::getQuestionNumber, questionNumber);
-        return this.list(queryWrapper);
-    }
-
-    @Override
-    public void deleteByStudentId(Long studentId) {
-        UpdateWrapper<MarkTrack> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.lambda().eq(MarkTrack::getStudentId, studentId);
-        this.remove(updateWrapper);
-    }
-
-    @Override
-    public void deleteByExamIdAndPaperNumberAndGroupNumber(Long examId, String paperNumber, Integer groupNumber) {
-        UpdateWrapper<MarkTrack> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.lambda().eq(MarkTrack::getExamId, examId)
-                .eq(MarkTrack::getPaperNumber, paperNumber)
-                .eq(MarkTrack::getGroupNumber, groupNumber);
-        this.remove(updateWrapper);
-    }
-
-	@Override
-	public List<MarkTrack> listByTaskId(Long taskId) {
-		 QueryWrapper<MarkTrack> queryWrapper = new QueryWrapper<>();
-	        queryWrapper.lambda().eq(MarkTrack::getTaskId, taskId);
-	        return this.list(queryWrapper);
-	}
-
-	@Override
-	public List<MarkTrack> findByStudentIdAndQuestionNumber(Long studentId, String questionNumber) {
-		QueryWrapper<MarkTrack> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(MarkTrack::getStudentId, studentId)
-                .eq(MarkTrack::getQuestionNumber, questionNumber)
-                .orderByAsc(MarkTrack::getNumber);
-        return this.list(queryWrapper);
-	}
-
-    @Override
-    public List<MarkTrack> listByStudentId(Long studentId) {
-        QueryWrapper<MarkTrack> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(MarkTrack::getStudentId, studentId)
-                .orderByAsc(MarkTrack::getQuestionNumber);
-        return this.list(queryWrapper);
-    }
-}

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

@@ -34,18 +34,10 @@ public class TaskServiceImpl implements TaskService {
     @Resource
     private MarkQuestionService markQuestionService;
     @Resource
-    private MarkHeaderTrackService markHeaderTrackService;
-    @Resource
-    private MarkTrackService markTrackService;
-    @Resource
     private MarkSubjectiveScoreService markSubjectiveScoreService;
     @Resource
     private TeachcloudCommonService teachcloudCommonService;
     @Resource
-    private MarkHeaderTagService markHeaderTagService;
-    @Resource
-    private MarkSpecialTagService markSpecialTagService;
-    @Resource
     private SysUserService sysUserService;
 
     @Override
@@ -124,7 +116,10 @@ public class TaskServiceImpl implements TaskService {
             // 增加阅卷轨迹列表获取
             List<MarkTask> markTaskList = markTaskService.listByStudentIdAndQuestionId(markStudent.getId(), question.getId());
             // 仲裁轨迹
-            List<MarkHeaderTrack> headerTracks = markHeaderTrackService.listByStudentIdAndQuestionNumber(markStudent.getId(), questionNumber);
+            List<MarkHeaderTrack> headerTracks = new ArrayList<>();
+            for (MarkTask markTask : markTaskList) {
+                headerTracks.addAll(markTask.listHeaderTrack());
+            }
             Map<Long, String> userNameMap = new HashMap<>();
             // 不管单评还是多评显示所有评卷员给分轨迹
             for (MarkTask markTask : markTaskList) {
@@ -274,7 +269,11 @@ public class TaskServiceImpl implements TaskService {
     }
 
     private SpecialTagDTO[] getHeaderTagList(MarkStudent student) {
-        List<MarkHeaderTag> list = markHeaderTagService.findByStudentId(student.getId());
+        List<MarkTask> markTaskList = markTaskService.listByStudentId(student.getId());
+        List<MarkHeaderTag> list = new ArrayList<>();
+        for (MarkTask markTask : markTaskList) {
+            list.addAll(markTask.listHeaderTag());
+        }
         SpecialTagDTO[] specialTags = new SpecialTagDTO[list.size()];
         for (int i = 0; i < list.size(); i++) {
             specialTags[i] = new MarkerSpecialTagDTO(list.get(i).getUserId(), list.get(i).getGroupNumber(),

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

@@ -7,7 +7,7 @@
         <id column="id" property="id" />
         <result column="exam_id" property="examId" />
         <result column="paper_number" property="paperNumber" />
-        <result column="group_number" property="groupNumber" />
+        <result column="question_id" property="questionId" />
         <result column="student_code" property="studentCode" />
         <result column="secret_number" property="secretNumber" />
         <result column="student_id" property="studentId" />

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

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.qmth.teachcloud.mark.mapper.MarkHeaderSubjectiveScoreMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.qmth.teachcloud.mark.entity.MarkHeaderSubjectiveScore">
-        <id column="student_id" property="studentId" />
-        <id column="main_number" property="mainNumber" />
-        <id column="sub_number" property="subNumber" />
-        <result column="exam_id" property="examId" />
-        <result column="paper_number" property="paperNumber" />
-        <result column="group_number" property="groupNumber" />
-        <result column="group_score" property="groupScore" />
-        <result column="main_score" property="mainScore" />
-        <result column="score" property="score" />
-        <result column="uncalculate" property="uncalculate" />
-        <result column="user_id" property="userId" />
-    </resultMap>
-
-</mapper>

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

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.qmth.teachcloud.mark.mapper.MarkHeaderTagMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.qmth.teachcloud.mark.entity.MarkHeaderTag">
-        <id column="id" property="id" />
-        <result column="student_id" property="studentId" />
-        <result column="group_number" property="groupNumber" />
-        <result column="user_id" property="userId" />
-        <result column="tag_name" property="tagName" />
-        <result column="position_x" property="positionX" />
-        <result column="position_y" property="positionY" />
-        <result column="offset_index" property="offsetIndex" />
-        <result column="offset_x" property="offsetX" />
-        <result column="offset_y" property="offsetY" />
-    </resultMap>
-
-</mapper>

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

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.qmth.teachcloud.mark.mapper.MarkHeaderTrackMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.qmth.teachcloud.mark.entity.MarkHeaderTrack">
-        <id column="student_id" property="studentId" />
-        <id column="question_number" property="questionNumber" />
-        <id column="number" property="number" />
-        <result column="exam_id" property="examId" />
-        <result column="paper_number" property="paperNumber" />
-        <result column="group_number" property="groupNumber" />
-        <result column="user_id" property="userId" />
-        <result column="score" property="score" />
-        <result column="position_x" property="positionX" />
-        <result column="position_y" property="positionY" />
-        <result column="offset_index" property="offsetIndex" />
-        <result column="offset_x" property="offsetX" />
-        <result column="offset_y" property="offsetY" />
-    </resultMap>
-
-</mapper>

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

@@ -25,7 +25,7 @@
         <result column="mark_end_time" property="markEndTime"/>
         <result column="sheet_view" property="sheetView"/>
         <result column="show_object_score" property="showObjectScore"/>
-        <result column="open_mark_class" property="openMarkClass"/>
+        <result column="class_mark" property="classMark"/>
         <result column="status" property="status"/>
     </resultMap>
     <select id="listPaperSetting" resultType="com.qmth.teachcloud.common.bean.dto.mark.MarkSettingDto">

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

@@ -7,7 +7,7 @@
         <id column="id" property="id" />
         <result column="exam_id" property="examId" />
         <result column="paper_number" property="paperNumber" />
-        <result column="group_number" property="groupNumber" />
+        <result column="question_id" property="questionId" />
         <result column="student_code" property="studentCode" />
         <result column="secret_number" property="secretNumber" />
         <result column="type" property="type" />

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

@@ -8,7 +8,6 @@
         <result column="exam_id" property="examId" />
         <result column="paper_number" property="paperNumber" />
         <result column="objective" property="objective" />
-        <result column="group_number" property="groupNumber" />
         <result column="main_number" property="mainNumber" />
         <result column="sub_number" property="subNumber" />
         <result column="main_title" property="mainTitle" />

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

@@ -7,16 +7,13 @@
         <id column="id" property="id" />
         <result column="exam_id" property="examId" />
         <result column="paper_number" property="paperNumber" />
-        <result column="group_number" property="groupNumber" />
+        <result column="question_id" property="questionId" />
         <result column="task_id" property="taskId" />
         <result column="student_id" property="studentId" />
         <result column="student_code" property="studentCode" />
         <result column="secret_number" property="secretNumber" />
         <result column="user_id" property="userId" />
-        <result column="reason" property="reason" />
         <result column="reject_score_list" property="rejectScoreList" />
-        <result column="score_list" property="scoreList" />
-        <result column="total_score" property="totalScore" />
         <result column="marker_time" property="markerTime" />
         <result column="reject_user_id" property="rejectUserId" />
         <result column="reject_time" property="rejectTime" />

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

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.qmth.teachcloud.mark.mapper.MarkSpecialTagMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.qmth.teachcloud.mark.entity.MarkSpecialTag">
-        <id column="id" property="id" />
-        <result column="task_id" property="taskId" />
-        <result column="tag_name" property="tagName" />
-        <result column="position_x" property="positionX" />
-        <result column="position_y" property="positionY" />
-        <result column="offset_index" property="offsetIndex" />
-        <result column="offset_x" property="offsetX" />
-        <result column="offset_y" property="offsetY" />
-    </resultMap>
-    <delete id="deleteByStudentId" parameterType="java.lang.Long">
-        DELETE FROM mark_special_tag
-        WHERE
-            EXISTS (SELECT
-                        1
-                    FROM
-                        mark_task mt
-                    WHERE
-                        mt.student_id = #{studentId} AND task_id = mt.id)
-    </delete>
-    <delete id="deleteByExamIdAndPaperNumberAndGroupNumber">
-        DELETE FROM mark_special_tag
-        WHERE
-                task_id IN (SELECT
-                                mt.id
-                            FROM
-                                mark_task mt
-                            WHERE
-                                mt.exam_id = #{examId}
-                              AND mt.paper_number = #{paperNumber}
-                              AND mt.group_number = #{groupNumber})
-    </delete>
-
-</mapper>

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

@@ -9,11 +9,9 @@
         <result column="sub_number" property="subNumber" />
         <result column="exam_id" property="examId" />
         <result column="paper_number" property="paperNumber" />
-        <result column="group_number" property="groupNumber" />
-        <result column="group_score" property="groupScore" />
+        <result column="question_id" property="questionId" />
         <result column="main_score" property="mainScore" />
         <result column="score" property="score" />
-        <result column="uncalculate" property="uncalculate" />
     </resultMap>
     <select id="getSubjectiveVo" resultType="com.qmth.teachcloud.mark.bean.archivescore.QuestionVo">
         SELECT 

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

@@ -9,7 +9,7 @@
         <result column="course_code" property="courseCode" />
         <result column="course_name" property="courseName" />
         <result column="paper_number" property="paperNumber" />
-        <result column="group_number" property="groupNumber" />
+        <result column="question_id" property="questionId" />
         <result column="student_id" property="studentId" />
         <result column="student_code" property="studentCode" />
         <result column="secret_number" property="secretNumber" />
@@ -18,12 +18,10 @@
         <result column="user_id" property="userId" />
         <result column="marker_time" property="markerTime" />
         <result column="marker_score" property="markerScore" />
-        <result column="marker_score_list" property="markerScoreList" />
         <result column="marker_spent" property="markerSpent" />
         <result column="header_id" property="headerId" />
         <result column="header_time" property="headerTime" />
         <result column="header_score" property="headerScore" />
-        <result column="header_score_list" property="headerScoreList" />
     </resultMap>
     <select id="listPaperManage" resultType="com.qmth.teachcloud.mark.dto.mark.manage.MarkManageDto">
         SELECT

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

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.qmth.teachcloud.mark.mapper.MarkTrackMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.qmth.teachcloud.mark.entity.MarkTrack">
-        <id column="id" property="id" />
-        <result column="task_id" property="taskId" />
-        <result column="question_number" property="questionNumber" />
-        <result column="number" property="number" />
-        <result column="student_id" property="studentId" />
-        <result column="exam_id" property="examId" />
-        <result column="paper_number" property="paperNumber" />
-        <result column="group_number" property="groupNumber" />
-        <result column="user_id" property="userId" />
-        <result column="type" property="type" />
-        <result column="score" property="score" />
-        <result column="remark" property="remark" />
-        <result column="position_x" property="positionX" />
-        <result column="position_y" property="positionY" />
-        <result column="offset_index" property="offsetIndex" />
-        <result column="offset_x" property="offsetX" />
-        <result column="offset_y" property="offsetY" />
-    </resultMap>
-
-</mapper>

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

@@ -7,9 +7,8 @@
         <id column="id" property="id" />
         <result column="exam_id" property="examId" />
         <result column="paper_number" property="paperNumber" />
-        <result column="group_number" property="groupNumber" />
+        <result column="question_id" property="questionId" />
         <result column="user_id" property="userId" />
-        <result column="mode" property="mode" />
         <result column="top_count" property="topCount" />
         <result column="finish_count" property="finishCount" />
         <result column="valid_count" property="validCount" />

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

@@ -12,7 +12,6 @@
         <result column="card_number" property="cardNumber" />
         <result column="main_number" property="mainNumber" />
         <result column="sub_number" property="subNumber" />
-        <result column="main_title" property="mainTitle" />
         <result column="question_type" property="questionType" />
         <result column="paper_index" property="paperIndex" />
         <result column="page_index" property="pageIndex" />