Bladeren bron

初始化

xiaof 2 jaren geleden
bovenliggende
commit
d127914864
100 gewijzigde bestanden met toevoegingen van 0 en 9217 verwijderingen
  1. 0 23
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/BasicExamDto.java
  2. 0 32
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/BasicPrintConfigDto.java
  3. 0 143
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/CardCustDto.java
  4. 0 80
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/CardDetailDto.java
  5. 0 194
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/CardRuleDto.java
  6. 0 103
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ClazzContentDto.java
  7. 0 80
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ClientExamStudentDto.java
  8. 0 125
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ClientExamTaskDto.java
  9. 0 62
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ClientPrintBackupDataDto.java
  10. 0 80
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ClientPrintDataDto.java
  11. 0 134
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ClientPrintStatisticsDto.java
  12. 0 99
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ClientPrintStatisticsTotalDto.java
  13. 0 425
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ClientPrintTaskDto.java
  14. 0 107
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ClientPrintTaskTotalDto.java
  15. 0 96
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExamCardDto.java
  16. 0 101
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExamPaperInfoDto.java
  17. 0 92
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExamPaperObjectiveStructureDto.java
  18. 0 73
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExamPaperStructureDto.java
  19. 0 75
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExamPaperSubjectiveStructureDto.java
  20. 0 214
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExamTaskDetailCardDto.java
  21. 0 301
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExamTaskDetailDto.java
  22. 0 382
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExamTaskDto.java
  23. 0 39
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExamTaskImportDto.java
  24. 0 34
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExamTaskPaperDto.java
  25. 0 73
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExamTaskPaperExportDto.java
  26. 0 189
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExamTaskPaperFileDto.java
  27. 0 164
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExamTaskPlanStatisticDto.java
  28. 0 19
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExamTaskPrintDetailDto.java
  29. 0 55
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExamTaskPrintDto.java
  30. 0 59
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExamTaskTempDto.java
  31. 0 158
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExaminationExportDto.java
  32. 0 262
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExaminationImportDto.java
  33. 0 61
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExtendFieldsDto.java
  34. 0 99
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/FieldsDto.java
  35. 0 87
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/GradeBatchStudentClazzDto.java
  36. 0 97
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/GradeBatchStudentDto.java
  37. 0 77
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/PaperPdfDto.java
  38. 0 119
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/PdfDto.java
  39. 0 50
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/PdfPackageDto.java
  40. 0 78
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/PdfSignDto.java
  41. 0 272
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/PrintTaskDto.java
  42. 0 89
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/PrintTaskTotalDto.java
  43. 0 64
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/RelatePaperDto.java
  44. 0 92
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ReviewLogDto.java
  45. 0 32
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ReviewSampleDto.java
  46. 0 24
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/StudentExtendDto.java
  47. 0 75
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/SyncExamCardDto.java
  48. 0 61
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/SyncExamStudentDto.java
  49. 0 78
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/TCStatisticsDto.java
  50. 0 35
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/TaskPrintExtendFieldsDto.java
  51. 0 44
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/TaskPrintHouseDto.java
  52. 0 44
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/TaskTotalLeftDto.java
  53. 0 116
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/TemplateDto.java
  54. 0 89
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/approvalForm/ApprovalInfo.java
  55. 0 46
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/approvalForm/ExamTaskApprovalFormDto.java
  56. 0 40
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/flow/CustomFlowApproveRoleDto.java
  57. 0 40
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/flow/CustomFlowApproveUserDto.java
  58. 0 108
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/flow/CustomFlowCommonDto.java
  59. 0 40
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/flow/CustomFlowCopyUserDto.java
  60. 0 72
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/flow/CustomFlowDto.java
  61. 0 63
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/flow/CustomFlowEditDto.java
  62. 0 72
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/flow/CustomFlowGatewayDto.java
  63. 0 151
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/flow/CustomFlowPropDto.java
  64. 0 130
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/flow/CustomFlowPropertyDto.java
  65. 0 63
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/flow/CustomFlowSaveDto.java
  66. 0 82
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/flow/CustomFlowSequenceDto.java
  67. 0 235
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/flow/CustomFlowVarDto.java
  68. 0 281
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/flow/link/FlowTaskLink.java
  69. 0 68
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/flow/link/FlowTaskNode.java
  70. 0 42
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/ApproveFormParams.java
  71. 0 28
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/BlurryParam.java
  72. 0 37
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/CardRuleParam.java
  73. 0 41
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/ChooseParams.java
  74. 0 29
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/CourseParam.java
  75. 0 43
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/CustomFlowParam.java
  76. 0 44
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/CustomFlowRenameParam.java
  77. 0 29
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/DeleteBatchParams.java
  78. 0 30
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/DeleteParams.java
  79. 0 133
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/DownloadPaperFileParam.java
  80. 0 139
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/ExamCardParams.java
  81. 0 91
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/ExamDetailList.java
  82. 0 82
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/ExamDetailParams.java
  83. 0 47
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/ExamTaskApplyParam.java
  84. 0 74
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/ExamTaskParam.java
  85. 0 29
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/ExamTaskPrintParams.java
  86. 0 30
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/ExamTaskReApplyParam.java
  87. 0 60
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/ExamTaskStudentObjectParam.java
  88. 0 45
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/FlowApproveParam.java
  89. 0 78
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/FlowTaskApproveParam.java
  90. 0 95
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/GenericExamCardParams.java
  91. 0 182
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/PrintPlanParams.java
  92. 0 56
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/RelatePaperParam.java
  93. 0 29
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/RoleParam.java
  94. 0 53
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/SerialNumberParams.java
  95. 0 39
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/SyncDataParam.java
  96. 0 85
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/TaskPrintParams.java
  97. 0 60
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/TeachClazzParams.java
  98. 0 32
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/TeachCourseParams.java
  99. 0 47
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/TeachStudentBatchParam.java
  100. 0 61
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/TeachStudentParams.java

+ 0 - 23
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/BasicExamDto.java

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

+ 0 - 32
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/BasicPrintConfigDto.java

@@ -1,32 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-import com.qmth.paper.library.common.entity.BasicPrintConfig;
-import com.qmth.paper.library.common.entity.SysOrg;
-
-import java.util.List;
-
-/**
- * @Date: 2022/2/11.
- */
-public class BasicPrintConfigDto extends BasicPrintConfig {
-
-    private String orgNames;
-
-    private List<SysOrg> orgs;
-
-    public String getOrgNames() {
-        return orgNames;
-    }
-
-    public void setOrgNames(String orgNames) {
-        this.orgNames = orgNames;
-    }
-
-    public List<SysOrg> getOrgs() {
-        return orgs;
-    }
-
-    public void setOrgs(List<SysOrg> orgs) {
-        this.orgs = orgs;
-    }
-}

+ 0 - 143
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/CardCustDto.java

@@ -1,143 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-/**
- * @Date: 2021/3/29.
- */
-public class CardCustDto {
-
-    private String examTaskId;
-    private String cardId;
-    private String cardRuleId;
-    private String courseCode;
-    private String courseName;
-    private String status;
-    private String paperNumber;
-    private String schoolId;
-    private String schoolName;
-    private String orgId;
-    private String orgName;
-    private String createId;
-    private Long createTime;
-    private String createName;
-    private Long updateTime;
-
-    public String getExamTaskId() {
-        return examTaskId;
-    }
-
-    public void setExamTaskId(String examTaskId) {
-        this.examTaskId = examTaskId;
-    }
-
-    public String getCardId() {
-        return cardId;
-    }
-
-    public void setCardId(String cardId) {
-        this.cardId = cardId;
-    }
-
-    public String getCardRuleId() {
-        return cardRuleId;
-    }
-
-    public void setCardRuleId(String cardRuleId) {
-        this.cardRuleId = cardRuleId;
-    }
-
-    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 getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    public String getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(String schoolId) {
-        this.schoolId = schoolId;
-    }
-
-    public String getSchoolName() {
-        return schoolName;
-    }
-
-    public void setSchoolName(String schoolName) {
-        this.schoolName = schoolName;
-    }
-
-    public String getOrgId() {
-        return orgId;
-    }
-
-    public void setOrgId(String orgId) {
-        this.orgId = orgId;
-    }
-
-    public String getOrgName() {
-        return orgName;
-    }
-
-    public void setOrgName(String orgName) {
-        this.orgName = orgName;
-    }
-
-    public String getCreateId() {
-        return createId;
-    }
-
-    public void setCreateId(String createId) {
-        this.createId = createId;
-    }
-
-    public String getCreateName() {
-        return createName;
-    }
-
-    public void setCreateName(String createName) {
-        this.createName = createName;
-    }
-
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
-
-    public Long getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Long updateTime) {
-        this.updateTime = updateTime;
-    }
-}

+ 0 - 80
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/CardDetailDto.java

