修改小题分析、大题分析保存模型

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/report/model/ReportSubject.java

@@ -104,7 +104,7 @@ public class ReportSubject implements Serializable {
     /**
      * 实考人数
      */
-    @ExcelField(title = "实考代码", align = 2, sort = 110)
+    @ExcelField(title = "实考人数", align = 2, sort = 110)
     @Column(name = "reality_count")
     private Integer realityCount;
 

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/report/model/ReportSubjectGroup.java

@@ -63,7 +63,7 @@ public class ReportSubjectGroup implements Serializable {
     @ExcelField(title = "大题号", align = 2, sort = 40)
     @Column(name = "group_number")
     private Integer groupNumber;
-    
+
     /**
      * 最高分
      */
@@ -127,6 +127,12 @@ public class ReportSubjectGroup implements Serializable {
     @Column(name = "full_count")
     private Integer fullCount;
 
+    /**
+     * 是否客观
+     */
+    @Column(name = "objective")
+    private Boolean objective;
+
     public Integer getId() {
         return id;
     }
@@ -239,14 +245,20 @@ public class ReportSubjectGroup implements Serializable {
         this.scoreRate = scoreRate;
     }
 
-    
     public Integer getGroupNumber() {
         return groupNumber;
     }
 
-    
     public void setGroupNumber(Integer groupNumber) {
         this.groupNumber = groupNumber;
     }
 
+    public Boolean getObjective() {
+        return objective;
+    }
+
+    public void setObjective(Boolean objective) {
+        this.objective = objective;
+    }
+
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/report/model/ReportSubjectQuestion.java

@@ -57,45 +57,59 @@ public class ReportSubjectQuestion implements Serializable {
     @Column(name = "question_Name", length = 128)
     private String questionName;
 
+    /**
+     * 大题号
+     */
+    @ExcelField(title = "大题号", align = 2, sort = 40)
+    @Column(name = "main_number", nullable = false)
+    private Integer mainNumber;
+
+    /**
+     * 小题号
+     */
+    @ExcelField(title = "小题号", align = 2, sort = 50)
+    @Column(name = "sub_number", nullable = false)
+    private Integer subNumber;
+
     /**
      * 总分
      */
-    @ExcelField(title = "总分", align = 2, sort = 40)
+    @ExcelField(title = "总分", align = 2, sort = 60)
     @Column(name = "total_score")
     private Double totalScore;
 
     /**
      * 平均分
      */
-    @ExcelField(title = "平均分", align = 2, sort = 50)
+    @ExcelField(title = "平均分", align = 2, sort = 70)
     @Column(name = "avg_score")
     private Double avgScore;
 
     /**
      * 标准差
      */
-    @ExcelField(title = "标准差", align = 2, sort = 60)
+    @ExcelField(title = "标准差", align = 2, sort = 80)
     @Column(name = "sd")
     private Double sd;
 
     /**
      * 得分率
      */
-    @ExcelField(title = "得分率", align = 2, sort = 70)
+    @ExcelField(title = "得分率", align = 2, sort = 90)
     @Column(name = "score_rate")
     private Double scoreRate;
 
     /**
      * 满分率
      */
-    @ExcelField(title = "满分率", align = 2, sort = 80)
+    @ExcelField(title = "满分率", align = 2, sort = 100)
     @Column(name = "full_score_rate")
     private Double fullScoreRate;
 
     /**
      * 卷型
      */
-    @ExcelField(title = "卷型", align = 2, sort = 80)
+    @ExcelField(title = "卷型", align = 2, sort = 110)
     @Column(name = "paper_type", nullable = true, length = 32)
     private String paperType;
 
@@ -201,4 +215,20 @@ public class ReportSubjectQuestion implements Serializable {
         this.paperType = paperType;
     }
 
+    public Integer getMainNumber() {
+        return mainNumber;
+    }
+
+    public void setMainNumber(Integer mainNumber) {
+        this.mainNumber = mainNumber;
+    }
+
+    public Integer getSubNumber() {
+        return subNumber;
+    }
+
+    public void setSubNumber(Integer subNumber) {
+        this.subNumber = subNumber;
+    }
+
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/report/service/impl/ReportSubjectQuestionServiceImpl.java

@@ -153,7 +153,9 @@ public class ReportSubjectQuestionServiceImpl extends BaseQueryService<ReportSub
                     reportSubjectQuestion.setSubjectCode(subjectCode);
                     reportSubjectQuestion.setSubjectName(subject.getName());
                     reportSubjectQuestion.setObjective(objective);
-                    reportSubjectQuestion.setQuestionName(question.getMainTitle() + "_" + question.getMainNumber()+ "_"+question.getSubNumber());
+                    reportSubjectQuestion.setQuestionName(question.getMainTitle());
+                    reportSubjectQuestion.setMainNumber(question.getMainNumber());
+                    reportSubjectQuestion.setSubNumber(question.getSubNumber());
                     reportSubjectQuestion.setTotalScore(question.getTotalScore());
                     reportSubjectQuestion.setAvgScore(avgScore);
                     reportSubjectQuestion.setScoreRate(DoubleUtil.div(avgScore, question.getTotalScore(), 2));