fix:paperType

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

@@ -37,8 +37,8 @@ public class BasicPaperInfo {
     @ApiModelProperty(value = "试卷编号")
     private String paperNumber;
 
-    @ApiModelProperty(value = "试卷类型集合A、B")
-    private List<String> paperTypes;
+    @ApiModelProperty(value = "试卷类型(A,B)")
+    private String paperType;
 
     @ApiModelProperty(value = "状态")
     private ExamPaperStructureStatusEnum status;
@@ -102,12 +102,12 @@ public class BasicPaperInfo {
         this.paperNumber = paperNumber;
     }
 
-    public List<String> getPaperTypes() {
-        return paperTypes;
+    public String getPaperType() {
+        return paperType;
     }
 
-    public void setPaperTypes(List<String> paperTypes) {
-        this.paperTypes = paperTypes;
+    public void setPaperType(String paperType) {
+        this.paperType = paperType;
     }
 
     public ExamPaperStructureStatusEnum getStatus() {

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

@@ -75,9 +75,6 @@ public class Question {
         if (!a.getTotalScore().equals(b.getTotalScore())) {
             return false;
         }
-        if (!a.getMainTitle().equals(b.getMainTitle())) {
-            return false;
-        }
-        return true;
+        return a.getMainTitle().equals(b.getMainTitle());
     }
 }

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

@@ -343,11 +343,7 @@ public class ExamPaperStructureServiceImpl extends ServiceImpl<ExamPaperStructur
         String paperNumber = basicPaperInfo.getPaperNumber();
         String courseCode = basicPaperInfo.getCourseCode();
         String courseName = basicPaperInfo.getCourseName();
-        List<String> paperTypeList = basicPaperInfo.getPaperTypes();
-        if (paperTypeList == null || paperTypeList.size() == 0) {
-            throw ExceptionResultEnum.ERROR.exception("缺少试卷类型");
-        }
-        String paperType = String.join(",", paperTypeList);
+        String paperType = basicPaperInfo.getPaperType();
         ExamPaperStructureStatusEnum status = basicPaperInfo.getStatus();
         String objectiveStructure = JSON.toJSONString(paperStructureInfo.getObjectiveQuestionList());
         String subjectiveStructure = JSON.toJSONString(paperStructureInfo.getSubjectiveQuestionList());