@@ -1,80 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-/**
- * @Date: 2021/3/29.
- */
-public class CardDetailDto {
-
-    private String cardId;
-    private String title;
-    private String createMethod;
-    private String makeMethod;
-    private String content;
-    private String htmlContent;
-    private String type;
-    private String paperType;
-
-    public String getCardId() {
-        return cardId;
-    }
-
-    public void setCardId(String cardId) {
-        this.cardId = cardId;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getCreateMethod() {
-        return createMethod;
-    }
-
-    public void setCreateMethod(String createMethod) {
-        this.createMethod = createMethod;
-    }
-
-    public String getMakeMethod() {
-        return makeMethod;
-    }
-
-    public void setMakeMethod(String makeMethod) {
-        this.makeMethod = makeMethod;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-    public String getHtmlContent() {
-        return htmlContent;
-    }
-
-    public void setHtmlContent(String htmlContent) {
-        this.htmlContent = htmlContent;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getPaperType() {
-        return paperType;
-    }
-
-    public void setPaperType(String paperType) {
-        this.paperType = paperType;
-    }
-}

+ 0 - 194
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/CardRuleDto.java

@@ -1,194 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-import com.qmth.paper.library.business.enums.ExamNumberStyleEnum;
-import com.qmth.paper.library.business.enums.PaperTypeEnum;
-import com.qmth.paper.library.common.entity.SysOrg;
-
-import java.util.List;
-
-/**
- * @Date: 2021/3/29.
- */
-public class CardRuleDto {
-
-    private String id;
-    private String schoolId;
-    private String name;
-    private ExamNumberStyleEnum examNumberStyle;
-    private PaperTypeEnum paperType;
-    private Boolean examAbsent;
-    private Boolean writeSign;
-    private Boolean discipline;
-    private String requiredFields;
-    private String extendFields;
-    private String titleRule;
-    private String attention;
-    private String objectiveAttention;
-    private String subjectiveAttention;
-    private Boolean enable;
-    private String remark;
-    private String createId;
-    private Long createTime;
-    private List<SysOrg> orgs;
-    private Integer fillNumber;
-
-    public Integer getFillNumber() {
-        return fillNumber;
-    }
-
-    public void setFillNumber(Integer fillNumber) {
-        this.fillNumber = fillNumber;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(String schoolId) {
-        this.schoolId = schoolId;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public ExamNumberStyleEnum getExamNumberStyle() {
-        return examNumberStyle;
-    }
-
-    public void setExamNumberStyle(ExamNumberStyleEnum examNumberStyle) {
-        this.examNumberStyle = examNumberStyle;
-    }
-
-    public PaperTypeEnum getPaperType() {
-        return paperType;
-    }
-
-    public void setPaperType(PaperTypeEnum paperType) {
-        this.paperType = paperType;
-    }
-
-    public Boolean getExamAbsent() {
-        return examAbsent;
-    }
-
-    public void setExamAbsent(Boolean examAbsent) {
-        this.examAbsent = examAbsent;
-    }
-
-    public Boolean getWriteSign() {
-        return writeSign;
-    }
-
-    public void setWriteSign(Boolean writeSign) {
-        this.writeSign = writeSign;
-    }
-
-    public Boolean getDiscipline() {
-        return discipline;
-    }
-
-    public void setDiscipline(Boolean discipline) {
-        this.discipline = discipline;
-    }
-
-    public String getRequiredFields() {
-        return requiredFields;
-    }
-
-    public void setRequiredFields(String requiredFields) {
-        this.requiredFields = requiredFields;
-    }
-
-    public String getExtendFields() {
-        return extendFields;
-    }
-
-    public void setExtendFields(String extendFields) {
-        this.extendFields = extendFields;
-    }
-
-    public String getTitleRule() {
-        return titleRule;
-    }
-
-    public void setTitleRule(String titleRule) {
-        this.titleRule = titleRule;
-    }
-
-    public String getAttention() {
-        return attention;
-    }
-
-    public void setAttention(String attention) {
-        this.attention = attention;
-    }
-
-    public String getObjectiveAttention() {
-        return objectiveAttention;
-    }
-
-    public void setObjectiveAttention(String objectiveAttention) {
-        this.objectiveAttention = objectiveAttention;
-    }
-
-    public String getSubjectiveAttention() {
-        return subjectiveAttention;
-    }
-
-    public void setSubjectiveAttention(String subjectiveAttention) {
-        this.subjectiveAttention = subjectiveAttention;
-    }
-
-    public Boolean getEnable() {
-        return enable;
-    }
-
-    public void setEnable(Boolean enable) {
-        this.enable = enable;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getCreateId() {
-        return createId;
-    }
-
-    public void setCreateId(String createId) {
-        this.createId = createId;
-    }
-
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
-
-    public List<SysOrg> getOrgs() {
-        return orgs;
-    }
-
-    public void setOrgs(List<SysOrg> orgs) {
-        this.orgs = orgs;
-    }
-}

+ 0 - 103
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ClazzContentDto.java

@@ -1,103 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.paper.library.business.enums.ClazzContentEnum;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: 命题计划统计表班级内容详细细心
- * @Author: CaoZixuan
- * @Date: 2022-04-26
- */
-public class ClazzContentDto {
-    @ApiModelProperty(value = "班级id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long clazzId;
-
-    @ApiModelProperty(value = "班级名称")
-    private String clazzName;
-
-    @ApiModelProperty(value = "任课老师名称")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long examPrintPlanId;
-
-    @ApiModelProperty(value = "任课老师名称")
-    private String examPrintPlanName;
-
-    @ApiModelProperty(value = "任课老师名称")
-    private String paperNumber;
-
-    @ApiModelProperty(value = "任课老师名称")
-    private ClazzContentEnum status;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    @ApiModelProperty(value = "学生数量")
-    private String printCount;
-
-    public Long getClazzId() {
-        return clazzId;
-    }
-
-    public void setClazzId(Long clazzId) {
-        this.clazzId = clazzId;
-    }
-
-    public String getClazzName() {
-        return clazzName;
-    }
-
-    public void setClazzName(String clazzName) {
-        this.clazzName = clazzName;
-    }
-
-    public Long getExamPrintPlanId() {
-        return examPrintPlanId;
-    }
-
-    public void setExamPrintPlanId(Long examPrintPlanId) {
-        this.examPrintPlanId = examPrintPlanId;
-    }
-
-    public String getExamPrintPlanName() {
-        return examPrintPlanName;
-    }
-
-    public void setExamPrintPlanName(String examPrintPlanName) {
-        this.examPrintPlanName = examPrintPlanName;
-    }
-
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    public ClazzContentEnum getStatus() {
-        return status;
-    }
-
-    public void setStatus(ClazzContentEnum status) {
-        this.status = status;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getPrintCount() {
-        return printCount;
-    }
-
-    public void setPrintCount(String printCount) {
-        this.printCount = printCount;
-    }
-}

+ 0 - 80
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ClientExamStudentDto.java

@@ -1,80 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-/**
- * @Date: 2021/3/31.
- */
-public class ClientExamStudentDto {
-
-    private String examDetailId;
-    private String courseCode;
-    private String courseName;
-    private String paperNumber;
-    private String studentCode;
-    private String ticketNumber;
-    private String studentName;
-    private String siteNumber;
-
-    public String getExamDetailId() {
-        return examDetailId;
-    }
-
-    public void setExamDetailId(String examDetailId) {
-        this.examDetailId = examDetailId;
-    }
-
-    public String getCourseCode() {
-        return courseCode;
-    }
-
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
-    }
-
-    public String getCourseName() {
-        return courseName;
-    }
-
-    public void setCourseName(String courseName) {
-        this.courseName = courseName;
-    }
-
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    public String getStudentCode() {
-        return studentCode;
-    }
-
-    public void setStudentCode(String studentCode) {
-        this.studentCode = studentCode;
-    }
-
-    public String getTicketNumber() {
-        return ticketNumber;
-    }
-
-    public void setTicketNumber(String ticketNumber) {
-        this.ticketNumber = ticketNumber;
-    }
-
-    public String getStudentName() {
-        return studentName;
-    }
-
-    public void setStudentName(String studentName) {
-        this.studentName = studentName;
-    }
-
-    public String getSiteNumber() {
-        return siteNumber;
-    }
-
-    public void setSiteNumber(String siteNumber) {
-        this.siteNumber = siteNumber;
-    }
-}

+ 0 - 125
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ClientExamTaskDto.java

@@ -1,125 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-/**
- * @Date: 2021/3/31.
- */
-public class ClientExamTaskDto {
-
-    private String examTaskId;
-    private String schoolId;
-    private String printPlanId;
-    private String printPlanName;
-    private String paperNumber;
-    private String courseCode;
-    private String courseName;
-    private String specialty;
-    private String userId;
-    private String userName;
-    private Boolean isTry;
-    private Boolean isPass;
-    private Long tryTime;
-
-    public String getExamTaskId() {
-        return examTaskId;
-    }
-
-    public void setExamTaskId(String examTaskId) {
-        this.examTaskId = examTaskId;
-    }
-
-    public String getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(String schoolId) {
-        this.schoolId = schoolId;
-    }
-
-    public String getPrintPlanId() {
-        return printPlanId;
-    }
-
-    public void setPrintPlanId(String printPlanId) {
-        this.printPlanId = printPlanId;
-    }
-
-    public String getPrintPlanName() {
-        return printPlanName;
-    }
-
-    public void setPrintPlanName(String printPlanName) {
-        this.printPlanName = printPlanName;
-    }
-
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    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 getSpecialty() {
-        return specialty;
-    }
-
-    public void setSpecialty(String specialty) {
-        this.specialty = specialty;
-    }
-
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public Boolean getTry() {
-        return isTry;
-    }
-
-    public void setTry(Boolean aTry) {
-        isTry = aTry;
-    }
-
-    public Boolean getPass() {
-        return isPass;
-    }
-
-    public void setPass(Boolean pass) {
-        isPass = pass;
-    }
-
-    public Long getTryTime() {
-        return tryTime;
-    }
-
-    public void setTryTime(Long tryTime) {
-        this.tryTime = tryTime;
-    }
-}

+ 0 - 62
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ClientPrintBackupDataDto.java

@@ -1,62 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-/**
- * @Date: 2021/3/31.
- */
-public class ClientPrintBackupDataDto {
-
-    private String courseCode;
-    private String courseName;
-    private String paperNumber;
-    private String paperType;
-    private String md5;
-    private String url;
-
-    public String getCourseCode() {
-        return courseCode;
-    }
-
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
-    }
-
-    public String getCourseName() {
-        return courseName;
-    }
-
-    public void setCourseName(String courseName) {
-        this.courseName = courseName;
-    }
-
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    public String getPaperType() {
-        return paperType;
-    }
-
-    public void setPaperType(String paperType) {
-        this.paperType = paperType;
-    }
-
-    public String getMd5() {
-        return md5;
-    }
-
-    public void setMd5(String md5) {
-        this.md5 = md5;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-}

+ 0 - 80
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ClientPrintDataDto.java

@@ -1,80 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-/**
- * @Date: 2021/3/31.
- */
-public class ClientPrintDataDto {
-
-    private String courseCode;
-    private String courseName;
-    private String paperNumber;
-    private String studentName;
-    private String studentCode;
-    private String paperType;
-    private String md5;
-    private String url;
-
-    public String getCourseCode() {
-        return courseCode;
-    }
-
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
-    }
-
-    public String getCourseName() {
-        return courseName;
-    }
-
-    public void setCourseName(String courseName) {
-        this.courseName = courseName;
-    }
-
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    public String 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 getPaperType() {
-        return paperType;
-    }
-
-    public void setPaperType(String paperType) {
-        this.paperType = paperType;
-    }
-
-    public String getMd5() {
-        return md5;
-    }
-
-    public void setMd5(String md5) {
-        this.md5 = md5;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-}

+ 0 - 134
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ClientPrintStatisticsDto.java

@@ -1,134 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-/**
- * @Date: 2021/3/29.
- */
-public class ClientPrintStatisticsDto {
-
-    private String printPlanId;
-    private String printPlanName;
-    private Long examStartTime;
-    private Long examEndTime;
-    private String courseNameCode;
-    private String paperNumber;
-    private String examPlace;
-    private Integer packageCount;
-    private Integer totalSubjects;
-    private Integer totalSubjectsLeft;
-    private Integer paperPagesLeft;
-    private Integer cardPagesLeft;
-    private Integer pagesA4Left;
-    private Integer progress;
-
-    public String getPrintPlanId() {
-        return printPlanId;
-    }
-
-    public void setPrintPlanId(String printPlanId) {
-        this.printPlanId = printPlanId;
-    }
-
-    public String getPrintPlanName() {
-        return printPlanName;
-    }
-
-    public void setPrintPlanName(String printPlanName) {
-        this.printPlanName = printPlanName;
-    }
-
-    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 getCourseNameCode() {
-        return courseNameCode;
-    }
-
-    public void setCourseNameCode(String courseNameCode) {
-        this.courseNameCode = courseNameCode;
-    }
-
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    public String getExamPlace() {
-        return examPlace;
-    }
-
-    public void setExamPlace(String examPlace) {
-        this.examPlace = examPlace;
-    }
-
-    public Integer getPackageCount() {
-        return packageCount;
-    }
-
-    public void setPackageCount(Integer packageCount) {
-        this.packageCount = packageCount;
-    }
-
-    public Integer getTotalSubjects() {
-        return totalSubjects;
-    }
-
-    public void setTotalSubjects(Integer totalSubjects) {
-        this.totalSubjects = totalSubjects;
-    }
-
-    public Integer getTotalSubjectsLeft() {
-        return totalSubjectsLeft;
-    }
-
-    public void setTotalSubjectsLeft(Integer totalSubjectsLeft) {
-        this.totalSubjectsLeft = totalSubjectsLeft;
-    }
-
-    public Integer getPaperPagesLeft() {
-        return paperPagesLeft;
-    }
-
-    public void setPaperPagesLeft(Integer paperPagesLeft) {
-        this.paperPagesLeft = paperPagesLeft;
-    }
-
-    public Integer getCardPagesLeft() {
-        return cardPagesLeft;
-    }
-
-    public void setCardPagesLeft(Integer cardPagesLeft) {
-        this.cardPagesLeft = cardPagesLeft;
-    }
-
-    public Integer getPagesA4Left() {
-        return pagesA4Left;
-    }
-
-    public void setPagesA4Left(Integer pagesA4Left) {
-        this.pagesA4Left = pagesA4Left;
-    }
-
-    public Integer getProgress() {
-        return progress;
-    }
-
-    public void setProgress(Integer progress) {
-        this.progress = progress;
-    }
-}

+ 0 - 99
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ClientPrintStatisticsTotalDto.java

@@ -1,99 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-/**
- * @Date: 2021/3/29.
- */
-public class ClientPrintStatisticsTotalDto {
-
-    private Integer totalSubjects;
-    private Integer packageCount;
-    private Integer paperCount;
-    private String paperNumberAndType;
-    private Integer paperPages;
-    private Integer cardPages;
-    private Integer pagesA4;
-    private Integer paperPagesLeft;
-    private Integer cardPagesLeft;
-    private Integer pagesA4Left;
-
-    public Integer getTotalSubjects() {
-        return totalSubjects;
-    }
-
-    public void setTotalSubjects(Integer totalSubjects) {
-        this.totalSubjects = totalSubjects;
-    }
-
-    public Integer getPackageCount() {
-        return packageCount;
-    }
-
-    public void setPackageCount(Integer packageCount) {
-        this.packageCount = packageCount;
-    }
-
-    public Integer getPaperCount() {
-        return paperCount;
-    }
-
-    public void setPaperCount(Integer paperCount) {
-        this.paperCount = paperCount;
-    }
-
-    public String getPaperNumberAndType() {
-        return paperNumberAndType;
-    }
-
-    public void setPaperNumberAndType(String paperNumberAndType) {
-        this.paperNumberAndType = paperNumberAndType;
-    }
-
-    public Integer getPaperPages() {
-        return paperPages;
-    }
-
-    public void setPaperPages(Integer paperPages) {
-        this.paperPages = paperPages;
-    }
-
-    public Integer getCardPages() {
-        return cardPages;
-    }
-
-    public void setCardPages(Integer cardPages) {
-        this.cardPages = cardPages;
-    }
-
-    public Integer getPagesA4() {
-        return pagesA4;
-    }
-
-    public void setPagesA4(Integer pagesA4) {
-        this.pagesA4 = pagesA4;
-    }
-
-    public Integer getPaperPagesLeft() {
-        return paperPagesLeft;
-    }
-
-    public void setPaperPagesLeft(Integer paperPagesLeft) {
-        this.paperPagesLeft = paperPagesLeft;
-    }
-
-    public Integer getCardPagesLeft() {
-        return cardPagesLeft;
-    }
-
-    public void setCardPagesLeft(Integer cardPagesLeft) {
-        this.cardPagesLeft = cardPagesLeft;
-    }
-
-    public Integer getPagesA4Left() {
-        return pagesA4Left;
-    }
-
-    public void setPagesA4Left(Integer pagesA4Left) {
-        this.pagesA4Left = pagesA4Left;
-    }
-
-}

+ 0 - 425
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ClientPrintTaskDto.java

@@ -1,425 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-
-import com.qmth.paper.library.common.annotation.ExcelProperty;
-
-/**
- * @Date: 2021/3/29.
- */
-public class ClientPrintTaskDto {
-
-    private String examDetailId;
-    private String printPlanId;
-    @ExcelProperty(name = "印刷计划", width = 30, index = 2)
-    private String printPlanName;
-    private Long examStartTime;
-    @ExcelProperty(name = "考试开始日期", width = 30, index = 3)
-    private String examStartTimeStr;
-    private Long examEndTime;
-    @ExcelProperty(name = "考试结束日期", width = 30, index = 4)
-    private String examEndTimeStr;
-    @ExcelProperty(name = "课程(代码)", width = 30, index = 5)
-    private String courseNameCode;
-    @ExcelProperty(name = "试卷编号", width = 30, index = 6)
-    private String paperNumber;
-    @ExcelProperty(name = "考点", width = 30, index = 7)
-    private String examPlace;
-    @ExcelProperty(name = "考场", width = 30, index = 8)
-    private String examRoom;
-    private String classId;
-    private String className;
-    @ExcelProperty(name = "单科次A3(页)", width = 30, index = 9)
-    private String singlePagesA3;
-    private String singlePagesA4;
-    private Integer paperPages;
-    private Integer cardPages;
-    private Integer pagesA4;
-    @ExcelProperty(name = "科次", width = 30, index = 10)
-    private Integer totalSubjects;
-    private Integer totalPrint;
-    private String status;
-    @ExcelProperty(name = "印刷状态", width = 30, index = 11)
-    private String statusStr;
-    private Boolean validate;
-    @ExcelProperty(name = "是否校验", width = 30, index = 13)
-    private String validateStr;
-    private Boolean download;
-    @ExcelProperty(name = "是否缓存", width = 30, index = 12)
-    private String downloadStr;
-    private Boolean isTry;
-    private Boolean isPass;
-    @ExcelProperty(name = "印刷员", width = 30, index = 14)
-    private String printUser;
-    private Long printStartTime;
-    @ExcelProperty(name = "印刷开始时间", width = 30, index = 15)
-    private String printStartTimeStr;
-    private Long printEndTime;
-    @ExcelProperty(name = "印刷完成时间", width = 30, index = 16)
-    private String printEndTimeStr;
-    @ExcelProperty(name = "卷袋编号", width = 30, index = 1)
-    private String packageCode;
-    private Long createId;
-    private Long createTime;
-
-    private String printContent;
-    private String variableContent;
-    private String ordinaryContent;
-
-    private Boolean incluedPaper;
-    private Boolean incluedCard;
-    private Boolean incluedSign;
-    private Boolean incluedPackage;
-    private Boolean incluedCheckin;
-
-    public String getExamDetailId() {
-        return examDetailId;
-    }
-
-    public void setExamDetailId(String examDetailId) {
-        this.examDetailId = examDetailId;
-    }
-
-    public String getPrintPlanId() {
-        return printPlanId;
-    }
-
-    public void setPrintPlanId(String printPlanId) {
-        this.printPlanId = printPlanId;
-    }
-
-    public String getPrintPlanName() {
-        return printPlanName;
-    }
-
-    public void setPrintPlanName(String printPlanName) {
-        this.printPlanName = printPlanName;
-    }
-
-    public Long getExamStartTime() {
-        return examStartTime;
-    }
-
-    public void setExamStartTime(Long examStartTime) {
-        this.examStartTime = examStartTime;
-    }
-
-    public String getExamStartTimeStr() {
-        return examStartTimeStr;
-    }
-
-    public void setExamStartTimeStr(String examStartTimeStr) {
-        this.examStartTimeStr = examStartTimeStr;
-    }
-
-    public Long getExamEndTime() {
-        return examEndTime;
-    }
-
-    public void setExamEndTime(Long examEndTime) {
-        this.examEndTime = examEndTime;
-    }
-
-    public String getExamEndTimeStr() {
-        return examEndTimeStr;
-    }
-
-    public void setExamEndTimeStr(String examEndTimeStr) {
-        this.examEndTimeStr = examEndTimeStr;
-    }
-
-    public String getCourseNameCode() {
-        return courseNameCode;
-    }
-
-    public void setCourseNameCode(String courseNameCode) {
-        this.courseNameCode = courseNameCode;
-    }
-
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    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 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 String getSinglePagesA3() {
-        return singlePagesA3;
-    }
-
-    public void setSinglePagesA3(String singlePagesA3) {
-        this.singlePagesA3 = singlePagesA3;
-    }
-
-    public String getSinglePagesA4() {
-        return singlePagesA4;
-    }
-
-    public void setSinglePagesA4(String singlePagesA4) {
-        this.singlePagesA4 = singlePagesA4;
-    }
-
-    public Integer getPaperPages() {
-        return paperPages;
-    }
-
-    public void setPaperPages(Integer paperPages) {
-        this.paperPages = paperPages;
-    }
-
-    public Integer getCardPages() {
-        return cardPages;
-    }
-
-    public void setCardPages(Integer cardPages) {
-        this.cardPages = cardPages;
-    }
-
-    public Integer getPagesA4() {
-        return pagesA4;
-    }
-
-    public void setPagesA4(Integer pagesA4) {
-        this.pagesA4 = pagesA4;
-    }
-
-    public Integer getTotalSubjects() {
-        return totalSubjects;
-    }
-
-    public void setTotalSubjects(Integer totalSubjects) {
-        this.totalSubjects = totalSubjects;
-    }
-
-    public Integer getTotalPrint() {
-        return totalPrint;
-    }
-
-    public void setTotalPrint(Integer totalPrint) {
-        this.totalPrint = totalPrint;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getStatusStr() {
-        return statusStr;
-    }
-
-    public void setStatusStr(String statusStr) {
-        this.statusStr = statusStr;
-    }
-
-    public Boolean getValidate() {
-        return validate;
-    }
-
-    public void setValidate(Boolean validate) {
-        this.validate = validate;
-    }
-
-    public String getValidateStr() {
-        return validateStr;
-    }
-
-    public void setValidateStr(String validateStr) {
-        this.validateStr = validateStr;
-    }
-
-    public Boolean getDownload() {
-        return download;
-    }
-
-    public void setDownload(Boolean download) {
-        this.download = download;
-    }
-
-    public String getDownloadStr() {
-        return downloadStr;
-    }
-
-    public void setDownloadStr(String downloadStr) {
-        this.downloadStr = downloadStr;
-    }
-
-    public Boolean getTry() {
-        return isTry;
-    }
-
-    public void setTry(Boolean aTry) {
-        isTry = aTry;
-    }
-
-    public Boolean getPass() {
-        return isPass;
-    }
-
-    public void setPass(Boolean pass) {
-        isPass = pass;
-    }
-
-    public String getPrintUser() {
-        return printUser;
-    }
-
-    public void setPrintUser(String printUser) {
-        this.printUser = printUser;
-    }
-
-    public Long getPrintStartTime() {
-        return printStartTime;
-    }
-
-    public void setPrintStartTime(Long printStartTime) {
-        this.printStartTime = printStartTime;
-    }
-
-    public String getPrintStartTimeStr() {
-        return printStartTimeStr;
-    }
-
-    public void setPrintStartTimeStr(String printStartTimeStr) {
-        this.printStartTimeStr = printStartTimeStr;
-    }
-
-    public Long getPrintEndTime() {
-        return printEndTime;
-    }
-
-    public void setPrintEndTime(Long printEndTime) {
-        this.printEndTime = printEndTime;
-    }
-
-    public String getPrintEndTimeStr() {
-        return printEndTimeStr;
-    }
-
-    public void setPrintEndTimeStr(String printEndTimeStr) {
-        this.printEndTimeStr = printEndTimeStr;
-    }
-
-    public String getPackageCode() {
-        return packageCode;
-    }
-
-    public void setPackageCode(String packageCode) {
-        this.packageCode = packageCode;
-    }
-
-    public Long getCreateId() {
-        return createId;
-    }
-
-    public void setCreateId(Long createId) {
-        this.createId = createId;
-    }
-
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getPrintContent() {
-        return printContent;
-    }
-
-    public void setPrintContent(String printContent) {
-        this.printContent = printContent;
-    }
-
-    public String getVariableContent() {
-        return variableContent;
-    }
-
-    public void setVariableContent(String variableContent) {
-        this.variableContent = variableContent;
-    }
-
-    public String getOrdinaryContent() {
-        return ordinaryContent;
-    }
-
-    public void setOrdinaryContent(String ordinaryContent) {
-        this.ordinaryContent = ordinaryContent;
-    }
-
-    public Boolean getIncluedPaper() {
-        return incluedPaper;
-    }
-
-    public void setIncluedPaper(Boolean incluedPaper) {
-        this.incluedPaper = incluedPaper;
-    }
-
-    public Boolean getIncluedCard() {
-        return incluedCard;
-    }
-
-    public void setIncluedCard(Boolean incluedCard) {
-        this.incluedCard = incluedCard;
-    }
-
-    public Boolean getIncluedSign() {
-        return incluedSign;
-    }
-
-    public void setIncluedSign(Boolean incluedSign) {
-        this.incluedSign = incluedSign;
-    }
-
-    public Boolean getIncluedPackage() {
-        return incluedPackage;
-    }
-
-    public void setIncluedPackage(Boolean incluedPackage) {
-        this.incluedPackage = incluedPackage;
-    }
-
-    public Boolean getIncluedCheckin() {
-        return incluedCheckin;
-    }
-
-    public void setIncluedCheckin(Boolean incluedCheckin) {
-        this.incluedCheckin = incluedCheckin;
-    }
-}

+ 0 - 107
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ClientPrintTaskTotalDto.java

@@ -1,107 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-/**
- * @Date: 2021/3/29.
- */
-public class ClientPrintTaskTotalDto {
-
-    private Integer totalSubjects;
-    private Integer packageCount;
-    private Integer paperPages;
-    private Integer cardPages;
-    private Integer pagesA4;
-    private Integer paperPagesLeft;
-    private Integer cardPagesLeft;
-    private Integer pagesA4Left;
-    private Integer hostPaperPages;
-    private Integer hostCardPages;
-    private Integer hostPagesA4;
-
-    public Integer getTotalSubjects() {
-        return totalSubjects;
-    }
-
-    public void setTotalSubjects(Integer totalSubjects) {
-        this.totalSubjects = totalSubjects;
-    }
-
-    public Integer getPackageCount() {
-        return packageCount;
-    }
-
-    public void setPackageCount(Integer packageCount) {
-        this.packageCount = packageCount;
-    }
-
-    public Integer getPaperPages() {
-        return paperPages;
-    }
-
-    public void setPaperPages(Integer paperPages) {
-        this.paperPages = paperPages;
-    }
-
-    public Integer getCardPages() {
-        return cardPages;
-    }
-
-    public void setCardPages(Integer cardPages) {
-        this.cardPages = cardPages;
-    }
-
-    public Integer getPagesA4() {
-        return pagesA4;
-    }
-
-    public void setPagesA4(Integer pagesA4) {
-        this.pagesA4 = pagesA4;
-    }
-
-    public Integer getPaperPagesLeft() {
-        return paperPagesLeft;
-    }
-
-    public void setPaperPagesLeft(Integer paperPagesLeft) {
-        this.paperPagesLeft = paperPagesLeft;
-    }
-
-    public Integer getCardPagesLeft() {
-        return cardPagesLeft;
-    }
-
-    public void setCardPagesLeft(Integer cardPagesLeft) {
-        this.cardPagesLeft = cardPagesLeft;
-    }
-
-    public Integer getPagesA4Left() {
-        return pagesA4Left;
-    }
-
-    public void setPagesA4Left(Integer pagesA4Left) {
-        this.pagesA4Left = pagesA4Left;
-    }
-
-    public Integer getHostPaperPages() {
-        return hostPaperPages;
-    }
-
-    public void setHostPaperPages(Integer hostPaperPages) {
-        this.hostPaperPages = hostPaperPages;
-    }
-
-    public Integer getHostCardPages() {
-        return hostCardPages;
-    }
-
-    public void setHostCardPages(Integer hostCardPages) {
-        this.hostCardPages = hostCardPages;
-    }
-
-    public Integer getHostPagesA4() {
-        return hostPagesA4;
-    }
-
-    public void setHostPagesA4(Integer hostPagesA4) {
-        this.hostPagesA4 = hostPagesA4;
-    }
-}

+ 0 - 96
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExamCardDto.java

@@ -1,96 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.paper.library.business.enums.CardStatusEnum;
-import com.qmth.paper.library.business.enums.CardTypeEnum;
-import com.qmth.paper.library.business.enums.MakeMethodEnum;
-import com.qmth.paper.library.common.enums.CardCreateMethodEnum;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-
-/**
- * @Description: 题卡dto对象
- * @Author: CaoZixuan
- * @Date: 2022-09-01
- */
-public class ExamCardDto implements Serializable {
-    @ApiModelProperty(value = "题卡id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long cardId;
-
-    @ApiModelProperty(value = "标题")
-    private String title;
-
-    @ApiModelProperty(value = "题卡制作方式:SELECT-选择已有题卡,SELF-自助创建,CUST-客户制卡")
-    private MakeMethodEnum makeMethod;
-
-    @ApiModelProperty(value = "STAGE-暂存,SUBMIT-提交")
-    private CardStatusEnum status;
-
-    @ApiModelProperty(value = "题卡类型:GENERIC-通卡,CUSTOM-自定义")
-    private CardTypeEnum type;
-
-    @ApiModelProperty(value = "通卡创建方式(UPLOAD-上传,CUSTOMIZE-自定义)")
-    private CardCreateMethodEnum createMethod;
-
-    @ApiModelProperty(value = "试卷编号")
-    private String paperType;
-
-    public Long getCardId() {
-        return cardId;
-    }
-
-    public void setCardId(Long cardId) {
-        this.cardId = cardId;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public MakeMethodEnum getMakeMethod() {
-        return makeMethod;
-    }
-
-    public void setMakeMethod(MakeMethodEnum makeMethod) {
-        this.makeMethod = makeMethod;
-    }
-
-    public CardStatusEnum getStatus() {
-        return status;
-    }
-
-    public void setStatus(CardStatusEnum status) {
-        this.status = status;
-    }
-
-    public CardTypeEnum getType() {
-        return type;
-    }
-
-    public void setType(CardTypeEnum type) {
-        this.type = type;
-    }
-
-    public CardCreateMethodEnum getCreateMethod() {
-        return createMethod;
-    }
-
-    public void setCreateMethod(CardCreateMethodEnum createMethod) {
-        this.createMethod = createMethod;
-    }
-
-    public String getPaperType() {
-        return paperType;
-    }
-
-    public void setPaperType(String paperType) {
-        this.paperType = paperType;
-    }
-}

+ 0 - 101
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExamPaperInfoDto.java

@@ -1,101 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: 考试试卷题卡信息对象
- * @Author: CaoZixuan
- * @Date: 2022-09-01
- */
-public class ExamPaperInfoDto {
-
-    @ApiModelProperty("卷型")
-    private String name;
-
-    @ApiModelProperty("附件id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long attachmentId;
-
-    @ApiModelProperty("试卷文件名称")
-    private String filename;
-
-    @ApiModelProperty("试卷页数")
-    private Integer pages;
-
-    private Boolean canDelete;
-
-    private Boolean isExposed;
-
-    @ApiModelProperty("题卡主键")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long cardId;
-
-    @ApiModelProperty("原卷")
-    private Original original;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Long getAttachmentId() {
-        return attachmentId;
-    }
-
-    public void setAttachmentId(Long attachmentId) {
-        this.attachmentId = attachmentId;
-    }
-
-    public String getFilename() {
-        return filename;
-    }
-
-    public void setFilename(String filename) {
-        this.filename = filename;
-    }
-
-    public Integer getPages() {
-        return pages;
-    }
-
-    public void setPages(Integer pages) {
-        this.pages = pages;
-    }
-
-    public Boolean getCanDelete() {
-        return canDelete;
-    }
-
-    public void setCanDelete(Boolean canDelete) {
-        this.canDelete = canDelete;
-    }
-
-    public Boolean getExposed() {
-        return isExposed;
-    }
-
-    public void setExposed(Boolean exposed) {
-        isExposed = exposed;
-    }
-
-    public Long getCardId() {
-        return cardId;
-    }
-
-    public void setCardId(Long cardId) {
-        this.cardId = cardId;
-    }
-
-    public Original getOriginal() {
-        return original;
-    }
-
-    public void setOriginal(Original original) {
-        this.original = original;
-    }
-}

+ 0 - 92
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExamPaperObjectiveStructureDto.java

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

+ 0 - 73
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExamPaperStructureDto.java

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

+ 0 - 75
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExamPaperSubjectiveStructureDto.java

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

+ 0 - 214
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExamTaskDetailCardDto.java

@@ -1,214 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-import com.qmth.paper.library.common.enums.FlowStatusEnum;
-
-import java.util.Objects;
-
-/**
- * @Date: 2021/3/31.
- */
-public class ExamTaskDetailCardDto {
-
-    private String examTaskId;
-    private String paperType;
-    private String paperAttachmentIds;
-//    private String cardId;
-    private String paperConfirmAttachmentIds;
-    private String remark;
-    private String exposedPaperType;
-    private String relatePaperType;
-    private String unexposedPaperType;
-    private Boolean enable;
-    private String makeMethod;
-    private Integer drawCount;
-//    private String status;
-    private String flowId;
-    private Integer setup;
-    // 审核流程taskId
-    private String flowTaskId;
-    private String examId;
-    private String examModel;
-    private String examName;
-    private String semesterName;
-    private FlowStatusEnum flowStatus;
-    private String flowStatusStr;
-
-    public FlowStatusEnum getFlowStatus() {
-        return flowStatus;
-    }
-
-    public void setFlowStatus(FlowStatusEnum flowStatus) {
-        this.flowStatus = flowStatus;
-    }
-
-    public String getFlowStatusStr() {
-        if (Objects.nonNull(flowStatus)) {
-            return flowStatus.getTitle();
-        } else {
-            return flowStatusStr;
-        }
-    }
-
-    public void setFlowStatusStr(String flowStatusStr) {
-        this.flowStatusStr = flowStatusStr;
-    }
-
-    public String getExamTaskId() {
-        return examTaskId;
-    }
-
-    public void setExamTaskId(String 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 String getCardId() {
-//        return cardId;
-//    }
-//
-//    public void setCardId(String cardId) {
-//        this.cardId = cardId;
-//    }
-
-    public String getPaperConfirmAttachmentIds() {
-        return paperConfirmAttachmentIds;
-    }
-
-    public void setPaperConfirmAttachmentIds(String paperConfirmAttachmentIds) {
-        this.paperConfirmAttachmentIds = paperConfirmAttachmentIds;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getExposedPaperType() {
-        return exposedPaperType;
-    }
-
-    public void setExposedPaperType(String exposedPaperType) {
-        this.exposedPaperType = exposedPaperType;
-    }
-
-    public String getRelatePaperType() {
-        return relatePaperType;
-    }
-
-    public void setRelatePaperType(String relatePaperType) {
-        this.relatePaperType = relatePaperType;
-    }
-
-    public String getUnexposedPaperType() {
-        return unexposedPaperType;
-    }
-
-    public void setUnexposedPaperType(String unexposedPaperType) {
-        this.unexposedPaperType = unexposedPaperType;
-    }
-
-    public Boolean getEnable() {
-        return enable;
-    }
-
-    public void setEnable(Boolean enable) {
-        this.enable = enable;
-    }
-
-    public String getMakeMethod() {
-        return makeMethod;
-    }
-
-    public void setMakeMethod(String makeMethod) {
-        this.makeMethod = makeMethod;
-    }
-
-    public Integer getDrawCount() {
-        return drawCount;
-    }
-
-    public void setDrawCount(Integer drawCount) {
-        this.drawCount = drawCount;
-    }
-
-//    public String getStatus() {
-//        return status;
-//    }
-//
-//    public void setStatus(String status) {
-//        this.status = status;
-//    }
-    public String getFlowId() {
-        return flowId;
-    }
-
-    public void setFlowId(String flowId) {
-        this.flowId = flowId;
-    }
-
-    public Integer getSetup() {
-        return setup;
-    }
-
-    public void setSetup(Integer setup) {
-        this.setup = setup;
-    }
-
-    public String getFlowTaskId() {
-        return flowTaskId;
-    }
-
-    public void setFlowTaskId(String flowTaskId) {
-        this.flowTaskId = flowTaskId;
-    }
-
-    public String getExamId() {
-        return examId;
-    }
-
-    public void setExamId(String examId) {
-        this.examId = examId;
-    }
-
-    public String getExamName() {
-        return examName;
-    }
-
-    public void setExamName(String examName) {
-        this.examName = examName;
-    }
-
-    public String getExamModel() {
-        return examModel;
-    }
-
-    public void setExamModel(String examModel) {
-        this.examModel = examModel;
-    }
-
-    public String getSemesterName() {
-        return semesterName;
-    }
-
-    public void setSemesterName(String semesterName) {
-        this.semesterName = semesterName;
-    }
-}

+ 0 - 301
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExamTaskDetailDto.java

@@ -1,301 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-import com.qmth.paper.library.business.enums.MakeMethodEnum;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Date: 2021/3/31.
- */
-public class ExamTaskDetailDto {
-
-    private String id;
-    private String examDetailId;
-    private String printPlanId;
-    private String printPlanName;
-    private String paperNumber;
-    private String courseCode;
-    private String courseName;
-    private String specialty;
-    private String cardRuleId;
-
-    @ApiModelProperty(value = "题卡规则名称")
-    private String cardRuleName;
-    private String userId;
-    private String userName;
-    private String status;
-    private Boolean enable;
-    private String createId;
-    private Long createTime;
-    private String paperType;
-    private String relatePaperType;
-    private String exposedPaperType;
-    private String unexposedPaperType;
-    private Integer totalSubjects;
-    private String examDetailCourseIds;
-
-    private Long examId;
-    private String examName;
-    private Long semesterId;
-    private String semesterName;
-
-    @ApiModelProperty(value = "题卡制作方式:SELECT-选择已有题卡,SELF-自助创建,CUST-客户制卡")
-    private MakeMethodEnum makeMethod;
-
-    private Integer setup;
-    @ApiModelProperty(value = "机构id")
-    private String orgName;
-
-    @ApiModelProperty(value = "题卡id")
-    private Long examCardId;
-
-    @ApiModelProperty(value = "命题任务试卷附件")
-    private String paperAttachmentIds;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getExamDetailId() {
-        return examDetailId;
-    }
-
-    public void setExamDetailId(String examDetailId) {
-        this.examDetailId = examDetailId;
-    }
-
-    public String getPrintPlanId() {
-        return printPlanId;
-    }
-
-    public void setPrintPlanId(String printPlanId) {
-        this.printPlanId = printPlanId;
-    }
-
-    public String getPrintPlanName() {
-        return printPlanName;
-    }
-
-    public void setPrintPlanName(String printPlanName) {
-        this.printPlanName = printPlanName;
-    }
-
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    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 getSpecialty() {
-        return specialty;
-    }
-
-    public void setSpecialty(String specialty) {
-        this.specialty = specialty;
-    }
-
-    public String getCardRuleId() {
-        return cardRuleId;
-    }
-
-    public void setCardRuleId(String cardRuleId) {
-        this.cardRuleId = cardRuleId;
-    }
-
-    public String getCardRuleName() {
-        return cardRuleName;
-    }
-
-    public void setCardRuleName(String cardRuleName) {
-        this.cardRuleName = cardRuleName;
-    }
-
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public Boolean getEnable() {
-        return enable;
-    }
-
-    public void setEnable(Boolean enable) {
-        this.enable = enable;
-    }
-
-    public String getCreateId() {
-        return createId;
-    }
-
-    public void setCreateId(String createId) {
-        this.createId = createId;
-    }
-
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getRelatePaperType() {
-        return relatePaperType;
-    }
-
-    public void setRelatePaperType(String relatePaperType) {
-        this.relatePaperType = relatePaperType;
-    }
-
-    public String getExposedPaperType() {
-        return exposedPaperType;
-    }
-
-    public void setExposedPaperType(String exposedPaperType) {
-        this.exposedPaperType = exposedPaperType;
-    }
-
-    public String getUnexposedPaperType() {
-        return unexposedPaperType;
-    }
-
-    public void setUnexposedPaperType(String unexposedPaperType) {
-        this.unexposedPaperType = unexposedPaperType;
-    }
-
-    public Integer getTotalSubjects() {
-        return totalSubjects;
-    }
-
-    public void setTotalSubjects(Integer totalSubjects) {
-        this.totalSubjects = totalSubjects;
-    }
-
-    public String getPaperType() {
-        return paperType;
-    }
-
-    public void setPaperType(String paperType) {
-        this.paperType = paperType;
-    }
-
-    public String getExamDetailCourseIds() {
-        return examDetailCourseIds;
-    }
-
-    public void setExamDetailCourseIds(String examDetailCourseIds) {
-        this.examDetailCourseIds = examDetailCourseIds;
-    }
-
-    public MakeMethodEnum getMakeMethod() {
-        return makeMethod;
-    }
-
-    public void setMakeMethod(MakeMethodEnum makeMethod) {
-        this.makeMethod = makeMethod;
-    }
-
-    public Integer getSetup() {
-        return setup;
-    }
-
-    public void setSetup(Integer setup) {
-        this.setup = setup;
-    }
-
-    public String getExamName() {
-        return examName;
-    }
-
-    public void setExamName(String examName) {
-        this.examName = examName;
-    }
-
-    public String getSemesterName() {
-        return semesterName;
-    }
-
-    public void setSemesterName(String semesterName) {
-        this.semesterName = semesterName;
-    }
-
-    public String getOrgName() {
-        return orgName;
-    }
-
-    public void setOrgName(String orgName) {
-        this.orgName = orgName;
-    }
-
-    public Long getExamCardId() {
-        return examCardId;
-    }
-
-    public void setExamCardId(Long examCardId) {
-        this.examCardId = examCardId;
-    }
-
-    public String getPaperAttachmentIds() {
-        return paperAttachmentIds;
-    }
-
-    public void setPaperAttachmentIds(String paperAttachmentIds) {
-        this.paperAttachmentIds = paperAttachmentIds;
-    }
-
-    public Long getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Long examId) {
-        this.examId = examId;
-    }
-
-    public Long getSemesterId() {
-        return semesterId;
-    }
-
-    public void setSemesterId(Long semesterId) {
-        this.semesterId = semesterId;
-    }
-}

+ 0 - 382
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExamTaskDto.java

@@ -1,382 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.paper.library.business.enums.FlowJoinTypeEnum;
-import com.qmth.paper.library.common.bean.dto.BlurryUserDto;
-import com.qmth.paper.library.common.enums.ExamModelEnum;
-import com.qmth.paper.library.common.enums.FlowStatusEnum;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.List;
-import java.util.Objects;
-
-/**
- * @Date: 2021/3/31.
- */
-public class ExamTaskDto {
-
-    private String id;
-    private String paperNumber;
-    private String courseCode;
-    private String courseName;
-    private String sequence;
-    private String specialty;
-    private String cardRuleId;
-    private String cardRuleName;
-    private String userId;
-    private String userName;
-    private Long startTime;
-    private Long endTime;
-    private String status;
-    private Boolean review;
-    private Boolean enable;
-    private String createId;
-    private String createName;
-    private Long createTime;
-    private String auditStatus;
-    private String reviewStatus;
-    private String teacherName;
-    private String lecturerName;
-    private String teachingRoomName;
-    private String flowId;
-    private Integer setup;
-    private FlowStatusEnum flowStatus;
-    private String flowStatusStr;
-    private String statusStr;
-    private List<BlurryUserDto> users;
-    private boolean myself;
-    @ApiModelProperty(value = "审批表展示状态")
-    private Boolean approveFormStatus;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "考试id")
-    private Long examId;
-
-    @ApiModelProperty(value = "考试名称")
-    private String examName;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "学期id")
-    private Long semesterId;
-
-    @ApiModelProperty(value = "学期名称")
-    private String semesterName;
-
-    @ApiModelProperty(value = "考试模式")
-    private ExamModelEnum examModel;
-
-    @ApiModelProperty(value = "审批次数")
-    private Integer approveCount;
-
-    @ApiModelProperty(value = "流程类型")
-    private FlowJoinTypeEnum flowType;
-
-    public Integer getApproveCount() {
-        return approveCount;
-    }
-
-    public void setApproveCount(Integer approveCount) {
-        this.approveCount = approveCount;
-    }
-
-    public FlowJoinTypeEnum getFlowType() {
-        return flowType;
-    }
-
-    public void setFlowType(FlowJoinTypeEnum flowType) {
-        this.flowType = flowType;
-    }
-
-    public Boolean getApproveFormStatus() {
-        return approveFormStatus;
-    }
-
-    public void setApproveFormStatus(Boolean approveFormStatus) {
-        this.approveFormStatus = approveFormStatus;
-    }
-
-    public boolean isMyself() {
-        return myself;
-    }
-
-    public void setMyself(boolean myself) {
-        this.myself = myself;
-    }
-
-    public FlowStatusEnum getFlowStatus() {
-        return flowStatus;
-    }
-
-    public void setFlowStatus(FlowStatusEnum flowStatus) {
-        this.flowStatus = flowStatus;
-    }
-
-    public String getFlowStatusStr() {
-        if (Objects.nonNull(flowStatus)) {
-            return flowStatus.getTitle();
-        } else {
-            return flowStatusStr;
-        }
-    }
-
-    public void setFlowStatusStr(String flowStatusStr) {
-        this.flowStatusStr = flowStatusStr;
-    }
-
-    public String getStatusStr() {
-        return statusStr;
-    }
-
-    public void setStatusStr(String statusStr) {
-        this.statusStr = statusStr;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    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 getSequence() {
-        return sequence;
-    }
-
-    public void setSequence(String sequence) {
-        this.sequence = sequence;
-    }
-
-    public String getSpecialty() {
-        return specialty;
-    }
-
-    public void setSpecialty(String specialty) {
-        this.specialty = specialty;
-    }
-
-    public Boolean getReview() {
-        return review;
-    }
-
-    public void setReview(Boolean review) {
-        this.review = review;
-    }
-
-    public String getCardRuleId() {
-        return cardRuleId;
-    }
-
-    public void setCardRuleId(String cardRuleId) {
-        this.cardRuleId = cardRuleId;
-    }
-
-    public String getCardRuleName() {
-        return cardRuleName;
-    }
-
-    public void setCardRuleName(String cardRuleName) {
-        this.cardRuleName = cardRuleName;
-    }
-
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public Long getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(Long startTime) {
-        this.startTime = startTime;
-    }
-
-    public Long getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(Long endTime) {
-        this.endTime = endTime;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public Boolean getEnable() {
-        return enable;
-    }
-
-    public void setEnable(Boolean enable) {
-        this.enable = enable;
-    }
-
-    public String getCreateId() {
-        return createId;
-    }
-
-    public void setCreateId(String createId) {
-        this.createId = createId;
-    }
-
-    public String getCreateName() {
-        return createName;
-    }
-
-    public void setCreateName(String createName) {
-        this.createName = createName;
-    }
-
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
-
-    public List<BlurryUserDto> getUsers() {
-        return users;
-    }
-
-    public void setUsers(List<BlurryUserDto> users) {
-        this.users = users;
-    }
-
-    public String getAuditStatus() {
-        return auditStatus;
-    }
-
-    public void setAuditStatus(String auditStatus) {
-        this.auditStatus = auditStatus;
-    }
-
-    public String getReviewStatus() {
-        return reviewStatus;
-    }
-
-    public void setReviewStatus(String reviewStatus) {
-        this.reviewStatus = reviewStatus;
-    }
-
-    public String getTeacherName() {
-        return teacherName;
-    }
-
-    public void setTeacherName(String teacherName) {
-        this.teacherName = teacherName;
-    }
-
-    public String getLecturerName() {
-        return lecturerName;
-    }
-
-    public void setLecturerName(String lecturerName) {
-        this.lecturerName = lecturerName;
-    }
-
-    public String getTeachingRoomName() {
-        return teachingRoomName;
-    }
-
-    public void setTeachingRoomName(String teachingRoomName) {
-        this.teachingRoomName = teachingRoomName;
-    }
-
-    public String getFlowId() {
-        return flowId;
-    }
-
-    public void setFlowId(String flowId) {
-        this.flowId = flowId;
-    }
-
-    public Integer getSetup() {
-        return setup;
-    }
-
-    public void setSetup(Integer setup) {
-        this.setup = setup;
-    }
-
-    public Long getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Long examId) {
-        this.examId = examId;
-    }
-
-    public String getExamName() {
-        return examName;
-    }
-
-    public void setExamName(String examName) {
-        this.examName = examName;
-    }
-
-    public Long getSemesterId() {
-        return semesterId;
-    }
-
-    public void setSemesterId(Long semesterId) {
-        this.semesterId = semesterId;
-    }
-
-    public String getSemesterName() {
-        return semesterName;
-    }
-
-    public void setSemesterName(String semesterName) {
-        this.semesterName = semesterName;
-    }
-
-    public ExamModelEnum getExamModel() {
-        return examModel;
-    }
-
-    public void setExamModel(ExamModelEnum examModel) {
-        this.examModel = examModel;
-    }
-}

+ 0 - 39
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExamTaskImportDto.java

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

+ 0 - 34
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExamTaskPaperDto.java

@@ -1,34 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.List;
-
-/**
- * @Description: 命题任务试卷文件
- * @Author: CaoZixuan
- * @Date: 2022-04-11
- */
-public class ExamTaskPaperDto {
-    @ApiModelProperty(value = "命题任务试卷文件Dto")
-    private List<ExamTaskPaperFileDto> examTaskPaperFileDtoList;
-
-    @ApiModelProperty(value = "试卷批量下载导出excelDto")
-    private List<ExamTaskPaperExportDto> examTaskPaperExportDtoList;
-
-    public List<ExamTaskPaperFileDto> getExamTaskPaperFileDtoList() {
-        return examTaskPaperFileDtoList;
-    }
-
-    public void setExamTaskPaperFileDtoList(List<ExamTaskPaperFileDto> examTaskPaperFileDtoList) {
-        this.examTaskPaperFileDtoList = examTaskPaperFileDtoList;
-    }
-
-    public List<ExamTaskPaperExportDto> getExamTaskPaperExportDtoList() {
-        return examTaskPaperExportDtoList;
-    }
-
-    public void setExamTaskPaperExportDtoList(List<ExamTaskPaperExportDto> examTaskPaperExportDtoList) {
-        this.examTaskPaperExportDtoList = examTaskPaperExportDtoList;
-    }
-}

+ 0 - 73
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExamTaskPaperExportDto.java

@@ -1,73 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-import com.qmth.paper.library.common.annotation.ExcelProperty;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-
-/**
- * @Description: 试卷批量下载导出excelDto
- * @Author: CaoZixuan
- * @Date: 2022-04-11
- */
-public class ExamTaskPaperExportDto implements Serializable {
-    @ApiModelProperty(value = "课程名称")
-    @ExcelProperty(name = "课程名称", width = 30, index = 1)
-    private String courseName;
-
-    @ApiModelProperty(value = "课程代码")
-    @ExcelProperty(name = "课程代码", width = 30, index = 2)
-    private String courseCode;
-
-    @ApiModelProperty(value = "试卷编号")
-    @ExcelProperty(name = "试卷编号", width = 30, index = 3)
-    private String paperNumber;
-
-    @ApiModelProperty(value = "全部卷型")
-    @ExcelProperty(name = "全部卷型", width = 30, index = 4)
-    private String paperType;
-
-    @ApiModelProperty(value = "未曝光卷型")
-    @ExcelProperty(name = "未曝光卷型", width = 30, index = 5)
-    private String unexposedPaperType;
-
-    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;
-    }
-
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    public String getPaperType() {
-        return paperType;
-    }
-
-    public void setPaperType(String paperType) {
-        this.paperType = paperType;
-    }
-
-    public String getUnexposedPaperType() {
-        return unexposedPaperType;
-    }
-
-    public void setUnexposedPaperType(String unexposedPaperType) {
-        this.unexposedPaperType = unexposedPaperType;
-    }
-}

+ 0 - 189
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExamTaskPaperFileDto.java

@@ -1,189 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.paper.library.business.entity.ExamPrintPlan;
-import com.qmth.paper.library.common.annotation.ExcelProperty;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.List;
-
-/**
- * @Description: 命题任务试卷文件Dto
- * @Author: CaoZixuan
- * @Date: 2022-04-07
- */
-public class ExamTaskPaperFileDto {
-    // 命题任务基本信息
-    @ApiModelProperty(value = "命题任务id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long examTaskId;
-
-    @ApiModelProperty(value = "学期名称")
-    private String semesterName;
-
-    @ApiModelProperty(value = "考试名称")
-    private String examName;
-
-    @ApiModelProperty(value = "机构名称")
-    private String orgName;
-
-    // 命题任务基础信息
-    @ApiModelProperty(value = "印刷计划集合")
-    private List<ExamPrintPlan> examPrintPlanList;
-
-    @ApiModelProperty(value = "课程名称")
-    @ExcelProperty(name = "课程名称", width = 30, index = 1)
-    private String courseName;
-
-    @ApiModelProperty(value = "课程代码")
-    @ExcelProperty(name = "课程代码", width = 30, index = 2)
-    private String courseCode;
-
-    @ApiModelProperty(value = "试卷编号")
-    @ExcelProperty(name = "试卷编号", width = 30, index = 3)
-    private String paperNumber;
-
-    // 试卷信息
-    @ApiModelProperty(value = "试卷类型")
-    private String paperType;
-
-    @ApiModelProperty(value = "曝光状态 true-已曝光、false-未曝光")
-    private Boolean exposureStatus;
-
-    @ApiModelProperty(value = "试卷文件名称")
-    private String paperName;
-
-    @ApiModelProperty(value = "试卷文件后缀")
-    private String paperSuffix;
-
-    @ApiModelProperty(value = "试卷文件路径")
-    private String paperPath;
-
-    // 题卡信息
-    @ApiModelProperty(value = "该命题任务id")
-    private Long examCardId;
-
-    @ApiModelProperty(value = "题卡规则id")
-    private Long cardRuleId;
-
-    public Long getExamTaskId() {
-        return examTaskId;
-    }
-
-    public void setExamTaskId(Long examTaskId) {
-        this.examTaskId = examTaskId;
-    }
-
-    public String getSemesterName() {
-        return semesterName;
-    }
-
-    public void setSemesterName(String semesterName) {
-        this.semesterName = semesterName;
-    }
-
-    public String getExamName() {
-        return examName;
-    }
-
-    public void setExamName(String examName) {
-        this.examName = examName;
-    }
-
-    public String getOrgName() {
-        return orgName;
-    }
-
-    public void setOrgName(String orgName) {
-        this.orgName = orgName;
-    }
-
-    public List<ExamPrintPlan> getExamPrintPlanList() {
-        return examPrintPlanList;
-    }
-
-    public void setExamPrintPlanList(List<ExamPrintPlan> examPrintPlanList) {
-        this.examPrintPlanList = examPrintPlanList;
-    }
-
-    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;
-    }
-
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    public String getPaperType() {
-        return paperType;
-    }
-
-    public void setPaperType(String paperType) {
-        this.paperType = paperType;
-    }
-
-    public Boolean getExposureStatus() {
-        return exposureStatus;
-    }
-
-    public void setExposureStatus(Boolean exposureStatus) {
-        this.exposureStatus = exposureStatus;
-    }
-
-    public String getPaperName() {
-        return paperName;
-    }
-
-    public void setPaperName(String paperName) {
-        this.paperName = paperName;
-    }
-
-    public String getPaperSuffix() {
-        return paperSuffix;
-    }
-
-    public void setPaperSuffix(String paperSuffix) {
-        this.paperSuffix = paperSuffix;
-    }
-
-    public String getPaperPath() {
-        return paperPath;
-    }
-
-    public void setPaperPath(String paperPath) {
-        this.paperPath = paperPath;
-    }
-
-    public Long getExamCardId() {
-        return examCardId;
-    }
-
-    public void setExamCardId(Long examCardId) {
-        this.examCardId = examCardId;
-    }
-
-    public Long getCardRuleId() {
-        return cardRuleId;
-    }
-
-    public void setCardRuleId(Long cardRuleId) {
-        this.cardRuleId = cardRuleId;
-    }
-}

+ 0 - 164
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExamTaskPlanStatisticDto.java

@@ -1,164 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.paper.library.business.enums.BackupMethodEnum;
-import com.qmth.paper.library.business.enums.ExamDetailStatusEnum;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-
-/**
- * @Description: 命题计划统计Dto
- * @Author: CaoZixuan
- * @Date: 2022-04-25
- */
-public class ExamTaskPlanStatisticDto implements Serializable {
-
-    @ApiModelProperty(value = "考试id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long examId;
-
-    @ApiModelProperty(value = "印刷计划id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long examPrintPlanId;
-
-    @ApiModelProperty(value = "备份方式")
-    private BackupMethodEnum backupMethod;
-
-    @ApiModelProperty(value = "备份数量")
-    private Integer backupCount;
-
-    @ApiModelProperty(value = "印刷计划名称")
-    private String examPrintPlanName;
-
-    @ApiModelProperty(value = "考场表id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long examDetailId;
-
-    @ApiModelProperty(value = "考场表印刷状态")
-    private ExamDetailStatusEnum examDetailStatus;
-
-    @ApiModelProperty(value = "考试科目表id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long examDetailCourseId;
-
-    @ApiModelProperty(value = "试卷编号")
-    private String paperNumber;
-
-    @ApiModelProperty(value = "课程编号")
-    private String courseCode;
-
-    @ApiModelProperty(value = "课程名称")
-    private String courseName;
-
-    @ApiModelProperty(value = "班级名称逗号隔开")
-    private String clazzIds;
-
-    @ApiModelProperty(value = "学生数量")
-    private Integer studentCount;
-
-    public Long getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Long examId) {
-        this.examId = examId;
-    }
-
-    public BackupMethodEnum getBackupMethod() {
-        return backupMethod;
-    }
-
-    public void setBackupMethod(BackupMethodEnum backupMethod) {
-        this.backupMethod = backupMethod;
-    }
-
-    public Integer getBackupCount() {
-        return backupCount;
-    }
-
-    public void setBackupCount(Integer backupCount) {
-        this.backupCount = backupCount;
-    }
-
-    public Long getExamPrintPlanId() {
-        return examPrintPlanId;
-    }
-
-    public void setExamPrintPlanId(Long examPrintPlanId) {
-        this.examPrintPlanId = examPrintPlanId;
-    }
-
-    public String getExamPrintPlanName() {
-        return examPrintPlanName;
-    }
-
-    public void setExamPrintPlanName(String examPrintPlanName) {
-        this.examPrintPlanName = examPrintPlanName;
-    }
-
-    public Long getExamDetailId() {
-        return examDetailId;
-    }
-
-    public void setExamDetailId(Long examDetailId) {
-        this.examDetailId = examDetailId;
-    }
-
-    public ExamDetailStatusEnum getExamDetailStatus() {
-        return examDetailStatus;
-    }
-
-    public void setExamDetailStatus(ExamDetailStatusEnum examDetailStatus) {
-        this.examDetailStatus = examDetailStatus;
-    }
-
-    public Long getExamDetailCourseId() {
-        return examDetailCourseId;
-    }
-
-    public void setExamDetailCourseId(Long examDetailCourseId) {
-        this.examDetailCourseId = examDetailCourseId;
-    }
-
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    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 getClazzIds() {
-        return clazzIds;
-    }
-
-    public void setClazzIds(String clazzIds) {
-        this.clazzIds = clazzIds;
-    }
-
-    public Integer getStudentCount() {
-        return studentCount;
-    }
-
-    public void setStudentCount(Integer studentCount) {
-        this.studentCount = studentCount;
-    }
-}

+ 0 - 19
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExamTaskPrintDetailDto.java

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

+ 0 - 55
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExamTaskPrintDto.java

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

+ 0 - 59
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExamTaskTempDto.java

@@ -1,59 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-public class ExamTaskTempDto {
-
-    private String courseCode;
-    private String courseName;
-    private String paperNumber;
-    private String specialty;
-    private String userAccount;
-    private String userName;
-
-    public String getCourseCode() {
-        return courseCode;
-    }
-
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
-    }
-
-    public String getCourseName() {
-        return courseName;
-    }
-
-    public void setCourseName(String courseName) {
-        this.courseName = courseName;
-    }
-
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    public String getSpecialty() {
-        return specialty;
-    }
-
-    public void setSpecialty(String specialty) {
-        this.specialty = specialty;
-    }
-
-    public String getUserAccount() {
-        return userAccount;
-    }
-
-    public void setUserAccount(String userAccount) {
-        this.userAccount = userAccount;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-}

+ 0 - 158
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExaminationExportDto.java

@@ -1,158 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.paper.library.common.annotation.ExcelProperty;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: 考务数据导出Dto
- * @Author: CaoZixuan
- * @Date: 2021-04-15
- */
-public class ExaminationExportDto {
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "序号")
-    @ExcelProperty(name = "序号", width = 30, index = 1)
-    private Long index;
-
-    @ApiModelProperty(value = "学期名称")
-    @ExcelProperty(name = "学期名称", width = 30, index = 2)
-    private String semesterName;
-
-    @ApiModelProperty(value = "考试名称")
-    @ExcelProperty(name = "考试名称", width = 30, index = 3)
-    private String examName;
-
-    @ApiModelProperty(value = "印刷计划名称")
-    @ExcelProperty(name = "印刷计划名称", width = 30, index = 4)
-    private String printPlanName;
-
-    @ApiModelProperty(value = "考试日期")
-    @ExcelProperty(name = "考试日期", width = 30, index = 5)
-    private String examDate;
-
-    @ApiModelProperty(value = "考试时间")
-    @ExcelProperty(name = "考试时间", width = 30, index = 6)
-    private String examTime;
-
-    @ApiModelProperty(value = "考点")
-    @ExcelProperty(name = "考点", width = 30, index = 7)
-    private String examPlace;
-
-    @ApiModelProperty(value = "考场")
-    @ExcelProperty(name = "考场", width = 30, index = 8)
-    private String examRoom;
-
-    @ApiModelProperty(value = "卷袋号")
-    @ExcelProperty(name = "卷袋号", width = 30, index = 9)
-    private String packageCode;
-
-    @ApiModelProperty(value = "课程(代码)")
-    @ExcelProperty(name = "课程(代码)", width = 30, index = 10)
-    private String courseNameCode;
-
-    @ApiModelProperty(value = "试卷编号")
-    @ExcelProperty(name = "试卷编号", width = 30, index = 11)
-    private String paperNumber;
-
-    @ApiModelProperty(value = "科次")
-    @ExcelProperty(name = "科次", width = 30, index = 12)
-    private int totalSubjects;
-
-    public Long getIndex() {
-        return index;
-    }
-
-    public void setIndex(Long index) {
-        this.index = index;
-    }
-
-    public String getSemesterName() {
-        return semesterName;
-    }
-
-    public void setSemesterName(String semesterName) {
-        this.semesterName = semesterName;
-    }
-
-    public String getExamName() {
-        return examName;
-    }
-
-    public void setExamName(String examName) {
-        this.examName = examName;
-    }
-
-    public String getPrintPlanName() {
-        return printPlanName;
-    }
-
-    public void setPrintPlanName(String printPlanName) {
-        this.printPlanName = printPlanName;
-    }
-
-    public String getExamDate() {
-        return examDate;
-    }
-
-    public void setExamDate(String examDate) {
-        this.examDate = examDate;
-    }
-
-    public String getExamTime() {
-        return examTime;
-    }
-
-    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;
-    }
-
-    public String getPackageCode() {
-        return packageCode;
-    }
-
-    public void setPackageCode(String packageCode) {
-        this.packageCode = packageCode;
-    }
-
-    public String getCourseNameCode() {
-        return courseNameCode;
-    }
-
-    public void setCourseNameCode(String courseNameCode) {
-        this.courseNameCode = courseNameCode;
-    }
-
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    public int getTotalSubjects() {
-        return totalSubjects;
-    }
-
-    public void setTotalSubjects(int totalSubjects) {
-        this.totalSubjects = totalSubjects;
-    }
-}

+ 0 - 262
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExaminationImportDto.java

@@ -1,262 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-import com.qmth.paper.library.common.annotation.ExcelDBFieldDesc;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.List;
-
-/**
- * @Description: 考务数据导入Dto(对应 ExaminationDBFieldsEnum 同时作为考务数据表所需要的的字段,来接收excel导入的考务数据)
- * @Author: CaoZixuan
- * @Date: 2021-04-25
- */
-public class ExaminationImportDto {
-
-    @ApiModelProperty(value = "学号")
-    @ExcelDBFieldDesc(name = "学号", length = 30)
-    private String studentCode;
-
-    @ApiModelProperty(value = "考号")
-    @ExcelDBFieldDesc(name = "考号", length = 30)
-    private String ticketNumber;
-
-    @ApiModelProperty(value = "座位号")
-    @ExcelDBFieldDesc(name = "座位号", length = 30)
-    private String siteNumber;
-
-    @ApiModelProperty(value = "姓名")
-    @ExcelDBFieldDesc(name = "姓名", length = 30)
-    private String studentName;
-
-    @ApiModelProperty(value = "课程代码")
-    @ExcelDBFieldDesc(name = "课程代码", length = 30)
-    private String courseCode;
-
-    @ApiModelProperty(value = "课程名称")
-    @ExcelDBFieldDesc(name = "课程名称", length = 50)
-    private String courseName;
-
-    @ApiModelProperty(value = "考点")
-    @ExcelDBFieldDesc(name = "考点", length = 30)
-    private String examPlace;
-
-    @ApiModelProperty(value = "考场")
-    @ExcelDBFieldDesc(name = "考场", length = 30)
-    private String examRoom;
-
-    @ApiModelProperty(value = "考试日期")
-    @ExcelDBFieldDesc(name = "考试日期")
-    private String examDate;
-
-    @ApiModelProperty(value = "考试时间")
-    @ExcelDBFieldDesc(name = "考试时间")
-    private String examTime;
-
-    @ApiModelProperty(value = "试卷编号")
-    @ExcelDBFieldDesc(name = "试卷编号", length = 30)
-    private String paperNumber;
-
-    @ApiModelProperty(value = "学院")
-    @ExcelDBFieldDesc(name = "学院", length = 30)
-    private String collegeName;
-
-    @ApiModelProperty(value = "专业")
-    @ExcelDBFieldDesc(name = "专业", length = 30)
-    private String majorName;
-
-    @ApiModelProperty(value = "班级")
-    @ExcelDBFieldDesc(name = "班级", length = 30)
-    private String clazzName;
-
-    @ApiModelProperty(value = "课程创建的任务序号")
-    private String sequence;
-
-    @ApiModelProperty(value = "备选字段集合")
-    private List<FieldsDto> secondaryFieldList;
-
-    @ApiModelProperty(value = "考试开始时间")
-    private String examStartTime;
-
-    @ApiModelProperty(value = "考试结束时间")
-    private String examEndTime;
-
-    @ApiModelProperty(value = "学校id")
-    private Long schoolId;
-
-    @ApiModelProperty(value = "印刷计划id")
-    private Long printPlanId;
-
-    @ApiModelProperty(value = "印刷计划名称")
-    private String printPlanName;
-
-    public ExaminationImportDto() {
-    }
-
-    public String getStudentCode() {
-        return studentCode;
-    }
-
-    public void setStudentCode(String studentCode) {
-        this.studentCode = studentCode;
-    }
-
-    public String getTicketNumber() {
-        return ticketNumber;
-    }
-
-    public void setTicketNumber(String ticketNumber) {
-        this.ticketNumber = ticketNumber;
-    }
-
-    public String getSiteNumber() {
-        return siteNumber;
-    }
-
-    public void setSiteNumber(String siteNumber) {
-        this.siteNumber = siteNumber;
-    }
-
-    public String getStudentName() {
-        return studentName;
-    }
-
-    public void setStudentName(String studentName) {
-        this.studentName = studentName;
-    }
-
-    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 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 getExamDate() {
-        return examDate;
-    }
-
-    public void setExamDate(String examDate) {
-        this.examDate = examDate;
-    }
-
-    public String getExamTime() {
-        return examTime;
-    }
-
-    public void setExamTime(String examTime) {
-        this.examTime = examTime;
-    }
-
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    public String getSequence() {
-        return sequence;
-    }
-
-    public void setSequence(String sequence) {
-        this.sequence = sequence;
-    }
-
-    public List<FieldsDto> getSecondaryFieldList() {
-        return secondaryFieldList;
-    }
-
-    public void setSecondaryFieldList(List<FieldsDto> secondaryFieldList) {
-        this.secondaryFieldList = secondaryFieldList;
-    }
-
-    public String getExamStartTime() {
-        return examStartTime;
-    }
-
-    public void setExamStartTime(String examStartTime) {
-        this.examStartTime = examStartTime;
-    }
-
-    public String getExamEndTime() {
-        return examEndTime;
-    }
-
-    public void setExamEndTime(String examEndTime) {
-        this.examEndTime = examEndTime;
-    }
-
-    public Long getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(Long schoolId) {
-        this.schoolId = schoolId;
-    }
-
-    public Long getPrintPlanId() {
-        return printPlanId;
-    }
-
-    public void setPrintPlanId(Long printPlanId) {
-        this.printPlanId = printPlanId;
-    }
-
-    public String getPrintPlanName() {
-        return printPlanName;
-    }
-
-    public void setPrintPlanName(String printPlanName) {
-        this.printPlanName = printPlanName;
-    }
-
-    public String getCollegeName() {
-        return collegeName;
-    }
-
-    public void setCollegeName(String collegeName) {
-        this.collegeName = collegeName;
-    }
-
-    public String getMajorName() {
-        return majorName;
-    }
-
-    public void setMajorName(String majorName) {
-        this.majorName = majorName;
-    }
-
-    public String getClazzName() {
-        return clazzName;
-    }
-
-    public void setClazzName(String clazzName) {
-        this.clazzName = clazzName;
-    }
-}

+ 0 - 61
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExtendFieldsDto.java

@@ -1,61 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-/**
- * @Description: 考务学生-扩展字段
- * @Author: CaoZixuan
- * @Date: 2021-04-21
- */
-public class ExtendFieldsDto {
-
-    /**
-     * 考务字段代码
-     */
-    private String code;
-
-    /**
-     * 考务字段名称
-     */
-    private String name;
-
-    /**
-     * 考务字段是否可用(仅考务规则有)
-     */
-    private Boolean enable;
-
-    /**
-     * 考务字段值(仅考生有)
-     */
-    private String value;
-
-    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 getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-}

+ 0 - 99
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/FieldsDto.java

@@ -1,99 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: 考务字段Dto
- * @Author: CaoZixuan
- * @Date: 2021-04-07
- */
-public class FieldsDto {
-
-    /**
-     * 考务字段代码
-     */
-    private String code;
-
-    /**
-     * 考务字段名称
-     */
-    private String name;
-
-    /**
-     * 考务字段是否可用(仅考务规则有)
-     */
-    private Boolean enable;
-
-    /**
-     * 考务字段值(仅考生有)
-     */
-    private String value;
-
-    /**
-     * 索引
-     */
-    private int index;
-
-    @ApiModelProperty(value = "字段级别(必选字段 - 'primary'、扩展字段 - 'secondary')")
-    private String level;
-
-    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 getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    public int getIndex() {
-        return index;
-    }
-
-    public void setIndex(int index) {
-        this.index = index;
-    }
-
-    public String getLevel() {
-        return level;
-    }
-
-    public void setLevel(String level) {
-        this.level = level;
-    }
-
-    @Override
-    public String toString() {
-        return "FieldsDto{" +
-                "code='" + code + '\'' +
-                ", name='" + name + '\'' +
-                ", enable=" + enable +
-                ", value='" + value + '\'' +
-                ", index=" + index +
-                ", level='" + level + '\'' +
-                '}';
-    }
-}

+ 0 - 87
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/GradeBatchStudentClazzDto.java

@@ -1,87 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-import com.qmth.paper.library.common.annotation.ExcelImportTempleteVaild;
-
-/**
- * <p>
- * 考务数据班级(包含任课老师)
- * </p>
- *
- * @since 2022-07-14
- */
-@ExcelImportTempleteVaild(value = true)
-public class GradeBatchStudentClazzDto {
-
-    private String courseCode;
-    private String courseName;
-    private String paperNumber;
-    private String paperType;
-    private String clazzId;
-    private String clazzName;
-    private String teacherName;
-    private String teacherNumber;
-
-    public String getCourseCode() {
-        return courseCode;
-    }
-
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
-    }
-
-    public String getCourseName() {
-        return courseName;
-    }
-
-    public void setCourseName(String courseName) {
-        this.courseName = courseName;
-    }
-
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    public String getPaperType() {
-        return paperType;
-    }
-
-    public void setPaperType(String paperType) {
-        this.paperType = paperType;
-    }
-
-    public String getClazzId() {
-        return clazzId;
-    }
-
-    public void setClazzId(String clazzId) {
-        this.clazzId = clazzId;
-    }
-
-    public String getClazzName() {
-        return clazzName;
-    }
-
-    public void setClazzName(String clazzName) {
-        this.clazzName = clazzName;
-    }
-
-    public String getTeacherName() {
-        return teacherName;
-    }
-
-    public void setTeacherName(String teacherName) {
-        this.teacherName = teacherName;
-    }
-
-    public String getTeacherNumber() {
-        return teacherNumber;
-    }
-
-    public void setTeacherNumber(String teacherNumber) {
-        this.teacherNumber = teacherNumber;
-    }
-}

+ 0 - 97
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/GradeBatchStudentDto.java

@@ -1,97 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-import com.qmth.paper.library.common.annotation.ExcelImportTempleteVaild;
-
-/**
- * <p>
- * 考务数据(包含任课老师)
- * </p>
- *
- * @author wangliang
- * @since 2022-05-20
- */
-@ExcelImportTempleteVaild(value = true)
-public class GradeBatchStudentDto {
-
-    private String courseCode;
-    private String courseName;
-    private String paperNumber;
-    private String paperType;
-    private String studentCode;
-    private String studentName;
-    private String ticketNumber;
-    private String teacherName;
-    private String teacherNumber;
-
-    public String getCourseCode() {
-        return courseCode;
-    }
-
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
-    }
-
-    public String getCourseName() {
-        return courseName;
-    }
-
-    public void setCourseName(String courseName) {
-        this.courseName = courseName;
-    }
-
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    public String getPaperType() {
-        return paperType;
-    }
-
-    public void setPaperType(String paperType) {
-        this.paperType = paperType;
-    }
-
-    public String 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 getTicketNumber() {
-        return ticketNumber;
-    }
-
-    public void setTicketNumber(String ticketNumber) {
-        this.ticketNumber = ticketNumber;
-    }
-
-    public String getTeacherName() {
-        return teacherName;
-    }
-
-    public void setTeacherName(String teacherName) {
-        this.teacherName = teacherName;
-    }
-
-    public String getTeacherNumber() {
-        return teacherNumber;
-    }
-
-    public void setTeacherNumber(String teacherNumber) {
-        this.teacherNumber = teacherNumber;
-    }
-}

+ 0 - 77
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/PaperPdfDto.java

@@ -1,77 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-import com.qmth.paper.library.common.enums.PageSizeEnum;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.File;
-import java.io.Serializable;
-
-/**
- * @Description: 试卷pdf dto
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/4/26
- */
-public class PaperPdfDto implements Serializable {
-
-    @ApiModelProperty(name = "文件")
-    File file;
-
-    @ApiModelProperty(name = "页面大小")
-    int pages;
-
-    @ApiModelProperty(name = "卷型")
-    String type;
-
-    @ApiModelProperty(value = "pdf格式")
-    PageSizeEnum pageSize;
-
-    public PaperPdfDto() {
-
-    }
-
-    public PaperPdfDto(File file, int pages) {
-        this.file = file;
-        this.pages = pages;
-    }
-
-    public PaperPdfDto(String type, File file, int pages, PageSizeEnum pageSize) {
-        this.type = type;
-        this.file = file;
-        this.pages = pages;
-        this.pageSize = pageSize;
-    }
-
-    public PageSizeEnum getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(PageSizeEnum pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public File getFile() {
-        return file;
-    }
-
-    public void setFile(File file) {
-        this.file = file;
-    }
-
-    public int getPages() {
-        return pages;
-    }
-
-    public void setPages(int pages) {
-        this.pages = pages;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-}

+ 0 - 119
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/PdfDto.java

@@ -1,119 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-import com.qmth.paper.library.common.enums.PageSizeEnum;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: pdf dto
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/4/13
- */
-public class PdfDto {
-
-    @ApiModelProperty(name = "路径")
-    String path;
-
-    @ApiModelProperty(name = "页数")
-    int pageCount = 0;
-
-    @ApiModelProperty(name = "实际页数")
-    int actualPageCount = 0;
-
-    @ApiModelProperty(name = "页面大小")
-    PageSizeEnum pageSize;
-
-    @ApiModelProperty(name = "序号")
-    int sequence = 0;
-
-    @ApiModelProperty(name = "tag")
-    boolean tag = true;
-
-    public PdfDto() {
-
-    }
-
-    public PdfDto(String path, PageSizeEnum pageSize) {
-        this.path = path;
-        this.pageSize = pageSize;
-    }
-
-    public PdfDto(String path, PageSizeEnum pageSize, int pageCount) {
-        this.path = path;
-        this.pageSize = pageSize;
-        this.pageCount = pageCount;
-    }
-
-    public PdfDto(String path, PageSizeEnum pageSize, int pageCount, int sequence) {
-        this.path = path;
-        this.pageSize = pageSize;
-        this.pageCount = pageCount;
-        this.sequence = sequence;
-    }
-
-    public PdfDto(PageSizeEnum pageSize, int pageCount, boolean tag) {
-        this.pageSize = pageSize;
-        this.pageCount = pageCount;
-        this.tag = tag;
-    }
-
-    public PdfDto(PageSizeEnum pageSize, int pageCount) {
-        this.pageSize = pageSize;
-        this.pageCount = pageCount;
-    }
-
-    public PdfDto(PageSizeEnum pageSize, int pageCount, int actualPageCount) {
-        this.pageSize = pageSize;
-        this.pageCount = pageCount;
-        this.actualPageCount = actualPageCount;
-    }
-
-    public boolean isTag() {
-        return tag;
-    }
-
-    public void setTag(boolean tag) {
-        this.tag = tag;
-    }
-
-    public String getPath() {
-        return path;
-    }
-
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    public int getPageCount() {
-        return pageCount;
-    }
-
-    public void setPageCount(int pageCount) {
-        this.pageCount = pageCount;
-    }
-
-    public int getActualPageCount() {
-        return actualPageCount;
-    }
-
-    public void setActualPageCount(int actualPageCount) {
-        this.actualPageCount = actualPageCount;
-    }
-
-    public int getSequence() {
-        return sequence;
-    }
-
-    public void setSequence(int sequence) {
-        this.sequence = sequence;
-    }
-
-    public PageSizeEnum getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(PageSizeEnum pageSize) {
-        this.pageSize = pageSize;
-    }
-}

+ 0 - 50
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/PdfPackageDto.java

@@ -1,50 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- *
- */
-public class PdfPackageDto {
-
-    /**
-     * 标题
-     */
-    private String title;
-
-    /**
-     * 卷袋号
-     */
-    private String packageNumber;
-
-    /**
-     * 基础板块信息
-     */
-    private List<Map<String, String>> basicPlate;
-
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getPackageNumber() {
-        return packageNumber;
-    }
-
-    public void setPackageNumber(String packageNumber) {
-        this.packageNumber = packageNumber;
-    }
-
-    public List<Map<String, String>> getBasicPlate() {
-        return basicPlate;
-    }
-
-    public void setBasicPlate(List<Map<String, String>> basicPlate) {
-        this.basicPlate = basicPlate;
-    }
-}

+ 0 - 78
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/PdfSignDto.java

@@ -1,78 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- *
- */
-public class PdfSignDto {
-
-    /**
-     * 标题
-     */
-    private String title;
-
-    /**
-     * 卷袋号
-     */
-    private String packageNumber;
-
-    /**
-     * 基础板块信息
-     */
-    private List<Map<String, String>> basicPlate;
-
-    /**
-     * 考生表头信息
-     */
-    private Map<String, String> studentHeadPlate;
-
-    /**
-     * 考生信息
-     */
-    private List<Map<String, String>> studentPlate;
-
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getPackageNumber() {
-        return packageNumber;
-    }
-
-    public void setPackageNumber(String packageNumber) {
-        this.packageNumber = packageNumber;
-    }
-
-    public List<Map<String, String>> getBasicPlate() {
-        return basicPlate;
-    }
-
-    public void setBasicPlate(List<Map<String, String>> basicPlate) {
-        this.basicPlate = basicPlate;
-    }
-
-    public Map<String, String> getStudentHeadPlate() {
-        return studentHeadPlate;
-    }
-
-    public void setStudentHeadPlate(Map<String, String> studentHeadPlate) {
-        this.studentHeadPlate = studentHeadPlate;
-    }
-
-    public List<Map<String, String>> getStudentPlate() {
-        return studentPlate;
-    }
-
-    public void setStudentPlate(List<Map<String, String>> studentPlate) {
-        this.studentPlate = studentPlate;
-    }
-
-
-}

+ 0 - 272
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/PrintTaskDto.java

@@ -1,272 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Date: 2021/3/29.
- */
-public class PrintTaskDto {
-
-    private String examDetailId;
-    private String printPlanId;
-    private String printPlanName;
-    private Long examStartTime;
-    private Long examEndTime;
-    private String courseNameCode;
-    private String paperNumber;
-    private String examPlace;
-    private String examRoom;
-    private String singlePagesA3;
-    private Integer paperPages;
-    private Integer cardPages;
-    private Integer pagesA4;
-    private Integer totalSubjects;
-    private String status;
-    private Boolean validate;
-    private Long printStartTime;
-    private Long printEndTime;
-    private String packageCode;
-    private Boolean normal;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "印刷室id")
-    private Long printHouseId;
-
-    @ApiModelProperty(value = "印刷室编号")
-    private String printHouseCode;
-
-    @ApiModelProperty(value = "印刷室名称")
-    private String printHouseName;
-
-    @ApiModelProperty(value = "学期id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long semesterId;
-
-    @ApiModelProperty(value = "学期名称")
-    private String semesterName;
-
-    @ApiModelProperty(value = "考试id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long examId;
-
-    @ApiModelProperty(value = "考试名称")
-    private String examName;
-
-    public String getExamDetailId() {
-        return examDetailId;
-    }
-
-    public void setExamDetailId(String examDetailId) {
-        this.examDetailId = examDetailId;
-    }
-
-    public String getPrintPlanId() {
-        return printPlanId;
-    }
-
-    public void setPrintPlanId(String printPlanId) {
-        this.printPlanId = printPlanId;
-    }
-
-    public String getPrintPlanName() {
-        return printPlanName;
-    }
-
-    public void setPrintPlanName(String printPlanName) {
-        this.printPlanName = printPlanName;
-    }
-
-    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 getCourseNameCode() {
-        return courseNameCode;
-    }
-
-    public void setCourseNameCode(String courseNameCode) {
-        this.courseNameCode = courseNameCode;
-    }
-
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    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 getSinglePagesA3() {
-        return singlePagesA3;
-    }
-
-    public void setSinglePagesA3(String singlePagesA3) {
-        this.singlePagesA3 = singlePagesA3;
-    }
-
-    public Integer getPaperPages() {
-        return paperPages;
-    }
-
-    public void setPaperPages(Integer paperPages) {
-        this.paperPages = paperPages;
-    }
-
-    public Integer getCardPages() {
-        return cardPages;
-    }
-
-    public void setCardPages(Integer cardPages) {
-        this.cardPages = cardPages;
-    }
-
-    public Integer getPagesA4() {
-        return pagesA4;
-    }
-
-    public void setPagesA4(Integer pagesA4) {
-        this.pagesA4 = pagesA4;
-    }
-
-    public Integer getTotalSubjects() {
-        return totalSubjects;
-    }
-
-    public void setTotalSubjects(Integer totalSubjects) {
-        this.totalSubjects = totalSubjects;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public Boolean getValidate() {
-        return validate;
-    }
-
-    public void setValidate(Boolean validate) {
-        this.validate = validate;
-    }
-
-    public Long getPrintStartTime() {
-        return printStartTime;
-    }
-
-    public void setPrintStartTime(Long printStartTime) {
-        this.printStartTime = printStartTime;
-    }
-
-    public Long getPrintEndTime() {
-        return printEndTime;
-    }
-
-    public void setPrintEndTime(Long printEndTime) {
-        this.printEndTime = printEndTime;
-    }
-
-    public String getPackageCode() {
-        return packageCode;
-    }
-
-    public void setPackageCode(String packageCode) {
-        this.packageCode = packageCode;
-    }
-
-    public Boolean getNormal() {
-        return normal;
-    }
-
-    public void setNormal(Boolean normal) {
-        this.normal = normal;
-    }
-
-    public Long getPrintHouseId() {
-        return printHouseId;
-    }
-
-    public void setPrintHouseId(Long printHouseId) {
-        this.printHouseId = printHouseId;
-    }
-
-    public String getPrintHouseCode() {
-        return printHouseCode;
-    }
-
-    public void setPrintHouseCode(String printHouseCode) {
-        this.printHouseCode = printHouseCode;
-    }
-
-    public String getPrintHouseName() {
-        return printHouseName;
-    }
-
-    public void setPrintHouseName(String printHouseName) {
-        this.printHouseName = printHouseName;
-    }
-
-    public Long getSemesterId() {
-        return semesterId;
-    }
-
-    public void setSemesterId(Long semesterId) {
-        this.semesterId = semesterId;
-    }
-
-    public String getSemesterName() {
-        return semesterName;
-    }
-
-    public void setSemesterName(String semesterName) {
-        this.semesterName = semesterName;
-    }
-
-    public Long getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Long examId) {
-        this.examId = examId;
-    }
-
-    public String getExamName() {
-        return examName;
-    }
-
-    public void setExamName(String examName) {
-        this.examName = examName;
-    }
-}

+ 0 - 89
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/PrintTaskTotalDto.java

@@ -1,89 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-/**
- * @Date: 2021/3/29.
- */
-public class PrintTaskTotalDto {
-
-    private Integer totalSubjects;
-    private Integer packageCount;
-    private Integer paperCount;
-    private Integer paperPages;
-    private Integer cardPages;
-    private Integer pagesA4;
-    private Integer paperPagesLeft;
-    private Integer cardPagesLeft;
-    private Integer pagesA4Left;
-
-    public Integer getTotalSubjects() {
-        return totalSubjects;
-    }
-
-    public void setTotalSubjects(Integer totalSubjects) {
-        this.totalSubjects = totalSubjects;
-    }
-
-    public Integer getPackageCount() {
-        return packageCount;
-    }
-
-    public void setPackageCount(Integer packageCount) {
-        this.packageCount = packageCount;
-    }
-
-    public Integer getPaperCount() {
-        return paperCount;
-    }
-
-    public void setPaperCount(Integer paperCount) {
-        this.paperCount = paperCount;
-    }
-
-    public Integer getPaperPages() {
-        return paperPages;
-    }
-
-    public void setPaperPages(Integer paperPages) {
-        this.paperPages = paperPages;
-    }
-
-    public Integer getCardPages() {
-        return cardPages;
-    }
-
-    public void setCardPages(Integer cardPages) {
-        this.cardPages = cardPages;
-    }
-
-    public Integer getPagesA4() {
-        return pagesA4;
-    }
-
-    public void setPagesA4(Integer pagesA4) {
-        this.pagesA4 = pagesA4;
-    }
-
-    public Integer getPaperPagesLeft() {
-        return paperPagesLeft;
-    }
-
-    public void setPaperPagesLeft(Integer paperPagesLeft) {
-        this.paperPagesLeft = paperPagesLeft;
-    }
-
-    public Integer getCardPagesLeft() {
-        return cardPagesLeft;
-    }
-
-    public void setCardPagesLeft(Integer cardPagesLeft) {
-        this.cardPagesLeft = cardPagesLeft;
-    }
-
-    public Integer getPagesA4Left() {
-        return pagesA4Left;
-    }
-
-    public void setPagesA4Left(Integer pagesA4Left) {
-        this.pagesA4Left = pagesA4Left;
-    }
-}

+ 0 - 64
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/RelatePaperDto.java

@@ -1,64 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-import java.util.List;
-
-/**
- * @Date: 2021/3/29.
- */
-public class RelatePaperDto {
-
-    private String id;
-    private String schoolId;
-    private String courseCode;
-    private String courseName;
-    private String paperNumber;
-    private List<String> paperTypes;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(String schoolId) {
-        this.schoolId = schoolId;
-    }
-
-    public String 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 List<String> getPaperTypes() {
-        return paperTypes;
-    }
-
-    public void setPaperTypes(List<String> paperTypes) {
-        this.paperTypes = paperTypes;
-    }
-}

+ 0 - 92
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ReviewLogDto.java

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

+ 0 - 32
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ReviewSampleDto.java

@@ -1,32 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: 审核样品Dto(来自 exam_task_detail 和 exam_task_paper_log)
- * @Author: CaoZixuan
- * @Date: 2021-04-27
- */
-public class ReviewSampleDto {
-    @ApiModelProperty(value = "试卷副本信息")
-    private String paperAttachmentIds;
-
-    @ApiModelProperty(value = "审核副本信息")
-    private String paperConfirmAttachmentIds;
-
-    public String getPaperAttachmentIds() {
-        return paperAttachmentIds;
-    }
-
-    public void setPaperAttachmentIds(String paperAttachmentIds) {
-        this.paperAttachmentIds = paperAttachmentIds;
-    }
-
-    public String getPaperConfirmAttachmentIds() {
-        return paperConfirmAttachmentIds;
-    }
-
-    public void setPaperConfirmAttachmentIds(String paperConfirmAttachmentIds) {
-        this.paperConfirmAttachmentIds = paperConfirmAttachmentIds;
-    }
-}

+ 0 - 24
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/StudentExtendDto.java

@@ -1,24 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-public class StudentExtendDto {
-
-    private String fieldName;
-
-    private Object value;
-
-    public String getFieldName() {
-        return fieldName;
-    }
-
-    public void setFieldName(String fieldName) {
-        this.fieldName = fieldName;
-    }
-
-    public Object getValue() {
-        return value;
-    }
-
-    public void setValue(Object value) {
-        this.value = value;
-    }
-}

+ 0 - 75
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/SyncExamCardDto.java

@@ -1,75 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-import com.qmth.paper.library.business.entity.ExamCard;
-
-/**
- * @Description: 题卡同步 DTO
- */
-public class SyncExamCardDto extends ExamCard {
-
-    private String courseCode;
-
-    private String courseName;
-
-    private String paperNumber;
-
-    private String sequence;
-
-    private String title;
-
-    private String content;
-
-    @Override
-    public String getCourseCode() {
-        return courseCode;
-    }
-
-    @Override
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
-    }
-
-    @Override
-    public String getCourseName() {
-        return courseName;
-    }
-
-    @Override
-    public void setCourseName(String courseName) {
-        this.courseName = courseName;
-    }
-
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    public String getSequence() {
-        return sequence;
-    }
-
-    public void setSequence(String sequence) {
-        this.sequence = sequence;
-    }
-
-    @Override
-    public String getTitle() {
-        return title;
-    }
-
-    @Override
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-}

+ 0 - 61
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/SyncExamStudentDto.java

@@ -1,61 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-import com.qmth.paper.library.business.entity.ExamStudent;
-
-/**
- * @Description: 考生同步 DTO
- */
-public class SyncExamStudentDto extends ExamStudent {
-
-    private String courseCode;
-
-    private String courseName;
-
-    private String paperNumber;
-
-    private String sequence;
-
-    private String packageCode;
-
-    public String getCourseCode() {
-        return courseCode;
-    }
-
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
-    }
-
-    public String getCourseName() {
-        return courseName;
-    }
-
-    public void setCourseName(String courseName) {
-        this.courseName = courseName;
-    }
-
-    @Override
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    @Override
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    public String getSequence() {
-        return sequence;
-    }
-
-    public void setSequence(String sequence) {
-        this.sequence = sequence;
-    }
-
-    public String getPackageCode() {
-        return packageCode;
-    }
-
-    public void setPackageCode(String packageCode) {
-        this.packageCode = packageCode;
-    }
-}

+ 0 - 78
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/TCStatisticsDto.java

@@ -1,78 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.qmth.paper.library.business.entity.TCStatistics;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Objects;
-
-/**
- * @Description: 命题统计导入 dto
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/9/10
- */
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class TCStatisticsDto extends TCStatistics implements Serializable {
-
-    @ApiModelProperty(value = "完成状态,FINISH:已完成,UN_FINISH:未完成")
-    private String statusStr;
-
-    @ApiModelProperty(value = "印刷计划名称")
-    private String printPlanName;
-
-    @ApiModelProperty(value = "学生数量")
-    int examStudentCount;
-
-    @ApiModelProperty(value = "抽卷数")
-    int drawCount;
-
-    @ApiModelProperty(value = "备份数")
-    int backupCount;
-
-    public int getExamStudentCount() {
-        return examStudentCount;
-    }
-
-    public void setExamStudentCount(int examStudentCount) {
-        this.examStudentCount = examStudentCount;
-    }
-
-    public int getDrawCount() {
-        return drawCount;
-    }
-
-    public void setDrawCount(int drawCount) {
-        this.drawCount = drawCount;
-    }
-
-    public int getBackupCount() {
-        return backupCount;
-    }
-
-    public void setBackupCount(int backupCount) {
-        this.backupCount = backupCount;
-    }
-
-    public String getPrintPlanName() {
-        return printPlanName;
-    }
-
-    public void setPrintPlanName(String printPlanName) {
-        this.printPlanName = printPlanName;
-    }
-
-    public String getStatusStr() {
-        if (Objects.nonNull(this.getStatus())) {
-            return this.getStatus().getTitle();
-        } else {
-            return statusStr;
-        }
-    }
-
-    public void setStatusStr(String statusStr) {
-        this.statusStr = statusStr;
-    }
-}

+ 0 - 35
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/TaskPrintExtendFieldsDto.java

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

+ 0 - 44
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/TaskPrintHouseDto.java

@@ -1,44 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-/**
- * @Date: 2021/3/29.
- */
-public class TaskPrintHouseDto {
-
-    private String printHouseId;
-    private String printHouseName;
-    private String campusId;
-    private String campusName;
-
-    public String getPrintHouseId() {
-        return printHouseId;
-    }
-
-    public void setPrintHouseId(String printHouseId) {
-        this.printHouseId = printHouseId;
-    }
-
-    public String getPrintHouseName() {
-        return printHouseName;
-    }
-
-    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;
-    }
-}

+ 0 - 44
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/TaskTotalLeftDto.java

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

+ 0 - 116
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/TemplateDto.java

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

+ 0 - 89
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/approvalForm/ApprovalInfo.java

@@ -1,89 +0,0 @@
-package com.qmth.paper.library.business.bean.dto.approvalForm;
-
-import com.qmth.paper.library.common.enums.FlowApproveOperationEnum;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: 命题任务审批表 - 审批信息
- * @Author: CaoZixuan
- * @Date: 2021-09-06
- */
-public class ApprovalInfo {
-
-    @ApiModelProperty(value = "审批人id")
-    private Long approveId;
-
-    @ApiModelProperty(value = "审批人名称")
-    private String approveName;
-
-    @ApiModelProperty(value = "审批时间")
-    private Long time;
-
-    @ApiModelProperty(value = "审批意见(通过 + 备注信息)")
-    private String remark;
-
-    @ApiModelProperty(value = "审核级别(2:主任审核、3:院长审核)")
-    private int level;
-
-    @ApiModelProperty(value = "审核机构名称")
-    private String approveOrgName;
-
-    @ApiModelProperty(value = "审核类型")
-    private FlowApproveOperationEnum approveType;
-
-    public Long getApproveId() {
-        return approveId;
-    }
-
-    public void setApproveId(Long approveId) {
-        this.approveId = approveId;
-    }
-
-    public String getApproveName() {
-        return approveName;
-    }
-
-    public void setApproveName(String approveName) {
-        this.approveName = approveName;
-    }
-
-    public Long getTime() {
-        return time;
-    }
-
-    public void setTime(Long time) {
-        this.time = time;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public int getLevel() {
-        return level;
-    }
-
-    public void setLevel(int level) {
-        this.level = level;
-    }
-
-    public String getApproveOrgName() {
-        return approveOrgName;
-    }
-
-    public void setApproveOrgName(String approveOrgName) {
-        this.approveOrgName = approveOrgName;
-    }
-
-    public FlowApproveOperationEnum getApproveType() {
-        return approveType;
-    }
-
-    public void setApproveType(FlowApproveOperationEnum approveType) {
-        this.approveType = approveType;
-    }
-}

+ 0 - 46
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/approvalForm/ExamTaskApprovalFormDto.java

@@ -1,46 +0,0 @@
-package com.qmth.paper.library.business.bean.dto.approvalForm;
-
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.List;
-
-/**
- * @Description: 命题任务审批表Dto
- * @Author: CaoZixuan
- * @Date: 2021-09-06
- */
-public class ExamTaskApprovalFormDto {
-
-    @ApiModelProperty(value = "基础信息")
-    private BasicInfo basicInfo;
-
-    @ApiModelProperty(value = "考场信息集合")
-    private List<ExamRoomInfo> examRoomInfoList;
-
-    @ApiModelProperty(value = "审批信息集合")
-    private List<ApprovalInfo> approvalInfoList;
-
-    public BasicInfo getBasicInfo() {
-        return basicInfo;
-    }
-
-    public void setBasicInfo(BasicInfo basicInfo) {
-        this.basicInfo = basicInfo;
-    }
-
-    public List<ExamRoomInfo> getExamRoomInfoList() {
-        return examRoomInfoList;
-    }
-
-    public void setExamRoomInfoList(List<ExamRoomInfo> examRoomInfoList) {
-        this.examRoomInfoList = examRoomInfoList;
-    }
-
-    public List<ApprovalInfo> getApprovalInfoList() {
-        return approvalInfoList;
-    }
-
-    public void setApprovalInfoList(List<ApprovalInfo> approvalInfoList) {
-        this.approvalInfoList = approvalInfoList;
-    }
-}

+ 0 - 40
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/flow/CustomFlowApproveRoleDto.java

@@ -1,40 +0,0 @@
-package com.qmth.paper.library.business.bean.flow;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-
-/**
- * @Description: 自定义流程审核角色 dto
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2022/1/21
- */
-public class CustomFlowApproveRoleDto implements Serializable {
-
-    @ApiModelProperty(value = "id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    Long id;
-
-    @ApiModelProperty(value = "角色名称")
-    String name;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}

+ 0 - 40
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/flow/CustomFlowApproveUserDto.java

@@ -1,40 +0,0 @@
-package com.qmth.paper.library.business.bean.flow;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-
-/**
- * @Description: 自定义流程审核用户 dto
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2022/1/21
- */
-public class CustomFlowApproveUserDto implements Serializable {
-
-    @ApiModelProperty(value = "id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    Long id;
-
-    @ApiModelProperty(value = "用户名称")
-    String name;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}

+ 0 - 108
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/flow/CustomFlowCommonDto.java

@@ -1,108 +0,0 @@
-package com.qmth.paper.library.business.bean.flow;
-
-import com.qmth.paper.library.business.enums.CustomFlowTypeEnum;
-import io.swagger.annotations.ApiModelProperty;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-
-/**
- * @Description: 自定义流程common dto
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2022/1/21
- */
-public class CustomFlowCommonDto implements Serializable {
-
-    @ApiModelProperty(value = "id")
-    @NotBlank(message = "id不能为空")
-    String id;
-
-    @ApiModelProperty(value = "节点类型")
-    @NotNull(message = "节点类型不能为空")
-    CustomFlowTypeEnum type;
-
-    @ApiModelProperty(value = "节点内容")
-    String content;
-
-    @ApiModelProperty(value = "width")
-    Double w;
-
-    @ApiModelProperty(value = "height")
-    Double h;
-
-    @ApiModelProperty(value = "x坐标轴")
-    Double x;
-
-    @ApiModelProperty(value = "y坐标轴")
-    Double y;
-
-    @ApiModelProperty(value = "属性")
-    CustomFlowPropertyDto property;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public CustomFlowTypeEnum getType() {
-        return type;
-    }
-
-    public void setType(CustomFlowTypeEnum type) {
-        this.type = type;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-    public Double getW() {
-        return w;
-    }
-
-    public void setW(Double w) {
-        this.w = w;
-    }
-
-    public Double getH() {
-        return h;
-    }
-
-    public void setH(Double h) {
-        this.h = h;
-    }
-
-    public Double getX() {
-        return x;
-    }
-
-    public void setX(Double x) {
-        this.x = x;
-    }
-
-    public Double getY() {
-        return y;
-    }
-
-    public void setY(Double y) {
-        this.y = y;
-    }
-
-    public CustomFlowPropertyDto getProperty() {
-        return property;
-    }
-
-    public void setProperty(CustomFlowPropertyDto property) {
-        this.property = property;
-    }
-}

+ 0 - 40
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/flow/CustomFlowCopyUserDto.java

@@ -1,40 +0,0 @@
-package com.qmth.paper.library.business.bean.flow;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-
-/**
- * @Description: 自定义流程抄送用户 dto
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2022/1/21
- */
-public class CustomFlowCopyUserDto implements Serializable {
-
-    @ApiModelProperty(value = "id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    Long id;
-
-    @ApiModelProperty(value = "用户名称")
-    String name;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}

+ 0 - 72
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/flow/CustomFlowDto.java

@@ -1,72 +0,0 @@
-package com.qmth.paper.library.business.bean.flow;
-
-import com.qmth.paper.library.business.enums.CustomFlowTypeEnum;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @Description: 自定义流程dto
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2022/1/21
- */
-public class CustomFlowDto extends CustomFlowCommonDto implements Serializable {
-
-    @ApiModelProperty(value = "流程属性id")
-    String flowTaskId;
-
-    @ApiModelProperty(value = "前置流程节点id集合")
-    List<CustomFlowSequenceDto> beforeFlowTaskIds;
-
-    @ApiModelProperty(value = "后置流程节点id集合")
-    List<CustomFlowSequenceDto> afterFlowTaskIds;
-
-    @ApiModelProperty(value = "流程步骤")
-    Integer setup;
-
-    public CustomFlowDto() {
-
-    }
-
-    public CustomFlowDto(String id, CustomFlowTypeEnum type, String content, String flowTaskId) {
-        this.id = id;
-        this.type = type;
-        this.content = content;
-        this.flowTaskId = flowTaskId;
-    }
-
-    public Integer getSetup() {
-        return setup;
-    }
-
-    public void setSetup(Integer setup) {
-        this.setup = setup;
-    }
-
-    public List<CustomFlowSequenceDto> getBeforeFlowTaskIds() {
-        return beforeFlowTaskIds;
-    }
-
-    public void setBeforeFlowTaskIds(List<CustomFlowSequenceDto> beforeFlowTaskIds) {
-        this.beforeFlowTaskIds = beforeFlowTaskIds;
-    }
-
-    public List<CustomFlowSequenceDto> getAfterFlowTaskIds() {
-        return afterFlowTaskIds;
-    }
-
-    public void setAfterFlowTaskIds(List<CustomFlowSequenceDto> afterFlowTaskIds) {
-        this.afterFlowTaskIds = afterFlowTaskIds;
-    }
-
-    public String getFlowTaskId() {
-        return flowTaskId;
-    }
-
-    public void setFlowTaskId(String flowTaskId) {
-        this.flowTaskId = flowTaskId;
-    }
-}

+ 0 - 63
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/flow/CustomFlowEditDto.java

@@ -1,63 +0,0 @@
-package com.qmth.paper.library.business.bean.flow;
-
-import com.qmth.paper.library.business.entity.TFCustomFlow;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * @Description: 自定义流程edit dto
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2022/1/21
- */
-public class CustomFlowEditDto extends CustomFlowPropDto implements Serializable {
-
-    @ApiModelProperty(value = "流程节点内容")
-    List<CustomFlowCommonDto> customFlowLists;
-
-    public CustomFlowEditDto() {
-
-    }
-
-    public CustomFlowEditDto(TFCustomFlow tfCustomFlow, List<CustomFlowCommonDto> customFlowLists) {
-        super(tfCustomFlow);
-        this.customFlowLists = customFlowLists;
-    }
-
-    public List<CustomFlowCommonDto> getCustomFlowLists() {
-        return customFlowLists;
-    }
-
-    public void setCustomFlowLists(List<CustomFlowCommonDto> customFlowLists) {
-        this.customFlowLists = customFlowLists;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        CustomFlowEditDto that = (CustomFlowEditDto) o;
-        return type == that.type && schoolId.equals(that.schoolId);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(type, schoolId);
-    }
-
-    @Override
-    public String toString() {
-        return "CustomFlowEditDto{" +
-                "type=" + type +
-                ", schoolId=" + schoolId +
-                '}';
-    }
-}

+ 0 - 72
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/flow/CustomFlowGatewayDto.java

@@ -1,72 +0,0 @@
-package com.qmth.paper.library.business.bean.flow;
-
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * @Description: 自定义流程网关 dto
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2022/2/10
- */
-public class CustomFlowGatewayDto implements Serializable {
-
-    @ApiModelProperty(value = "审批通过排他网关节点id")
-    List<String> beforeExclusiveGatewayId;
-
-    @ApiModelProperty(value = "审批驳回排他网关节点id")
-    String afterExclusiveGatewayId;
-
-    @ApiModelProperty(value = "流程节点id集合")
-    Map<String, List<CustomFlowSequenceDto>> flowTaskIds;
-
-    public CustomFlowGatewayDto() {
-
-    }
-
-    public CustomFlowGatewayDto(String exclusiveGatewayId, Map<String, List<CustomFlowSequenceDto>> flowTaskIds, boolean beforeExclusiveGateway) {
-        if (beforeExclusiveGateway) {
-            if (Objects.isNull(this.beforeExclusiveGatewayId)) {
-                this.beforeExclusiveGatewayId = new ArrayList<>();
-            }
-            this.beforeExclusiveGatewayId.add(exclusiveGatewayId);
-        } else {
-            this.afterExclusiveGatewayId = exclusiveGatewayId;
-        }
-        this.flowTaskIds = flowTaskIds;
-    }
-
-    public List<String> getBeforeExclusiveGatewayId() {
-        if (Objects.isNull(beforeExclusiveGatewayId)) {
-            return new ArrayList<>();
-        } else {
-            return beforeExclusiveGatewayId;
-        }
-    }
-
-    public void setBeforeExclusiveGatewayId(List<String> beforeExclusiveGatewayId) {
-        this.beforeExclusiveGatewayId = beforeExclusiveGatewayId;
-    }
-
-    public String getAfterExclusiveGatewayId() {
-        return afterExclusiveGatewayId;
-    }
-
-    public void setAfterExclusiveGatewayId(String afterExclusiveGatewayId) {
-        this.afterExclusiveGatewayId = afterExclusiveGatewayId;
-    }
-
-    public Map<String, List<CustomFlowSequenceDto>> getFlowTaskIds() {
-        return flowTaskIds;
-    }
-
-    public void setFlowTaskIds(Map<String, List<CustomFlowSequenceDto>> flowTaskIds) {
-        this.flowTaskIds = flowTaskIds;
-    }
-}

+ 0 - 151
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/flow/CustomFlowPropDto.java

@@ -1,151 +0,0 @@
-package com.qmth.paper.library.business.bean.flow;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.paper.library.business.entity.TFCustomFlow;
-import com.qmth.paper.library.common.enums.TFCustomModelTypeEnum;
-import com.qmth.paper.library.common.enums.TFCustomTypeEnum;
-import io.swagger.annotations.ApiModelProperty;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-import java.util.Objects;
-
-/**
- * @Description: 自定义流程save dto
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2022/1/21
- */
-public class CustomFlowPropDto implements Serializable {
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "自定义流程id")
-    Long customFlowId;
-
-    @ApiModelProperty(value = "id")
-    @NotBlank(message = "流程名称")
-    String name;
-
-    @ApiModelProperty(value = "流程模式")
-    @NotNull(message = "流程模式不能为空")
-    TFCustomModelTypeEnum modelType;
-
-    @ApiModelProperty(value = "流程类型")
-    @NotNull(message = "流程类型不能为空")
-    TFCustomTypeEnum type;
-
-    @ApiModelProperty(value = "是否发布,0:否,1:是")
-    Boolean publish;
-
-    @ApiModelProperty(value = "学校id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    Long schoolId;
-
-    @ApiModelProperty(value = "机构id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    Long orgId;
-
-    public CustomFlowPropDto(){
-
-    }
-
-    public CustomFlowPropDto(TFCustomFlow tfCustomFlow){
-        this.customFlowId = tfCustomFlow.getId();
-        this.name = tfCustomFlow.getName();
-        this.modelType = tfCustomFlow.getModelType();
-        this.type = tfCustomFlow.getType();
-        this.publish = tfCustomFlow.getPublish();
-        this.schoolId = tfCustomFlow.getSchoolId();
-        this.orgId = tfCustomFlow.getOrgId();
-    }
-
-    public void setSchoolAndOrgInfo(Long schoolId, Long orgId) {
-        this.schoolId = schoolId;
-        this.orgId = orgId;
-    }
-
-
-    public TFCustomModelTypeEnum getModelType() {
-        return modelType;
-    }
-
-    public void setModelType(TFCustomModelTypeEnum modelType) {
-        this.modelType = modelType;
-    }
-
-    public Long getCustomFlowId() {
-        return customFlowId;
-    }
-
-    public void setCustomFlowId(Long customFlowId) {
-        this.customFlowId = customFlowId;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public TFCustomTypeEnum getType() {
-        return type;
-    }
-
-    public void setType(TFCustomTypeEnum type) {
-        this.type = type;
-    }
-
-    public Boolean getPublish() {
-        return publish;
-    }
-
-    public void setPublish(Boolean publish) {
-        this.publish = publish;
-    }
-
-    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;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        CustomFlowPropDto that = (CustomFlowPropDto) o;
-        return type == that.type && schoolId.equals(that.schoolId);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(type, schoolId);
-    }
-
-    @Override
-    public String toString() {
-        return "CustomFlowSaveDto{" +
-                "type=" + type +
-                ", schoolId=" + schoolId +
-                '}';
-    }
-}

+ 0 - 130
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/flow/CustomFlowPropertyDto.java

@@ -1,130 +0,0 @@
-package com.qmth.paper.library.business.bean.flow;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.qmth.paper.library.business.enums.*;
-import com.qmth.paper.library.business.enums.*;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @Description: 自定义流程property dto
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2022/1/21
- */
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class CustomFlowPropertyDto implements Serializable {
-
-    @ApiModelProperty(value = "属性")
-    CustomFlowApproveUserTypeEnum approveUserType;
-
-    @ApiModelProperty(value = "审批用户列表")
-    List<CustomFlowApproveUserDto> approveUsers;
-
-    @ApiModelProperty(value = "审批角色列表")
-    List<CustomFlowApproveRoleDto> approveRoles;
-
-    @ApiModelProperty(value = "抄送用户列表")
-    List<CustomFlowCopyUserDto> copyForUsers;
-
-    @ApiModelProperty(value = "自定义流程审核类型")
-    CustomFlowMultipleUserApproveTypeEnum multipleUserApproveType;
-
-    @ApiModelProperty(value = "自定义流程驳回类型")
-    CustomFlowRejectTypeEnum rejectType;
-
-    @ApiModelProperty(value = "自定义流程驳回重新提交类型")
-    CustomFlowRejectResubmitTypeEnum rejectResubmitType;
-
-    @ApiModelProperty(value = "自定义流程发起人指定选择人数")
-    CustomFlowApproveUserCountTypeEnum approveUserCountType;
-
-    @ApiModelProperty(value = "自定义流程发起人指定选择用户类型")
-    CustomFlowApproveUserSelectRangeEnum approveUserSelectRange;
-
-    @ApiModelProperty(value = "自定义流程发起人指定审批角色列表")
-    List<CustomFlowApproveRoleDto> approveUserSelectRoles;
-
-    public CustomFlowApproveUserCountTypeEnum getApproveUserCountType() {
-        return approveUserCountType;
-    }
-
-    public void setApproveUserCountType(CustomFlowApproveUserCountTypeEnum approveUserCountType) {
-        this.approveUserCountType = approveUserCountType;
-    }
-
-    public CustomFlowApproveUserSelectRangeEnum getApproveUserSelectRange() {
-        return approveUserSelectRange;
-    }
-
-    public void setApproveUserSelectRange(CustomFlowApproveUserSelectRangeEnum approveUserSelectRange) {
-        this.approveUserSelectRange = approveUserSelectRange;
-    }
-
-    public List<CustomFlowApproveRoleDto> getApproveUserSelectRoles() {
-        return approveUserSelectRoles;
-    }
-
-    public void setApproveUserSelectRoles(List<CustomFlowApproveRoleDto> approveUserSelectRoles) {
-        this.approveUserSelectRoles = approveUserSelectRoles;
-    }
-
-    public CustomFlowApproveUserTypeEnum getApproveUserType() {
-        return approveUserType;
-    }
-
-    public void setApproveUserType(CustomFlowApproveUserTypeEnum approveUserType) {
-        this.approveUserType = approveUserType;
-    }
-
-    public List<CustomFlowApproveUserDto> getApproveUsers() {
-        return approveUsers;
-    }
-
-    public void setApproveUsers(List<CustomFlowApproveUserDto> approveUsers) {
-        this.approveUsers = approveUsers;
-    }
-
-    public List<CustomFlowApproveRoleDto> getApproveRoles() {
-        return approveRoles;
-    }
-
-    public void setApproveRoles(List<CustomFlowApproveRoleDto> approveRoles) {
-        this.approveRoles = approveRoles;
-    }
-
-    public List<CustomFlowCopyUserDto> getCopyForUsers() {
-        return copyForUsers;
-    }
-
-    public void setCopyForUsers(List<CustomFlowCopyUserDto> copyForUsers) {
-        this.copyForUsers = copyForUsers;
-    }
-
-    public CustomFlowMultipleUserApproveTypeEnum getMultipleUserApproveType() {
-        return multipleUserApproveType;
-    }
-
-    public void setMultipleUserApproveType(CustomFlowMultipleUserApproveTypeEnum multipleUserApproveType) {
-        this.multipleUserApproveType = multipleUserApproveType;
-    }
-
-    public CustomFlowRejectTypeEnum getRejectType() {
-        return rejectType;
-    }
-
-    public void setRejectType(CustomFlowRejectTypeEnum rejectType) {
-        this.rejectType = rejectType;
-    }
-
-    public CustomFlowRejectResubmitTypeEnum getRejectResubmitType() {
-        return rejectResubmitType;
-    }
-
-    public void setRejectResubmitType(CustomFlowRejectResubmitTypeEnum rejectResubmitType) {
-        this.rejectResubmitType = rejectResubmitType;
-    }
-}

+ 0 - 63
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/flow/CustomFlowSaveDto.java

@@ -1,63 +0,0 @@
-package com.qmth.paper.library.business.bean.flow;
-
-import com.qmth.paper.library.business.entity.TFCustomFlow;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * @Description: 自定义流程save dto
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2022/1/21
- */
-public class CustomFlowSaveDto extends CustomFlowPropDto implements Serializable {
-
-    @ApiModelProperty(value = "流程节点内容")
-    List<CustomFlowDto> customFlowLists;
-
-    public CustomFlowSaveDto() {
-
-    }
-
-    public CustomFlowSaveDto(TFCustomFlow tfCustomFlow, List<CustomFlowDto> customFlowLists) {
-        super(tfCustomFlow);
-        this.customFlowLists = customFlowLists;
-    }
-
-    public List<CustomFlowDto> getCustomFlowLists() {
-        return customFlowLists;
-    }
-
-    public void setCustomFlowLists(List<CustomFlowDto> customFlowLists) {
-        this.customFlowLists = customFlowLists;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        CustomFlowSaveDto that = (CustomFlowSaveDto) o;
-        return type == that.type && schoolId.equals(that.schoolId);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(type, schoolId);
-    }
-
-    @Override
-    public String toString() {
-        return "CustomFlowSaveDto{" +
-                "type=" + type +
-                ", schoolId=" + schoolId +
-                '}';
-    }
-}

+ 0 - 82
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/flow/CustomFlowSequenceDto.java

@@ -1,82 +0,0 @@
-package com.qmth.paper.library.business.bean.flow;
-
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-
-/**
- * @Description: 自定义流程网关 dto
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2022/2/10
- */
-public class CustomFlowSequenceDto implements Serializable {
-
-    @ApiModelProperty(value = "后置流程节点id")
-    String afterFlowTaskId;
-
-    @ApiModelProperty(value = "前置流程节点id")
-    String beforeFlowTaskId;
-
-    @ApiModelProperty(value = "条件表达式")
-    String conditionExp;
-
-    @ApiModelProperty(value = "流程步骤")
-    Integer setup;
-
-    public CustomFlowSequenceDto() {
-
-    }
-
-    public CustomFlowSequenceDto(String flowTaskId, boolean beforeFlowTask, Integer setup) {
-        if (beforeFlowTask) {
-            this.beforeFlowTaskId = flowTaskId;
-        } else {
-            this.afterFlowTaskId = flowTaskId;
-        }
-        this.setup = setup;
-    }
-
-    public CustomFlowSequenceDto(String flowTaskId, String conditionExp, boolean beforeFlowTask, Integer setup) {
-        if (beforeFlowTask) {
-            this.beforeFlowTaskId = flowTaskId;
-        } else {
-            this.afterFlowTaskId = flowTaskId;
-        }
-        this.conditionExp = conditionExp;
-        this.setup = setup;
-    }
-
-    public Integer getSetup() {
-        return setup;
-    }
-
-    public void setSetup(Integer setup) {
-        this.setup = setup;
-    }
-
-    public String getAfterFlowTaskId() {
-        return afterFlowTaskId;
-    }
-
-    public void setAfterFlowTaskId(String afterFlowTaskId) {
-        this.afterFlowTaskId = afterFlowTaskId;
-    }
-
-    public String getBeforeFlowTaskId() {
-        return beforeFlowTaskId;
-    }
-
-    public void setBeforeFlowTaskId(String beforeFlowTaskId) {
-        this.beforeFlowTaskId = beforeFlowTaskId;
-    }
-
-    public String getConditionExp() {
-        return conditionExp;
-    }
-
-    public void setConditionExp(String conditionExp) {
-        this.conditionExp = conditionExp;
-    }
-}

+ 0 - 235
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/flow/CustomFlowVarDto.java

@@ -1,235 +0,0 @@
-package com.qmth.paper.library.business.bean.flow;
-
-import com.qmth.paper.library.business.enums.*;
-import com.qmth.paper.library.business.enums.*;
-import com.qmth.paper.library.common.enums.TFCustomModelTypeEnum;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @Description: 自定义流程节点变量 dto
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2022/2/10
- */
-public class CustomFlowVarDto implements Serializable {
-
-    @ApiModelProperty(value = "流程节点变量")
-    String flowTaskVar;
-
-    @ApiModelProperty(value = "审批人id")
-    List<String> approveIds;
-
-    @ApiModelProperty(value = "流程模式")
-    TFCustomModelTypeEnum modelType;
-
-    @ApiModelProperty(value = "属性")
-    CustomFlowApproveUserTypeEnum approveUserType;
-
-    @ApiModelProperty(value = "自定义流程审核类型")
-    CustomFlowMultipleUserApproveTypeEnum multipleUserApproveType;
-
-    @ApiModelProperty(value = "自定义流程驳回类型")
-    CustomFlowRejectTypeEnum rejectType;
-
-    @ApiModelProperty(value = "自定义流程驳回重新提交类型")
-    CustomFlowRejectResubmitTypeEnum rejectResubmitType;
-
-    @ApiModelProperty(value = "审批人姓名")
-    String approveUserNames;
-
-    @ApiModelProperty(value = "抄送人id")
-    List<String> copyForUserIds;
-
-    @ApiModelProperty(value = "抄送人姓名")
-    String copyForUserNames;
-
-    @ApiModelProperty(value = "审批角色ids")
-    List<String> approveRoleIds;
-
-    @ApiModelProperty(value = "发起人指定审批角色ids")
-    List<String> approveUserSelectRolesIds;
-
-    @ApiModelProperty(value = "自定义流程发起人指定选择人数")
-    CustomFlowApproveUserCountTypeEnum approveUserCountType;
-
-    @ApiModelProperty(value = "自定义流程发起人指定选择用户类型")
-    CustomFlowApproveUserSelectRangeEnum approveUserSelectRange;
-
-    public CustomFlowVarDto() {
-
-    }
-
-    public CustomFlowVarDto(String flowTaskVar) {
-        this.flowTaskVar = flowTaskVar;
-    }
-
-    public CustomFlowVarDto(String flowTaskVar, List<String> approveIds, List<String> copyForUserIds, String copyForUserNames, List<String> approveRoleIds, List<String> approveUserSelectRolesIds, CustomFlowApproveUserCountTypeEnum approveUserCountType, CustomFlowApproveUserSelectRangeEnum approveUserSelectRange, TFCustomModelTypeEnum modelType) {
-        this.flowTaskVar = flowTaskVar;
-        this.approveIds = approveIds;
-        this.copyForUserIds = copyForUserIds;
-        this.copyForUserNames = copyForUserNames;
-        this.approveRoleIds = approveRoleIds;
-        this.approveUserSelectRolesIds = approveUserSelectRolesIds;
-        this.approveUserCountType = approveUserCountType;
-        this.approveUserSelectRange = approveUserSelectRange;
-        this.modelType = modelType;
-    }
-
-    public CustomFlowVarDto(String flowTaskVar, List<String> approveIds, String approveUserNames, List<String> copyForUserIds, String copyForUserNames, List<String> approveRoleIds, List<String> approveUserSelectRolesIds, CustomFlowApproveUserCountTypeEnum approveUserCountType, CustomFlowApproveUserSelectRangeEnum approveUserSelectRange, TFCustomModelTypeEnum modelType) {
-        this.flowTaskVar = flowTaskVar;
-        this.approveIds = approveIds;
-        this.approveUserNames = approveUserNames;
-        this.copyForUserIds = copyForUserIds;
-        this.copyForUserNames = copyForUserNames;
-        this.approveRoleIds = approveRoleIds;
-        this.approveUserSelectRolesIds = approveUserSelectRolesIds;
-        this.approveUserCountType = approveUserCountType;
-        this.approveUserSelectRange = approveUserSelectRange;
-        this.modelType = modelType;
-    }
-
-    public CustomFlowVarDto(String flowTaskVar, List<String> approveIds,
-                            CustomFlowApproveUserTypeEnum approveUserType,
-                            CustomFlowMultipleUserApproveTypeEnum multipleUserApproveType,
-                            CustomFlowRejectTypeEnum rejectType,
-                            CustomFlowRejectResubmitTypeEnum rejectResubmitType,
-                            String approveUserNames,
-                            List<String> copyForUserIds,
-                            String copyForUserNames,
-                            List<String> approveRoleIds,
-                            List<String> approveUserSelectRolesIds,
-                            CustomFlowApproveUserCountTypeEnum approveUserCountType,
-                            CustomFlowApproveUserSelectRangeEnum approveUserSelectRange,
-                            TFCustomModelTypeEnum modelType) {
-        this.flowTaskVar = flowTaskVar;
-        this.approveIds = approveIds;
-        this.approveUserType = approveUserType;
-        this.multipleUserApproveType = multipleUserApproveType;
-        this.rejectType = rejectType;
-        this.rejectResubmitType = rejectResubmitType;
-        this.approveUserNames = approveUserNames;
-        this.copyForUserIds = copyForUserIds;
-        this.copyForUserNames = copyForUserNames;
-        this.approveRoleIds = approveRoleIds;
-        this.approveUserSelectRolesIds = approveUserSelectRolesIds;
-        this.approveUserCountType = approveUserCountType;
-        this.approveUserSelectRange = approveUserSelectRange;
-        this.modelType = modelType;
-    }
-
-    public TFCustomModelTypeEnum getModelType() {
-        return modelType;
-    }
-
-    public void setModelType(TFCustomModelTypeEnum modelType) {
-        this.modelType = modelType;
-    }
-
-    public CustomFlowApproveUserCountTypeEnum getApproveUserCountType() {
-        return approveUserCountType;
-    }
-
-    public void setApproveUserCountType(CustomFlowApproveUserCountTypeEnum approveUserCountType) {
-        this.approveUserCountType = approveUserCountType;
-    }
-
-    public CustomFlowApproveUserSelectRangeEnum getApproveUserSelectRange() {
-        return approveUserSelectRange;
-    }
-
-    public void setApproveUserSelectRange(CustomFlowApproveUserSelectRangeEnum approveUserSelectRange) {
-        this.approveUserSelectRange = approveUserSelectRange;
-    }
-
-    public List<String> getApproveUserSelectRolesIds() {
-        return approveUserSelectRolesIds;
-    }
-
-    public void setApproveUserSelectRolesIds(List<String> approveUserSelectRolesIds) {
-        this.approveUserSelectRolesIds = approveUserSelectRolesIds;
-    }
-
-    public List<String> getApproveRoleIds() {
-        return approveRoleIds;
-    }
-
-    public void setApproveRoleIds(List<String> approveRoleIds) {
-        this.approveRoleIds = approveRoleIds;
-    }
-
-    public List<String> getCopyForUserIds() {
-        return copyForUserIds;
-    }
-
-    public void setCopyForUserIds(List<String> copyForUserIds) {
-        this.copyForUserIds = copyForUserIds;
-    }
-
-    public String getCopyForUserNames() {
-        return copyForUserNames;
-    }
-
-    public void setCopyForUserNames(String copyForUserNames) {
-        this.copyForUserNames = copyForUserNames;
-    }
-
-    public String getApproveUserNames() {
-        return approveUserNames;
-    }
-
-    public void setApproveUserNames(String approveUserNames) {
-        this.approveUserNames = approveUserNames;
-    }
-
-    public CustomFlowApproveUserTypeEnum getApproveUserType() {
-        return approveUserType;
-    }
-
-    public void setApproveUserType(CustomFlowApproveUserTypeEnum approveUserType) {
-        this.approveUserType = approveUserType;
-    }
-
-    public CustomFlowMultipleUserApproveTypeEnum getMultipleUserApproveType() {
-        return multipleUserApproveType;
-    }
-
-    public void setMultipleUserApproveType(CustomFlowMultipleUserApproveTypeEnum multipleUserApproveType) {
-        this.multipleUserApproveType = multipleUserApproveType;
-    }
-
-    public CustomFlowRejectTypeEnum getRejectType() {
-        return rejectType;
-    }
-
-    public void setRejectType(CustomFlowRejectTypeEnum rejectType) {
-        this.rejectType = rejectType;
-    }
-
-    public CustomFlowRejectResubmitTypeEnum getRejectResubmitType() {
-        return rejectResubmitType;
-    }
-
-    public void setRejectResubmitType(CustomFlowRejectResubmitTypeEnum rejectResubmitType) {
-        this.rejectResubmitType = rejectResubmitType;
-    }
-
-    public String getFlowTaskVar() {
-        return flowTaskVar;
-    }
-
-    public void setFlowTaskVar(String flowTaskVar) {
-        this.flowTaskVar = flowTaskVar;
-    }
-
-    public List<String> getApproveIds() {
-        return approveIds;
-    }
-
-    public void setApproveIds(List<String> approveIds) {
-        this.approveIds = approveIds;
-    }
-}

+ 0 - 281
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/flow/link/FlowTaskLink.java

@@ -1,281 +0,0 @@
-package com.qmth.paper.library.business.bean.flow.link;
-
-import com.qmth.paper.library.common.enums.ExceptionResultEnum;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Objects;
-
-/**
- * @Description: 流程节点链表
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2022/1/26
- */
-public class FlowTaskLink implements Serializable {
-
-    @ApiModelProperty(name = "头节点")
-    FlowTaskNode first;
-
-    @ApiModelProperty(name = "尾节点")
-    FlowTaskNode last;
-
-    @ApiModelProperty(name = "长度")
-    volatile int size;
-
-    public FlowTaskLink() {
-        this.size = 0;
-    }
-
-    public FlowTaskLink(FlowTaskNode first) {
-        this.size = 1;
-        this.first = first;
-    }
-
-    /**
-     * 增加头节点
-     *
-     * @param first
-     * @return
-     */
-    public boolean addFirst(FlowTaskNode first) {
-        first.next = this.first;
-        this.first.before = first;
-        this.first = first;
-        this.size++;
-        return true;
-    }
-
-    /**
-     * 增加尾节点
-     *
-     * @param last
-     * @return
-     */
-    public boolean addLast(FlowTaskNode last) {
-        this.last.next = last;
-        last.before = this.last;
-        this.last = last;
-        this.size++;
-        return true;
-    }
-
-    /**
-     * 新增节点
-     *
-     * @param node
-     * @return
-     */
-    public boolean add(FlowTaskNode node) {
-        if (Objects.isNull(this.first)) {
-            this.first = node;
-        } else {
-            FlowTaskNode flowTaskNode = this.first.next;
-            if (Objects.isNull(flowTaskNode)) {
-                this.first.next = node;
-                node.before = this.first;
-            } else {
-                boolean next = true;
-                while (next) {
-                    if (Objects.nonNull(flowTaskNode.next)) {
-                        flowTaskNode = flowTaskNode.next;
-                    } else {
-                        flowTaskNode.next = node;
-                        node.before = flowTaskNode;
-                        next = false;
-                    }
-                }
-            }
-            this.last = node;
-        }
-        this.size++;
-        return true;
-    }
-
-    /**
-     * 删除节点
-     *
-     * @param node
-     * @return
-     */
-    public boolean remove(FlowTaskNode node) {
-        if (this.size == 0) {
-            throw ExceptionResultEnum.ERROR.exception("没有数据");
-        } else if (this.first.getTask().getType() == node.getTask().getType() &&
-                Objects.equals(this.first.getTask().getId(), node.getTask().getId())) {
-            if (Objects.nonNull(this.first.next)) {
-                this.first = this.first.next;
-                this.first.before = null;
-            } else {
-                this.first = null;
-            }
-        } else if (this.last.getTask().getType() == node.getTask().getType() &&
-                Objects.equals(this.last.getTask().getId(), node.getTask().getId())) {
-            if (Objects.nonNull(this.last.before)) {
-                this.last = this.last.before;
-                this.last.next = null;
-            }
-        } else {
-            FlowTaskNode flowTaskNode = this.first.next;
-            boolean next = true;
-            while (next) {
-                if (flowTaskNode.getTask().getType() == node.getTask().getType() &&
-                        Objects.equals(flowTaskNode.getTask().getId(), node.getTask().getId())) {
-                    flowTaskNode.before.next = flowTaskNode.next;
-                    flowTaskNode.next.before = flowTaskNode.before;
-                    next = false;
-                }
-            }
-        }
-        this.size--;
-        return true;
-    }
-
-    /**
-     * 删除节点
-     *
-     * @param index
-     * @return
-     */
-    public boolean remove(int index) {
-        if (index < 0) {
-            throw ExceptionResultEnum.ERROR.exception("index必须大于0");
-        } else if (index >= this.size) {
-            throw ExceptionResultEnum.ERROR.exception("index已超过链表最大值");
-        } else if (index == 0) {
-            if (Objects.nonNull(this.first.next)) {
-                this.first = this.first.next;
-                this.first.before = null;
-            } else {
-                this.first = null;
-            }
-        } else if (index == this.size - 1) {
-            if (Objects.nonNull(this.last.before)) {
-                this.last = this.last.before;
-                this.last.next = null;
-            }
-        } else {
-            FlowTaskNode flowTaskNode = this.first.next;
-            for (int i = 1; i < this.size; i++) {
-                if (i == index) {
-                    flowTaskNode.before.next = flowTaskNode.next;
-                    flowTaskNode.next.before = flowTaskNode.before;
-                    break;
-                }
-                flowTaskNode = flowTaskNode.next;
-            }
-        }
-        this.size--;
-        return true;
-    }
-
-    /**
-     * 根据下标新增节点
-     *
-     * @param index
-     * @param node
-     * @return
-     */
-    public boolean add(int index, FlowTaskNode node) {
-        if (index < 0) {
-            throw ExceptionResultEnum.ERROR.exception("index必须大于0");
-        } else if (index > this.size) {
-            throw ExceptionResultEnum.ERROR.exception("index已超过链表最大值");
-        } else if (index == 0) {
-            node.next = this.first;
-            this.first.before = node;
-            this.first = node;
-        } else {
-            if (this.size == index) {
-                this.last.next = node;
-                node.before = this.last;
-                this.last = node;
-            } else {
-                FlowTaskNode flowTaskNode = first.next;
-                for (int i = 1; i < this.size; i++) {
-                    if (i == index) {
-                        node.before = flowTaskNode.before;
-                        node.next = flowTaskNode;
-                        flowTaskNode.before.next = node;
-                        flowTaskNode.before = node;
-                        break;
-                    }
-                    flowTaskNode = flowTaskNode.next;
-                }
-            }
-        }
-        this.size++;
-        return true;
-    }
-
-    /**
-     * 是否为空
-     *
-     * @return
-     */
-    public boolean isEmpty() {
-        return this.size == 0;
-    }
-
-    /**
-     * 根据下标获取
-     *
-     * @param index
-     * @return
-     */
-    public FlowTaskNode get(int index) {
-        FlowTaskNode flowTaskNode = null;
-        if (index < 0) {
-            throw ExceptionResultEnum.ERROR.exception("index必须大于0");
-        } else if (index > this.size) {
-            throw ExceptionResultEnum.ERROR.exception("index已超过链表最大值");
-        } else if (index == 0) {
-            flowTaskNode = this.first;
-        } else if (index == this.size - 1) {
-            flowTaskNode = this.last;
-        } else {
-            flowTaskNode = first.next;
-            for (int i = 1; i < this.size; i++) {
-                if (i == index) {
-                    break;
-                }
-                flowTaskNode = flowTaskNode.next;
-            }
-        }
-        return flowTaskNode;
-    }
-
-    /**
-     * 大小
-     *
-     * @return
-     */
-    public int size() {
-        return this.size <= 0 ? 0 : this.size;
-    }
-
-    public FlowTaskNode getFirst() {
-        return first;
-    }
-
-    public void setFirst(FlowTaskNode first) {
-        this.first = first;
-    }
-
-    public FlowTaskNode getLast() {
-        return last;
-    }
-
-    public void setLast(FlowTaskNode last) {
-        this.last = last;
-    }
-
-    public int getSize() {
-        return size;
-    }
-
-    public void setSize(int size) {
-        this.size = size;
-    }
-}

+ 0 - 68
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/flow/link/FlowTaskNode.java

@@ -1,68 +0,0 @@
-package com.qmth.paper.library.business.bean.flow.link;
-
-import com.qmth.paper.library.business.bean.flow.CustomFlowDto;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-
-/**
- * @Description: 流程节点链表元素
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2022/1/26
- */
-public class FlowTaskNode implements Serializable {
-
-    @ApiModelProperty(name = "节点")
-    CustomFlowDto task;
-
-    @ApiModelProperty(name = "下一个节点")
-    FlowTaskNode next;
-
-    @ApiModelProperty(name = "上一个节点")
-    FlowTaskNode before;
-
-    public FlowTaskNode() {
-
-    }
-
-    public FlowTaskNode(CustomFlowDto task) {
-        this.task = task;
-    }
-
-    public FlowTaskNode(CustomFlowDto task, FlowTaskNode next) {
-        this.task = task;
-        this.next = next;
-    }
-
-    public FlowTaskNode(CustomFlowDto task, FlowTaskNode next, FlowTaskNode before) {
-        this.task = task;
-        this.next = next;
-        this.before = before;
-    }
-
-    public CustomFlowDto getTask() {
-        return task;
-    }
-
-    public void setTask(CustomFlowDto task) {
-        this.task = task;
-    }
-
-    public FlowTaskNode getNext() {
-        return next;
-    }
-
-    public void setNext(FlowTaskNode next) {
-        this.next = next;
-    }
-
-    public FlowTaskNode getBefore() {
-        return before;
-    }
-
-    public void setBefore(FlowTaskNode before) {
-        this.before = before;
-    }
-}

+ 0 - 42
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/ApproveFormParams.java

@@ -1,42 +0,0 @@
-package com.qmth.paper.library.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.NotNull;
-
-/**
- * @Description:
- * @Author: CaoZixuan
- * @Date:
- */
-public class ApproveFormParams {
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "命题任务id")
-    @NotNull(message = "请选择命题任务")
-    @Range(min = 1L,message = "请选择命题任务")
-    private Long examTaskId;
-
-    @ApiModelProperty(value = "html")
-    @NotNull(message = "请提供html")
-    private String htmlContent;
-
-    public Long getExamTaskId() {
-        return examTaskId;
-    }
-
-    public void setExamTaskId(Long examTaskId) {
-        this.examTaskId = examTaskId;
-    }
-
-    public String getHtmlContent() {
-        return htmlContent;
-    }
-
-    public void setHtmlContent(String htmlContent) {
-        this.htmlContent = htmlContent;
-    }
-}

+ 0 - 28
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/BlurryParam.java

@@ -1,28 +0,0 @@
-package com.qmth.paper.library.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;
-    }
-}

+ 0 - 37
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/CardRuleParam.java

@@ -1,37 +0,0 @@
-package com.qmth.paper.library.business.bean.params;
-
-import com.qmth.paper.library.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;
-    }
-}

+ 0 - 41
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/ChooseParams.java

@@ -1,41 +0,0 @@
-package com.qmth.paper.library.business.bean.params;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.paper.library.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;
-    }
-}

+ 0 - 29
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/CourseParam.java

@@ -1,29 +0,0 @@
-package com.qmth.paper.library.business.bean.params;
-
-
-import com.qmth.paper.library.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;
-    }
-}

+ 0 - 43
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/CustomFlowParam.java

@@ -1,43 +0,0 @@
-package com.qmth.paper.library.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.NotNull;
-import java.io.Serializable;
-
-/**
- * @Description: 流程参数
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/8/6
- */
-public class CustomFlowParam implements Serializable {
-
-    @ApiModelProperty(value = "id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @NotNull(message = "id不能为空")
-    private Long id;
-
-    @ApiModelProperty(value = "是否启用,0:停用,1:启用")
-    @NotNull(message = "启用/禁用不能为空")
-    private Boolean enable;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Boolean getEnable() {
-        return enable;
-    }
-
-    public void setEnable(Boolean enable) {
-        this.enable = enable;
-    }
-}

+ 0 - 44
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/CustomFlowRenameParam.java

@@ -1,44 +0,0 @@
-package com.qmth.paper.library.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.NotNull;
-import java.io.Serializable;
-
-/**
- * @Description: 流程重命名参数
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/8/6
- */
-public class CustomFlowRenameParam implements Serializable {
-
-    @ApiModelProperty(value = "自定义流程id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @NotNull(message = "id不能为空")
-    private Long id;
-
-    @ApiModelProperty(value = "自定义流程名称")
-    @NotNull(message = "流程名称不能为空")
-    private String name;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-}

+ 0 - 29
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/DeleteBatchParams.java

@@ -1,29 +0,0 @@
-package com.qmth.paper.library.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;
-    }
-}

+ 0 - 30
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/DeleteParams.java

@@ -1,30 +0,0 @@
-package com.qmth.paper.library.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.NotNull;
-
-/**
- * @Description: 单个删除参数
- * @Author: CaoZixuan
- * @Date: 2021-04-06
- */
-public class DeleteParams {
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "要删除的记录主键", required = true)
-    @NotNull(message = "请输入要删除的记录主键")
-    @Range(min = 1L, message = "请输入要删除的记录主键")
-    private Long id;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-}

+ 0 - 133
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/DownloadPaperFileParam.java

@@ -1,133 +0,0 @@
-package com.qmth.paper.library.business.bean.params;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.paper.library.business.enums.PaperFileDownloadContentEnum;
-import com.qmth.paper.library.business.enums.PaperFileDownloadExposureStatusEnum;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.Set;
-
-/**
- * @Description: 试卷文件下载参数
- * @Author: CaoZixuan
- * @Date: 2022-04-08
- */
-public class DownloadPaperFileParam {
-    // 查询条件
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "学期id")
-    private Long semesterId;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "考试id")
-    private Long examId;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "机构id")
-    private Long orgId;
-
-    @ApiModelProperty(value = "课程名称")
-    private String courseName;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "印刷计划id")
-    private Set<Long> idSet;
-
-    @ApiModelProperty(value = "下载的内容:'试卷、题卡、试卷题卡'")
-    private PaperFileDownloadContentEnum paperFileDownloadContentType;
-
-    @ApiModelProperty(value = "下载的曝光类型:'已曝光、未曝光、全部'")
-    private PaperFileDownloadExposureStatusEnum paperFileDownloadExposureStatus;
-
-    @ApiModelProperty(value = "开启根据课程名称-课程代码命名?true 是 false 否")
-    private Boolean namedByCourseInfo;
-
-    @ApiModelProperty(value = "开启根据试卷编号命名?true 是 false 否")
-    private Boolean namedByPaperNumber;
-
-    @ApiModelProperty(value = "开启根据原始文件名命名?true 是 false 否")
-    private Boolean namedByOriginalFile;
-
-
-
-    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 getOrgId() {
-        return orgId;
-    }
-
-    public void setOrgId(Long orgId) {
-        this.orgId = orgId;
-    }
-
-    public String getCourseName() {
-        return courseName;
-    }
-
-    public void setCourseName(String courseName) {
-        this.courseName = courseName;
-    }
-
-    public Set<Long> getIdSet() {
-        return idSet;
-    }
-
-    public void setIdSet(Set<Long> idSet) {
-        this.idSet = idSet;
-    }
-
-    public PaperFileDownloadContentEnum getPaperFileDownloadContentType() {
-        return paperFileDownloadContentType;
-    }
-
-    public void setPaperFileDownloadContentType(PaperFileDownloadContentEnum paperFileDownloadContentType) {
-        this.paperFileDownloadContentType = paperFileDownloadContentType;
-    }
-
-    public PaperFileDownloadExposureStatusEnum getPaperFileDownloadExposureStatus() {
-        return paperFileDownloadExposureStatus;
-    }
-
-    public void setPaperFileDownloadExposureStatus(PaperFileDownloadExposureStatusEnum paperFileDownloadExposureStatus) {
-        this.paperFileDownloadExposureStatus = paperFileDownloadExposureStatus;
-    }
-
-    public Boolean getNamedByCourseInfo() {
-        return namedByCourseInfo;
-    }
-
-    public void setNamedByCourseInfo(Boolean namedByCourseInfo) {
-        this.namedByCourseInfo = namedByCourseInfo;
-    }
-
-    public Boolean getNamedByPaperNumber() {
-        return namedByPaperNumber;
-    }
-
-    public void setNamedByPaperNumber(Boolean namedByPaperNumber) {
-        this.namedByPaperNumber = namedByPaperNumber;
-    }
-
-    public Boolean getNamedByOriginalFile() {
-        return namedByOriginalFile;
-    }
-
-    public void setNamedByOriginalFile(Boolean namedByOriginalFile) {
-        this.namedByOriginalFile = namedByOriginalFile;
-    }
-}

+ 0 - 139
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/ExamCardParams.java

@@ -1,139 +0,0 @@
-package com.qmth.paper.library.business.bean.params;
-
-import com.qmth.paper.library.business.enums.CardStatusEnum;
-import com.qmth.paper.library.business.enums.CardTypeEnum;
-import com.qmth.paper.library.business.enums.MakeMethodEnum;
-
-/**
- * @Date: 2021/4/8.
- */
-public class ExamCardParams {
-
-    private Long id;
-    private Long orgId;
-    private CardStatusEnum status;
-    private String examTaskId;
-    private String courseCode;
-    private String courseName;
-    private String title;
-    private MakeMethodEnum makeMethod;
-    private String content;
-    private String htmlContent;
-    private String attachmentId;
-    private String custAttachmentId;
-    private CardTypeEnum type;
-    private Long templateId;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-
-    public Long getOrgId() {
-        return orgId;
-    }
-
-    public void setOrgId(Long orgId) {
-        this.orgId = orgId;
-    }
-
-    public CardStatusEnum getStatus() {
-        return status;
-    }
-
-    public void setStatus(CardStatusEnum status) {
-        this.status = status;
-    }
-
-    public String getExamTaskId() {
-        return examTaskId;
-    }
-
-    public void setExamTaskId(String examTaskId) {
-        this.examTaskId = examTaskId;
-    }
-
-    public String getCourseCode() {
-        return courseCode;
-    }
-
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
-    }
-
-    public String getCourseName() {
-        return courseName;
-    }
-
-    public void setCourseName(String courseName) {
-        this.courseName = courseName;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public MakeMethodEnum getMakeMethod() {
-        return makeMethod;
-    }
-
-    public void setMakeMethod(MakeMethodEnum makeMethod) {
-        this.makeMethod = makeMethod;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-    public String getHtmlContent() {
-        return htmlContent;
-    }
-
-    public void setHtmlContent(String htmlContent) {
-        this.htmlContent = htmlContent;
-    }
-
-    public String getAttachmentId() {
-        return attachmentId;
-    }
-
-    public void setAttachmentId(String attachmentId) {
-        this.attachmentId = attachmentId;
-    }
-
-    public String getCustAttachmentId() {
-        return custAttachmentId;
-    }
-
-    public void setCustAttachmentId(String custAttachmentId) {
-        this.custAttachmentId = custAttachmentId;
-    }
-
-    public CardTypeEnum getType() {
-        return type;
-    }
-
-    public void setType(CardTypeEnum type) {
-        this.type = type;
-    }
-
-    public Long getTemplateId() {
-        return templateId;
-    }
-
-    public void setTemplateId(Long templateId) {
-        this.templateId = templateId;
-    }
-}

+ 0 - 91
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/ExamDetailList.java

@@ -1,91 +0,0 @@
-package com.qmth.paper.library.business.bean.params;
-
-import java.util.List;
-
-/**
- * @Date: 2021/4/8.
- */
-public class ExamDetailList {
-
-    private String examPlace;
-    private String examRoom;
-    private String classId;
-    private String className;
-    private Integer studentCount;
-    private Long printHouseId;
-    private String printHouseName;
-    private String extendFields;
-    private List<ExamTaskStudentObjectParam> examTaskStudentObjectParamList;
-
-    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 Long getPrintHouseId() {
-        return printHouseId;
-    }
-
-    public void setPrintHouseId(Long printHouseId) {
-        this.printHouseId = printHouseId;
-    }
-
-    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 getPrintHouseName() {
-        return printHouseName;
-    }
-
-    public void setPrintHouseName(String printHouseName) {
-        this.printHouseName = printHouseName;
-    }
-
-    public String getExtendFields() {
-        return extendFields;
-    }
-
-    public void setExtendFields(String extendFields) {
-        this.extendFields = extendFields;
-    }
-
-    public List<ExamTaskStudentObjectParam> getExamTaskStudentObjectParamList() {
-        return examTaskStudentObjectParamList;
-    }
-
-    public void setExamTaskStudentObjectParamList(List<ExamTaskStudentObjectParam> examTaskStudentObjectParamList) {
-        this.examTaskStudentObjectParamList = examTaskStudentObjectParamList;
-    }
-}

+ 0 - 82
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/ExamDetailParams.java

@@ -1,82 +0,0 @@
-package com.qmth.paper.library.business.bean.params;
-
-import java.util.List;
-
-/**
- * @Date: 2021/4/8.
- */
-public class ExamDetailParams {
-
-    private Long examStartTime;
-    private Long examEndTime;
-    private String paperNumber;
-    private String courseCode;
-    private String courseName;
-    private Integer printCount; // 总数量,适用于模式2
-    private Long printHouseId; // 总印刷室,适用于模式2
-    private List<ExamDetailList> list;
-
-    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 getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    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 Integer getPrintCount() {
-        return printCount;
-    }
-
-    public void setPrintCount(Integer printCount) {
-        this.printCount = printCount;
-    }
-
-    public Long getPrintHouseId() {
-        return printHouseId;
-    }
-
-    public void setPrintHouseId(Long printHouseId) {
-        this.printHouseId = printHouseId;
-    }
-
-    public List<ExamDetailList> getList() {
-        return list;
-    }
-
-    public void setList(List<ExamDetailList> list) {
-        this.list = list;
-    }
-}

+ 0 - 47
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/ExamTaskApplyParam.java

@@ -1,47 +0,0 @@
-package com.qmth.paper.library.business.bean.params;
-
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.paper.library.business.entity.ExamTask;
-import com.qmth.paper.library.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;
-    }
-}

+ 0 - 74
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/ExamTaskParam.java

@@ -1,74 +0,0 @@
-package com.qmth.paper.library.business.bean.params;
-
-
-import com.qmth.paper.library.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;
-    }
-}

