3.4.0 update

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

@@ -0,0 +1,76 @@
+package com.qmth.distributed.print.business.bean;
+
+public class BasicExamStudentQuery {
+    private Long schoolId;
+    private Long semesterId;
+    private Long examId;
+    private Long courseId;
+    private String teacherName;
+    private String teachClassName;
+    private String className;
+    private String paperNumber;
+
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
+    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 Long getCourseId() {
+        return courseId;
+    }
+
+    public void setCourseId(Long courseId) {
+        this.courseId = courseId;
+    }
+
+    public String getTeacherName() {
+        return teacherName;
+    }
+
+    public void setTeacherName(String teacherName) {
+        this.teacherName = teacherName;
+    }
+
+    public String getTeachClassName() {
+        return teachClassName;
+    }
+
+    public void setTeachClassName(String teachClassName) {
+        this.teachClassName = teachClassName;
+    }
+
+    public String getClassName() {
+        return className;
+    }
+
+    public void setClassName(String className) {
+        this.className = className;
+    }
+
+    public String getPaperNumber() {
+        return paperNumber;
+    }
+
+    public void setPaperNumber(String paperNumber) {
+        this.paperNumber = paperNumber;
+    }
+}

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

@@ -1,20 +1,22 @@
 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 TaskPrintHouseDto {
 
-    private String printHouseId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long printHouseId;
     private String printHouseName;
-    private String campusId;
-    private String campusName;
 
-    public String getPrintHouseId() {
+    public Long getPrintHouseId() {
         return printHouseId;
     }
 
-    public void setPrintHouseId(String printHouseId) {
+    public void setPrintHouseId(Long printHouseId) {
         this.printHouseId = printHouseId;
     }
 
@@ -25,20 +27,4 @@ public class TaskPrintHouseDto {
     public void setPrintHouseName(String printHouseName) {
         this.printHouseName = printHouseName;
     }
-
-    public String getCampusId() {
-        return campusId;
-    }
-
-    public void setCampusId(String campusId) {
-        this.campusId = campusId;
-    }
-
-    public String getCampusName() {
-        return campusName;
-    }
-
-    public void setCampusName(String campusName) {
-        this.campusName = campusName;
-    }
 }

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

@@ -1,60 +0,0 @@
-package com.qmth.distributed.print.business.bean.params;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModelProperty;
-import org.hibernate.validator.constraints.Range;
-
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-import java.util.List;
-
-/**
- * @Description: 分配班级参数
- * @Author: CaoZixuan
- * @Date: 2024-03-07
- */
-public class AssignClazzParam {
-    @ApiModelProperty("教学课程id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @NotNull(message = "缺少教学课程")
-    @Range(min = 1L, message = "缺少教学课程")
-    private Long teachCourseId;
-
-    @ApiModelProperty("教师id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @NotNull(message = "请选择教师")
-    @Range(min = 1L, message = "请选择教师")
-    private Long teacherId;
-
-    @ApiModelProperty("班级集合")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @NotEmpty(message = "请选择班级")
-    @Size(min = 1, message = "请选择班级")
-    private List<Long> clazzIdList;
-
-    public Long getTeachCourseId() {
-        return teachCourseId;
-    }
-
-    public void setTeachCourseId(Long teachCourseId) {
-        this.teachCourseId = teachCourseId;
-    }
-
-    public Long getTeacherId() {
-        return teacherId;
-    }
-
-    public void setTeacherId(Long teacherId) {
-        this.teacherId = teacherId;
-    }
-
-    public List<Long> getClazzIdList() {
-        return clazzIdList;
-    }
-
-    public void setClazzIdList(List<Long> clazzIdList) {
-        this.clazzIdList = clazzIdList;
-    }
-}

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

@@ -1,28 +0,0 @@
-package com.qmth.distributed.print.business.bean.params;
-
-/**
- * 模糊查询
- * @Date: 2021/3/26.
- */
-public class BlurryParam {
-
-    private Long schoolId;
-
-    private String param;
-
-    public Long getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(Long schoolId) {
-        this.schoolId = schoolId;
-    }
-
-    public String getParam() {
-        return param;
-    }
-
-    public void setParam(String param) {
-        this.param = param;
-    }
-}

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

@@ -1,37 +0,0 @@
-package com.qmth.distributed.print.business.bean.params;
-
-import com.qmth.teachcloud.common.base.BasePage;
-
-/**
- * @Date: 2021/3/23.
- */
-public class CardRuleParam extends BasePage {
-
-    private Boolean enable;
-    private String name;
-    private Long createTime;
-
-    public Boolean getEnable() {
-        return enable;
-    }
-
-    public void setEnable(Boolean enable) {
-        this.enable = enable;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
-}

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

@@ -1,41 +0,0 @@
-package com.qmth.distributed.print.business.bean.params;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.distributed.print.business.enums.ChooseTypeEnum;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-
-/**
- * @Description: 选择参数params
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/3/24
- */
-public class ChooseParams implements Serializable {
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "数组id")
-    Long[] ids;
-
-    @ApiModelProperty(value = "选择类型")
-    ChooseTypeEnum type;
-
-    public Long[] getIds() {
-        return ids;
-    }
-
-    public void setIds(Long[] ids) {
-        this.ids = ids;
-    }
-
-    public ChooseTypeEnum getType() {
-        return type;
-    }
-
-    public void setType(ChooseTypeEnum type) {
-        this.type = type;
-    }
-}

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

@@ -1,29 +0,0 @@
-package com.qmth.distributed.print.business.bean.params;
-
-
-import com.qmth.teachcloud.common.base.BasePage;
-
-/**
- * @Date: 2021/3/23.
- */
-public class CourseParam extends BasePage {
-
-    private String code;
-    private String name;
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}

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

@@ -1,29 +0,0 @@
-package com.qmth.distributed.print.business.bean.params;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModelProperty;
-
-import javax.validation.constraints.NotEmpty;
-import java.util.List;
-
-/**
- * @Description: 批量删除参数接收类
- * @Author: CaoZixuan
- * @Date: 2021-08-04
- */
-public class DeleteBatchParams {
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "选择的要删除的id数组",required = true)
-    @NotEmpty(message = "必须勾选要删除的目标")
-    private List<Long> idList;
-
-    public List<Long> getIdList() {
-        return idList;
-    }
-
-    public void setIdList(List<Long> idList) {
-        this.idList = idList;
-    }
-}

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

@@ -1,47 +0,0 @@
-package com.qmth.distributed.print.business.bean.params;
-
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.distributed.print.business.entity.ExamTask;
-import com.qmth.distributed.print.business.entity.ExamTaskDetail;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.List;
-
-/**
- * @Date: 2021/3/23.
- */
-public class ExamTaskApplyParam {
-
-    private ExamTask examTask;
-    private ExamTaskDetail examTaskDetail;
-
-    @ApiModelProperty(value = "流程审批人列表")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private List<Long> approveUserIds;
-
-    public List<Long> getApproveUserIds() {
-        return approveUserIds;
-    }
-
-    public void setApproveUserIds(List<Long> approveUserIds) {
-        this.approveUserIds = approveUserIds;
-    }
-
-    public ExamTask getExamTask() {
-        return examTask;
-    }
-
-    public void setExamTask(ExamTask examTask) {
-        this.examTask = examTask;
-    }
-
-    public ExamTaskDetail getExamTaskDetail() {
-        return examTaskDetail;
-    }
-
-    public void setExamTaskDetail(ExamTaskDetail examTaskDetail) {
-        this.examTaskDetail = examTaskDetail;
-    }
-}

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

@@ -1,74 +0,0 @@
-package com.qmth.distributed.print.business.bean.params;
-
-
-import com.qmth.teachcloud.common.base.BasePage;
-
-/**
- * @Date: 2021/3/23.
- */
-public class ExamTaskParam extends BasePage {
-
-    private Boolean enable;
-    private String status;
-    private Long cardRuleId;
-    private String courseCode;
-    private String paperNumber;
-    private Long startTime;
-    private Long endTime;
-
-    public Boolean getEnable() {
-        return enable;
-    }
-
-    public void setEnable(Boolean enable) {
-        this.enable = enable;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public Long getCardRuleId() {
-        return cardRuleId;
-    }
-
-    public void setCardRuleId(Long cardRuleId) {
-        this.cardRuleId = cardRuleId;
-    }
-
-    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 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;
-    }
-}

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

@@ -1,29 +0,0 @@
-package com.qmth.distributed.print.business.bean.params;
-
-import java.util.List;
-
-/**
- * @Description: 批量提交命题任务-卷库查询入口
- * @Date: 2021-08-26
- */
-public class ExamTaskPrintParams {
-
-    private Long printPlanId;
-    private List<Long> list;
-
-    public Long getPrintPlanId() {
-        return printPlanId;
-    }
-
-    public void setPrintPlanId(Long printPlanId) {
-        this.printPlanId = printPlanId;
-    }
-
-    public List<Long> getList() {
-        return list;
-    }
-
-    public void setList(List<Long> list) {
-        this.list = list;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ExamTaskApplyTemp.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/ExamTaskSubmitPram.java

@@ -1,4 +1,4 @@
-package com.qmth.distributed.print.business.entity;
+package com.qmth.distributed.print.business.bean.params;
 
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -19,8 +19,7 @@ import java.util.List;
  * @author xf
  * @since 2021-03-23
  */
-@TableName("exam_task_apply_temp")
-public class ExamTaskApplyTemp extends BaseEntity implements Serializable {
+public class ExamTaskSubmitPram extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -1,45 +0,0 @@
-package com.qmth.distributed.print.business.bean.params;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.teachcloud.common.base.BasePage;
-import io.swagger.annotations.ApiModelProperty;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-
-/**
- * @Description: 流程审批参数
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/8/6
- */
-public class FlowApproveParam implements Serializable {
-
-    @ApiModelProperty(value = "流程id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @NotNull(message = "流程id不能为空")
-    private Long flowId;
-
-    @ApiModelProperty(value = "是否启用，0：停用，1：启用")
-    @NotNull(message = "启用/禁用不能为空")
-    private Boolean enable;
-
-    public Long getFlowId() {
-        return flowId;
-    }
-
-    public void setFlowId(Long flowId) {
-        this.flowId = flowId;
-    }
-
-    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/params/RoleParam.java

@@ -1,29 +0,0 @@
-package com.qmth.distributed.print.business.bean.params;
-
-
-import com.qmth.teachcloud.common.base.BasePage;
-
-/**
- * @Date: 2021/3/23.
- */
-public class RoleParam extends BasePage {
-
-    private String name;
-    private Boolean enable;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    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/params/SerialNumberParams.java

@@ -1,53 +0,0 @@
-package com.qmth.distributed.print.business.bean.params;
-
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: redis生成序列号参数类
- * @Author: CaoZixuan
- * @Date: 2021-04-19
- */
-public class SerialNumberParams {
-
-    @ApiModelProperty(value = "序列号所属模块")
-    private String model;
-
-    @ApiModelProperty(value = "序列号前缀（序列号模块加前缀作为key）")
-    private String prefix;
-
-    @ApiModelProperty(value = "补齐位数")
-    private int digit;
-
-    public SerialNumberParams(String model, String prefix, int digit) {
-        this.model = model;
-        this.prefix = prefix;
-        this.digit = digit;
-    }
-
-    public SerialNumberParams() {
-    }
-
-    public String getModel() {
-        return model;
-    }
-
-    public void setModel(String model) {
-        this.model = model;
-    }
-
-    public String getPrefix() {
-        return prefix;
-    }
-
-    public void setPrefix(String prefix) {
-        this.prefix = prefix;
-    }
-
-    public int getDigit() {
-        return digit;
-    }
-
-    public void setDigit(int digit) {
-        this.digit = digit;
-    }
-}

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

@@ -1,77 +0,0 @@
-package com.qmth.distributed.print.business.bean.params;
-
-import com.qmth.distributed.print.business.bean.examRule.CodeNameEnableValue;
-import com.qmth.distributed.print.business.entity.ExamDetailCourse;
-import com.qmth.teachcloud.common.base.BasePage;
-
-import java.util.List;
-
-/**
- * 新增考生request
- */
-public class SingleExamStudentAddParam extends BasePage {
-
-    private Long examDetailCourseId;
-    private String paperType;
-    private String studentCode;
-    private String studentName;
-    private String college;
-    private String majorName;
-    private String className;
-
-    public Long getExamDetailCourseId() {
-        return examDetailCourseId;
-    }
-
-    public void setExamDetailCourseId(Long examDetailCourseId) {
-        this.examDetailCourseId = examDetailCourseId;
-    }
-
-    public String getPaperType() {
-        return paperType;
-    }
-
-    public void setPaperType(String paperType) {
-        this.paperType = paperType;
-    }
-
-    public String getStudentCode() {
-        return studentCode;
-    }
-
-    public void setStudentCode(String studentCode) {
-        this.studentCode = studentCode;
-    }
-
-    public String getStudentName() {
-        return studentName;
-    }
-
-    public void setStudentName(String studentName) {
-        this.studentName = studentName;
-    }
-
-    public String getCollege() {
-        return college;
-    }
-
-    public void setCollege(String college) {
-        this.college = college;
-    }
-
-    public String getMajorName() {
-        return majorName;
-    }
-
-    public void setMajorName(String majorName) {
-        this.majorName = majorName;
-    }
-
-    public String getClassName() {
-        return className;
-    }
-
-    public void setClassName(String className) {
-        this.className = className;
-    }
-}

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

@@ -1,87 +0,0 @@
-package com.qmth.distributed.print.business.bean.params;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.distributed.print.business.entity.ExamTaskPrint;
-import com.qmth.distributed.print.business.enums.ChooseTypeEnum;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 发布印刷任务
- */
-public class TaskPrintParams implements Serializable {
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long printPlanId;
-
-    private String courseCode;
-
-    private String courseName;
-
-    private String paperNumber;
-
-    private Long examStartTime;
-
-    private Long examEndTime;
-
-    private List<ExamTaskPrint> list;
-
-    public Long getPrintPlanId() {
-        return printPlanId;
-    }
-
-    public void setPrintPlanId(Long printPlanId) {
-        this.printPlanId = printPlanId;
-    }
-
-    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 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 List<ExamTaskPrint> getList() {
-        return list;
-    }
-
-    public void setList(List<ExamTaskPrint> list) {
-        this.list = list;
-    }
-}

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

@@ -1,39 +0,0 @@
-package com.qmth.distributed.print.business.bean.params;
-
-import io.swagger.annotations.ApiModelProperty;
-import org.hibernate.validator.constraints.Length;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * @Description: 教学课程编辑参数
- * @Author: CaoZixuan
- * @Date: 2022-02-14
- */
-public class TeachCourseParams {
-    @ApiModelProperty("课程名称")
-    @NotNull(message = "请填写课程名称")
-    @Length(message = "请填写课程名称")
-    private String courseName;
-
-    @ApiModelProperty("课程编号")
-    @NotNull(message = "请填写课程编号")
-    @Length(message = "请填写课程编号")
-    private String courseCode;
-
-    public String getCourseName() {
-        return courseName;
-    }
-
-    public void setCourseName(String courseName) {
-        this.courseName = courseName;
-    }
-
-    public String getCourseCode() {
-        return courseCode;
-    }
-
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
-    }
-}

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

@@ -1,58 +0,0 @@
-package com.qmth.distributed.print.business.bean.params;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModelProperty;
-import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.constraints.Range;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * @Description: 教师团队参数
- * @Author: CaoZixuan
- * @Date: 2023-03-16
- */
-public class TeacherTeamParam {
-
-    @ApiModelProperty("姓名")
-    @NotNull(message = "请填写姓名")
-    @Length(message = "请填写姓名")
-    private String teacherName;
-
-    @ApiModelProperty("工号")
-    @NotNull(message = "请填写工号")
-    @Length(message = "请填写工号")
-    private String teacherCode;
-
-    @ApiModelProperty("教学课程id")
-    @NotNull(message = "缺少教学课程")
-    @Range(min = 1L, message = "缺少教学课程id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long teachCourseId;
-
-
-    public String getTeacherName() {
-        return teacherName;
-    }
-
-    public void setTeacherName(String teacherName) {
-        this.teacherName = teacherName;
-    }
-
-    public String getTeacherCode() {
-        return teacherCode;
-    }
-
-    public void setTeacherCode(String teacherCode) {
-        this.teacherCode = teacherCode;
-    }
-
-    public Long getTeachCourseId() {
-        return teachCourseId;
-    }
-
-    public void setTeachCourseId(Long teachCourseId) {
-        this.teachCourseId = teachCourseId;
-    }
-}

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

@@ -1,55 +0,0 @@
-package com.qmth.distributed.print.business.bean.params;
-
-import com.qmth.teachcloud.common.base.BasePage;
-
-/**
- * @Date: 2021/3/23.
- */
-public class TemplateParam extends BasePage {
-
-    private Boolean enable;
-    private String type;
-    private String name;
-    private Long startTime;
-    private Long endTime;
-
-    public Boolean getEnable() {
-        return enable;
-    }
-
-    public void setEnable(Boolean enable) {
-        this.enable = enable;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    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;
-    }
-}

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

@@ -1,39 +0,0 @@
-package com.qmth.distributed.print.business.bean.params;
-
-
-import com.qmth.teachcloud.common.base.BasePage;
-
-/**
- * @Date: 2021/3/23.
- */
-public class UserParam extends BasePage {
-
-    private String realName;
-    private Long roleId;
-    private Boolean enable;
-
-
-    public String getRealName() {
-        return realName;
-    }
-
-    public void setRealName(String realName) {
-        this.realName = realName;
-    }
-
-    public Long getRoleId() {
-        return roleId;
-    }
-
-    public void setRoleId(Long roleId) {
-        this.roleId = roleId;
-    }
-
-    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/result/BasicExamStudentResult.java

@@ -2,26 +2,22 @@ package com.qmth.distributed.print.business.bean.result;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.teachcloud.common.entity.BasicExamStudent;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiParam;
+
+import javax.annotation.Resource;
 
 /**
  * @Description: 考生字典查询结果
  * @Author: CaoZixuan
  * @Date: 2024-02-22
  */
-public class BasicExamStudentResult {
-
-    @ApiModelProperty("id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long id;
-
-    @ApiModelProperty("学期id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long semesterId;
+public class BasicExamStudentResult extends BasicExamStudent {
 
-    @ApiModelProperty("考试id")
+    @ApiModelProperty("课程名称")
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long examId;
+    private Long studentId;
 
     @ApiModelProperty("课程名称")
     private String courseName;
@@ -29,70 +25,24 @@ public class BasicExamStudentResult {
     @ApiModelProperty("课程代码")
     private String courseCode;
 
-    @ApiModelProperty("姓名")
-    private String studentName;
-
-    @ApiModelProperty("学号")
-    private String studentCode;
-
-    @ApiModelProperty("学院")
-    private String college;
-
-    @ApiModelProperty("专业")
-    private String major;
-
-    @ApiModelProperty("教学班")
-    private String teachClazz;
-
-    @ApiModelProperty("试卷编号")
-    private String paperNumber;
-
     @ApiModelProperty("任课老师")
     private String teacherName;
 
     @ApiModelProperty("任课老师工号")
     private String teacherCode;
 
-    @ApiModelProperty("考试开始时间")
-    private Long examStartTime;
-
-    @ApiModelProperty("考试结束时间")
-    private Long examEndTime;
-
     @ApiModelProperty("考试日期")
     private String examDate;
 
     @ApiModelProperty("考试时间")
     private String examTime;
 
-    @ApiModelProperty("考点(校区)")
-    private String examPlace;
-
-    @ApiModelProperty("考场(考试教室)")
-    private String examRoom;
-
-    public Long getId() {
-        return id;
+    public Long getStudentId() {
+        return super.getId();
     }
 
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    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 void setStudentId(Long studentId) {
+        this.studentId = studentId;
     }
 
     public String getCourseName() {
@@ -103,62 +53,16 @@ public class BasicExamStudentResult {
         this.courseName = courseName;
     }
 
+    @Override
     public String getCourseCode() {
         return courseCode;
     }
 
+    @Override
     public void setCourseCode(String courseCode) {
         this.courseCode = courseCode;
     }
 
-    public String getStudentName() {
-        return studentName;
-    }
-
-    public void setStudentName(String studentName) {
-        this.studentName = studentName;
-    }
-
-    public String getStudentCode() {
-        return studentCode;
-    }
-
-    public void setStudentCode(String studentCode) {
-        this.studentCode = studentCode;
-    }
-
-    public String getCollege() {
-        return college;
-    }
-
-    public void setCollege(String college) {
-        this.college = college;
-    }
-
-    public String getMajor() {
-        return major;
-    }
-
-    public void setMajor(String major) {
-        this.major = major;
-    }
-
-    public String getTeachClazz() {
-        return teachClazz;
-    }
-
-    public void setTeachClazz(String teachClazz) {
-        this.teachClazz = teachClazz;
-    }
-
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
     public String getTeacherName() {
         return teacherName;
     }
@@ -175,22 +79,6 @@ public class BasicExamStudentResult {
         this.teacherCode = teacherCode;
     }
 
-    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 String getExamDate() {
         return examDate;
     }
@@ -206,20 +94,4 @@ public class BasicExamStudentResult {
     public void setExamTime(String examTime) {
         this.examTime = examTime;
     }
-
-    public String getExamPlace() {
-        return examPlace;
-    }
-
-    public void setExamPlace(String examPlace) {
-        this.examPlace = examPlace;
-    }
-
-    public String getExamRoom() {
-        return examRoom;
-    }
-
-    public void setExamRoom(String examRoom) {
-        this.examRoom = examRoom;
-    }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/examTaskStudent/ExamTaskStudentObjectResult.java

@@ -1,7 +1,6 @@
 package com.qmth.distributed.print.business.bean.result.examTaskStudent;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.distributed.print.business.bean.result.BasicExamStudentResult;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
@@ -13,37 +12,25 @@ import java.util.List;
  * @Date: 2022-08-18
  */
 public class ExamTaskStudentObjectResult implements Serializable {
-    @ApiModelProperty(value = "班级id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long clazzId;
-
-    @ApiModelProperty(value = "班级名称")
-    private String clazzName;
+    @ApiModelProperty(value = "教学班")
+    private String teachClassName;
 
     @ApiModelProperty(value = "学生信息集合")
-    private List<StudentInfo> studentInfoList;
-
-    public Long getClazzId() {
-        return clazzId;
-    }
-
-    public void setClazzId(Long clazzId) {
-        this.clazzId = clazzId;
-    }
+    private List<BasicExamStudentResult> studentInfoList;
 
-    public String getClazzName() {
-        return clazzName;
+    public String getTeachClassName() {
+        return teachClassName;
     }
 
-    public void setClazzName(String clazzName) {
-        this.clazzName = clazzName;
+    public void setTeachClassName(String teachClassName) {
+        this.teachClassName = teachClassName;
     }
 
-    public List<StudentInfo> getStudentInfoList() {
+    public List<BasicExamStudentResult> getStudentInfoList() {
         return studentInfoList;
     }
 
-    public void setStudentInfoList(List<StudentInfo> studentInfoList) {
+    public void setStudentInfoList(List<BasicExamStudentResult> studentInfoList) {
         this.studentInfoList = studentInfoList;
     }
 }

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

@@ -1,116 +0,0 @@
-package com.qmth.distributed.print.business.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-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.ReviewStatusEnum;
-import com.qmth.teachcloud.common.base.BaseEntity;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 卷库修改审核临时表
- * </p>
- *
- * @author xf
- * @since 2021-03-23
- */
-@TableName("exam_task_paper_log")
-public class ExamTaskPaperLog extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 命题任务ID
-     */
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("exam_task_id")
-    private Long examTaskId;
-    /**
-     * 试卷类型，多个以”/“分隔，如A/B/C/D
-     */
-    @TableField("paper_type")
-    private String paperType;
-    /**
-     * [
-     * {
-     * "type": "A",
-     * "attachmentId": 12,
-     * "totalPages": 3
-     * },
-     * {
-     * "type": "B",
-     * "attachmentId": 13,
-     * "totalPages": 2
-     * }
-     * ]
-     */
-    @TableField("paper_attachment_ids")
-    private String paperAttachmentIds;
-    /**
-     * 题卡ID
-     */
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("card_id")
-    private Long cardId;
-
-    /**
-     * 0-禁用，1-启用
-     */
-    private Boolean review;
-    /**
-     * 审核状态：PASS-审核通过，NOT_PASS-审核不通过，默认为空-未审核
-     */
-    @TableField("review_status")
-    private ReviewStatusEnum reviewStatus;
-
-    public Long getExamTaskId() {
-        return examTaskId;
-    }
-
-    public void setExamTaskId(Long examTaskId) {
-        this.examTaskId = examTaskId;
-    }
-
-    public String getPaperType() {
-        return paperType;
-    }
-
-    public void setPaperType(String paperType) {
-        this.paperType = paperType;
-    }
-
-    public String getPaperAttachmentIds() {
-        return paperAttachmentIds;
-    }
-
-    public void setPaperAttachmentIds(String paperAttachmentIds) {
-        this.paperAttachmentIds = paperAttachmentIds;
-    }
-
-    public Long getCardId() {
-        return cardId;
-    }
-
-    public void setCardId(Long cardId) {
-        this.cardId = cardId;
-    }
-
-    public Boolean getReview() {
-        return review;
-    }
-
-    public void setReview(Boolean review) {
-        this.review = review;
-    }
-
-    public ReviewStatusEnum getReviewStatus() {
-        return reviewStatus;
-    }
-
-    public void setReviewStatus(ReviewStatusEnum reviewStatus) {
-        this.reviewStatus = reviewStatus;
-    }
-}

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

@@ -1,255 +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.TableName;
-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.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 以试卷作为起点生成考务数据
- * </p>
- *
- * @author xf
- * @since 2021-03-23
- */
-@TableName("exam_task_print")
-public class ExamTaskPrint extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("school_id")
-    private Long schoolId;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField(value = "org_id", updateStrategy = FieldStrategy.IGNORED)
-    private Long orgId;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("print_plan_id")
-    private Long printPlanId;
-
-    @TableField("course_code")
-    private String courseCode;
-
-    @TableField("course_name")
-    private String courseName;
-
-    @TableField("paper_number")
-    private String paperNumber;
-
-    @TableField("exam_start_time")
-    private Long examStartTime;
-
-    @TableField("exam_end_time")
-    private Long examEndTime;
-
-    @TableField("package_seq")
-    private String packageSeq;
-
-    @TableField("exam_place")
-    private String examPlace;
-
-    @TableField("exam_room")
-    private String examRoom;
-
-    @TableField("invigilator_teacher")
-    private String invigilatorTeacher;
-
-    @TableField("class_id")
-    private String classId;
-
-    @TableField(value = "class_name")
-    private String className;
-
-    @TableField(value = "student_count")
-    private Integer studentCount;
-
-    @TableField(value = "campus_id")
-    private String campusId;
-
-    @TableField(value = "print_house_id")
-    private String printHouseId;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("exam_detail_id")
-    private Long examDetailId;
-
-    @TableField(value = "extend_fields")
-    private String extendFields;
-
-    @TableField(value = "print_house_name")
-    private String printHouseName;
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public Long getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(Long schoolId) {
-        this.schoolId = schoolId;
-    }
-
-    public Long getOrgId() {
-        return orgId;
-    }
-
-    public void setOrgId(Long orgId) {
-        this.orgId = orgId;
-    }
-
-    public Long getPrintPlanId() {
-        return printPlanId;
-    }
-
-    public void setPrintPlanId(Long printPlanId) {
-        this.printPlanId = printPlanId;
-    }
-
-    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 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 String getPackageSeq() {
-        return packageSeq;
-    }
-
-    public void setPackageSeq(String packageSeq) {
-        this.packageSeq = packageSeq;
-    }
-
-    public String getExamPlace() {
-        return examPlace;
-    }
-
-    public void setExamPlace(String examPlace) {
-        this.examPlace = examPlace;
-    }
-
-    public String getExamRoom() {
-        return examRoom;
-    }
-
-    public void setExamRoom(String examRoom) {
-        this.examRoom = examRoom;
-    }
-
-    public String getInvigilatorTeacher() {
-        return invigilatorTeacher;
-    }
-
-    public void setInvigilatorTeacher(String invigilatorTeacher) {
-        this.invigilatorTeacher = invigilatorTeacher;
-    }
-
-    public String getClassId() {
-        return classId;
-    }
-
-    public void setClassId(String classId) {
-        this.classId = classId;
-    }
-
-    public String getClassName() {
-        return className;
-    }
-
-    public void setClassName(String className) {
-        this.className = className;
-    }
-
-    public Integer getStudentCount() {
-        return studentCount;
-    }
-
-    public void setStudentCount(Integer studentCount) {
-        this.studentCount = studentCount;
-    }
-
-    public String getCampusId() {
-        return campusId;
-    }
-
-    public void setCampusId(String campusId) {
-        this.campusId = campusId;
-    }
-
-    public String getPrintHouseId() {
-        return printHouseId;
-    }
-
-    public void setPrintHouseId(String printHouseId) {
-        this.printHouseId = printHouseId;
-    }
-
-    public Long getExamDetailId() {
-        return examDetailId;
-    }
-
-    public void setExamDetailId(Long examDetailId) {
-        this.examDetailId = examDetailId;
-    }
-
-    public String getExtendFields() {
-        return extendFields;
-    }
-
-    public void setExtendFields(String extendFields) {
-        this.extendFields = extendFields;
-    }
-
-    public String getPrintHouseName() {
-        return printHouseName;
-    }
-
-    public void setPrintHouseName(String printHouseName) {
-        this.printHouseName = printHouseName;
-    }
-}

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

@@ -1,98 +0,0 @@
-package com.qmth.distributed.print.business.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-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.ReviewStatusEnum;
-import com.qmth.teachcloud.common.base.BaseEntity;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 命题任务审核日志表
- * </p>
- *
- * @author xf
- * @since 2021-03-23
- */
-@TableName("exam_task_review_log")
-public class ExamTaskReviewLog extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 命题任务ID
-     */
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("exam_task_id")
-    private Long examTaskId;
-    /**
-     * PASS-通过，NOT_PASS-不通过
-     */
-    @TableField("review_status")
-    private ReviewStatusEnum reviewStatus;
-    /**
-     * 审核意见
-     */
-    private String reason;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("operate_id")
-    private Long operateId;
-
-    @TableField("operate_time")
-    private Long operateTime;
-
-    @TableField(exist = false)
-    private Long[] examTaskIds;
-
-    public Long getExamTaskId() {
-        return examTaskId;
-    }
-
-    public void setExamTaskId(Long examTaskId) {
-        this.examTaskId = examTaskId;
-    }
-
-    public ReviewStatusEnum getReviewStatus() {
-        return reviewStatus;
-    }
-
-    public void setReviewStatus(ReviewStatusEnum reviewStatus) {
-        this.reviewStatus = reviewStatus;
-    }
-
-    public String getReason() {
-        return reason;
-    }
-
-    public void setReason(String reason) {
-        this.reason = reason;
-    }
-
-    public Long getOperateId() {
-        return operateId;
-    }
-
-    public void setOperateId(Long operateId) {
-        this.operateId = operateId;
-    }
-
-    public Long getOperateTime() {
-        return operateTime;
-    }
-
-    public void setOperateTime(Long operateTime) {
-        this.operateTime = operateTime;
-    }
-
-    public Long[] getExamTaskIds() {
-        return examTaskIds;
-    }
-
-    public void setExamTaskIds(Long[] examTaskIds) {
-        this.examTaskIds = examTaskIds;
-    }
-}

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

@@ -1,7 +1,5 @@
 package com.qmth.distributed.print.business.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.teachcloud.common.base.BaseEntity;

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

@@ -3,6 +3,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.BasicExamStudentQuery;
 import com.qmth.distributed.print.business.bean.result.BasicExamStudentResult;
 import com.qmth.teachcloud.common.entity.BasicExamStudent;
 import com.qmth.teachcloud.common.bean.dto.DataPermissionRule;
@@ -53,4 +54,6 @@ public interface BasicExamStudentMapper extends BaseMapper<BasicExamStudent> {
      * @return 被绑定的考生字典
      */
     List<String> findBoundBasicExamStudentNames(@Param("idList") List<Long> idList);
+
+    List<BasicExamStudentResult> listByParams(@Param("query") BasicExamStudentQuery query);
 }

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

@@ -1,16 +0,0 @@
-package com.qmth.distributed.print.business.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qmth.distributed.print.business.entity.ExamTaskApplyTemp;
-
-/**
- * <p>
- * 命题任务创建临时表 Mapper 接口
- * </p>
- *
- * @author xf
- * @since 2021-09-06
- */
-public interface ExamTaskApplyTempMapper extends BaseMapper<ExamTaskApplyTemp> {
-
-}

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

@@ -1,16 +0,0 @@
-package com.qmth.distributed.print.business.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qmth.distributed.print.business.entity.ExamTaskPaperLog;
-
-/**
- * <p>
- * 卷库修改审核临时表 Mapper 接口
- * </p>
- *
- * @author xf
- * @since 2021-03-23
- */
-public interface ExamTaskPaperLogMapper extends BaseMapper<ExamTaskPaperLog> {
-
-}

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

@@ -1,22 +0,0 @@
-package com.qmth.distributed.print.business.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qmth.distributed.print.business.bean.dto.TaskPrintHouseDto;
-import com.qmth.distributed.print.business.entity.ExamTaskPrint;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 以试卷作为起点生成考务数据 Mapper 接口
- * </p>
- *
- * @author xf
- * @since 2021-08-02
- */
-public interface ExamTaskPrintMapper extends BaseMapper<ExamTaskPrint> {
-    List<TaskPrintHouseDto> listTaskPrintHouse(@Param("schoolId") Long schoolId, @Param("type") String type);
-
-    List<TaskPrintHouseDto> listTaskPrintHouseAll(@Param("schoolId") Long schoolId, @Param("type") String type);
-}

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

@@ -1,16 +0,0 @@
-package com.qmth.distributed.print.business.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qmth.distributed.print.business.entity.ExamTaskReviewLog;
-
-/**
- * <p>
- * 命题任务审核日志表 Mapper 接口
- * </p>
- *
- * @author xf
- * @since 2021-03-23
- */
-public interface ExamTaskReviewLogMapper extends BaseMapper<ExamTaskReviewLog> {
-
-}

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

@@ -2,6 +2,7 @@ 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.BasicExamStudentQuery;
 import com.qmth.distributed.print.business.bean.params.BasicExamStudentParam;
 import com.qmth.distributed.print.business.bean.result.BasicExamStudentResult;
 import com.qmth.teachcloud.common.entity.BasicExam;
@@ -92,4 +93,6 @@ public interface BasicExamStudentService extends IService<BasicExamStudent> {
     BasicExamStudent editEntityHelp(BasicExamStudentParam basicExamStudentParam, BasicExam basicExam, List<String> oldPaperNumberList, SysUser requestUser);
 
     List<BasicExamStudent> listByExamIdAndPaperNumber(Long examId, String paperNumber);
+
+    List<BasicExamStudentResult> listByParams(BasicExamStudentQuery basicExamStudentQuery);
 }

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

@@ -2,9 +2,6 @@ package com.qmth.distributed.print.business.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.distributed.print.business.bean.dto.ExamDetailCourseFieldsDto;
-import com.qmth.distributed.print.business.bean.params.SingleExamStudentAddParam;
-import com.qmth.distributed.print.business.entity.ExamDetail;
 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/service/ExamTaskApplyTempService.java

@@ -1,16 +0,0 @@
-package com.qmth.distributed.print.business.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.distributed.print.business.entity.ExamTaskApplyTemp;
-
-/**
- * <p>
- * 命题任务 服务类
- * </p>
- *
- * @author xf
- * @since 2021-03-23
- */
-public interface ExamTaskApplyTempService extends IService<ExamTaskApplyTemp> {
-    ExamTaskApplyTemp stageTaskApply(ExamTaskApplyTemp examTaskApplyTemp);
-}

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

@@ -1,17 +0,0 @@
-package com.qmth.distributed.print.business.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.distributed.print.business.entity.ExamTaskPaperLog;
-
-/**
- * <p>
- * 卷库修改审核临时表 服务类
- * </p>
- *
- * @author xf
- * @since 2021-03-23
- */
-public interface ExamTaskPaperLogService extends IService<ExamTaskPaperLog> {
-
-    ExamTaskPaperLog getByExamTaskIdAndReview(Long examTaskId, boolean review);
-}

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

@@ -1,33 +0,0 @@
-package com.qmth.distributed.print.business.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.distributed.print.business.bean.dto.TaskPrintHouseDto;
-import com.qmth.distributed.print.business.entity.ExamTaskPrint;
-import com.qmth.teachcloud.common.bean.dto.TaskPrintClassDto;
-
-import java.util.List;
-
-/**
- * <p>
- * 以试卷作为起点生成考务数据 服务类
- * </p>
- *
- * @author xf
- * @since 2021-08-02
- */
-public interface ExamTaskPrintService extends IService<ExamTaskPrint> {
-    List<TaskPrintHouseDto> listHouse();
-
-    /**
-     * 查找考场
-     * <p>
-     * 入库申请里——新建任务，需要命题老师提交试卷+考务数据的模式，课程选择范围依然是从字典里取数据，列表显示当前用户所在机构下的全部课程，
-     * 考务数据选择班级，优先查看基础信息里是否有当前用户自己在基础管理里创建的数据，如果没有选择字典
-     * 如果基础管理创建的班级数据，无命题老师想选择的，选择班级下拉列表应该有一个选项，创建班级
-     * </p>
-     *
-     * @param courseCode 课程编号
-     * @return 结果
-     */
-    List<TaskPrintClassDto> listExamTaskClass(String courseCode);
-}

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

@@ -1,16 +0,0 @@
-package com.qmth.distributed.print.business.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.distributed.print.business.entity.ExamTaskReviewLog;
-
-/**
- * <p>
- * 命题任务审核日志表 服务类
- * </p>
- *
- * @author xf
- * @since 2021-03-23
- */
-public interface ExamTaskReviewLogService extends IService<ExamTaskReviewLog> {
-
-}

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

@@ -6,12 +6,13 @@ 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.ExamTaskReApplyParam;
+import com.qmth.distributed.print.business.bean.params.ExamTaskSubmitPram;
 import com.qmth.distributed.print.business.bean.params.MakeupExamTaskTotalParam;
 import com.qmth.distributed.print.business.bean.result.WorkResult;
-import com.qmth.distributed.print.business.bean.result.examTaskStudent.ExamTaskExamStudentImportResult;
 import com.qmth.distributed.print.business.bean.result.examTaskStudent.ExamTaskStudentObjectResult;
-import com.qmth.distributed.print.business.entity.*;
-import com.qmth.distributed.print.business.enums.MakeMethodEnum;
+import com.qmth.distributed.print.business.entity.ExamDetail;
+import com.qmth.distributed.print.business.entity.ExamTask;
+import com.qmth.distributed.print.business.entity.ExamTaskDetail;
 import com.qmth.teachcloud.common.bean.dto.BlurryUserDto;
 import com.qmth.teachcloud.common.bean.tiku.TikuPaperInfo;
 import com.qmth.teachcloud.common.entity.BasicExam;
@@ -118,21 +119,12 @@ public interface ExamTaskService extends IService<ExamTask> {
 
     void removeByExamTaskId(Long examTaskId);
 
-    /**
-     * 查找题卡规则标题
-     *
-     * @param cardRuleId 题卡规则主键
-     * @return 标题名称
-     */
-    String findCardTitle(Long cardRuleId);
-
     /**
      * 新增命题申请
      *
-     * @param examTaskApplyTemp
      * @return
      */
-    Map<String, Object> submitTaskApply(ExamTaskApplyTemp examTaskApplyTemp);
+    Map<String, Object> submitTaskApply(ExamTaskSubmitPram examTaskSubmitPram);
 
     /**
      * 查找命题任务审核表
@@ -170,30 +162,7 @@ public interface ExamTaskService extends IService<ExamTask> {
 
     ExamTaskDto getByExamTaskId(Long examTaskId);
 
-    /**
-     * 查找命题任务考试对象
-     * <p>
-     * 1.选择教学班当考试对象 - TEACH_CLAZZ_STUDENT -> 以学生的教学班当考试对象集合，但学生信息中附带教学班和行政班数据。
-     * 2.选择行政班当考试对象 - BASIC_CLAZZ_STUDENT -> 以学生的行政班当考试对象集合，且学生信息只包含行政班数据。
-     * </P>
-     *
-     * @param examId      考试id
-     * @param courseId    基础课程编号
-     * @param teacher
-     * @param className
-     * @param requestUser 请求的用户
-     * @return 命题任务考试对象查询结果
-     */
-    List<ExamTaskStudentObjectResult> findExamTaskStudentObject(Long examId, Long courseId, String teacher, String className, SysUser requestUser) throws Exception;
-
-    /**
-     * 命题任务考生导入
-     *
-     * @param file        命题任务考生导入excel
-     * @param requestUser 请求用户
-     * @return 命题任务考生导入
-     */
-    List<ExamTaskExamStudentImportResult> examTaskExamStudentImport(MultipartFile file, SysUser requestUser) throws IOException, NoSuchFieldException, IllegalAccessException;
+    List<ExamTaskStudentObjectResult> findExamTaskStudentObject(Long examId, Long courseId, String teacher, String teachClassName, String className, String paperNumber) throws Exception;
 
     void delete(Long id);
 
@@ -216,4 +185,6 @@ public interface ExamTaskService extends IService<ExamTask> {
     Map<String, Object> getTikuPaperData(Long examId, Long paperId, String uuid);
 
     List<ExamDetail> matchBasicExamStudent(BasicExam basicExam, ExamTask examTask, ExamTaskDetail examTaskDetail, SysUser user);
+
+    List<TaskPrintHouseDto> listPrintHouse();
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.BasicExamStudentQuery;
 import com.qmth.distributed.print.business.bean.dto.BasicExamStudentDto;
 import com.qmth.distributed.print.business.bean.params.BasicExamStudentParam;
 import com.qmth.distributed.print.business.bean.result.BasicExamStudentResult;
@@ -387,4 +388,9 @@ public class BasicExamStudentServiceImpl extends ServiceImpl<BasicExamStudentMap
         return this.list(queryWrapper);
     }
 
+    @Override
+    public List<BasicExamStudentResult> listByParams(BasicExamStudentQuery basicExamStudentQuery) {
+        return this.baseMapper.listByParams(basicExamStudentQuery);
+    }
+
 }

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

@@ -1,38 +1,21 @@
 package com.qmth.distributed.print.business.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.params.SingleExamStudentAddParam;
-import com.qmth.distributed.print.business.entity.ExamDetail;
 import com.qmth.distributed.print.business.entity.ExamDetailCourse;
-import com.qmth.distributed.print.business.entity.ExamStudent;
-import com.qmth.distributed.print.business.entity.ExamTask;
 import com.qmth.distributed.print.business.enums.ExamDetailStatusEnum;
 import com.qmth.distributed.print.business.enums.ExamStatusEnum;
 import com.qmth.distributed.print.business.mapper.ExamDetailCourseMapper;
 import com.qmth.distributed.print.business.service.ExamDetailCourseService;
-import com.qmth.distributed.print.business.service.ExamDetailService;
-import com.qmth.distributed.print.business.service.ExamStudentService;
-import com.qmth.distributed.print.business.service.ExamTaskService;
 import com.qmth.teachcloud.common.bean.result.TbTaskDetailResult;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicCourse;
-import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.enums.mark.MarkPaperStatus;
-import com.qmth.teachcloud.common.util.ServletUtil;
-import com.qmth.teachcloud.mark.entity.MarkPaper;
-import com.qmth.teachcloud.mark.entity.MarkStudent;
-import com.qmth.teachcloud.mark.service.MarkPaperService;
-import com.qmth.teachcloud.mark.service.MarkStudentService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
 import java.util.*;
 
 /**
@@ -46,16 +29,6 @@ import java.util.*;
 @Service
 public class ExamDetailCourseServiceImpl extends ServiceImpl<ExamDetailCourseMapper, ExamDetailCourse> implements ExamDetailCourseService {
 
-    @Resource
-    private ExamStudentService examStudentService;
-    @Resource
-    private ExamDetailService examDetailService;
-    @Resource
-    private MarkStudentService markStudentService;
-    @Resource
-    private MarkPaperService markPaperService;
-    @Resource
-    private ExamTaskService examTaskService;
 
     @Override
     public List<Map<String, Object>> listClientByExamDetailIdAndStatus(Long examDetailId) {

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

@@ -1,29 +0,0 @@
-package com.qmth.distributed.print.business.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.distributed.print.business.entity.ExamTaskApplyTemp;
-import com.qmth.distributed.print.business.mapper.ExamTaskApplyTempMapper;
-import com.qmth.distributed.print.business.service.ExamTaskApplyTempService;
-import com.qmth.teachcloud.common.entity.SysUser;
-import com.qmth.teachcloud.common.util.ServletUtil;
-import org.springframework.stereotype.Service;
-
-import java.util.Objects;
-
-/**
- * @Date: 2021/9/6.
- */
-@Service
-public class ExamTaskApplyTempServiceImpl extends ServiceImpl<ExamTaskApplyTempMapper, ExamTaskApplyTemp> implements ExamTaskApplyTempService {
-    @Override
-    public ExamTaskApplyTemp stageTaskApply(ExamTaskApplyTemp examTaskApplyTemp) {
-        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        if (Objects.isNull(examTaskApplyTemp.getId())) {
-            examTaskApplyTemp.setSchoolId(schoolId);
-            examTaskApplyTemp.setOrgId(sysUser.getOrgId());
-        }
-        this.saveOrUpdate(examTaskApplyTemp);
-        return examTaskApplyTemp;
-    }
-}

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

@@ -1,27 +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.ExamTaskPaperLog;
-import com.qmth.distributed.print.business.mapper.ExamTaskPaperLogMapper;
-import com.qmth.distributed.print.business.service.ExamTaskPaperLogService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 卷库修改审核临时表 服务实现类
- * </p>
- *
- * @author xf
- * @since 2021-03-23
- */
-@Service
-public class ExamTaskPaperLogServiceImpl extends ServiceImpl<ExamTaskPaperLogMapper, ExamTaskPaperLog> implements ExamTaskPaperLogService {
-
-    @Override
-    public ExamTaskPaperLog getByExamTaskIdAndReview(Long examTaskId, boolean review) {
-        QueryWrapper<ExamTaskPaperLog> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(ExamTaskPaperLog::getExamTaskId, examTaskId).eq(ExamTaskPaperLog::getReview, review);
-        return this.getOne(queryWrapper);
-    }
-}

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

@@ -1,132 +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.dto.TaskPrintHouseDto;
-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.TaskPrintClassDto;
-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.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.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-/**
- * @Date: 2021/8/2.
- */
-@Service
-public class ExamTaskPrintServiceImpl extends ServiceImpl<ExamTaskPrintMapper, ExamTaskPrint> implements ExamTaskPrintService {
-
-    @Resource
-    private BasicStudentService basicStudentService;
-
-    @Resource
-    private ExamDetailService examDetailService;
-
-    @Resource
-    private ExamDetailCourseService examDetailCourseService;
-
-    @Resource
-    private ExamStudentService examStudentService;
-
-    @Resource
-    private ExamPrintPlanService examPrintPlanService;
-
-    @Resource
-    private BasicExamRuleService basicExamRuleService;
-
-    @Resource
-    private BasicUserCourseService basicUserCourseService;
-
-    @Resource
-    TBTaskService tbTaskService;
-
-    @Resource
-    @Lazy
-    PrintCommonService printCommonService;
-
-    @Resource
-    BasicClazzService basicClazzService;
-
-    @Resource
-    RedisUtil redisUtil;
-
-    @Resource
-    private TeachCourseService teachCourseService;
-
-    @Resource
-    private TeachClazzService teachClazzService;
-
-    @Resource
-    private TeachStudentService teachStudentService;
-
-    @Resource
-    private BasicCourseService basicCourseService;
-
-    @Override
-    public List<TaskPrintHouseDto> listHouse() {
-        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        List<TaskPrintHouseDto> houseDtos = this.baseMapper.listTaskPrintHouse(schoolId, OrgTypeEnum.PRINTING_HOUSE.name());
-        return houseDtos;
-    }
-
-    @Override
-    public List<TaskPrintClassDto> listExamTaskClass(String courseCode) {
-        SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
-        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        List<TaskPrintClassDto> taskPrintClassDtos = new ArrayList<>();
-//        BasicCourse basicCourse = basicCourseService.findByCourseCode(courseCode, schoolId);
-//        // 1.判断教学表中是否有数据
-//        List<TeachCourse> teachCourseDatasource = teachCourseService.list(new QueryWrapper<TeachCourse>().lambda()
-//                .eq(TeachCourse::getSchoolId, schoolId)
-//                .eq(TeachCourse::getUserId, requestUser.getId()));
-//        if (teachCourseDatasource != null && teachCourseDatasource.size() > 0) {
-//            // 如果该用户创建了任意教学课程，则走教学课程查询逻辑
-//            List<TeachCourse> teachCourseList = teachCourseDatasource.stream().filter(e -> basicCourseService.getById(e.getBasicCourseId()).getCode().equals(courseCode)).collect(Collectors.toList());
-//            if (teachCourseList.size() > 1) {
-//                throw ExceptionResultEnum.ERROR.exception("基础信息管理中[" + basicCourse.getName() + "]教学课程信息存在多条数据异常");
-//            }
-//            if (teachCourseList.size() == 0) {
-//                // 没创建该教学课程
-//                throw ExceptionResultEnum.ERROR.exception("请优先在基础信息管理中创建[" + basicCourse.getName() + "]的教学课程信息");
-//            }
-//            TeachCourse teachCourse = teachCourseList.get(0);
-//            List<TeachClazz> teachClazzList = teachClazzService.list(new QueryWrapper<TeachClazz>().lambda().in(TeachClazz::getBasicCourseId, teachCourse.getBasicCourseId()));
-//            for (TeachClazz teachClazz : teachClazzList) {
-//                TaskPrintClassDto dto = new TaskPrintClassDto();
-//                dto.setClassId(String.valueOf(teachClazz.getId()));
-//                dto.setTeachBasicEnum(TeachBasicEnum.TEACH_CLAZZ);
-//                dto.setClassName(teachClazz.getTeachClazzName());
-//                dto.setStudentCount(teachStudentService.count(new QueryWrapper<TeachStudent>().lambda().eq(TeachStudent::getTeachClazzId, teachClazz.getId())));
-//                taskPrintClassDtos.add(dto);
-//            }
-//        } else {
-//            List<BasicUserCourse> courseList = basicUserCourseService.listBySchoolIdAndCourseCode(schoolId, courseCode);
-//            Set<String> stringList = courseList.stream().map(m -> String.valueOf(m.getClazzId())).collect(Collectors.toSet());
-//
-//            if (!CollectionUtils.isEmpty(stringList)) {
-//                taskPrintClassDtos = basicStudentService.listByClass(schoolId, stringList);
-//            }
-//        }
-        return taskPrintClassDtos;
-    }
-
-}

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

@@ -1,20 +0,0 @@
-package com.qmth.distributed.print.business.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.distributed.print.business.entity.ExamTaskReviewLog;
-import com.qmth.distributed.print.business.mapper.ExamTaskReviewLogMapper;
-import com.qmth.distributed.print.business.service.ExamTaskReviewLogService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 命题任务审核日志表 服务实现类
- * </p>
- *
- * @author xf
- * @since 2021-03-23
- */
-@Service
-public class ExamTaskReviewLogServiceImpl extends ServiceImpl<ExamTaskReviewLogMapper, ExamTaskReviewLog> implements ExamTaskReviewLogService {
-
-}

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

@@ -10,15 +10,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import com.google.gson.Gson;
+import com.qmth.distributed.print.business.bean.BasicExamStudentQuery;
 import com.qmth.distributed.print.business.bean.dto.*;
 import com.qmth.distributed.print.business.bean.dto.approvalForm.*;
 import com.qmth.distributed.print.business.bean.dto.examObject.ExamObjectDto;
-import com.qmth.distributed.print.business.bean.dto.excel.ExamStudentImportDto;
 import com.qmth.distributed.print.business.bean.params.*;
+import com.qmth.distributed.print.business.bean.result.BasicExamStudentResult;
 import com.qmth.distributed.print.business.bean.result.WorkResult;
-import com.qmth.distributed.print.business.bean.result.examTaskStudent.ExamTaskExamStudentImportResult;
 import com.qmth.distributed.print.business.bean.result.examTaskStudent.ExamTaskStudentObjectResult;
-import com.qmth.distributed.print.business.bean.result.examTaskStudent.StudentInfo;
 import com.qmth.distributed.print.business.entity.*;
 import com.qmth.distributed.print.business.enums.*;
 import com.qmth.distributed.print.business.mapper.ExamTaskMapper;
@@ -29,9 +28,6 @@ import com.qmth.distributed.print.business.util.pdf.CreatePdfNewUtil;
 import com.qmth.teachcloud.common.bean.dto.AssignTeacherDto;
 import com.qmth.teachcloud.common.bean.dto.BlurryUserDto;
 import com.qmth.teachcloud.common.bean.dto.DataPermissionRule;
-import com.qmth.teachcloud.common.bean.dto.excel.DescribeImportDto;
-import com.qmth.teachcloud.common.bean.params.BasicStudentExtrasParam;
-import com.qmth.teachcloud.common.bean.result.BasicExamStudentResult;
 import com.qmth.teachcloud.common.bean.result.SysUserResult;
 import com.qmth.teachcloud.common.bean.result.TbTaskDetailResult;
 import com.qmth.teachcloud.common.bean.tiku.TikuPaperInfo;
@@ -92,8 +88,6 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
     @Resource
     private ExamTaskTempService examTaskTempService;
     @Resource
-    private ExamTaskReviewLogService examTaskReviewLogService;
-    @Resource
     private ExamTaskDetailService examTaskDetailService;
     @Resource
     private BasicAttachmentService basicAttachmentService;
@@ -117,8 +111,6 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
     @Resource
     private TBTaskPdfService tbTaskPdfService;
     @Resource
-    private ExamTaskPaperLogService examTaskPaperLogService;
-    @Resource
     AsyncPaperReviewPdfExportService asyncPaperReviewPdfExportService;
     @Resource
     TeachcloudCommonService teachcloudCommonService;
@@ -895,7 +887,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                 if (Objects.nonNull(attachmentId)) {
                     BasicAttachment attachment = basicAttachmentService.getById(attachmentId);
                     Optional.ofNullable(attachment).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("附件数据异常"));
-                    String fileName = dirPath + "试卷" + SystemConstant.HYPHEN + name  + attachment.getType();
+                    String fileName = dirPath + "试卷" + SystemConstant.HYPHEN + name + attachment.getType();
                     fileUploadService.downloadFile(attachment, fileName);
                 }
 
@@ -1129,37 +1121,23 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         }
     }
 
-    @Override
-    public String findCardTitle(Long cardRuleId) {
-        String title = "通用题卡";
-        if (-1L != cardRuleId) {
-            BasicCardRule basicCardRule = basicCardRuleService.getById(cardRuleId);
-            if (Objects.isNull(basicCardRule)) {
-                throw ExceptionResultEnum.ERROR.exception("未找到题卡规则id");
-            }
-            title = basicCardRule.getTitleRule();
-            // TODO: 2021/8/16 title中的动态变量替换规则
-        }
-        return title;
-    }
-
     @Transactional
     @Override
-    public Map<String, Object> submitTaskApply(ExamTaskApplyTemp examTaskApplyTemp) {
+    public Map<String, Object> submitTaskApply(ExamTaskSubmitPram examTaskSubmitPram) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
 
-        JSONObject jsonObject = JSONObject.parseObject(examTaskApplyTemp.getExamTaskContent());
+        JSONObject jsonObject = JSONObject.parseObject(examTaskSubmitPram.getExamTaskContent());
         // 新建命题任务
         ExamTask examTask = JSONObject.parseObject(String.valueOf(jsonObject.get("examTask")), ExamTask.class);
         BasicPrintConfig basicPrintConfig = basicPrintConfigService.getByExamId(examTask.getExamId());
 
         if (basicPrintConfig.getReview()) {
-            Long customFlowId = examTaskApplyTemp.getCustomFlowId();
+            Long customFlowId = examTaskSubmitPram.getCustomFlowId();
             Optional.ofNullable(customFlowId).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("自定义流程ID为空"));
 
-            if (Objects.nonNull(examTaskApplyTemp.getVersion())) {
-                Integer version = examTaskApplyTemp.getVersion();
+            if (Objects.nonNull(examTaskSubmitPram.getVersion())) {
+                Integer version = examTaskSubmitPram.getVersion();
                 Optional.ofNullable(version).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("自定义流程版本号为空"));
 
                 TFCustomFlow tfCustomFlow = tfCustomFlowService.getById(customFlowId);
@@ -1472,7 +1450,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                     map.computeIfAbsent(SystemConstant.FLOW_TASK_ID, v -> task.getId());
                     map.computeIfAbsent(SystemConstant.APPROVE_OPERATION, v -> FlowApprovePassEnum.PASS);
                     map.computeIfAbsent(SystemConstant.PAPAER_ATTACHMENT_IDS, v -> examTaskDetail.getPaperAttachmentIds());
-                    map.computeIfAbsent(SystemConstant.APPROVE_USER_IDS, v -> examTaskApplyTemp.getApproveUserIds());
+                    map.computeIfAbsent(SystemConstant.APPROVE_USER_IDS, v -> examTaskSubmitPram.getApproveUserIds());
                     activitiService.taskApprove(map);
                     mapVar.putAll(map);
                     mapVar.remove(SystemConstant.SEND_FLOW_START_MQ);
@@ -1651,234 +1629,42 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public List<ExamTaskStudentObjectResult> findExamTaskStudentObject(Long examId, Long courseId, String teacher, String className, SysUser requestUser) {
-        Long schoolId = requestUser.getSchoolId();
+    public List<ExamTaskStudentObjectResult> findExamTaskStudentObject(Long examId, Long courseId, String teacher, String teachClassName, String className, String paperNumber) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         List<ExamTaskStudentObjectResult> result = new ArrayList<>();
         // 基础班级对象
-        List<BasicExamStudentResult> basicStudentResultList = basicStudentService.basicStudentList(schoolId, examId, courseId, teacher, className, null);
+        BasicExamStudentQuery basicExamStudentQuery = new BasicExamStudentQuery();
+        basicExamStudentQuery.setSchoolId(schoolId);
+        basicExamStudentQuery.setExamId(examId);
+        basicExamStudentQuery.setCourseId(courseId);
+        basicExamStudentQuery.setTeacherName(teacher);
+        basicExamStudentQuery.setTeachClassName(teachClassName);
+        basicExamStudentQuery.setTeachClassName(className);
+        basicExamStudentQuery.setPaperNumber(paperNumber);
+        List<BasicExamStudentResult> basicStudentResultList = basicExamStudentService.listByParams(basicExamStudentQuery);
         if (!CollectionUtils.isEmpty(basicStudentResultList)) {
-            LinkedMultiValueMap<Long, StudentInfo> studentInfoLinkedMultiValueMap = new LinkedMultiValueMap<>();
-            Map<Long, ExamTaskStudentObjectResult> examTaskStudentObjectResultMap = new LinkedHashMap<>();
+            LinkedMultiValueMap<String, BasicExamStudentResult> studentInfoLinkedMultiValueMap = new LinkedMultiValueMap<>();
+            Map<String, ExamTaskStudentObjectResult> examTaskStudentObjectResultMap = new LinkedHashMap<>();
             for (BasicExamStudentResult e : basicStudentResultList) {
+                String studentTeachClassName = StringUtils.isNotBlank(e.getTeachClassName()) ? e.getTeachClassName() : "空";
                 // 没有班级的考生，不返回
-                if (StringUtils.isBlank(e.getClazz())) {
-                    continue;
-                }
-                StudentInfo studentInfo = new StudentInfo();
-                studentInfo.setStudentId(e.getId());
-                studentInfo.setStudentCode(e.getStudentCode());
-                studentInfo.setStudentName(e.getStudentName());
-                studentInfo.setCollegeName(e.getCollegeName());
-                studentInfo.setMajorName(e.getMajorName());
-                studentInfo.setBasicClazzId(e.getClazzId());
-                studentInfo.setBasicClazzName(e.getClazz());
-                studentInfoLinkedMultiValueMap.add(e.getClazzId(), studentInfo);
-
-                ExamTaskStudentObjectResult examTaskStudentObjectResult = null;
-                if (!examTaskStudentObjectResultMap.containsKey(e.getClazzId())) {
+                studentInfoLinkedMultiValueMap.add(studentTeachClassName, e);
+
+                ExamTaskStudentObjectResult examTaskStudentObjectResult;
+                if (!examTaskStudentObjectResultMap.containsKey(studentTeachClassName)) {
                     examTaskStudentObjectResult = new ExamTaskStudentObjectResult();
-                    examTaskStudentObjectResult.setClazzId(e.getClazzId());
-                    examTaskStudentObjectResult.setClazzName(e.getClazz());
+                    examTaskStudentObjectResult.setTeachClassName(studentTeachClassName);
                 } else {
-                    examTaskStudentObjectResult = examTaskStudentObjectResultMap.get(e.getClazzId());
+                    examTaskStudentObjectResult = examTaskStudentObjectResultMap.get(studentTeachClassName);
                 }
-                examTaskStudentObjectResult.setStudentInfoList(studentInfoLinkedMultiValueMap.get(e.getClazzId()));
-                examTaskStudentObjectResultMap.put(e.getClazzId(), examTaskStudentObjectResult);
+                examTaskStudentObjectResult.setStudentInfoList(studentInfoLinkedMultiValueMap.get(studentTeachClassName));
+                examTaskStudentObjectResultMap.put(studentTeachClassName, examTaskStudentObjectResult);
             }
             result.addAll(examTaskStudentObjectResultMap.values());
         }
         return result;
     }
 
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public List<ExamTaskExamStudentImportResult> examTaskExamStudentImport(MultipartFile file, SysUser requestUser) throws IOException, NoSuchFieldException, IllegalAccessException {
-        if (Objects.isNull(file)) {
-            throw ExceptionResultEnum.ERROR.exception("缺少导入文件");
-        }
-        // excel 读取和检验
-        List<ExamStudentImportDto> examStudentImportDtoList = new ArrayList<>();
-        List<LinkedMultiValueMap<Integer, Object>> finalList = ExcelUtil.excelReader(file.getInputStream(), Lists.newArrayList(ExamStudentImportDto.class, DescribeImportDto.class), (finalExcelList, finalColumnNameList, finalExcelErrorList) -> {
-            List<ExcelError> excelErrorTemp = new ArrayList<>();
-            Map<String, String> checkCodeMap = new HashMap<>();
-            Map<String, String> checkPhoneMap = new HashMap<>();
-            for (int i = 0; i < finalExcelList.size(); i++) {
-                LinkedMultiValueMap<Integer, Object> excelMap = finalExcelList.get(i);
-                List<Object> examStudentImportDtoDatasource = excelMap.get(i);
-                assert examStudentImportDtoDatasource != null;
-                if (examStudentImportDtoDatasource.get(0) instanceof DescribeImportDto) {
-                    continue;
-                }
-                for (int y = 0; y < Objects.requireNonNull(examStudentImportDtoDatasource).size(); y++) {
-                    ExamStudentImportDto examStudentImportDto = (ExamStudentImportDto) examStudentImportDtoDatasource.get(y);
-                    String studentName = examStudentImportDto.getStudentName();
-                    String studentCode = examStudentImportDto.getStudentCode();
-                    String phoneNumber = examStudentImportDto.getPhoneNumber();
-                    String clazzName = examStudentImportDto.getClazzName();
-                    String examPlace = examStudentImportDto.getExamPlace();
-                    String examRoom = examStudentImportDto.getExamRoom();
-                    examStudentImportDtoList.add(examStudentImportDto);
-
-
-                    // 检验excel中
-                    // 检验学号
-                    if (SystemConstant.strNotNull(studentCode)) {
-                        if (checkCodeMap.containsKey(studentCode)) {
-                            throw ExceptionResultEnum.ERROR.exception("导入的excel中包含在重复的学生编号[" + studentCode + "]");
-                        } else {
-                            checkCodeMap.put(studentCode, studentName);
-                        }
-                    }
-                    // 如果电话有值则检验电话excel中唯一性
-                    if (SystemConstant.strNotNull(phoneNumber)) {
-                        if (checkPhoneMap.containsKey(phoneNumber)) {
-                            throw ExceptionResultEnum.ERROR.exception("导入的excel中包含在重复的电话号码[" + phoneNumber + "]");
-                        } else {
-                            checkPhoneMap.put(phoneNumber, studentCode);
-                        }
-                    }
-
-                    excelErrorTemp.addAll(ExcelUtil.checkExcelField(examStudentImportDto, y, i));
-                    if (Objects.nonNull(studentCode) && !studentCode.matches(SystemConstant.REGULAR_EXPRESSION_OF_CODE)) {
-                        excelErrorTemp.add(new ExcelError(y + 1, "excel第" + (i + 1) + "个sheet第" + (y + 1) + "行[学号]不符合输入规范"));
-                    }
-                    if (Objects.nonNull(phoneNumber) && !phoneNumber.matches(SystemConstant.REGULAR_EXPRESSION_OF_PHONE)) {
-                        excelErrorTemp.add(new ExcelError(y + 1, "excel第" + (i + 1) + "个sheet第" + (y + 1) + "行[电话号码]不符合输入规范"));
-                    }
-                }
-            }
-            if (excelErrorTemp.size() > 0) {
-                List<String> errors = excelErrorTemp.stream().map(ExcelError::getExcelErrorType).collect(Collectors.toList());
-                throw ExceptionResultEnum.ERROR.exception(JSONObject.toJSONString(errors));
-            }
-            return finalExcelList;
-        }, 2);
-        // 校验已经有的考生所在部门的信息是否正确
-        // 导入的excel创建或查询的学生集合
-        List<BasicExamStudentResult> studentDatasource = basicStudentService.basicStudentList(requestUser.getSchoolId(), null, null, null, null, null);
-
-        List<ExamStudentImportDto> existStudentList = examStudentImportDtoList
-                .stream()
-                .filter(e -> studentDatasource.stream().map(BasicExamStudentResult::getStudentCode).collect(Collectors.toList()).contains(e.getStudentCode()))
-                .collect(Collectors.toList());
-        for (ExamStudentImportDto examStudentImportDto : existStudentList) {
-            String studentName = examStudentImportDto.getStudentName();
-            String studentCode = examStudentImportDto.getStudentCode();
-            String impCollegeName = examStudentImportDto.getCollegeName();
-            String impMajorName = examStudentImportDto.getMajorName();
-            String impClazzName = examStudentImportDto.getClazzName();
-
-
-            List<BasicExamStudentResult> basicStudentList = studentDatasource.stream().filter(e -> e.getStudentCode().equals(studentCode)).collect(Collectors.toList());
-            if (basicStudentList.size() != 1) {
-                throw ExceptionResultEnum.ERROR.exception("学号为：" + studentCode + "的考生数据异常");
-            }
-            BasicExamStudentResult basicStudent = basicStudentList.get(0);
-
-            String realityCollegeName = basicStudent.getCollegeName();
-            String realityMajorName = basicStudent.getMajorName();
-            String realityClazzName = basicStudent.getClazz();
-
-            // 学院核对
-            if (!impCollegeName.equals(realityCollegeName)) {
-                throw ExceptionResultEnum.ERROR.exception("导入的考生[" + studentName + "(" + studentCode + ")]所在学院[" + impCollegeName +
-                        "]与该考生实际所在学院[" + realityCollegeName + "]不符，请检验excel数据是否异常或联系管理员核对");
-            }
-
-            // 专业核对
-            if (!impMajorName.equals(realityMajorName)) {
-                throw ExceptionResultEnum.ERROR.exception("导入的考生[" + studentName + "(" + studentCode + ")]所在专业[" + impMajorName +
-                        "]与该考生实际所在专业[" + realityMajorName + "]不符，请检验excel数据是否异常或联系管理员核对");
-            }
-
-            // 班级核对
-            if (!impClazzName.equals(realityClazzName)) {
-                throw ExceptionResultEnum.ERROR.exception("导入的考生[" + studentName + "(" + studentCode + ")]所在班级[" + impClazzName +
-                        "]与该考生实际所在班级[" + realityClazzName + "]不符，请检验excel数据是否异常或联系管理员核对");
-            }
-        }
-        // 去掉已存在的学生集合
-        List<ExamStudentImportDto> willAddStudentList = new ArrayList<>(examStudentImportDtoList);
-        willAddStudentList.removeAll(existStudentList);
-
-        // 创建基础学生信息
-        List<BasicStudentExtrasParam> basicStudentExtrasParamList = willAddStudentList.stream().flatMap(e -> {
-            BasicStudentExtrasParam basicStudentExtrasParam = new BasicStudentExtrasParam();
-            basicStudentExtrasParam.setStudentName(e.getStudentName());
-            basicStudentExtrasParam.setStudentCode(e.getStudentCode());
-            basicStudentExtrasParam.setPhoneNumber(e.getPhoneNumber());
-            basicStudentExtrasParam.setCollegeName(e.getCollegeName());
-            basicStudentExtrasParam.setMajorName(e.getMajorName());
-            basicStudentExtrasParam.setClazzName(e.getClazzName());
-            return Stream.of(basicStudentExtrasParam);
-        }).collect(Collectors.toList());
-        basicStudentService.saveBasicStudentWithExtrasList(basicStudentExtrasParamList, requestUser, false, null);
-
-
-        // 考生信息回溯
-        List<ExamTaskExamStudentImportResult> result = new ArrayList<>();
-
-        List<String> studentCodeDatasource = examStudentImportDtoList.stream().map(ExamStudentImportDto::getStudentCode).distinct().collect(Collectors.toList());
-        // 导入的excel创建或查询的学生集合
-        List<BasicExamStudentResult> basicStudentResultDatasource = basicStudentService.basicStudentList(requestUser.getSchoolId(), null, null, null, null, studentCodeDatasource);
-
-        // 考试对象键(考点、考场)
-        List<Map<String, String>> examObjectKeyList = examStudentImportDtoList.stream().flatMap(e -> {
-            Map<String, String> key = new HashMap<>();
-            key.put("examPlace", e.getExamPlace());
-            key.put("examRoom", e.getExamRoom());
-            return Stream.of(key);
-        }).distinct().collect(Collectors.toList());
-
-        for (Map<String, String> key : examObjectKeyList) {
-            // 考点
-            String examPlace = key.get("examPlace");
-            // 考场
-            String examRoom = key.get("examRoom");
-
-            // 该考试对象考生考号集合
-            List<String> studentCodeList = examStudentImportDtoList.stream()
-                    .filter(e -> examPlace.equals(e.getExamPlace()) && examRoom.equals(e.getExamRoom()))
-                    .map(ExamStudentImportDto::getStudentCode)
-                    .distinct()
-                    .collect(Collectors.toList());
-
-            List<ExamTaskStudentObjectResult> examTaskStudentObjectResultList = new ArrayList<>();
-            List<BasicExamStudentResult> basicStudentResultList = basicStudentResultDatasource.stream().filter(e -> studentCodeList.contains(e.getStudentCode())).collect(Collectors.toList());
-            List<Long> basicClazzIdList = basicStudentResultList.stream().map(BasicExamStudentResult::getClazzId).distinct().collect(Collectors.toList());
-            for (Long basicClazzId : basicClazzIdList) {
-                List<BasicExamStudentResult> basicStudentClazzList = basicStudentResultList.stream()
-                        .filter(e -> basicClazzId.equals(e.getClazzId())).collect(Collectors.toList());
-                List<StudentInfo> studentInfoList = basicStudentClazzList.stream().flatMap(e -> {
-                    StudentInfo studentInfo = new StudentInfo();
-                    studentInfo.setStudentId(e.getId());
-                    studentInfo.setStudentCode(e.getStudentCode());
-                    studentInfo.setStudentName(e.getStudentName());
-                    studentInfo.setCollegeName(e.getCollegeName());
-                    studentInfo.setMajorName(e.getMajorName());
-                    studentInfo.setBasicClazzId(e.getClazzId());
-                    studentInfo.setBasicClazzName(e.getClazz());
-                    return Stream.of(studentInfo);
-                }).collect(Collectors.toList());
-                ExamTaskStudentObjectResult examTaskStudentObjectResult = new ExamTaskStudentObjectResult();
-                examTaskStudentObjectResult.setClazzId(basicClazzId);
-                examTaskStudentObjectResult.setClazzName(basicClazzService.getById(basicClazzId).getClazzName());
-                examTaskStudentObjectResult.setStudentInfoList(studentInfoList);
-                examTaskStudentObjectResultList.add(examTaskStudentObjectResult);
-            }
-
-
-            ExamTaskExamStudentImportResult examTaskExamStudentImportResult = new ExamTaskExamStudentImportResult();
-            examTaskExamStudentImportResult.setExamRoom(examRoom);
-            if (SystemConstant.strNotNull(examPlace)) {
-                examTaskExamStudentImportResult.setExamPlace(examPlace);
-            }
-            examTaskExamStudentImportResult.setExamTaskStudentObjectResultList(examTaskStudentObjectResultList);
-            result.add(examTaskExamStudentImportResult);
-        }
-        return result;
-    }
-
     @Override
     public void delete(Long id) {
         // 命题任务生成，命题老师未提交前允许删除
@@ -2244,6 +2030,21 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         return examDetailList;
     }
 
+    @Override
+    public List<TaskPrintHouseDto> listPrintHouse() {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+        QueryWrapper<SysOrg> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(SysOrg::getSchoolId, schoolId)
+                .eq(SysOrg::getType, OrgTypeEnum.PRINTING_HOUSE);
+        List<SysOrg> sysOrgList = sysOrgService.list(queryWrapper);
+        return sysOrgList.stream().map(m -> {
+            TaskPrintHouseDto taskPrintHouseDto = new TaskPrintHouseDto();
+            taskPrintHouseDto.setPrintHouseId(m.getId());
+            taskPrintHouseDto.setPrintHouseName(m.getName());
+            return taskPrintHouseDto;
+        }).collect(Collectors.toList());
+    }
+
     private ExamTaskPaperData saveTikuPaperData(Long examId, Long paperId, String uuid, File zipFile) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         String zipDestPath = null;

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

@@ -19,13 +19,15 @@ import com.qmth.distributed.print.business.enums.ClazzContentEnum;
 import com.qmth.distributed.print.business.enums.ExamDetailStatusEnum;
 import com.qmth.distributed.print.business.enums.StatisticsStatusEnum;
 import com.qmth.distributed.print.business.mapper.TCStatisticsMapper;
-import com.qmth.distributed.print.business.service.*;
+import com.qmth.distributed.print.business.service.ExamDetailService;
+import com.qmth.distributed.print.business.service.ExamStudentService;
+import com.qmth.distributed.print.business.service.TCStatisticsService;
+import com.qmth.distributed.print.business.service.TCStatisticsTempService;
 import com.qmth.teachcloud.common.contant.SpringContextHolder;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysOrg;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.service.BasicStudentService;
 import com.qmth.teachcloud.common.service.SysOrgService;
 import com.qmth.teachcloud.common.util.JacksonUtil;
 import com.qmth.teachcloud.common.util.RedisUtil;
@@ -61,13 +63,6 @@ public class TCStatisticsServiceImpl extends ServiceImpl<TCStatisticsMapper, TCS
 
     @Resource
     RedisUtil redisUtil;
-
-    @Resource
-    TeachStudentService teachStudentService;
-
-    @Resource
-    BasicStudentService basicStudentService;
-
     @Resource
     ExamDetailService examDetailService;
 

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

@@ -83,8 +83,6 @@ public class PdfTaskLogicServiceImpl implements PdfTaskLogicService {
     ExamDetailCourseService examDetailCourseService;
     @Autowired
     BasicStudentService basicStudentService;
-    @Autowired
-    ExamTaskPrintService examTaskPrintService;
     @Resource
     BasicExamService basicExamService;
     @Resource

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

@@ -158,4 +158,46 @@
             </if>
         </where>
     </select>
+    <select id="listByParams"
+            resultType="com.qmth.distributed.print.business.bean.result.BasicExamStudentResult">
+        SELECT
+            stu.*,
+            bc.code courseCode,
+            bc.name courseName,
+            su.login_name teacherCode,
+            su.real_name teacherName
+        FROM
+            basic_exam_student stu
+        LEFT JOIN
+            basic_course bc ON stu.course_id = bc.id
+        LEFT JOIN
+            sys_user su ON stu.teacher_id = su.id
+        <where>
+            <if test="query.schoolId != null">
+                and stu.school_id = #{query.schoolId}
+            </if>
+            <if test="query.semesterId != null">
+                and stu.semester_id = #{query.semesterId}
+            </if>
+            <if test="query.examId != null">
+                and stu.exam_id = #{query.examId}
+            </if>
+            <if test="query.courseId != null">
+                and stu.course_id = #{query.courseId}
+            </if>
+            <if test="query.teacherName != null and query.teacherName != ''">
+                and (su.login_name like concat('%', #{query.teacherName}, '%') or su.real_name like concat('%', #{query.teacherName}, '%'))
+            </if>
+            <if test="query.teachClassName != null and query.teachClassName != ''">
+                and stu.teach_class_name like concat('%', #{teachClassName}, '%')
+            </if>
+            <if test="query.className != null and query.className != ''">
+                and stu.class_name like concat('%', #{query.className}, '%')
+            </if>
+            <if test="query.paperNumber != null and query.paperNumber != ''">
+                and stu.paper_number like concat('%', #{paperNumber}, '%')
+            </if>
+        </where>
+        ORDER BY stu.student_code
+    </select>
 </mapper>

distributed-print-business/src/main/resources/mapper/ExamTaskApplyTempMapper.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.ExamTaskApplyTempMapper">
-</mapper>

distributed-print-business/src/main/resources/mapper/ExamTaskPaperLogMapper.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.ExamTaskPaperLogMapper">
-</mapper>

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

@@ -1,25 +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.ExamTaskPrintMapper">
-    <select id="listTaskPrintHouse"
-            resultType="com.qmth.distributed.print.business.bean.dto.TaskPrintHouseDto">
-        SELECT distinct
-            o.id printHouseId,
-            o.name printHouseName
-        FROM
-            sys_org o
-        WHERE
-            o.school_id = #{schoolId} AND o.type = #{type}
-    </select>
-    <select id="listTaskPrintHouseAll"
-            resultType="com.qmth.distributed.print.business.bean.dto.TaskPrintHouseDto">
-        SELECT
-            o.id houseId,
-            o.name houseName
-        FROM
-            sys_org o
-        WHERE
-            o.school_id = #{schoolId} AND o.type = #{type}
-        ORDER BY o.name
-    </select>
-</mapper>

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

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.qmth.distributed.print.business.mapper.ExamTaskReviewLogMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.qmth.distributed.print.business.entity.ExamTaskReviewLog">
-    <result column="id" property="id" />
-        <result column="exam_task_id" property="examTaskId" />
-        <result column="review_status" property="reviewStatus" />
-        <result column="reason" property="reason" />
-        <result column="operate_id" property="operateId" />
-        <result column="operate_time" property="operateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,
-        exam_task_id, review_status, reason, operate_id, operate_time
-    </sql>
-</mapper>

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

@@ -92,6 +92,7 @@ update mark_paper_package a left join basic_exam be on a.exam_id = be.id left jo
 
 ALTER TABLE `exam_print_plan` DROP COLUMN `third_relate_name`, DROP COLUMN `third_relate_id`;
 ALTER TABLE `exam_student` DROP COLUMN `can_delete`;
+ALTER TABLE `basic_exam_student` ADD COLUMN `teach_class_name` VARCHAR(100) NULL AFTER `major`, ADD COLUMN `class_name` VARCHAR(100) NULL AFTER `teach_class_name`;
 
 -- drop table if exists exam_detail_course_paper_type;
 -- drop table if exists basic_template_org;

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

@@ -6,7 +6,6 @@ import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.bean.params.ExamCardParams;
 import com.qmth.distributed.print.business.bean.params.GenericExamCardParams;
 import com.qmth.distributed.print.business.entity.ExamCard;
-import com.qmth.distributed.print.business.service.BasicPrintConfigService;
 import com.qmth.distributed.print.business.service.ExamCardService;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.contant.SystemConstant;

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

@@ -1,7 +1,6 @@
 package com.qmth.distributed.print.api;
 
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.distributed.print.business.bean.params.SingleExamStudentAddParam;
 import com.qmth.distributed.print.business.bean.result.EditResult;
 import com.qmth.distributed.print.business.service.ExamDetailCourseService;
 import com.qmth.distributed.print.business.service.ExamDetailService;
@@ -22,7 +21,10 @@ import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import io.swagger.annotations.*;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;

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

@@ -3,12 +3,15 @@ package com.qmth.distributed.print.api;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.bean.dto.ExamTaskDetailCardDto;
 import com.qmth.distributed.print.business.bean.params.ApproveFormParams;
+import com.qmth.distributed.print.business.bean.params.ExamTaskSubmitPram;
 import com.qmth.distributed.print.business.entity.ExamTask;
-import com.qmth.distributed.print.business.entity.ExamTaskApplyTemp;
 import com.qmth.distributed.print.business.entity.ExamTaskDetail;
 import com.qmth.distributed.print.business.entity.TFFlowJoin;
 import com.qmth.distributed.print.business.enums.ExamStatusEnum;
-import com.qmth.distributed.print.business.service.*;
+import com.qmth.distributed.print.business.service.ActivitiService;
+import com.qmth.distributed.print.business.service.ExamTaskService;
+import com.qmth.distributed.print.business.service.PrintCommonService;
+import com.qmth.distributed.print.business.service.TFFlowJoinService;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
@@ -24,7 +27,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
@@ -55,8 +57,6 @@ public class ExamTaskApplyController {
     @Resource
     private PrintCommonService printCommonService;
     @Resource
-    private ExamTaskPrintService examTaskPrintService;
-    @Resource
     private TaskService taskService;
     @Resource
     private ActivitiService activitiService;
@@ -76,6 +76,9 @@ public class ExamTaskApplyController {
                                 @ApiParam(value = "命题时间（结束）") @RequestParam(value = "endTime", required = false) Long endTime,
                                 @ApiParam(value = "分页参数") @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
                                 @ApiParam(value = "分页参数") @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
+        if (semesterId == null) {
+            throw ExceptionResultEnum.SEMESTER_ID_IS_NULL.exception();
+        }
         if (examId == null) {
             throw ExceptionResultEnum.EXAM_ID_IS_NULL.exception();
         }
@@ -180,8 +183,8 @@ public class ExamTaskApplyController {
     @ApiOperation(value = "入库申请-新建任务-保存")
     @RequestMapping(value = "/submit_task_apply", method = RequestMethod.POST)
     @OperationLogDetail(operationType = OperationTypeEnum.ADD, detail = "入库申请新增了一条命题数据")
-    public Result submitTaskApply(@RequestBody ExamTaskApplyTemp examTaskApplyTemp) throws IOException {
-        Map<String, Object> map = examTaskService.submitTaskApply(examTaskApplyTemp);
+    public Result submitTaskApply(@RequestBody ExamTaskSubmitPram examTaskSubmitPram) throws IOException {
+        Map<String, Object> map = examTaskService.submitTaskApply(examTaskSubmitPram);
         ExamTask examTask = (ExamTask) map.get(SystemConstant.EXAM_TASK);
         if (Objects.nonNull(examTask.getReview()) && !examTask.getReview()) {
             // 校验是否可以提交打印状态
@@ -205,14 +208,7 @@ public class ExamTaskApplyController {
     @ApiOperation(value = "印刷室列表")
     @RequestMapping(value = "/list_task_print_house", method = RequestMethod.POST)
     public Result listTaskPrintHouse() {
-        return ResultUtil.ok(examTaskPrintService.listHouse());
-    }
-
-    @ApiOperation(value = "题卡标题查询")
-    @RequestMapping(value = "/find_card_title", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
-    public Result findCardTitle(@ApiParam(value = "题卡规则id", required = true) @RequestParam String cardRuleId) {
-        return ResultUtil.ok((Object) examTaskService.findCardTitle(SystemConstant.convertIdToLong(cardRuleId)));
+        return ResultUtil.ok(examTaskService.listPrintHouse());
     }
 
     @ApiOperation(value = "命题任务-考试对象查询")
@@ -227,22 +223,13 @@ public class ExamTaskApplyController {
     @RequestMapping(value = "/find_exam_task_student_object", method = RequestMethod.POST)
     @Transactional(rollbackFor = Exception.class)
     @ApiResponses({@ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class)})
-    public Result findExamTaskStudentObject(@RequestParam(required = false) Long examId,
-                                            @RequestParam(required = false) Long courseId,
-                                            @RequestParam(required = false) String teacher,
-                                            @RequestParam(required = false) String className) throws Exception {
-        SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
-        return ResultUtil.ok(examTaskService.findExamTaskStudentObject(examId, courseId, teacher, className, requestUser));
-    }
-
-    @ApiOperation(value = "入库申请-导入考生对象")
-    @RequestMapping(value = "/exam_task_exam_student_import", method = RequestMethod.POST)
-    @Transactional(rollbackFor = Exception.class)
-    @ApiResponses({@ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class)})
-    @OperationLogDetail(operationType = OperationTypeEnum.IMPORT)
-    public Result examTaskExamStudentImport(@RequestParam MultipartFile file) throws Exception {
-        SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
-        return ResultUtil.ok(examTaskService.examTaskExamStudentImport(file, requestUser));
+    public Result findExamTaskStudentObject(@ApiParam(value = "考试ID") @RequestParam(required = false) Long examId,
+                                            @ApiParam(value = "课程ID") @RequestParam(required = false) Long courseId,
+                                            @ApiParam(value = "任课老师") @RequestParam(required = false) String teacher,
+                                            @ApiParam(value = "教学班") @RequestParam(required = false) String teachClassName,
+                                            @ApiParam(value = "行政班") @RequestParam(required = false) String className,
+                                            @ApiParam(value = "试卷编号") @RequestParam(required = false) String paperNumber) throws Exception {
+        return ResultUtil.ok(examTaskService.findExamTaskStudentObject(examId, courseId, teacher, teachClassName, className, paperNumber));
     }
 
     @ApiOperation(value = "入库申请-题库试卷列表")

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

@@ -5,8 +5,9 @@ import com.qmth.boot.api.exception.ApiException;
 import com.qmth.distributed.print.business.bean.dto.ExamTaskDto;
 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.*;
+import com.qmth.distributed.print.business.service.ActivitiService;
+import com.qmth.distributed.print.business.service.ExamTaskService;
+import com.qmth.distributed.print.business.service.PrintCommonService;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicAttachment;
@@ -53,11 +54,7 @@ public class ExamTaskController {
     @Resource
     private PrintCommonService printCommonService;
     @Resource
-    private ExamTaskPrintService examTaskPrintService;
-    @Resource
     ActivitiService activitiService;
-    @Resource
-    ExamTaskApplyTempService examTaskApplyTempService;
 
     @ApiOperation(value = "命题任务管理-分页查询")
     @RequestMapping(value = "/list", method = RequestMethod.POST)
@@ -192,32 +189,6 @@ public class ExamTaskController {
         return ResultUtil.ok(examTaskDto);
     }
 
-    /**
-     * 班级列表
-     *
-     * @param courseCode 课程代码
-     * @return Result
-     */
-    @ApiOperation(value = "命题任务管理-命题申请-班级列表")
-    @RequestMapping(value = "/list_task_apply_class", method = RequestMethod.POST)
-    public Result listTaskApplyClass(@RequestParam(value = "courseCode") String courseCode) {
-        return ResultUtil.ok(examTaskPrintService.listExamTaskClass(courseCode));
-    }
-
-    /**
-     * 命题任务管理-命题申请-暂存
-     *
-     * @param examTaskApplyTemp
-     * @return
-     */
-    @ApiOperation(value = "命题任务管理-命题申请-暂存")
-    @RequestMapping(value = "/stage_task_apply", method = RequestMethod.POST)
-    @OperationLogDetail(operationType = OperationTypeEnum.SAVE)
-    public Result stageTaskApply(@RequestBody ExamTaskApplyTemp examTaskApplyTemp) {
-        ExamTaskApplyTemp task = examTaskApplyTempService.stageTaskApply(examTaskApplyTemp);
-        return ResultUtil.ok(task);
-    }
-
     /**
      * 试卷编号模糊查询
      */

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

@@ -1,10 +1,7 @@
 package com.qmth.distributed.print.api;
 
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.distributed.print.business.bean.params.AssignClazzParam;
-import com.qmth.distributed.print.business.bean.params.TeachCourseParams;
 import com.qmth.distributed.print.business.bean.params.TeachCourseSelectParam;
-import com.qmth.distributed.print.business.bean.params.TeacherTeamParam;
 import com.qmth.distributed.print.business.bean.result.EditResult;
 import com.qmth.distributed.print.business.service.TeachCourseService;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
@@ -19,13 +16,11 @@ import io.swagger.annotations.*;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
-import java.io.IOException;
 import java.util.List;
 import java.util.stream.Collectors;
 

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/SchoolDto.java

@@ -1,102 +0,0 @@
-package com.qmth.teachcloud.common.bean.dto;
-
-/**
- * @Date: 2021/4/2.
- */
-public class SchoolDto {
-
-    private String id;
-
-    private String code;
-    private String name;
-    private Boolean enable;
-
-    private String accessKey;
-
-    private String accessSecret;
-
-    private String logo;
-    private String initPassword;
-    private Boolean defaultSchool;
-    private Boolean hasPaperNumber;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Boolean getEnable() {
-        return enable;
-    }
-
-    public void setEnable(Boolean enable) {
-        this.enable = enable;
-    }
-
-    public String getAccessKey() {
-        return accessKey;
-    }
-
-    public void setAccessKey(String accessKey) {
-        this.accessKey = accessKey;
-    }
-
-    public String getAccessSecret() {
-        return accessSecret;
-    }
-
-    public void setAccessSecret(String accessSecret) {
-        this.accessSecret = accessSecret;
-    }
-
-    public String getLogo() {
-        return logo;
-    }
-
-    public void setLogo(String logo) {
-        this.logo = logo;
-    }
-
-    public String getInitPassword() {
-        return initPassword;
-    }
-
-    public void setInitPassword(String initPassword) {
-        this.initPassword = initPassword;
-    }
-
-    public Boolean getDefaultSchool() {
-        return defaultSchool;
-    }
-
-    public void setDefaultSchool(Boolean defaultSchool) {
-        this.defaultSchool = defaultSchool;
-    }
-
-    public Boolean getHasPaperNumber() {
-        return hasPaperNumber;
-    }
-
-    public void setHasPaperNumber(Boolean hasPaperNumber) {
-        this.hasPaperNumber = hasPaperNumber;
-    }
-}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/params/BasicCampusParams.java

@@ -1,66 +0,0 @@
-package com.qmth.teachcloud.common.bean.params;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModelProperty;
-import org.hibernate.validator.constraints.Length;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * @Description: 基础校区参数（保存用）
- * @Author: CaoZixuan
- * @Date: 2021-08-03
- */
-public class BasicCampusParams {
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "校区id")
-    private Long id;
-
-    @ApiModelProperty(value = "校区名称")
-    @NotNull(message = "请输入校区名称")
-    @Length(min = 1,message = "请输入校区名称")
-    private String campusName;
-
-    @ApiModelProperty(value = "校区编号")
-    @NotNull(message = "请输入校区编码")
-    @Length(min = 1,message = "请输入校区编码")
-    private String campusCode;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "印刷室id")
-    private Long printHouseId;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getCampusName() {
-        return campusName;
-    }
-
-    public void setCampusName(String campusName) {
-        this.campusName = campusName;
-    }
-
-    public String getCampusCode() {
-        return campusCode;
-    }
-
-    public void setCampusCode(String campusCode) {
-        this.campusCode = campusCode;
-    }
-
-    public Long getPrintHouseId() {
-        return printHouseId;
-    }
-
-    public void setPrintHouseId(Long printHouseId) {
-        this.printHouseId = printHouseId;
-    }
-}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/params/BasicCollegeParams.java

@@ -1,45 +0,0 @@
-package com.qmth.teachcloud.common.bean.params;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.teachcloud.common.annotation.DBVerify;
-import com.qmth.teachcloud.common.annotation.EditKey;
-import io.swagger.annotations.ApiModelProperty;
-import org.hibernate.validator.constraints.Length;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * @Description: 学生学院参数
- * @Author: CaoZixuan
- * @Date: 2022-08-17
- */
-public class BasicCollegeParams {
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "学院id（编辑时必填）")
-    @EditKey
-    private Long id;
-
-    @ApiModelProperty(value = "学院名称")
-    @NotNull(message = "学院名称")
-    @Length(min = 1,message = "学院名称")
-    @DBVerify(value = "学院名称",required = true)
-    private String collegeName;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getCollegeName() {
-        return collegeName;
-    }
-
-    public void setCollegeName(String collegeName) {
-        this.collegeName = collegeName;
-    }
-}

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

@@ -42,6 +42,12 @@ public class BasicExamStudent extends BaseEntity {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long clazzId;
 
+    @ApiModelProperty(value = "教学班")
+    private String teachClassName;
+
+    @ApiModelProperty(value = "行政班")
+    private String className;
+
     @ApiModelProperty(value = "试卷编号")
     private String paperNumber;
 
@@ -66,10 +72,10 @@ public class BasicExamStudent extends BaseEntity {
     @ApiModelProperty(value = "考试结束时间")
     private Long examEndTime;
 
-    @ApiModelProperty(value = "考点")
+    @ApiModelProperty("考点(校区)")
     private String examPlace;
 
-    @ApiModelProperty(value = "考场")
+    @ApiModelProperty("考场(考试教室)")
     private String examRoom;
 
     public Long getSchoolId() {
@@ -120,6 +126,22 @@ public class BasicExamStudent extends BaseEntity {
         this.clazzId = clazzId;
     }
 
+    public String getTeachClassName() {
+        return teachClassName;
+    }
+
+    public void setTeachClassName(String teachClassName) {
+        this.teachClassName = teachClassName;
+    }
+
+    public String getClassName() {
+        return className;
+    }
+
+    public void setClassName(String className) {
+        this.className = className;
+    }
+
     public String getPaperNumber() {
         return paperNumber;
     }