3.3.0 删除评卷参数管理相关代码

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/BasicCardRuleDto.java

@@ -1,15 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto;
-
-import com.qmth.distributed.print.business.entity.BasicCardRule;
-import com.qmth.distributed.print.business.enums.ExamNumberStyleEnum;
-import com.qmth.distributed.print.business.enums.PaperTypeEnum;
-import com.qmth.teachcloud.common.entity.SysOrg;
-
-import java.util.List;
-
-/**
- * @Date: 2021/3/29.
- */
-public class BasicCardRuleDto extends BasicCardRule {
-
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/BasicExamDto.java

@@ -1,23 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto;
-
-import com.qmth.teachcloud.common.entity.BasicExam;
-import com.qmth.teachcloud.common.entity.BasicPrintConfig;
-import com.qmth.teachcloud.common.entity.SysOrg;
-
-import java.util.List;
-
-/**
- * @Date: 2022/2/11.
- */
-public class BasicExamDto extends BasicExam {
-
-    private String semesterName;
-
-    public String getSemesterName() {
-        return semesterName;
-    }
-
-    public void setSemesterName(String semesterName) {
-        this.semesterName = semesterName;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/ExamPaperObjectiveStructureDto.java

@@ -1,92 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto;
-
-import com.qmth.teachcloud.common.annotation.ExcelNote;
-
-import java.io.Serializable;
-
-/**
- * @Date: 2021/10/28.
- */
-public class ExamPaperObjectiveStructureDto implements Serializable {
-
-    @ExcelNote(value = "科目代码")
-    private String courseCode;
-    @ExcelNote(value = "科目名称")
-    private String courseName;
-    @ExcelNote(value = "试卷类型")
-    private String paperType;
-    @ExcelNote(value = "大题名称")
-    private String mainName;
-    @ExcelNote(value = "大题号(只能用小写数字)")
-    private String mainNumber;
-    @ExcelNote(value = "小题号(只能用小写数字)")
-    private String subNumber;
-    @ExcelNote(value = "标准答案")
-    private String answer;
-    @ExcelNote(value = "小题满分")
-    private String score;
-
-    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 getPaperType() {
-        return paperType;
-    }
-
-    public void setPaperType(String paperType) {
-        this.paperType = paperType;
-    }
-
-    public String getMainName() {
-        return mainName;
-    }
-
-    public void setMainName(String mainName) {
-        this.mainName = mainName;
-    }
-
-    public String getMainNumber() {
-        return mainNumber;
-    }
-
-    public void setMainNumber(String mainNumber) {
-        this.mainNumber = mainNumber;
-    }
-
-    public String getSubNumber() {
-        return subNumber;
-    }
-
-    public void setSubNumber(String subNumber) {
-        this.subNumber = subNumber;
-    }
-
-    public String getAnswer() {
-        return answer;
-    }
-
-    public void setAnswer(String answer) {
-        this.answer = answer;
-    }
-
-    public String getScore() {
-        return score;
-    }
-
-    public void setScore(String score) {
-        this.score = score;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/ExamPaperStructureDto.java

@@ -1,73 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto;
-
-import org.springframework.web.multipart.MultipartFile;
-
-/**
- * @Date: 2021/10/28.
- */
-public class ExamPaperStructureDto {
-
-    private String paperType;
-    private MultipartFile subjectiveQuestionFile;
-    private String subjectiveQuestionMd5;
-    private MultipartFile objectiveQuestionFile;
-    private String objectiveQuestionMd5;
-    private MultipartFile standardAnswerFile;
-    private String standardAnswerMd5;
-
-    public String getPaperType() {
-        return paperType;
-    }
-
-    public void setPaperType(String paperType) {
-        this.paperType = paperType;
-    }
-
-    public MultipartFile getSubjectiveQuestionFile() {
-        return subjectiveQuestionFile;
-    }
-
-    public void setSubjectiveQuestionFile(MultipartFile subjectiveQuestionFile) {
-        this.subjectiveQuestionFile = subjectiveQuestionFile;
-    }
-
-    public String getSubjectiveQuestionMd5() {
-        return subjectiveQuestionMd5;
-    }
-
-    public void setSubjectiveQuestionMd5(String subjectiveQuestionMd5) {
-        this.subjectiveQuestionMd5 = subjectiveQuestionMd5;
-    }
-
-    public MultipartFile getObjectiveQuestionFile() {
-        return objectiveQuestionFile;
-    }
-
-    public void setObjectiveQuestionFile(MultipartFile objectiveQuestionFile) {
-        this.objectiveQuestionFile = objectiveQuestionFile;
-    }
-
-    public String getObjectiveQuestionMd5() {
-        return objectiveQuestionMd5;
-    }
-
-    public void setObjectiveQuestionMd5(String objectiveQuestionMd5) {
-        this.objectiveQuestionMd5 = objectiveQuestionMd5;
-    }
-
-    public MultipartFile getStandardAnswerFile() {
-        return standardAnswerFile;
-    }
-
-    public void setStandardAnswerFile(MultipartFile standardAnswerFile) {
-        this.standardAnswerFile = standardAnswerFile;
-    }
-
-    public String getStandardAnswerMd5() {
-        return standardAnswerMd5;
-    }
-
-    public void setStandardAnswerMd5(String standardAnswerMd5) {
-        this.standardAnswerMd5 = standardAnswerMd5;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/ExamPaperSubjectiveStructureDto.java

@@ -1,75 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto;
-
-import com.qmth.teachcloud.common.annotation.ExcelImportTempleteVaild;
-import com.qmth.teachcloud.common.annotation.ExcelNote;
-
-import java.io.Serializable;
-
-/**
- * @Date: 2021/10/28.
- */
-
-@ExcelImportTempleteVaild(value = true)
-public class ExamPaperSubjectiveStructureDto implements Serializable {
-
-    @ExcelNote(value = "科目代码")
-    private String courseCode;
-    @ExcelNote(value = "科目名称")
-    private String courseName;
-    @ExcelNote(value = "大题名称")
-    private String mainName;
-    @ExcelNote(value = "大题号(只能用小写数字)")
-    private String mainNumber;
-    @ExcelNote(value = "小题号(只能用小写数字)")
-    private String subNumber;
-    @ExcelNote(value = "小题满分")
-    private String score;
-
-    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 getMainName() {
-        return mainName;
-    }
-
-    public void setMainName(String mainName) {
-        this.mainName = mainName;
-    }
-
-    public String getMainNumber() {
-        return mainNumber;
-    }
-
-    public void setMainNumber(String mainNumber) {
-        this.mainNumber = mainNumber;
-    }
-
-    public String getSubNumber() {
-        return subNumber;
-    }
-
-    public void setSubNumber(String subNumber) {
-        this.subNumber = subNumber;
-    }
-
-    public String getScore() {
-        return score;
-    }
-
-    public void setScore(String score) {
-        this.score = score;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/ExamStudentDto.java

@@ -1,25 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto;
-
-import com.qmth.distributed.print.business.entity.ExamStudent;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: 考生dto
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/4/12
- */
-public class ExamStudentDto extends ExamStudent {
-
-    @ApiModelProperty(value = "序号")
-    private Integer index; //序号
-
-    public Integer getIndex() {
-        return index;
-    }
-
-    public void setIndex(Integer index) {
-        this.index = index;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/ExamTaskImportDto.java

@@ -1,39 +1,61 @@
 package com.qmth.distributed.print.business.bean.dto;
 
-import java.util.List;
+import com.qmth.teachcloud.common.annotation.ExcelNote;
+
+import javax.validation.constraints.NotNull;
 
-/**
- * @Date: 2021/4/1.
- */
 public class ExamTaskImportDto {
 
-    private String batchNo;
+    @NotNull
+    @ExcelNote(value = "课程代码")
+    private String courseCode;
+    @NotNull
+    @ExcelNote(value = "课程名称")
+    private String courseName;
+    @ExcelNote(value = "试卷编号")
+    private String paperNumber;
+    @ExcelNote(value = "命题老师账号")
+    private String userAccount;
+    @ExcelNote(value = "命题老师名称")
+    private String userName;
+
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
 
-    private String errorMsg;
+    public String getCourseName() {
+        return courseName;
+    }
 
-    private List<ExamTaskDto> tasks;
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
 
-    public String getBatchNo() {
-        return batchNo;
+    public String getPaperNumber() {
+        return paperNumber;
     }
 
-    public void setBatchNo(String batchNo) {
-        this.batchNo = batchNo;
+    public void setPaperNumber(String paperNumber) {
+        this.paperNumber = paperNumber;
     }
 
-    public String getErrorMsg() {
-        return errorMsg;
+    public String getUserAccount() {
+        return userAccount;
     }
 
-    public void setErrorMsg(String errorMsg) {
-        this.errorMsg = errorMsg;
+    public void setUserAccount(String userAccount) {
+        this.userAccount = userAccount;
     }
 
-    public List<ExamTaskDto> getTasks() {
-        return tasks;
+    public String getUserName() {
+        return userName;
     }
 
-    public void setTasks(List<ExamTaskDto> tasks) {
-        this.tasks = tasks;
+    public void setUserName(String userName) {
+        this.userName = userName;
     }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/ExamTaskImportResultDto.java

@@ -0,0 +1,39 @@
+package com.qmth.distributed.print.business.bean.dto;
+
+import java.util.List;
+
+/**
+ * @Date: 2021/4/1.
+ */
+public class ExamTaskImportResultDto {
+
+    private String batchNo;
+
+    private String errorMsg;
+
+    private List<ExamTaskDto> tasks;
+
+    public String getBatchNo() {
+        return batchNo;
+    }
+
+    public void setBatchNo(String batchNo) {
+        this.batchNo = batchNo;
+    }
+
+    public String getErrorMsg() {
+        return errorMsg;
+    }
+
+    public void setErrorMsg(String errorMsg) {
+        this.errorMsg = errorMsg;
+    }
+
+    public List<ExamTaskDto> getTasks() {
+        return tasks;
+    }
+
+    public void setTasks(List<ExamTaskDto> tasks) {
+        this.tasks = tasks;
+    }
+}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/ExamTaskPrintDetailDto.java

@@ -1,19 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto;
-
-import com.qmth.distributed.print.business.entity.ExamTaskPrint;
-
-/**
- * @Date: 2021/8/27.
- */
-public class ExamTaskPrintDetailDto extends ExamTaskPrint {
-
-    private String status;
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/ExamTaskPrintDto.java

@@ -1,55 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto;
-
-import java.util.List;
-
-/**
- * @Date: 2021/3/31.
- */
-public class ExamTaskPrintDto {
-
-    private Long printPlanId;
-    private Boolean isSubmit;
-    private Long examStartTime;
-    private Long examEndTime;
-    private List<ExamTaskPrintDetailDto> list;
-
-    public Long getPrintPlanId() {
-        return printPlanId;
-    }
-
-    public void setPrintPlanId(Long printPlanId) {
-        this.printPlanId = printPlanId;
-    }
-
-    public Long getExamStartTime() {
-        return examStartTime;
-    }
-
-    public void setExamStartTime(Long examStartTime) {
-        this.examStartTime = examStartTime;
-    }
-
-    public Long getExamEndTime() {
-        return examEndTime;
-    }
-
-    public void setExamEndTime(Long examEndTime) {
-        this.examEndTime = examEndTime;
-    }
-
-    public Boolean getSubmit() {
-        return isSubmit;
-    }
-
-    public void setSubmit(Boolean submit) {
-        isSubmit = submit;
-    }
-
-    public List<ExamTaskPrintDetailDto> getList() {
-        return list;
-    }
-
-    public void setList(List<ExamTaskPrintDetailDto> list) {
-        this.list = list;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/ExamTaskTempDto.java

@@ -1,61 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto;
-
-import com.qmth.teachcloud.common.annotation.ExcelNote;
-
-import javax.validation.constraints.NotNull;
-
-public class ExamTaskTempDto {
-
-    @NotNull
-    @ExcelNote(value = "课程代码")
-    private String courseCode;
-    @NotNull
-    @ExcelNote(value = "课程名称")
-    private String courseName;
-    @ExcelNote(value = "试卷编号")
-    private String paperNumber;
-    @ExcelNote(value = "命题老师账号")
-    private String userAccount;
-    @ExcelNote(value = "命题老师名称")
-    private String userName;
-
-    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 getUserAccount() {
-        return userAccount;
-    }
-
-    public void setUserAccount(String userAccount) {
-        this.userAccount = userAccount;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/ReviewLogDto.java

@@ -1,92 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.teachcloud.common.enums.FlowApproveOperationEnum;
-import com.qmth.teachcloud.common.enums.FlowApprovePassEnum;
-
-import java.util.Objects;
-
-/**
- * @Date: 2021/4/1.
- */
-public class ReviewLogDto {
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long id;
-    private FlowApproveOperationEnum approvePass;
-    private String reviewStatus;
-    private String reason;
-    private String setUp;
-    private String operateId;
-    private String operateName;
-    private Long operateTime;
-
-    public FlowApproveOperationEnum getApprovePass() {
-        return approvePass;
-    }
-
-    public void setApprovePass(FlowApproveOperationEnum approvePass) {
-        this.approvePass = approvePass;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getReviewStatus() {
-        if (Objects.nonNull(approvePass)) {
-            return approvePass.getTitle();
-        } else {
-            return reviewStatus;
-        }
-    }
-
-    public void setReviewStatus(String reviewStatus) {
-        this.reviewStatus = reviewStatus;
-    }
-
-    public String getReason() {
-        return reason;
-    }
-
-    public void setReason(String reason) {
-        this.reason = reason;
-    }
-
-    public String getOperateId() {
-        return operateId;
-    }
-
-    public void setOperateId(String operateId) {
-        this.operateId = operateId;
-    }
-
-    public String getOperateName() {
-        return operateName;
-    }
-
-    public void setOperateName(String operateName) {
-        this.operateName = operateName;
-    }
-
-    public Long getOperateTime() {
-        return operateTime;
-    }
-
-    public void setOperateTime(Long operateTime) {
-        this.operateTime = operateTime;
-    }
-
-    public String getSetUp() {
-        return setUp;
-    }
-
-    public void setSetUp(String setUp) {
-        this.setUp = setUp;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/SyncExamStudentDto.java

@@ -1,61 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto;
-
-import com.qmth.distributed.print.business.entity.ExamStudent;
-
-/**
- * @Description: 考生同步 DTO
- */
-public class SyncExamStudentDto extends ExamStudent {
-
-    private String courseCode;
-
-    private String courseName;
-
-    private String paperNumber;
-
-    private String sequence;
-
-    private String packageCode;
-
-    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;
-    }
-
-    @Override
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    @Override
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    public String getSequence() {
-        return sequence;
-    }
-
-    public void setSequence(String sequence) {
-        this.sequence = sequence;
-    }
-
-    public String getPackageCode() {
-        return packageCode;
-    }
-
-    public void setPackageCode(String packageCode) {
-        this.packageCode = packageCode;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/SyncExamTaskDto.java

@@ -1,264 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto;
-
-
-import cn.hutool.core.date.DateUtil;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.distributed.print.business.enums.ExamTaskSyncStatusEnum;
-import com.qmth.teachcloud.common.contant.SystemConstant;
-
-import java.util.Date;
-
-/**
- * @Date: 2021/3/29.
- */
-public class SyncExamTaskDto {
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long semesterId;
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long examId;
-
-    private String examTaskId;
-    private String courseCode;
-    private String courseName;
-    private String paperNumber;
-    private String paperType;
-    private String syncCardType;
-    private String sequence;
-    private Long startTime;
-    private Long endTime;
-    private String examDate;
-    private String examTime;
-    private Integer totalSubjects;
-    private Integer thirdRelateId;
-    private String thirdRelateName;
-    private ExamTaskSyncStatusEnum syncStatus;
-    private String syncStatusDisplay;
-    private String errorMsg;
-    private String syncUserName;
-    private String printPlanIds;
-
-    private String teachingRoomId;
-
-    private String collegeId;
-    private String collegeCode;
-    private String collegeName;
-
-    private String paperAttachmentIds;
-
-    public Long getSemesterId() {
-        return semesterId;
-    }
-
-    public void setSemesterId(Long semesterId) {
-        this.semesterId = semesterId;
-    }
-
-    public Long getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Long examId) {
-        this.examId = examId;
-    }
-
-    public String getExamTaskId() {
-        return examTaskId;
-    }
-
-    public void setExamTaskId(String examTaskId) {
-        this.examTaskId = examTaskId;
-    }
-
-    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 getPaperType() {
-        return paperType;
-    }
-
-    public void setPaperType(String paperType) {
-        this.paperType = paperType;
-    }
-
-    public String getSyncCardType() {
-        return syncCardType;
-    }
-
-    public void setSyncCardType(String syncCardType) {
-        this.syncCardType = syncCardType;
-    }
-
-    public String getSequence() {
-        return sequence;
-    }
-
-    public void setSequence(String sequence) {
-        this.sequence = sequence;
-    }
-
-    public Long getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(Long startTime) {
-        this.startTime = startTime;
-    }
-
-    public Long getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(Long endTime) {
-        this.endTime = endTime;
-    }
-
-    public String getExamDate() {
-        if (this.startTime != null) {
-            return DateUtil.format(new Date(this.startTime), SystemConstant.DATE_PATTERN);
-        }
-        return "-";
-    }
-
-    public void setExamDate(String examDate) {
-        this.examDate = examDate;
-    }
-
-    public String getExamTime() {
-        if (this.startTime != null && this.endTime != null) {
-            String startTimeTemp = DateUtil.format(new Date(this.startTime), SystemConstant.TIME_PATTERN);
-            String endTimeTemp = DateUtil.format(new Date(this.endTime), SystemConstant.TIME_PATTERN);
-            return startTimeTemp + "-" + endTimeTemp;
-        }
-        return "-";
-    }
-
-    public void setExamTime(String examTime) {
-        this.examTime = examTime;
-    }
-
-    public Integer getTotalSubjects() {
-        return totalSubjects;
-    }
-
-    public void setTotalSubjects(Integer totalSubjects) {
-        this.totalSubjects = totalSubjects;
-    }
-
-    public Integer getThirdRelateId() {
-        return thirdRelateId;
-    }
-
-    public String getThirdRelateName() {
-        return thirdRelateName;
-    }
-
-    public void setThirdRelateName(String thirdRelateName) {
-        this.thirdRelateName = thirdRelateName;
-    }
-
-    public void setThirdRelateId(Integer thirdRelateId) {
-        this.thirdRelateId = thirdRelateId;
-    }
-
-    public ExamTaskSyncStatusEnum getSyncStatus() {
-        return syncStatus;
-    }
-
-    public void setSyncStatus(ExamTaskSyncStatusEnum syncStatus) {
-        this.syncStatus = syncStatus;
-    }
-
-    public String getSyncStatusDisplay() {
-        return this.syncStatus != null ? syncStatus.getDesc() : "-";
-    }
-
-    public void setSyncStatusDisplay(String syncStatusDisplay) {
-        this.syncStatusDisplay = syncStatusDisplay;
-    }
-
-    public String getErrorMsg() {
-        return errorMsg;
-    }
-
-    public void setErrorMsg(String errorMsg) {
-        this.errorMsg = errorMsg;
-    }
-
-    public String getSyncUserName() {
-        return syncUserName;
-    }
-
-    public void setSyncUserName(String syncUserName) {
-        this.syncUserName = syncUserName;
-    }
-
-    public String getPrintPlanIds() {
-        return printPlanIds;
-    }
-
-    public void setPrintPlanIds(String printPlanIds) {
-        this.printPlanIds = printPlanIds;
-    }
-
-    public String getTeachingRoomId() {
-        return teachingRoomId;
-    }
-
-    public void setTeachingRoomId(String teachingRoomId) {
-        this.teachingRoomId = teachingRoomId;
-    }
-
-    public String getCollegeId() {
-        return collegeId;
-    }
-
-    public void setCollegeId(String collegeId) {
-        this.collegeId = collegeId;
-    }
-
-    public String getCollegeCode() {
-        return collegeCode;
-    }
-
-    public void setCollegeCode(String collegeCode) {
-        this.collegeCode = collegeCode;
-    }
-
-    public String getCollegeName() {
-        return collegeName;
-    }
-
-    public void setCollegeName(String collegeName) {
-        this.collegeName = collegeName;
-    }
-
-    public String getPaperAttachmentIds() {
-        return paperAttachmentIds;
-    }
-
-    public void setPaperAttachmentIds(String paperAttachmentIds) {
-        this.paperAttachmentIds = paperAttachmentIds;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/TaskPrintExtendFieldsDto.java

@@ -1,35 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto;
-
-/**
- * @Date: 2021/3/29.
- */
-public class TaskPrintExtendFieldsDto {
-
-    private String name;
-    private String code;
-    private Boolean enable;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public Boolean getEnable() {
-        return enable;
-    }
-
-    public void setEnable(Boolean enable) {
-        this.enable = enable;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/TaskTotalLeftDto.java

@@ -1,44 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto;
-
-/**
- * @Date: 2021/4/12.
- */
-public class TaskTotalLeftDto {
-
-    private Integer paperPagesA3;
-    private Integer cardPagesA3;
-    private Integer printPaperCount;
-    private Integer printCardCount;
-
-    public Integer getPaperPagesA3() {
-        return paperPagesA3;
-    }
-
-    public void setPaperPagesA3(Integer paperPagesA3) {
-        this.paperPagesA3 = paperPagesA3;
-    }
-
-    public Integer getCardPagesA3() {
-        return cardPagesA3;
-    }
-
-    public void setCardPagesA3(Integer cardPagesA3) {
-        this.cardPagesA3 = cardPagesA3;
-    }
-
-    public Integer getPrintPaperCount() {
-        return printPaperCount;
-    }
-
-    public void setPrintPaperCount(Integer printPaperCount) {
-        this.printPaperCount = printPaperCount;
-    }
-
-    public Integer getPrintCardCount() {
-        return printCardCount;
-    }
-
-    public void setPrintCardCount(Integer printCardCount) {
-        this.printCardCount = printCardCount;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/TemplateDto.java

@@ -1,117 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.distributed.print.business.enums.TemplateTypeEnum;
-import com.qmth.teachcloud.common.entity.SysOrg;
-import com.qmth.teachcloud.common.enums.ClassifyEnum;
-
-import java.util.List;
-
-/**
- * @Date: 2021/3/29.
- */
-public class TemplateDto {
-
-    private String id;
-    private String schoolId;
-    private String name;
-    private ClassifyEnum classify;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long attachmentId;
-    private Boolean enable;
-    private String remark;
-    private String createId;
-    private Long createTime;
-    private String cardId;
-    private List<SysOrg> orgs;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(String schoolId) {
-        this.schoolId = schoolId;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public ClassifyEnum getClassify() {
-        return classify;
-    }
-
-    public void setClassify(ClassifyEnum classify) {
-        this.classify = classify;
-    }
-
-    public Long getAttachmentId() {
-        return attachmentId;
-    }
-
-    public void setAttachmentId(Long attachmentId) {
-        this.attachmentId = attachmentId;
-    }
-
-    public Boolean getEnable() {
-        return enable;
-    }
-
-    public void setEnable(Boolean enable) {
-        this.enable = enable;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getCreateId() {
-        return createId;
-    }
-
-    public void setCreateId(String createId) {
-        this.createId = createId;
-    }
-
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getCardId() {
-        return cardId;
-    }
-
-    public void setCardId(String cardId) {
-        this.cardId = cardId;
-    }
-
-    public List<SysOrg> getOrgs() {
-        return orgs;
-    }
-
-    public void setOrgs(List<SysOrg> orgs) {
-        this.orgs = orgs;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/ThirdObjectDto.java

@@ -1,30 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-
-/**
- * @Date: 2021/3/29.
- */
-public class ThirdObjectDto {
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long thirdRelateId;
-    private String thirdRelateName;
-
-    public Long getThirdRelateId() {
-        return thirdRelateId;
-    }
-
-    public void setThirdRelateId(Long thirdRelateId) {
-        this.thirdRelateId = thirdRelateId;
-    }
-
-    public String getThirdRelateName() {
-        return thirdRelateName;
-    }
-
-    public void setThirdRelateName(String thirdRelateName) {
-        this.thirdRelateName = thirdRelateName;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/SyncDataParam.java

@@ -1,64 +0,0 @@
-package com.qmth.distributed.print.business.bean.params;
-
-import com.alibaba.fastjson.JSONObject;
-import com.qmth.distributed.print.business.bean.dto.SyncExamTaskDto;
-
-import java.util.List;
-
-/**
- * @Date: 2021/7/28.
- */
-public class SyncDataParam {
-
-    /**
-     * thirdRelateId、thirdRelateName二选一，若thirdRelateId有值优先用thirdRelateId值
-     */
-    private Long thirdRelateId;
-
-    /**
-     * thirdRelateId、thirdRelateName二选一，若thirdRelateId有值优先用thirdRelateId值
-     */
-    private String thirdRelateName;
-
-    /**
-     * 考试时间
-     */
-    private Long examTime;
-
-    /**
-     * 参数
-     */
-    private List<SyncExamTaskDto> list;
-
-    public Long getThirdRelateId() {
-        return thirdRelateId;
-    }
-
-    public void setThirdRelateId(Long thirdRelateId) {
-        this.thirdRelateId = thirdRelateId;
-    }
-
-    public String getThirdRelateName() {
-        return thirdRelateName;
-    }
-
-    public void setThirdRelateName(String thirdRelateName) {
-        this.thirdRelateName = thirdRelateName;
-    }
-
-    public Long getExamTime() {
-        return examTime;
-    }
-
-    public void setExamTime(Long examTime) {
-        this.examTime = examTime;
-    }
-
-    public List<SyncExamTaskDto> getList() {
-        return list;
-    }
-
-    public void setList(List<SyncExamTaskDto> list) {
-        this.list = list;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/CloudUserPushStatus.java

@@ -1,79 +0,0 @@
-package com.qmth.distributed.print.business.entity;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.teachcloud.common.base.BaseEntity;
-import com.qmth.teachcloud.common.enums.userPush.SyncStatusEnum;
-import com.qmth.teachcloud.common.enums.userPush.UserPushResultEnum;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-
-/**
- * @Description: 云阅卷用户推送状态表
- * @Author: CaoZixuan
- * @Date: 2022-08-08
- */
-@ApiModel(value="CloudUserPushStatus对象", description="云阅卷用户推送状态表")
-public class CloudUserPushStatus extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "学校id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long schoolId;
-
-    @ApiModelProperty(value = "用户id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long userId;
-
-    @ApiModelProperty(value = "评卷员推送状态")
-    private UserPushResultEnum markerStatus;
-
-    @ApiModelProperty(value = "科组长推送状态")
-    private UserPushResultEnum markerLeaderStatus;
-
-    @ApiModelProperty(value = "同步状态")
-    private SyncStatusEnum syncStatus;
-
-    public Long getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(Long schoolId) {
-        this.schoolId = schoolId;
-    }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public UserPushResultEnum getMarkerStatus() {
-        return markerStatus;
-    }
-
-    public void setMarkerStatus(UserPushResultEnum markerStatus) {
-        this.markerStatus = markerStatus;
-    }
-
-    public UserPushResultEnum getMarkerLeaderStatus() {
-        return markerLeaderStatus;
-    }
-
-    public void setMarkerLeaderStatus(UserPushResultEnum markerLeaderStatus) {
-        this.markerLeaderStatus = markerLeaderStatus;
-    }
-
-    public SyncStatusEnum getSyncStatus() {
-        return syncStatus;
-    }
-
-    public void setSyncStatus(SyncStatusEnum syncStatus) {
-        this.syncStatus = syncStatus;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ExamPaperClassMarker.java

@@ -1,64 +0,0 @@
-package com.qmth.distributed.print.business.entity;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.teachcloud.common.base.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Objects;
-
-/**
- * @Description: 班级评卷员绑定关系
- */
-@ApiModel(value = "ExamPaperClassMarker对象", description = "班级评卷员绑定关系表")
-public class ExamPaperClassMarker extends BaseEntity implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "试卷结构id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long examPaperStructureId;
-
-    @ApiModelProperty(value = "评卷员id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long markerId;
-
-    @ApiModelProperty(value = "评卷员登录名")
-    private String loginName;
-
-    @ApiModelProperty(value = "班级")
-    private String className;
-
-    public Long getExamPaperStructureId() {
-        return examPaperStructureId;
-    }
-
-    public void setExamPaperStructureId(Long examPaperStructureId) {
-        this.examPaperStructureId = examPaperStructureId;
-    }
-
-    public Long getMarkerId() {
-        return markerId;
-    }
-
-    public void setMarkerId(Long markerId) {
-        this.markerId = markerId;
-    }
-
-    public String getLoginName() {
-        return loginName;
-    }
-
-    public void setLoginName(String loginName) {
-        this.loginName = loginName;
-    }
-
-    public String getClassName() {
-        return className;
-    }
-
-    public void setClassName(String className) {
-        this.className = className;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ExamPaperGroup.java

@@ -1,121 +0,0 @@
-package com.qmth.distributed.print.business.entity;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.teachcloud.common.base.BaseEntity;
-import com.qmth.teachcloud.common.enums.paperGroup.MarkModeEnum;
-import com.qmth.teachcloud.common.enums.paperGroup.ScorePolicyEnum;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-
-/**
- * @Description: 评卷分组数据库映射类
- * @Author: CaoZixuan
- * @Date: 2022-04-12
- */
-@ApiModel(value = "ExamPaperGroup对象", description = "试卷分组表")
-public class ExamPaperGroup extends BaseEntity implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "试卷结构id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long examPaperStructureId;
-
-    @ApiModelProperty(value = "分组序号")
-    private Integer groupNumber;
-
-    @ApiModelProperty(value = "双评比例（0关闭，1开启） tip : 云阅卷0-1之间是按照百分比人数开启双评，因此这里限制只能0或1")
-    private Double doubleRate;
-
-    @ApiModelProperty(value = "仲裁阈值（开启双评必填）'")
-    private Double arbitrateThreshold;
-
-    @ApiModelProperty(value = "合分策略 开启双评是必填 AVG(\"平均分\", 1), MAX(\"最高分\", 2), MIN(\"最低分\", 3)")
-    private ScorePolicyEnum scorePolicy;
-
-    @ApiModelProperty(value = "试评数量")
-    private Integer trialCount;
-
-    @ApiModelProperty(value = "评卷模式  COMMON(\"普通\"), TRACK(\"轨迹\")")
-    private MarkModeEnum markMode;
-
-    @ApiModelProperty(value = "题目信息")
-    private String questionInfo;
-
-    @ApiModelProperty(value = "分组图片设置")
-    private String pictureConfig;
-
-    public Long getExamPaperStructureId() {
-        return examPaperStructureId;
-    }
-
-    public void setExamPaperStructureId(Long examPaperStructureId) {
-        this.examPaperStructureId = examPaperStructureId;
-    }
-
-    public Integer getGroupNumber() {
-        return groupNumber;
-    }
-
-    public void setGroupNumber(Integer groupNumber) {
-        this.groupNumber = groupNumber;
-    }
-
-    public Double getDoubleRate() {
-        return doubleRate;
-    }
-
-    public void setDoubleRate(Double doubleRate) {
-        this.doubleRate = doubleRate;
-    }
-
-    public Double getArbitrateThreshold() {
-        return arbitrateThreshold;
-    }
-
-    public void setArbitrateThreshold(Double arbitrateThreshold) {
-        this.arbitrateThreshold = arbitrateThreshold;
-    }
-
-    public ScorePolicyEnum getScorePolicy() {
-        return scorePolicy;
-    }
-
-    public void setScorePolicy(ScorePolicyEnum scorePolicy) {
-        this.scorePolicy = scorePolicy;
-    }
-
-    public Integer getTrialCount() {
-        return trialCount;
-    }
-
-    public void setTrialCount(Integer trialCount) {
-        this.trialCount = trialCount;
-    }
-
-    public MarkModeEnum getMarkMode() {
-        return markMode;
-    }
-
-    public void setMarkMode(MarkModeEnum markMode) {
-        this.markMode = markMode;
-    }
-
-    public String getQuestionInfo() {
-        return questionInfo;
-    }
-
-    public void setQuestionInfo(String questionInfo) {
-        this.questionInfo = questionInfo;
-    }
-
-    public String getPictureConfig() {
-        return pictureConfig;
-    }
-
-    public void setPictureConfig(String pictureConfig) {
-        this.pictureConfig = pictureConfig;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ExamPaperGroupMarker.java

@@ -1,72 +0,0 @@
-package com.qmth.distributed.print.business.entity;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.teachcloud.common.base.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Objects;
-
-/**
- * @Description: 试卷分组和评卷员绑定关系
- * @Author: CaoZixuan
- * @Date: 2022-04-12
- */
-@ApiModel(value = "ExamPaperGroupMarker对象", description = "试卷分组和评卷员关系绑定表")
-public class ExamPaperGroupMarker extends BaseEntity implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "试卷分组id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long groupId;
-
-    @ApiModelProperty(value = "评卷员id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long markerId;
-
-    @ApiModelProperty(value = "评卷员登录名")
-    private String loginName;
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ExamPaperGroupMarker that = (ExamPaperGroupMarker) o;
-        return groupId.equals(that.groupId) && markerId.equals(that.markerId) && loginName.equals(that.loginName);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(groupId, markerId, loginName);
-    }
-
-    public Long getGroupId() {
-        return groupId;
-    }
-
-    public void setGroupId(Long groupId) {
-        this.groupId = groupId;
-    }
-
-    public Long getMarkerId() {
-        return markerId;
-    }
-
-    public void setMarkerId(Long markerId) {
-        this.markerId = markerId;
-    }
-
-    public String getLoginName() {
-        return loginName;
-    }
-
-    public void setLoginName(String loginName) {
-        this.loginName = loginName;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ExamTask.java

@@ -63,6 +63,11 @@ public class ExamTask extends BaseEntity implements Serializable {
      */
     @TableField("sequence")
     private String sequence;
+    /**
+     * 专业
+     */
+    @TableField("specialty")
+    private String specialty;
     /**
      * 命题开始时间
      */
@@ -212,6 +217,14 @@ public class ExamTask extends BaseEntity implements Serializable {
         this.sequence = sequence;
     }
 
+    public String getSpecialty() {
+        return specialty;
+    }
+
+    public void setSpecialty(String specialty) {
+        this.specialty = specialty;
+    }
+
     public Long getStartTime() {
         return startTime;
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ExamTaskSync.java

@@ -1,233 +0,0 @@
-package com.qmth.distributed.print.business.entity;
-
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.distributed.print.business.enums.ExamStatusEnum;
-import com.qmth.distributed.print.business.enums.ExamTaskSyncStatusEnum;
-import com.qmth.distributed.print.business.enums.ReviewStatusEnum;
-import com.qmth.teachcloud.common.annotation.EditKey;
-import com.qmth.teachcloud.common.base.BaseEntity;
-import com.qmth.teachcloud.common.contant.SystemConstant;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 数据同步
- * </p>
- */
-@TableName("exam_task_sync")
-public class ExamTaskSync implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "主键")
-    @TableId(value = "id")
-    @EditKey
-    private Long id;
-
-    @ApiModelProperty(value = "学校id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("school_id")
-    private Long schoolId;
-
-    @ApiModelProperty(value = "考试ID")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("exam_id")
-    private Long examId;
-
-    /**
-     * 课程代码
-     */
-    @TableField("course_code")
-    private String courseCode;
-    /**
-     * 试卷编号
-     */
-    @TableField("paper_number")
-    private String paperNumber;
-
-    /**
-     * 试卷类型
-     */
-    @TableField("paper_type")
-    private String paperType;
-
-    /**
-     * 试卷类型
-     */
-    @TableField("total_paper_type")
-    private String totalPaperType;
-    /**
-     * 机构代码
-     */
-    @TableField("org_code")
-    private String orgCode;
-
-    /**
-     * 云阅卷考试ID
-     */
-    @TableField(value = "third_relate_id", updateStrategy = FieldStrategy.IGNORED)
-    private Integer thirdRelateId;
-    /**
-     * 同步状态
-     */
-    @TableField("sync_status")
-    private ExamTaskSyncStatusEnum syncStatus;
-    @TableField(value = "error_msg", updateStrategy = FieldStrategy.IGNORED)
-    private String errorMsg;
-    /**
-     * 同步用户ID
-     */
-    @TableField("sync_user_id")
-    private Long syncUserId;
-
-    /**
-     * 同步开始时间
-     */
-    @TableField("sync_start_time")
-    private Long syncStartTime;
-    /**
-     * 同步结束时间
-     */
-    @TableField("sync_end_time")
-    private Long syncEndTime;
-
-    public ExamTaskSync() {
-    }
-
-    public ExamTaskSync(Long schoolId, Long examId, String courseCode, String paperNumber, String paperType, String totalPaperType, String orgCode, Long thirdRelateId, ExamTaskSyncStatusEnum syncStatus, Long syncUserId, Long syncStartTime, Long syncEndTime) {
-        this.id = SystemConstant.getDbUuid();
-        this.schoolId = schoolId;
-        this.examId = examId;
-        this.courseCode = courseCode;
-        this.paperNumber = paperNumber;
-        this.paperType = paperType;
-        this.totalPaperType = totalPaperType;
-        this.orgCode = orgCode;
-        this.thirdRelateId = thirdRelateId != null ? Math.toIntExact(thirdRelateId) : null;
-        this.syncStatus = syncStatus;
-        this.syncUserId = syncUserId;
-        this.syncStartTime = syncStartTime;
-        this.syncEndTime = syncEndTime;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(Long schoolId) {
-        this.schoolId = schoolId;
-    }
-
-    public Long getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Long examId) {
-        this.examId = examId;
-    }
-
-    public String getCourseCode() {
-        return courseCode;
-    }
-
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
-    }
-
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    public String getPaperType() {
-        return paperType;
-    }
-
-    public void setPaperType(String paperType) {
-        this.paperType = paperType;
-    }
-
-    public String getTotalPaperType() {
-        return totalPaperType;
-    }
-
-    public void setTotalPaperType(String totalPaperType) {
-        this.totalPaperType = totalPaperType;
-    }
-
-    public String getOrgCode() {
-        return orgCode;
-    }
-
-    public void setOrgCode(String orgCode) {
-        this.orgCode = orgCode;
-    }
-
-    public Integer getThirdRelateId() {
-        return thirdRelateId;
-    }
-
-    public void setThirdRelateId(Integer thirdRelateId) {
-        this.thirdRelateId = thirdRelateId;
-    }
-
-    public ExamTaskSyncStatusEnum getSyncStatus() {
-        return syncStatus;
-    }
-
-    public void setSyncStatus(ExamTaskSyncStatusEnum syncStatus) {
-        this.syncStatus = syncStatus;
-    }
-
-    public String getErrorMsg() {
-        return errorMsg;
-    }
-
-    public void setErrorMsg(String errorMsg) {
-        this.errorMsg = errorMsg;
-    }
-
-    public Long getSyncUserId() {
-        return syncUserId;
-    }
-
-    public void setSyncUserId(Long syncUserId) {
-        this.syncUserId = syncUserId;
-    }
-
-    public Long getSyncStartTime() {
-        return syncStartTime;
-    }
-
-    public void setSyncStartTime(Long syncStartTime) {
-        this.syncStartTime = syncStartTime;
-    }
-
-    public Long getSyncEndTime() {
-        return syncEndTime;
-    }
-
-    public void setSyncEndTime(Long syncEndTime) {
-        this.syncEndTime = syncEndTime;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/TSyncStmmsExam.java

@@ -1,105 +0,0 @@
-package com.qmth.distributed.print.business.entity;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-
-/**
- * 云阅卷考试表
- */
-@TableName("t_sync_stmms_exam")
-public class TSyncStmmsExam implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "主键")
-    @TableId(value = "id")
-    private Long id;
-
-    @ApiModelProperty(value = "学校ID")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long schoolId;
-
-    @ApiModelProperty(value = "机构代码")
-    private String orgCode;
-
-    @ApiModelProperty(value = "考试id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Integer examId;
-
-    @ApiModelProperty(value = "名称")
-    private String examName;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("create_id")
-    @ApiModelProperty(value = "创建人")
-    private Long createId;
-
-    @TableField(value = "create_time", fill = FieldFill.INSERT)//新增执行
-    @ApiModelProperty(value = "创建时间")
-    private Long createTime;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(Long schoolId) {
-        this.schoolId = schoolId;
-    }
-
-    public Integer getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Integer examId) {
-        this.examId = examId;
-    }
-
-    public String getExamName() {
-        return examName;
-    }
-
-    public void setExamName(String examName) {
-        this.examName = examName;
-    }
-
-    public Long getCreateId() {
-        return createId;
-    }
-
-    public void setCreateId(Long createId) {
-        this.createId = createId;
-    }
-
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getOrgCode() {
-        return orgCode;
-    }
-
-    public void setOrgCode(String orgCode) {
-        this.orgCode = orgCode;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/BasicCardRuleMapper.java

@@ -3,7 +3,6 @@ package com.qmth.distributed.print.business.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.distributed.print.business.bean.dto.BasicCardRuleDto;
 import com.qmth.distributed.print.business.entity.BasicCardRule;
 import com.qmth.teachcloud.common.bean.dto.DataPermissionRule;
 import org.apache.ibatis.annotations.Param;
@@ -20,7 +19,7 @@ import java.util.List;
  */
 public interface BasicCardRuleMapper extends BaseMapper<BasicCardRule> {
 
-    IPage<BasicCardRuleDto> listPage(Page<BasicCardRuleDto> page, @Param("schoolId") Long schoolId, @Param("enable") Boolean enable, @Param("name") String name, @Param("createStartTime") Long createStartTime, @Param("createEndTime") Long createEndTime, @Param("dpr") DataPermissionRule dpr);
+    IPage<BasicCardRule> listPage(Page<BasicCardRule> page, @Param("schoolId") Long schoolId, @Param("enable") Boolean enable, @Param("name") String name, @Param("createStartTime") Long createStartTime, @Param("createEndTime") Long createEndTime, @Param("dpr") DataPermissionRule dpr);
 
     List<BasicCardRule> list(@Param("schoolId") Long schoolId, @Param("param") String param);
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/BasicExamMapper.java

@@ -3,7 +3,6 @@ package com.qmth.distributed.print.business.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.distributed.print.business.bean.dto.BasicExamDto;
 import com.qmth.teachcloud.common.bean.dto.DataPermissionRule;
 import com.qmth.teachcloud.common.entity.BasicExam;
 import org.apache.ibatis.annotations.Param;
@@ -21,5 +20,5 @@ public interface BasicExamMapper extends BaseMapper<BasicExam> {
      * @param schoolId 学校id
      * @return 分页结果
      */
-    IPage<BasicExamDto> findBasicExamPage(@Param("objectPage") Page<Object> objectPage, @Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("enable") Boolean enable, @Param("dpr") DataPermissionRule dpr);
+    IPage<BasicExam> findBasicExamPage(@Param("objectPage") Page<Object> objectPage, @Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("enable") Boolean enable, @Param("dpr") DataPermissionRule dpr);
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/BasicTemplateMapper.java

@@ -3,7 +3,6 @@ package com.qmth.distributed.print.business.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.distributed.print.business.bean.dto.TemplateDto;
 import com.qmth.distributed.print.business.bean.result.TemplatePrintInfoResult;
 import com.qmth.distributed.print.business.entity.BasicTemplate;
 import com.qmth.teachcloud.common.bean.dto.DataPermissionRule;
@@ -21,7 +20,7 @@ import java.util.List;
  */
 public interface BasicTemplateMapper extends BaseMapper<BasicTemplate> {
 
-    IPage<TemplateDto> listPage(Page<TemplateDto> page, @Param("schoolId") Long schoolId, @Param("enable") Boolean enable, @Param("name") String name, @Param("startTime") Long startTime, @Param("endTime") Long endTime,@Param("dpr") DataPermissionRule dpr);
+    IPage<BasicTemplate> listPage(Page<BasicTemplate> page, @Param("schoolId") Long schoolId, @Param("enable") Boolean enable, @Param("name") String name, @Param("startTime") Long startTime, @Param("endTime") Long endTime,@Param("dpr") DataPermissionRule dpr);
 
     /**
      * 查找模版(机构同级及以下)

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/CloudUserPushStatusMapper.java

@@ -1,12 +0,0 @@
-package com.qmth.distributed.print.business.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qmth.distributed.print.business.entity.CloudUserPushStatus;
-
-/**
- * @Description: 云阅卷用户推送状态mapper
- * @Author: CaoZixuan
- * @Date: 2022-08-08
- */
-public interface CloudUserPushStatusMapper extends BaseMapper<CloudUserPushStatus> {
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/ExamDetailCourseMapper.java

@@ -1,10 +1,7 @@
 package com.qmth.distributed.print.business.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.distributed.print.business.bean.dto.ExamDetailCourseDto;
-import com.qmth.distributed.print.business.bean.dto.SyncExamTaskDto;
 import com.qmth.distributed.print.business.entity.ExamDetailCourse;
 import com.qmth.teachcloud.common.bean.result.TbTaskDetailResult;
 import com.qmth.teachcloud.common.entity.BasicCourse;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/ExamDetailCoursePaperTypeMapper.java

@@ -1,20 +1,7 @@
 package com.qmth.distributed.print.business.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.distributed.print.business.bean.dto.ExamDetailCourseDto;
-import com.qmth.distributed.print.business.bean.dto.SyncExamTaskDto;
-import com.qmth.distributed.print.business.entity.ExamDetailCourse;
 import com.qmth.distributed.print.business.entity.ExamDetailCoursePaperType;
-import com.qmth.distributed.print.business.enums.ExamTaskSyncStatusEnum;
-import com.qmth.distributed.print.business.enums.SyncCardTypeEnum;
-import com.qmth.teachcloud.common.entity.BasicCourse;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 /**
  * <p>

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/ExamPaperGroupMarkerMapper.java

@@ -1,12 +0,0 @@
-package com.qmth.distributed.print.business.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qmth.distributed.print.business.entity.ExamPaperGroupMarker;
-
-/**
- * @Description: 试卷分组和评卷员关系mapper
- * @Author: CaoZixuan
- * @Date: 2022-04-13
- */
-public interface ExamPaperGroupMarkerMapper extends BaseMapper<ExamPaperGroupMarker> {
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/ExamStudentMapper.java

@@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.qmth.distributed.print.business.bean.dto.ExamStudentCourseClassDto;
 import com.qmth.distributed.print.business.bean.dto.ExamStudentCourseDto;
 import com.qmth.distributed.print.business.bean.dto.ExamStudentPdfInfoDto;
-import com.qmth.distributed.print.business.bean.dto.SyncExamStudentDto;
 import com.qmth.distributed.print.business.entity.ExamStudent;
-import com.qmth.teachcloud.common.entity.BasicCollege;
-import com.qmth.teachcloud.common.entity.SysOrg;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/ExamTaskPrintMapper.java

@@ -1,7 +1,6 @@
 package com.qmth.distributed.print.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qmth.distributed.print.business.bean.dto.ExamTaskPrintDetailDto;
 import com.qmth.distributed.print.business.bean.dto.TaskPrintHouseDto;
 import com.qmth.distributed.print.business.entity.ExamTaskPrint;
 import org.apache.ibatis.annotations.Param;

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

@@ -2,7 +2,6 @@ package com.qmth.distributed.print.business.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.distributed.print.business.bean.dto.BasicCardRuleDto;
 import com.qmth.distributed.print.business.entity.BasicCardRule;
 
 import java.util.List;
@@ -17,7 +16,7 @@ import java.util.List;
  */
 public interface BasicCardRuleService extends IService<BasicCardRule> {
 
-    IPage<BasicCardRuleDto> list(Boolean enable, String name, Long createStartTime, Long createEndTime, Integer pageNumber, Integer pageSize);
+    IPage<BasicCardRule> list(Boolean enable, String name, Long createStartTime, Long createEndTime, Integer pageNumber, Integer pageSize);
 
     List<BasicCardRule> list(String param);
 

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

@@ -2,7 +2,6 @@ package com.qmth.distributed.print.business.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.distributed.print.business.bean.dto.BasicExamDto;
 import com.qmth.teachcloud.common.entity.BasicExam;
 import com.qmth.teachcloud.common.enums.ExamModelEnum;
 
@@ -47,7 +46,7 @@ public interface BasicExamService extends IService<BasicExam> {
      * @param pageNumber 分页参数
      * @param pageSize   分页参数
      */
-    IPage<BasicExamDto> basicExamPage(Long semesterId, Boolean enable, Integer pageNumber, Integer pageSize);
+    IPage<BasicExam> basicExamPage(Long semesterId, Boolean enable, Integer pageNumber, Integer pageSize);
 
     /**
      * 启用/禁用

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

@@ -2,11 +2,9 @@ package com.qmth.distributed.print.business.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.distributed.print.business.bean.dto.TemplateDto;
 import com.qmth.distributed.print.business.bean.result.TemplatePrintInfoResult;
 import com.qmth.distributed.print.business.entity.BasicTemplate;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -19,7 +17,7 @@ import java.util.List;
  */
 public interface BasicTemplateService extends IService<BasicTemplate> {
 
-    IPage<TemplateDto> list(Boolean enable, String name, Long startTime, Long endTime, Integer pageNumber, Integer pageSize);
+    IPage<BasicTemplate> list(Boolean enable, String name, Long startTime, Long endTime, Integer pageNumber, Integer pageSize);
 
     boolean saveTemplate(String data) throws Exception;
 

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

@@ -1,31 +0,0 @@
-package com.qmth.distributed.print.business.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.distributed.print.business.entity.CloudUserPushStatus;
-
-import java.util.List;
-
-/**
- * @Description: 云阅卷用户推送状态服务类
- * @Author: CaoZixuan
- * @Date: 2022-08-08
- */
-public interface CloudUserPushStatusService extends IService<CloudUserPushStatus> {
-
-    /**
-     * 根据用户id查询用户推送状态记录
-     *
-     * @param userId   用户id
-     * @param schoolId 学校id
-     * @return 云阅卷推送状态
-     */
-    CloudUserPushStatus findRecordByUserId(Long userId, Long schoolId);
-
-    /**
-     * 查找所有需要重新推送云阅卷的用户id集合
-     *
-     * @param schoolId 学校id
-     * @return 用户id集合
-     */
-    List<Long> findNeedPushAgainUserIdList(Long schoolId);
-}

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

@@ -1,36 +0,0 @@
-package com.qmth.distributed.print.business.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.distributed.print.business.bean.marking.Marker;
-import com.qmth.distributed.print.business.entity.ExamPaperGroupMarker;
-
-import java.util.List;
-import java.util.Set;
-
-/**
- * @Description: 分组和评卷员关系实现类
- * @Author: CaoZixuan
- * @Date: 2022-04-13
- */
-public interface ExamPaperGroupMarkerService extends IService<ExamPaperGroupMarker> {
-    /**
-     * 根据分组id和评卷员集合新增分组和评卷员关系
-     *
-     * @param examPaperGroupId 分组id
-     * @param markerList       评卷员集合
-     */
-    void saveExamPaperGroupMarkerByGroupId(Long examPaperGroupId, List<Marker> markerList);
-
-    /**
-     * 根据分组idSet删除评卷员分组关系
-     *
-     * @param groupIdSet 分组idSet
-     */
-    void deleteExamPaperGroupMarkerService(Set<Long> groupIdSet);
-
-    /**
-     * 查询评卷员
-     * @param id 分组Id
-     */
-    List<ExamPaperGroupMarker> listByGroupId(Long id);
-}

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

@@ -3,10 +3,12 @@ package com.qmth.distributed.print.business.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.distributed.print.business.bean.dto.*;
+import com.qmth.distributed.print.business.bean.dto.ClientPrintStatisticsDto;
+import com.qmth.distributed.print.business.bean.dto.ClientPrintStatisticsTotalDto;
+import com.qmth.distributed.print.business.bean.dto.ClientPrintTaskDto;
+import com.qmth.distributed.print.business.bean.dto.ClientPrintTaskTotalDto;
 import com.qmth.distributed.print.business.bean.params.DeleteParams;
 import com.qmth.distributed.print.business.bean.params.PrintPlanParams;
-import com.qmth.distributed.print.business.bean.params.SyncDataParam;
 import com.qmth.distributed.print.business.bean.result.PrintPlanBrief;
 import com.qmth.distributed.print.business.bean.result.PrintPlanResult;
 import com.qmth.distributed.print.business.entity.ExamPrintPlan;

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

@@ -1,15 +1,10 @@
 package com.qmth.distributed.print.business.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.distributed.print.business.bean.dto.ExamTaskPrintDto;
-import com.qmth.distributed.print.business.bean.dto.TaskPrintExtendFieldsDto;
 import com.qmth.distributed.print.business.bean.dto.TaskPrintHouseDto;
-import com.qmth.distributed.print.business.bean.params.ExamTaskPrintParams;
-import com.qmth.distributed.print.business.entity.ExamDetail;
 import com.qmth.distributed.print.business.entity.ExamTaskPrint;
 import com.qmth.teachcloud.common.bean.dto.TaskPrintClassDto;
 
-import java.io.IOException;
 import java.util.List;
 
 /**

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

@@ -13,7 +13,4 @@ import com.qmth.distributed.print.business.entity.ExamTaskReviewLog;
  */
 public interface ExamTaskReviewLogService extends IService<ExamTaskReviewLog> {
 
-//    List<ReviewLogDto> list(Long flowId);
-
-//    ApprovalInfo findOnePassBySetUp(Long flowId, int setup);
 }

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

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.distributed.print.business.bean.dto.*;
 import com.qmth.distributed.print.business.bean.dto.approvalForm.ExamTaskApprovalFormDto;
 import com.qmth.distributed.print.business.bean.dto.examObject.ExamObjectDto;
-import com.qmth.distributed.print.business.bean.params.ExamTaskApplyParam;
 import com.qmth.distributed.print.business.bean.params.ExamTaskReApplyParam;
 import com.qmth.distributed.print.business.bean.result.WorkResult;
 import com.qmth.distributed.print.business.bean.result.examTaskStudent.ExamTaskExamStudentImportResult;
@@ -53,7 +52,7 @@ public interface ExamTaskService extends IService<ExamTask> {
      */
     ExamTask saveExamTaskNew(ExamTask examTask);
 
-    ExamTaskImportDto importFile(MultipartFile file) throws IOException, NoSuchFieldException;
+    ExamTaskImportResultDto importFile(MultipartFile file) throws IOException, NoSuchFieldException;
 
     List<ExamTask> saveBatch(ExamTask task);
 

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

@@ -6,7 +6,6 @@ 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.distributed.print.business.bean.dto.BasicCardRuleDto;
 import com.qmth.distributed.print.business.entity.BasicCardRule;
 import com.qmth.distributed.print.business.entity.BasicExamRule;
 import com.qmth.distributed.print.business.entity.ExamCard;
@@ -59,11 +58,11 @@ public class BasicCardRuleServiceImpl extends ServiceImpl<BasicCardRuleMapper, B
     BasicExamRuleService basicExamRuleService;
 
     @Override
-    public IPage<BasicCardRuleDto> list(Boolean enable, String name, Long createStartTime, Long createEndTime, Integer pageNumber, Integer pageSize) {
+    public IPage<BasicCardRule> list(Boolean enable, String name, Long createStartTime, Long createEndTime, Integer pageNumber, Integer pageSize) {
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(schoolId, requestUser.getId(), ServletUtil.getRequest().getServletPath());
-        IPage<BasicCardRuleDto> cardRuleDtoIPage = this.baseMapper.listPage(new Page<>(pageNumber, pageSize), schoolId, enable, SystemConstant.translateSpecificSign(name), createStartTime, createEndTime, dpr);
+        IPage<BasicCardRule> cardRuleDtoIPage = this.baseMapper.listPage(new Page<>(pageNumber, pageSize), schoolId, enable, SystemConstant.translateSpecificSign(name), createStartTime, createEndTime, dpr);
 
         BasicExamRule basicExamRule = basicExamRuleService.getBySchoolId();
         List<JSONObject> examRuleRequiredFieldList = JSONObject.parseArray(basicExamRule.getRequiredFields(), JSONObject.class);
@@ -93,7 +92,7 @@ public class BasicCardRuleServiceImpl extends ServiceImpl<BasicCardRuleMapper, B
             allExamRuleFieldList.removeAll(removeJsonObject);
         }
 
-        for (BasicCardRuleDto record : cardRuleDtoIPage.getRecords()) {
+        for (BasicCardRule record : cardRuleDtoIPage.getRecords()) {
             List<JSONObject> cardRuleExtendFieldList = JSONObject.parseArray(record.getExtendFields(), JSONObject.class);
             for (JSONObject jsonObject : allExamRuleFieldList) {
                 Optional<JSONObject> objectOptional = cardRuleExtendFieldList.stream().filter(m -> m.getString("code").equals(jsonObject.getString("code"))).findFirst();

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

@@ -5,7 +5,6 @@ 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.distributed.print.business.bean.dto.BasicExamDto;
 import com.qmth.distributed.print.business.entity.ExamPrintPlan;
 import com.qmth.distributed.print.business.entity.ExamTask;
 import com.qmth.distributed.print.business.mapper.BasicExamMapper;
@@ -131,7 +130,7 @@ public class BasicExamServiceImpl extends ServiceImpl<BasicExamMapper, BasicExam
     }
 
     @Override
-    public IPage<BasicExamDto> basicExamPage(Long semesterId, Boolean enable, Integer pageNumber, Integer pageSize) {
+    public IPage<BasicExam> basicExamPage(Long semesterId, Boolean enable, Integer pageNumber, Integer pageSize) {
         Long schoolId = SystemConstant.convertIdToLong(ServletUtil.getRequestHeaderSchoolId().toString());
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
         DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(schoolId, requestUser.getId(), ServletUtil.getRequest().getServletPath());

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

@@ -7,7 +7,6 @@ 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.distributed.print.business.bean.dto.TemplateDto;
 import com.qmth.distributed.print.business.bean.result.TemplatePrintInfoResult;
 import com.qmth.distributed.print.business.entity.BasicExamRule;
 import com.qmth.distributed.print.business.entity.BasicTemplate;
@@ -76,7 +75,7 @@ public class BasicTemplateServiceImpl extends ServiceImpl<BasicTemplateMapper, B
     private ExamPrintPlanService examPrintPlanService;
 
     @Override
-    public IPage<TemplateDto> list(Boolean enable, String name, Long startTime, Long endTime, Integer pageNumber, Integer pageSize) {
+    public IPage<BasicTemplate> list(Boolean enable, String name, Long startTime, Long endTime, Integer pageNumber, Integer pageSize) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
         DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(schoolId, requestUser.getId(), ServletUtil.getRequest().getServletPath());

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

@@ -1,54 +0,0 @@
-package com.qmth.distributed.print.business.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.distributed.print.business.entity.CloudUserPushStatus;
-import com.qmth.distributed.print.business.mapper.CloudUserPushStatusMapper;
-import com.qmth.distributed.print.business.service.CloudUserPushStatusService;
-import com.qmth.teachcloud.common.entity.SysUser;
-import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.enums.userPush.SyncStatusEnum;
-import com.qmth.teachcloud.common.enums.userPush.UserPushResultEnum;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-/**
- * @Description: 云阅卷用户推送服务实现类
- * @Author: CaoZixuan
- * @Date: 2022-08-08
- */
-@Service
-public class CloudUserPushStatusServiceImpl extends ServiceImpl<CloudUserPushStatusMapper, CloudUserPushStatus> implements CloudUserPushStatusService {
-
-    @Override
-    public CloudUserPushStatus findRecordByUserId(Long userId, Long schoolId) {
-        List<CloudUserPushStatus> cloudUserPushStatusList = this.list(new QueryWrapper<CloudUserPushStatus>()
-                .lambda()
-                .eq(CloudUserPushStatus::getSchoolId, schoolId)
-                .eq(CloudUserPushStatus::getUserId, userId));
-
-        CloudUserPushStatus result = new CloudUserPushStatus();
-
-        if (cloudUserPushStatusList != null) {
-            if (cloudUserPushStatusList.size() > 1) {
-                throw ExceptionResultEnum.ERROR.exception("用户id[" + userId + "]在云阅卷用户推送状态表中有多条数据");
-            } else if (cloudUserPushStatusList.size() == 1) {
-                result = cloudUserPushStatusList.get(0);
-            }
-        }
-        return result;
-    }
-
-    @Override
-    public List<Long> findNeedPushAgainUserIdList(Long schoolId) {
-        return this.list(new QueryWrapper<CloudUserPushStatus>()
-                        .lambda()
-                        .eq(CloudUserPushStatus::getSchoolId, schoolId)
-                        .eq(CloudUserPushStatus::getSyncStatus, SyncStatusEnum.NEED_PUSH_AGAIN))
-                .stream().map(CloudUserPushStatus::getUserId).distinct().collect(Collectors.toList());
-    }
-}

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

@@ -1,58 +0,0 @@
-package com.qmth.distributed.print.business.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.distributed.print.business.bean.marking.Marker;
-import com.qmth.distributed.print.business.entity.ExamPaperGroupMarker;
-import com.qmth.distributed.print.business.mapper.ExamPaperGroupMarkerMapper;
-import com.qmth.distributed.print.business.service.ExamPaperGroupMarkerService;
-import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-/**
- * @Description: 评卷员-分组关系服务实现类
- * @Author: CaoZixuan
- * @Date: 2022-04-13
- */
-@Service
-public class ExamPaperGroupMarkerServiceImpl extends ServiceImpl<ExamPaperGroupMarkerMapper,ExamPaperGroupMarker> implements ExamPaperGroupMarkerService {
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public void saveExamPaperGroupMarkerByGroupId(Long examPaperGroupId, List<Marker> markerList) {
-        Set<ExamPaperGroupMarker> examPaperGroupMarkerSet = markerList.stream().flatMap(e -> {
-            ExamPaperGroupMarker marker = new ExamPaperGroupMarker();
-            marker.setGroupId(examPaperGroupId);
-            marker.setMarkerId(Long.valueOf(e.getId()));
-            String loginName = e.getLoginName();
-            if (!SystemConstant.strNotNull(loginName)){
-                throw ExceptionResultEnum.ERROR.exception("缺少评卷员用户登录名信息");
-            }
-            marker.setLoginName(loginName);
-            return Stream.of(marker);
-        }).collect(Collectors.toSet());
-        this.saveBatch(examPaperGroupMarkerSet);
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public void deleteExamPaperGroupMarkerService(Set<Long> groupIdSet) {
-        if (groupIdSet.size() > 0) {
-            this.remove(new QueryWrapper<ExamPaperGroupMarker>().lambda().in(ExamPaperGroupMarker::getGroupId, groupIdSet));
-        }
-    }
-
-    @Override
-    public List<ExamPaperGroupMarker> listByGroupId(Long id) {
-        QueryWrapper<ExamPaperGroupMarker> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(ExamPaperGroupMarker::getGroupId, id);
-        return this.baseMapper.selectList(queryWrapper);
-    }
-}

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

@@ -1,42 +1,32 @@
 package com.qmth.distributed.print.business.service.impl;
 
-import com.alibaba.fastjson.JSONObject;
 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.distributed.print.business.bean.dto.ExamTaskPrintDetailDto;
-import com.qmth.distributed.print.business.bean.dto.ExamTaskPrintDto;
-import com.qmth.distributed.print.business.bean.dto.TaskPrintExtendFieldsDto;
 import com.qmth.distributed.print.business.bean.dto.TaskPrintHouseDto;
-import com.qmth.distributed.print.business.bean.params.ExamTaskPrintParams;
-import com.qmth.distributed.print.business.bean.params.SerialNumberParams;
-import com.qmth.distributed.print.business.entity.*;
-import com.qmth.distributed.print.business.enums.ExamDataSourceEnum;
-import com.qmth.distributed.print.business.enums.ExamDetailStatusEnum;
-import com.qmth.distributed.print.business.enums.ExamTaskSyncStatusEnum;
-import com.qmth.distributed.print.business.enums.PrintPlanStatusEnum;
+import com.qmth.distributed.print.business.entity.ExamTaskPrint;
+import com.qmth.distributed.print.business.entity.TeachClazz;
+import com.qmth.distributed.print.business.entity.TeachCourse;
+import com.qmth.distributed.print.business.entity.TeachStudent;
 import com.qmth.distributed.print.business.mapper.ExamTaskPrintMapper;
 import com.qmth.distributed.print.business.service.*;
-import com.qmth.teachcloud.common.bean.dto.MqDto;
 import com.qmth.teachcloud.common.bean.dto.TaskPrintClassDto;
-import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicCourse;
 import com.qmth.teachcloud.common.entity.BasicUserCourse;
 import com.qmth.teachcloud.common.entity.SysUser;
-import com.qmth.teachcloud.common.entity.TBTask;
-import com.qmth.teachcloud.common.enums.*;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.enums.OrgTypeEnum;
+import com.qmth.teachcloud.common.enums.TeachBasicEnum;
 import com.qmth.teachcloud.common.service.*;
 import com.qmth.teachcloud.common.util.RedisUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**

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

@@ -1,7 +1,6 @@
 package com.qmth.distributed.print.business.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.distributed.print.business.bean.dto.approvalForm.ApprovalInfo;
 import com.qmth.distributed.print.business.entity.ExamTaskReviewLog;
 import com.qmth.distributed.print.business.mapper.ExamTaskReviewLogMapper;
 import com.qmth.distributed.print.business.service.ExamTaskReviewLogService;
@@ -18,13 +17,4 @@ import org.springframework.stereotype.Service;
 @Service
 public class ExamTaskReviewLogServiceImpl extends ServiceImpl<ExamTaskReviewLogMapper, ExamTaskReviewLog> implements ExamTaskReviewLogService {
 
-//    @Override
-//    public List<ReviewLogDto> list(Long flowId) {
-//        return this.baseMapper.list(flowId);
-//    }
-
-//    @Override
-//    public ApprovalInfo findOnePassBySetUp(Long flowId, int setup) {
-//        return this.baseMapper.findOnePassBySetUp(flowId,setup);
-//    }
 }

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

@@ -408,9 +408,9 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
     }
 
     @Override
-    public ExamTaskImportDto importFile(MultipartFile file) throws IOException, NoSuchFieldException {
+    public ExamTaskImportResultDto importFile(MultipartFile file) throws IOException, NoSuchFieldException {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        List<LinkedMultiValueMap<Integer, Object>> finalList = ExcelUtil.excelReader(file.getInputStream(), Lists.newArrayList(ExamTaskTempDto.class), (finalExcelList, finalColumnNameList, finalExcelErrorList) -> {
+        List<LinkedMultiValueMap<Integer, Object>> finalList = ExcelUtil.excelReader(file.getInputStream(), Lists.newArrayList(ExamTaskImportDto.class), (finalExcelList, finalColumnNameList, finalExcelErrorList) -> {
             // 课程代码与试卷有相同数据map
             Map<String, String> courseCodePaperNumberMap = new HashMap<>();
             // 试卷编号重复set
@@ -424,7 +424,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                 LinkedMultiValueMap<Integer, Object> excelMap = finalExcelList.get(i);
                 List<Object> examTaskTempList = excelMap.get(i);
                 for (int y = 0; y < examTaskTempList.size(); y++) {
-                    ExamTaskTempDto userImportDto = (ExamTaskTempDto) examTaskTempList.get(y);
+                    ExamTaskImportDto userImportDto = (ExamTaskImportDto) examTaskTempList.get(y);
 
                     String excelCourseCode = userImportDto.getCourseCode();
                     String excelCourseName = userImportDto.getCourseName();
@@ -503,7 +503,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
     }
 
     @Transactional
-    ExamTaskImportDto executeImportExamTaskBatch(List<LinkedMultiValueMap<Integer, Object>> finalList) {
+    ExamTaskImportResultDto executeImportExamTaskBatch(List<LinkedMultiValueMap<Integer, Object>> finalList) {
         // 学校ID
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         // 用户
@@ -511,8 +511,8 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         // 批次号
         Gson gson = new Gson();
         String batchNo = String.valueOf(System.nanoTime());
-        ExamTaskImportDto examTaskImportDto = new ExamTaskImportDto();
-        examTaskImportDto.setBatchNo(batchNo);
+        ExamTaskImportResultDto examTaskImportResultDto = new ExamTaskImportResultDto();
+        examTaskImportResultDto.setBatchNo(batchNo);
         List<ExamTaskDto> tasks = new ArrayList<>();
 
         List<BasicCourse> userCourses = printCommonService.list(null, null, null);
@@ -522,8 +522,8 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
             LinkedMultiValueMap<Integer, Object> excelMap = finalList.get(i);
             List<Object> examTaskTempList = excelMap.get(i);
             for (int y = 0; y < examTaskTempList.size(); y++) {
-                ExamTaskTempDto examTaskTempDto = (ExamTaskTempDto) examTaskTempList.get(y);
-                ExamTaskTemp examTaskTemp = gson.fromJson(gson.toJson(examTaskTempDto), ExamTaskTemp.class);
+                ExamTaskImportDto examTaskImportDto = (ExamTaskImportDto) examTaskTempList.get(y);
+                ExamTaskTemp examTaskTemp = gson.fromJson(gson.toJson(examTaskImportDto), ExamTaskTemp.class);
                 // 校验该用户是否有科目
                 long matchCourseCount = userCourses.stream().filter(m -> examTaskTemp.getCourseCode().equals(m.getCode())).count();
                 if (matchCourseCount == 0) {
@@ -552,8 +552,8 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                     assignTeacherDto = listUsers(examTaskTemp.getCourseCode(), null);
                 }
                 examTaskDto.setUsers(Objects.nonNull(assignTeacherDto) ? assignTeacherDto.getAllUserList() : new ArrayList<>());
-                String userName = examTaskTempDto.getUserName();
-                String userAccount = examTaskTempDto.getUserAccount();
+                String userName = examTaskImportDto.getUserName();
+                String userAccount = examTaskImportDto.getUserAccount();
                 if (SystemConstant.strNotNull(userName) && SystemConstant.strNotNull(userAccount)) {
                     List<SysUserResult> match = assignTeacherDto.getAllUserList().stream()
                             .filter(e -> e.getLoginName().equals(userAccount) && e.getRealName().equals(userName))
@@ -592,9 +592,9 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         }
 
         // 设置重复信息，页面做二次校验
-        examTaskImportDto.setErrorMsg(stringJoiner.toString());
-        examTaskImportDto.setTasks(tasks);
-        return examTaskImportDto;
+        examTaskImportResultDto.setErrorMsg(stringJoiner.toString());
+        examTaskImportResultDto.setTasks(tasks);
+        return examTaskImportResultDto;
     }
 
     private AssignTeacherDto listUsers(String courseCode, String userId) {

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/CreatePdfUtil.java

@@ -1490,31 +1490,4 @@ public class CreatePdfUtil {
         jsonArray.add(object);
         return cardAttachment;
     }
-
-    /**
-     * 获取班级名称
-     *
-     * @param examStudentDto
-     * @return
-     */
-    private String getClassName(ExamStudentDto examStudentDto) {
-        String clazzName = examStudentDto.getClazzName();
-        if (StringUtils.isNotBlank(clazzName)) {
-            return clazzName;
-        }
-        if (StringUtils.isNotBlank(examStudentDto.getClazzId())) {
-            BasicClazz basicClazz = basicClazzService.getById(examStudentDto.getClazzId());
-            clazzName = Objects.nonNull(basicClazz) ? basicClazz.getClazzName() : null;
-        }
-        if (StringUtils.isNotBlank(clazzName)) {
-            return clazzName;
-        }
-        List<Map> mapList = JSONObject.parseArray(examStudentDto.getExtendFields(), Map.class);
-        for (Map map : mapList) {
-            if (Objects.equals("className", map.get("code").toString())) {
-                return map.get("value").toString();
-            }
-        }
-        return null;
-    }
 }

distributed-print-business/src/main/resources/mapper/BasicCardRuleMapper.xml

@@ -32,7 +32,7 @@
     <sql id="Base_Column_List">
         select id, school_id, name, exam_number_style,exam_number_digit, paper_type, exam_absent, write_sign, discipline, required_fields, extend_fields, title_rule, attention, objective_attention, subjective_attention, enable, remark, create_id, create_time, update_id, update_time, fill_number from basic_card_rule
     </sql>
-    <select id="listPage" resultType="com.qmth.distributed.print.business.bean.dto.BasicCardRuleDto">
+    <select id="listPage" resultType="com.qmth.distributed.print.business.entity.BasicCardRule">
         <include refid="Base_Column_List"></include>
         <where>
             <if test="schoolId != null and schoolId != ''">

distributed-print-business/src/main/resources/mapper/BasicExamMapper.xml

@@ -18,7 +18,7 @@
     </resultMap>
 
 
-    <select id="findBasicExamPage" resultType="com.qmth.distributed.print.business.bean.dto.BasicExamDto">
+    <select id="findBasicExamPage" resultType="com.qmth.teachcloud.common.entity.BasicExam">
         SELECT
             a.id,
             a.school_id schoolId,
@@ -28,7 +28,6 @@
             a.category,
             a.exam_model examModel,
             a.enable,
-            a.auto_sync_student autoSyncStudent,
             a.create_id createId,
             a.create_time createTime,
             a.update_id updateId,

distributed-print-business/src/main/resources/mapper/BasicTemplateMapper.xml

@@ -7,7 +7,6 @@
         <result column="id" property="id"/>
         <result column="school_id" property="schoolId"/>
         <result column="name" property="name"/>
-        <result column="type" property="type"/>
         <result column="classify" property="classify"/>
         <result column="attachment_id" property="attachmentId"/>
         <result column="enable" property="enable"/>
@@ -25,7 +24,7 @@
         school_id, name, type, classify, attachment_id, enable, remark, create_id, create_time, update_id, update_time
     </sql>
 
-    <select id="listPage" resultType="com.qmth.distributed.print.business.bean.dto.TemplateDto">
+    <select id="listPage" resultType="com.qmth.distributed.print.business.entity.BasicTemplate">
         SELECT
         id,
         school_id schoolId,

distributed-print-business/src/main/resources/mapper/CloudUserPushStatusMapper.xml

@@ -1,4 +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.distributed.print.business.mapper.CloudUserPushStatusMapper">
-</mapper>

distributed-print-business/src/main/resources/mapper/ExamPaperGroupMarkerMapper.xml

@@ -1,5 +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.distributed.print.business.mapper.ExamPaperGroupMarkerMapper">
-
-</mapper>

distributed-print-business/src/main/resources/mapper/ExamTaskMapper.xml

@@ -9,6 +9,8 @@
         <result column="course_code" property="courseCode"/>
         <result column="course_name" property="courseName"/>
         <result column="paper_number" property="paperNumber"/>
+        <result column="sequence" property="sequence"/>
+        <result column="specialty" property="specialty"/>
         <result column="start_time" property="startTime"/>
         <result column="end_time" property="endTime"/>
         <result column="card_rule_id" property="cardRuleId"/>
@@ -25,8 +27,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,
-        school_id, course_code, course_name, specialty, paper_number, start_time, end_time, card_rule_id, user_id, status, review_status, enable, batch_no, create_id, create_time, update_id, update_time
+        id, school_id, course_code, course_name, specialty, paper_number,`sequence`, start_time, end_time, card_rule_id, user_id, status, review_status, enable, batch_no, create_id, create_time, update_id, update_time
     </sql>
     <select id="listPage" resultType="com.qmth.distributed.print.business.bean.dto.ExamTaskDto">
         SELECT

distributed-print-business/src/main/resources/mapper/ExamTaskReviewLogMapper.xml

@@ -17,54 +17,4 @@
         id,
         exam_task_id, review_status, reason, operate_id, operate_time
     </sql>
-
-<!--    <select id="list" resultType="com.qmth.distributed.print.business.bean.dto.ReviewLogDto">-->
-<!--        select-->
-<!--            tffl.id,-->
-<!--            tffl.approve_operation as approvePass,-->
-<!--            tffl.approve_remark as reason,-->
-<!--            tffl.approve_setup as setUp,-->
-<!--            tffl.approve_id as operateId,-->
-<!--            su.real_name as operateName,-->
-<!--            tffl.create_time as operateTime-->
-<!--        from-->
-<!--            t_f_flow_log tffl-->
-<!--        left join sys_user su on tffl.approve_id = su.id-->
-<!--        where EXISTS(-->
-<!--            select t.flow_id from t_f_flow_join t-->
-<!--        where EXISTS (select tffj.object_id from t_f_flow_join tffj-->
-<!--                where tffj.flow_id = #{flowId} and tffj.object_id = t.object_id)-->
-<!--        and tffl.flow_id = t.flow_id)-->
-<!--        order by tffl.create_time desc-->
-<!--    </select>-->
-
-<!--    <select id="findOnePassBySetUp"-->
-<!--            resultType="com.qmth.distributed.print.business.bean.dto.approvalForm.ApprovalInfo">-->
-<!--        SELECT-->
-<!--            tffl.approve_remark AS remark,-->
-<!--            tffl.approve_setup AS level,-->
-<!--            tffl.approve_id AS approveId,-->
-<!--            su.real_name AS approveName,-->
-<!--            tffl.create_time AS time-->
-<!--        FROM-->
-<!--            t_f_flow_log tffl-->
-<!--                LEFT JOIN-->
-<!--            sys_user su ON tffl.approve_id = su.id-->
-<!--        <where>-->
-<!--            AND tffl.approve_operation = 'APPROVE'-->
-<!--            <if test="flowId > 0 and flowId != ''">-->
-<!--                AND EXISTS(-->
-<!--                select t.flow_id from t_f_flow_join t-->
-<!--                where EXISTS (select tffj.object_id from t_f_flow_join tffj-->
-<!--                where tffj.flow_id = #{flowId} and tffj.object_id = t.object_id)-->
-<!--                and tffl.flow_id = t.flow_id)-->
-<!--            </if>-->
-<!--            <if test="setup != null and setup != ''">-->
-<!--                AND tffl.approve_setup = #{setup}-->
-<!--            </if>-->
-<!--        </where>-->
-<!--        ORDER BY tffl.create_time DESC-->
-<!--        LIMIT 1-->
-<!--    </select>-->
-
 </mapper>

distributed-print/src/main/java/com/qmth/distributed/print/api/BasicCardRuleController.java

@@ -3,7 +3,6 @@ package com.qmth.distributed.print.api;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.distributed.print.business.bean.dto.BasicCardRuleDto;
 import com.qmth.distributed.print.business.entity.BasicCardRule;
 import com.qmth.distributed.print.business.service.BasicCardRuleService;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
@@ -58,7 +57,7 @@ public class BasicCardRuleController {
                        @RequestParam(value = "createEndTime", required = false) Long createEndTime,
                        @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
                        @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
-        IPage<BasicCardRuleDto> cardRuleDtoIPage = basicCardRuleService.list(enable, name, createStartTime, createEndTime, pageNumber, pageSize);
+        IPage<BasicCardRule> cardRuleDtoIPage = basicCardRuleService.list(enable, name, createStartTime, createEndTime, pageNumber, pageSize);
         return ResultUtil.ok(cardRuleDtoIPage);
     }
 

distributed-print/src/main/java/com/qmth/distributed/print/api/BasicTemplateController.java

@@ -3,12 +3,10 @@ package com.qmth.distributed.print.api;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.distributed.print.business.bean.dto.TemplateDto;
 import com.qmth.distributed.print.business.entity.BasicTemplate;
 import com.qmth.distributed.print.business.service.BasicTemplateService;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.enums.ClassifyEnum;
 import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
@@ -18,7 +16,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 
@@ -58,7 +55,7 @@ public class BasicTemplateController {
                        @RequestParam(value = "endTime", required = false) Long endTime,
                        @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
                        @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
-        IPage<TemplateDto> templateDtoIPage = basicTemplateService.list(enable, name, startTime, endTime, pageNumber, pageSize);
+        IPage<BasicTemplate> templateDtoIPage = basicTemplateService.list(enable, name, startTime, endTime, pageNumber, pageSize);
         return ResultUtil.ok(templateDtoIPage);
     }
 

distributed-print/src/main/java/com/qmth/distributed/print/api/ExamTaskController.java

@@ -3,7 +3,7 @@ package com.qmth.distributed.print.api;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.boot.api.exception.ApiException;
 import com.qmth.distributed.print.business.bean.dto.ExamTaskDto;
-import com.qmth.distributed.print.business.bean.dto.ExamTaskImportDto;
+import com.qmth.distributed.print.business.bean.dto.ExamTaskImportResultDto;
 import com.qmth.distributed.print.business.entity.ExamTask;
 import com.qmth.distributed.print.business.entity.ExamTaskApplyTemp;
 import com.qmth.distributed.print.business.service.*;
@@ -172,8 +172,8 @@ public class ExamTaskController {
             if (Objects.isNull(basicAttachment)) {
                 throw ExceptionResultEnum.ATTACHMENT_ERROR.exception();
             } else {
-                ExamTaskImportDto examTaskImportDto = examTaskService.importFile(file);
-                return ResultUtil.ok(examTaskImportDto);
+                ExamTaskImportResultDto examTaskImportResultDto = examTaskService.importFile(file);
+                return ResultUtil.ok(examTaskImportResultDto);
             }
         } catch (Exception e) {
             if (Objects.nonNull(basicAttachment)) {

distributed-print/src/main/java/com/qmth/distributed/print/api/SysUserController.java

@@ -3,8 +3,6 @@ package com.qmth.distributed.print.api;
 import com.qmth.boot.api.annotation.Aac;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.bean.result.EditResult;
-import com.qmth.distributed.print.business.service.CloudUserPushService;
-import com.qmth.distributed.print.business.service.CloudUserPushStatusService;
 import com.qmth.distributed.print.business.service.PrintCommonService;
 import com.qmth.distributed.print.business.templete.execute.AsyncSysUserDataImportService;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;

distributed-print/src/test/java/com/qmth/distributed/print/ServiceTest.java

@@ -49,9 +49,6 @@ public class ServiceTest {
     @Resource
     private ExamTaskService examTaskService;
 
-    @Resource
-    private PrintCommonService printCommonService;
-
     @Resource
     private BasicPrintConfigService basicPrintConfigService;
 

teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/BasicExam.java

@@ -54,6 +54,9 @@ public class BasicExam extends BaseEntity implements Serializable {
     @TableField("enable")
     private Boolean enable;
 
+    @TableField(exist = false)
+    private String semesterName;
+
     public Long getSchoolId() {
         return schoolId;
     }
@@ -117,4 +120,12 @@ public class BasicExam extends BaseEntity implements Serializable {
     public void setEnable(Boolean enable) {
         this.enable = enable;
     }
+
+    public String getSemesterName() {
+        return semesterName;
+    }
+
+    public void setSemesterName(String semesterName) {
+        this.semesterName = semesterName;
+    }
 }