+ 0 - 29
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/ExamTaskPrintParams.java

@@ -1,29 +0,0 @@
-package com.qmth.paper.library.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;
-    }
-}

+ 0 - 30
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/ExamTaskReApplyParam.java

@@ -1,30 +0,0 @@
-package com.qmth.paper.library.business.bean.params;
-
-
-import com.qmth.paper.library.business.entity.ExamTaskDetail;
-
-/**
- * @Date: 2021/3/23.
- */
-public class ExamTaskReApplyParam {
-
-    private ExamTaskDetail examTaskDetail;
-
-    private String flowTaskId;
-
-    public ExamTaskDetail getExamTaskDetail() {
-        return examTaskDetail;
-    }
-
-    public void setExamTaskDetail(ExamTaskDetail examTaskDetail) {
-        this.examTaskDetail = examTaskDetail;
-    }
-
-    public String getFlowTaskId() {
-        return flowTaskId;
-    }
-
-    public void setFlowTaskId(String flowTaskId) {
-        this.flowTaskId = flowTaskId;
-    }
-}

+ 0 - 60
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/ExamTaskStudentObjectParam.java

@@ -1,60 +0,0 @@
-package com.qmth.paper.library.business.bean.params;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.paper.library.business.enums.StudentClazzEnum;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: 命题任务提交考务考生生参数
- * @Author: CaoZixuan
- * @Date: 2022-08-22
- */
-public class ExamTaskStudentObjectParam {
-    @ApiModelProperty("学生id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long studentId;
-
-    @ApiModelProperty("行政班id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long basicClazzId;
-
-    @ApiModelProperty("教学班id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long teachClazzId;
-
-    @ApiModelProperty("学生班级类型")
-    private StudentClazzEnum studentClazzType;
-
-    public Long getStudentId() {
-        return studentId;
-    }
-
-    public void setStudentId(Long studentId) {
-        this.studentId = studentId;
-    }
-
-    public Long getBasicClazzId() {
-        return basicClazzId;
-    }
-
-    public void setBasicClazzId(Long basicClazzId) {
-        this.basicClazzId = basicClazzId;
-    }
-
-    public Long getTeachClazzId() {
-        return teachClazzId;
-    }
-
-    public void setTeachClazzId(Long teachClazzId) {
-        this.teachClazzId = teachClazzId;
-    }
-
-    public StudentClazzEnum getStudentClazzType() {
-        return studentClazzType;
-    }
-
-    public void setStudentClazzType(StudentClazzEnum studentClazzType) {
-        this.studentClazzType = studentClazzType;
-    }
-}

+ 0 - 45
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/FlowApproveParam.java

@@ -1,45 +0,0 @@
-package com.qmth.paper.library.business.bean.params;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.paper.library.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;
-    }
-}

+ 0 - 78
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/FlowTaskApproveParam.java

@@ -1,78 +0,0 @@
-package com.qmth.paper.library.business.bean.params;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.paper.library.common.enums.FlowApprovePassEnum;
-import io.swagger.annotations.ApiModelProperty;
-
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @Description: 流程任务审批参数
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/8/6
- */
-public class FlowTaskApproveParam implements Serializable {
-
-    @ApiModelProperty(value = "流程任务id")
-    @NotNull(message = "流程任务id不能为空")
-    private String taskId;
-
-    @ApiModelProperty(value = "流程审核操作")
-    @NotNull(message = "流程审核操作不能为空")
-    private FlowApprovePassEnum approvePass;
-
-    @ApiModelProperty(value = "流程审核意见")
-    private String remark;
-
-    @ApiModelProperty(value = "流程驳回节点")
-    private Integer setup;
-
-    @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 String getTaskId() {
-        return taskId;
-    }
-
-    public void setTaskId(String taskId) {
-        this.taskId = taskId;
-    }
-
-    public FlowApprovePassEnum getApprovePass() {
-        return approvePass;
-    }
-
-    public void setApprovePass(FlowApprovePassEnum approvePass) {
-        this.approvePass = approvePass;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public Integer getSetup() {
-        return setup;
-    }
-
-    public void setSetup(Integer setup) {
-        this.setup = setup;
-    }
-}

+ 0 - 95
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/GenericExamCardParams.java

@@ -1,95 +0,0 @@
-package com.qmth.paper.library.business.bean.params;
-
-import com.qmth.paper.library.common.enums.CardCreateMethodEnum;
-
-/**
- * 题卡管理(通卡)参数
- */
-public class GenericExamCardParams {
-
-    /**
-     * exam_card主键ID
-     */
-    private Long id;
-    private String title;
-    private CardCreateMethodEnum createMethod;
-    private String content;
-    private String htmlContent;
-    // 上传附件ID
-    private Long attachmentId;
-    private String remark;
-    private Long cardRuleId;
-    private String status;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public CardCreateMethodEnum getCreateMethod() {
-        return createMethod;
-    }
-
-    public void setCreateMethod(CardCreateMethodEnum createMethod) {
-        this.createMethod = createMethod;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-    public String getHtmlContent() {
-        return htmlContent;
-    }
-
-    public void setHtmlContent(String htmlContent) {
-        this.htmlContent = htmlContent;
-    }
-
-    public Long getAttachmentId() {
-        return attachmentId;
-    }
-
-    public void setAttachmentId(Long attachmentId) {
-        this.attachmentId = attachmentId;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public Long getCardRuleId() {
-        return cardRuleId;
-    }
-
-    public void setCardRuleId(Long cardRuleId) {
-        this.cardRuleId = cardRuleId;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-}

+ 0 - 182
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/PrintPlanParams.java

@@ -1,182 +0,0 @@
-package com.qmth.paper.library.business.bean.params;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.paper.library.business.enums.BackupMethodEnum;
-import com.qmth.paper.library.common.enums.DrawRuleEnum;
-import io.swagger.annotations.ApiModelProperty;
-import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.constraints.Range;
-
-import javax.validation.constraints.NotNull;
-import java.util.List;
-
-/**
- * @Description: 印刷计划保存参数
- * @Author: CaoZixuan
- * @Date: 2021-04-06
- */
-public class PrintPlanParams {
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "印刷计划id")
-    private Long id;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "学校id")
-    private Long schoolId;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "考试ID")
-    private Long examId;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "机构id")
-    private Long orgId;
-
-    @ApiModelProperty(value = "印刷计划名称",required = true)
-    @NotNull(message = "请输入印刷计划名称")
-    @Length(min = 1,message = "请输入印刷计划名称")
-    private String name;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "考试开始时间",required = true)
-    @NotNull(message = "请输入考试开始时间")
-    @Range(min = 1L,message = "请输入考试开始时间")
-    private Long examStartTime;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "考试结束时间",required = true)
-    @NotNull(message = "请输入考试结束时间")
-    @Range(min = 1L,message = "请输入考试结束时间")
-    private Long examEndTime;
-
-    @ApiModelProperty(value = "*打印内容:{“PAPER”, \"CARD\"}",required = true)
-    @NotNull(message = "请输入打印内容")
-    private List<String> printContent;
-
-    @ApiModelProperty(value = "备份方式:PLACE-按考点,ROOM-按考场",required = true)
-    @NotNull(message = "请输入备份方式")
-    private BackupMethodEnum backupMethod;
-
-    @ApiModelProperty(value = "备份数量",required = true)
-    @NotNull(message = "请输入备份数量")
-    @Range(min = 0,message = "请输入正数")
-    private Integer backupCount;
-
-    @ApiModelProperty(value = "抽卷规则:ONE-只抽一次,CIRCLE-可循环抽取",required = true)
-    @NotNull(message = "请设置抽卷规则")
-    private DrawRuleEnum drawRule;
-
-    @ApiModelProperty(value = "变量印品:样例",required = true)
-    @NotNull(message = "请设置变量印品")
-    private String variableContent;
-
-    @ApiModelProperty(value = "普通印品:样例",required = true)
-    @NotNull(message = "请设置普通印品")
-    private String ordinaryContent;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(Long schoolId) {
-        this.schoolId = schoolId;
-    }
-
-    public Long getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Long examId) {
-        this.examId = examId;
-    }
-
-    public Long getOrgId() {
-        return orgId;
-    }
-
-    public void setOrgId(Long orgId) {
-        this.orgId = orgId;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    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<String> getPrintContent() {
-        return printContent;
-    }
-
-    public void setPrintContent(List<String> printContent) {
-        this.printContent = printContent;
-    }
-
-    public BackupMethodEnum getBackupMethod() {
-        return backupMethod;
-    }
-
-    public void setBackupMethod(BackupMethodEnum backupMethod) {
-        this.backupMethod = backupMethod;
-    }
-
-    public Integer getBackupCount() {
-        return backupCount;
-    }
-
-    public void setBackupCount(Integer backupCount) {
-        this.backupCount = backupCount;
-    }
-
-    public DrawRuleEnum getDrawRule() {
-        return drawRule;
-    }
-
-    public void setDrawRule(DrawRuleEnum drawRule) {
-        this.drawRule = drawRule;
-    }
-
-    public String getVariableContent() {
-        return variableContent;
-    }
-
-    public void setVariableContent(String variableContent) {
-        this.variableContent = variableContent;
-    }
-
-    public String getOrdinaryContent() {
-        return ordinaryContent;
-    }
-
-    public void setOrdinaryContent(String ordinaryContent) {
-        this.ordinaryContent = ordinaryContent;
-    }
-}

+ 0 - 56
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/RelatePaperParam.java

@@ -1,56 +0,0 @@
-package com.qmth.paper.library.business.bean.params;
-
-
-import com.qmth.paper.library.common.base.BasePage;
-
-/**
- * @Date: 2021/3/23.
- */
-public class RelatePaperParam extends BasePage {
-
-    private Long printPlanId;
-    private Long examTaskId;
-    private String paperNumber;
-    private String relatePaperType;
-    private String examDetailCourseIds;
-
-    public Long getPrintPlanId() {
-        return printPlanId;
-    }
-
-    public void setPrintPlanId(Long printPlanId) {
-        this.printPlanId = printPlanId;
-    }
-
-    public Long getExamTaskId() {
-        return examTaskId;
-    }
-
-    public void setExamTaskId(Long examTaskId) {
-        this.examTaskId = examTaskId;
-    }
-
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    public String getRelatePaperType() {
-        return relatePaperType;
-    }
-
-    public void setRelatePaperType(String relatePaperType) {
-        this.relatePaperType = relatePaperType;
-    }
-
-    public String getExamDetailCourseIds() {
-        return examDetailCourseIds;
-    }
-
-    public void setExamDetailCourseIds(String examDetailCourseIds) {
-        this.examDetailCourseIds = examDetailCourseIds;
-    }
-}

+ 0 - 29
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/RoleParam.java

@@ -1,29 +0,0 @@
-package com.qmth.paper.library.business.bean.params;
-
-
-import com.qmth.paper.library.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;
-    }
-}

+ 0 - 53
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/SerialNumberParams.java

@@ -1,53 +0,0 @@
-package com.qmth.paper.library.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;
-    }
-}

+ 0 - 39
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/SyncDataParam.java

@@ -1,39 +0,0 @@
-package com.qmth.paper.library.business.bean.params;
-
-import java.util.List;
-
-/**
- * @Date: 2021/7/28.
- */
-public class SyncDataParam {
-
-    private Long thirdRelateId;
-
-    private String thirdRelateName;
-
-    private List<Long> list;
-
-    public Long getThirdRelateId() {
-        return thirdRelateId;
-    }
-
-    public void setThirdRelateId(Long thirdRelateId) {
-        this.thirdRelateId = thirdRelateId;
-    }
-
-    public String getThirdRelateName() {
-        return thirdRelateName;
-    }
-
-    public void setThirdRelateName(String thirdRelateName) {
-        this.thirdRelateName = thirdRelateName;
-    }
-
-    public List<Long> getList() {
-        return list;
-    }
-
-    public void setList(List<Long> list) {
-        this.list = list;
-    }
-}

+ 0 - 85
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/TaskPrintParams.java

@@ -1,85 +0,0 @@
-package com.qmth.paper.library.business.bean.params;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.paper.library.business.entity.ExamTaskPrint;
-
-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;
-    }
-}

+ 0 - 60
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/TeachClazzParams.java

@@ -1,60 +0,0 @@
-package com.qmth.paper.library.business.bean.params;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.paper.library.common.annotation.DBVerify;
-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: 2022-02-11
- */
-public class TeachClazzParams {
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "班级id(修改时必填)")
-    @DBVerify(value = "班级id")
-    private Long id;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "教学课程主键")
-    @NotNull(message = "请选择教学课程")
-    @Range(min = 1L, message = "请选择教学课程")
-    @DBVerify(value = "教学课程id",required = true)
-    private Long teachCourseId;
-
-    @ApiModelProperty(value = "教学班级名称")
-    @NotNull(message = "请输入教学班级名称")
-    @Length(min = 1,message = "请输入教学班级名称")
-    @DBVerify(value = "教学班级名称",required = true)
-    private String teachClazzName;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getTeachCourseId() {
-        return teachCourseId;
-    }
-
-    public void setTeachCourseId(Long teachCourseId) {
-        this.teachCourseId = teachCourseId;
-    }
-
-    public String getTeachClazzName() {
-        return teachClazzName;
-    }
-
-    public void setTeachClazzName(String teachClazzName) {
-        this.teachClazzName = teachClazzName;
-    }
-}

+ 0 - 32
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/TeachCourseParams.java

@@ -1,32 +0,0 @@
-package com.qmth.paper.library.business.bean.params;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.paper.library.common.annotation.DBVerify;
-import io.swagger.annotations.ApiModelProperty;
-import org.hibernate.validator.constraints.Range;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * @Description: 教学课程编辑参数
- * @Author: CaoZixuan
- * @Date: 2022-02-14
- */
-public class TeachCourseParams {
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "基础课程id")
-    @NotNull(message = "请选择基础课程id")
-    @Range(min = 1L, message = "请选择基础课程id")
-    @DBVerify(value = "基础课程id")
-    private Long basicCourseId;
-
-    public Long getBasicCourseId() {
-        return basicCourseId;
-    }
-
-    public void setBasicCourseId(Long basicCourseId) {
-        this.basicCourseId = basicCourseId;
-    }
-}

+ 0 - 47
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/TeachStudentBatchParam.java

@@ -1,47 +0,0 @@
-package com.qmth.paper.library.business.bean.params;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.paper.library.common.annotation.DBVerify;
-import io.swagger.annotations.ApiModelProperty;
-import org.hibernate.validator.constraints.Range;
-
-import javax.validation.constraints.NotNull;
-import java.util.Set;
-
-/**
- * @Description: 教学学生批量新增
- * @Author: CaoZixuan
- * @Date: 2022-04-12
- */
-public class TeachStudentBatchParam {
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "教学班级主键")
-    @NotNull(message = "请选择教学班级")
-    @Range(min = 1L, message = "请选择教学班级")
-    @DBVerify(value = "教学班级id",required = true)
-    private Long teachClazzId;
-
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "学生字典id集合")
-    @NotNull(message = "请选择要添加的学生")
-    private Set<Long> basicStudentIdSet;
-
-    public Long getTeachClazzId() {
-        return teachClazzId;
-    }
-
-    public void setTeachClazzId(Long teachClazzId) {
-        this.teachClazzId = teachClazzId;
-    }
-
-    public Set<Long> getBasicStudentIdSet() {
-        return basicStudentIdSet;
-    }
-
-    public void setBasicStudentIdSet(Set<Long> basicStudentIdSet) {
-        this.basicStudentIdSet = basicStudentIdSet;
-    }
-}

+ 0 - 61
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/TeachStudentParams.java

@@ -1,61 +0,0 @@
-package com.qmth.paper.library.business.bean.params;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.paper.library.common.annotation.DBVerify;
-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: 2022-02-24
- */
-public class TeachStudentParams {
-
-    @ApiModelProperty(value = "教学学生名称")
-    @NotNull(message = "请输入教学学生名称")
-    @Length(min = 1,message = "请输入教学学生名称")
-    @DBVerify(value = "教学学生名称",required = true)
-    private String studentName;
-
-    @ApiModelProperty(value = "教学学生名称")
-    @NotNull(message = "请输入教学学生名称")
-    @Length(min = 1,message = "请输入教学学生名称")
-    @DBVerify(value = "教学学生名称",required = true)
-    private String studentCode;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "教学班级主键")
-    @NotNull(message = "请选择教学班级")
-    @Range(min = 1L, message = "请选择教学班级")
-    @DBVerify(value = "教学班级id",required = true)
-    private Long teachClazzId;
-
-    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 Long getTeachClazzId() {
-        return teachClazzId;
-    }
-
-    public void setTeachClazzId(Long teachClazzId) {
-        this.teachClazzId = teachClazzId;
-    }
-}

Some files were not shown because too many files changed in this diff