question的subNumber改为string

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/dao/ExamQuestionDao.java

@@ -23,7 +23,7 @@ public interface ExamQuestionDao extends JpaRepository<ExamQuestion, Integer>, J
 
     @Query("select count(q) from ExamQuestion q where q.examId=?1 and q.subjectCode=?2 and q.objective=?3 and q.mainNumber=?4 and q.subNumber=?5")
     public long countByExamIdAndSubjectCodeAndObjectiveAndMainNumberAndSubNumber(Integer examId, String subjectCode,
-            boolean objective, Integer mainNumber, Integer subNumber);
+            boolean objective, Integer mainNumber, String subNumber);
 
     // @Query("select q from ExamQuestion q where q.examId=?1 and
     // q.subjectCode=?2 and q.objective=?3 "
@@ -80,6 +80,6 @@ public interface ExamQuestionDao extends JpaRepository<ExamQuestion, Integer>, J
             boolean objective, Integer mainNumber, String paperType);
 
     public ExamQuestion findByExamIdAndSubjectCodeAndObjectiveAndMainNumberAndSubNumber(Integer examId,
-            String subjectCode, boolean objective, Integer mainNumber, Integer subNumber);
+            String subjectCode, boolean objective, Integer mainNumber, String subNumber);
 
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/model/ExamQuestion.java

@@ -33,7 +33,7 @@ public class ExamQuestion implements Serializable {
     private Integer mainNumber;
 
     @Column(name = "sub_number", nullable = false)
-    private Integer subNumber;
+    private String subNumber;
 
     @Column(name = "main_title", nullable = false, length = 32)
     private String mainTitle;
@@ -126,11 +126,11 @@ public class ExamQuestion implements Serializable {
         this.mainNumber = mainNumber;
     }
 
-    public Integer getSubNumber() {
+    public String getSubNumber() {
         return subNumber;
     }
 
-    public void setSubNumber(Integer subNumber) {
+    public void setSubNumber(String subNumber) {
         this.subNumber = subNumber;
     }
 

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/model/SubjectiveScore.java

@@ -74,11 +74,11 @@ public class SubjectiveScore implements Serializable {
         this.pk.setMainNumber(mainNumber);
     }
 
-    public Integer getSubNumber() {
+    public String getSubNumber() {
         return pk.getSubNumber();
     }
 
-    public void setSubNumber(Integer subNumber) {
+    public void setSubNumber(String subNumber) {
         this.pk.setSubNumber(subNumber);
     }
 

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/model/SubjectiveScorePK.java

@@ -16,7 +16,7 @@ public class SubjectiveScorePK implements Serializable {
     private Integer mainNumber;
 
     @Column(name = "sub_number", nullable = false)
-    private Integer subNumber;
+    private String subNumber;
 
     public Integer getStudentId() {
         return studentId;
@@ -34,11 +34,11 @@ public class SubjectiveScorePK implements Serializable {
         this.mainNumber = mainNumber;
     }
 
-    public Integer getSubNumber() {
+    public String getSubNumber() {
         return subNumber;
     }
 
-    public void setSubNumber(Integer subNumber) {
+    public void setSubNumber(String subNumber) {
         this.subNumber = subNumber;
     }
 

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/ExamQuestionService.java

@@ -49,14 +49,14 @@ public interface ExamQuestionService {
             boolean objective, Integer mainNumber, String paperType);
 
     long countByExamAndSubjectAndObjectiveAndMainNumberAndSubNumber(Integer examId, String subjectCode,
-            boolean objective, Integer mainNumber, Integer subNumber);
+            boolean objective, Integer mainNumber, String subNumber);
 
     ExamQuestion updateObjectivePolicy(Integer questionId, ObjectivePolicy objectivePolicy);
 
     ExamQuestion findById(Integer questionId);
 
     ExamQuestion findByExamAndSubjectAndObjectiveAndMainNumberAndSubNumber(Integer examId, String subjectCode,
-            boolean objective, Integer mainNumber, Integer subNumber);
+            boolean objective, Integer mainNumber, String subNumber);
 
     List<ExamQuestion> findMainByExamAndSubjectAndObjective(Integer examId, String subjectCode, boolean objective);
 

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/impl/ExamQuestionServiceImpl.java

@@ -180,7 +180,7 @@ public class ExamQuestionServiceImpl extends BaseQueryService<ExamQuestion> impl
 
     @Override
     public long countByExamAndSubjectAndObjectiveAndMainNumberAndSubNumber(Integer examId, String subjectCode,
-            boolean objective, Integer mainNumber, Integer subNumber) {
+            boolean objective, Integer mainNumber, String subNumber) {
         return questionDao.countByExamIdAndSubjectCodeAndObjectiveAndMainNumberAndSubNumber(examId, subjectCode,
                 objective, mainNumber, subNumber);
     }
@@ -202,7 +202,7 @@ public class ExamQuestionServiceImpl extends BaseQueryService<ExamQuestion> impl
 
     @Override
     public ExamQuestion findByExamAndSubjectAndObjectiveAndMainNumberAndSubNumber(Integer examId, String subjectCode,
-            boolean objective, Integer mainNumber, Integer subNumber) {
+            boolean objective, Integer mainNumber, String subNumber) {
         return questionDao.findByExamIdAndSubjectCodeAndObjectiveAndMainNumberAndSubNumber(examId, subjectCode,
                 objective, mainNumber, subNumber);
     }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/model/MarkStepDTO.java

@@ -14,7 +14,7 @@ public class MarkStepDTO implements Serializable {
 
     private int mainNumber;
 
-    private int subNumber;
+    private String subNumber;
 
     private int number;
 
@@ -86,11 +86,11 @@ public class MarkStepDTO implements Serializable {
         this.mainNumber = mainNumber;
     }
 
-    public int getSubNumber() {
+    public String getSubNumber() {
         return subNumber;
     }
 
-    public void setSubNumber(int subNumber) {
+    public void setSubNumber(String subNumber) {
         this.subNumber = subNumber;
     }
 

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/utils/ScoreCalculateUtil.java

@@ -104,37 +104,37 @@ public class ScoreCalculateUtil {
         ScoreCalculateUtil util = ScoreCalculateUtil.instance(student);
 
         List<ExamQuestion> oList = new LinkedList<ExamQuestion>();
-        ExamQuestion q = new ExamQuestion();
-        q.setMainNumber(1);
-        q.setMainTitle("单选");
-        q.setSubNumber(1);
-        q.setAnswer("B");
-        q.setTotalScore(2d);
-        oList.add(q);
-
-        q = new ExamQuestion();
-        q.setMainNumber(1);
-        q.setMainTitle("单选");
-        q.setSubNumber(2);
-        q.setAnswer("B");
-        q.setTotalScore(2d);
-        oList.add(q);
-
-        q = new ExamQuestion();
-        q.setMainNumber(2);
-        q.setMainTitle("多选");
-        q.setSubNumber(1);
-        q.setAnswer("AC");
-        q.setTotalScore(3d);
-        oList.add(q);
-
-        q = new ExamQuestion();
-        q.setMainNumber(2);
-        q.setMainTitle("多选");
-        q.setSubNumber(2);
-        q.setAnswer("C");
-        q.setTotalScore(3d);
-        oList.add(q);
+        // ExamQuestion q = new ExamQuestion();
+        // q.setMainNumber(1);
+        // q.setMainTitle("单选");
+        // q.setSubNumber(1);
+        // q.setAnswer("B");
+        // q.setTotalScore(2d);
+        // oList.add(q);
+        //
+        // q = new ExamQuestion();
+        // q.setMainNumber(1);
+        // q.setMainTitle("单选");
+        // q.setSubNumber(2);
+        // q.setAnswer("B");
+        // q.setTotalScore(2d);
+        // oList.add(q);
+        //
+        // q = new ExamQuestion();
+        // q.setMainNumber(2);
+        // q.setMainTitle("多选");
+        // q.setSubNumber(1);
+        // q.setAnswer("AC");
+        // q.setTotalScore(3d);
+        // oList.add(q);
+        //
+        // q = new ExamQuestion();
+        // q.setMainNumber(2);
+        // q.setMainTitle("多选");
+        // q.setSubNumber(2);
+        // q.setAnswer("C");
+        // q.setTotalScore(3d);
+        // oList.add(q);
 
         ScoreInfo info = util.calculate(oList, null);
         System.out.println(info.getObjectiveScore());

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/utils/ScoreInfo.java

@@ -7,7 +7,7 @@ public class ScoreInfo {
 
     private int mainNumber;
 
-    private int subNumber;
+    private String subNumber;
 
     private String mainTitle;
 
@@ -21,7 +21,7 @@ public class ScoreInfo {
 
     public ScoreInfo() {
         this.mainNumber = 0;
-        this.subNumber = 0;
+        this.subNumber = "";
         this.objectiveScore = 0d;
         this.subjectiveScore = 0d;
         this.totalScore = 0d;
@@ -31,16 +31,15 @@ public class ScoreInfo {
     public int incrMainNumber(String title) {
         mainTitle = title;
         mainNumber++;
-        subNumber = 0;
+        subNumber = "";
         return mainNumber;
     }
 
-    public void addScore(String title, int number, double score, String answer, boolean objective) {
-        subNumber++;
+    public void addScore(String title, String number, double score, String answer, boolean objective) {
 
         ScoreItem item = new ScoreItem(objective);
         item.setMainNumber(mainNumber);
-        item.setSubNumber(number > 0 ? number : subNumber);
+        item.setSubNumber(number);
         item.setTitle(title != null ? title : mainTitle + "-" + item.getSubNumber());
         item.setAnswer(answer);
         item.setScore(score);

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/utils/ScoreItem.java

@@ -12,7 +12,7 @@ public class ScoreItem {
 
     private int mainNumber;
 
-    private int subNumber;
+    private String subNumber;
 
     private String title;
 
@@ -41,11 +41,11 @@ public class ScoreItem {
         this.mainNumber = mainNumber;
     }
 
-    public int getSubNumber() {
+    public String getSubNumber() {
         return subNumber;
     }
 
-    public void setSubNumber(int subNumber) {
+    public void setSubNumber(String subNumber) {
         this.subNumber = subNumber;
     }
 

stmms-web/src/main/java/cn/com/qmth/stmms/admin/dto/ExamQuestionDTO.java

@@ -12,7 +12,7 @@ public class ExamQuestionDTO {
 
     private String mainTitle;
 
-    private Integer subNumber;
+    private String subNumber;
 
     private List<Double> scoreList;
 
@@ -26,11 +26,11 @@ public class ExamQuestionDTO {
         this.mainNumber = mainNumber;
     }
 
-    public Integer getSubNumber() {
+    public String getSubNumber() {
         return subNumber;
     }
 
-    public void setSubNumber(Integer subNumber) {
+    public void setSubNumber(String subNumber) {
         this.subNumber = subNumber;
     }
 

stmms-web/src/main/java/cn/com/qmth/stmms/admin/dto/ExceptionQuestionDTO.java

@@ -19,7 +19,7 @@ public class ExceptionQuestionDTO {
     private Integer mainNumber;
 
     @ExcelField(title = "小题号", align = 2, sort = 50)
-    private Integer subNumber;
+    private String subNumber;
 
     public ExceptionQuestionDTO(ExamQuestion question, ExamSubject subject) {
         setSubjectCode(question.getSubjectCode());
@@ -61,11 +61,11 @@ public class ExceptionQuestionDTO {
         this.mainNumber = mainNumber;
     }
 
-    public Integer getSubNumber() {
+    public String getSubNumber() {
         return subNumber;
     }
 
-    public void setSubNumber(Integer subNumber) {
+    public void setSubNumber(String subNumber) {
         this.subNumber = subNumber;
     }
 }

stmms-web/src/main/java/cn/com/qmth/stmms/admin/dto/ObjectiveQuestionDTO.java

@@ -26,7 +26,7 @@ public class ObjectiveQuestionDTO implements QuestionDTO {
     private Integer mainNumber;
 
     @ExcelField(title = "小题号(只能用小写数字)", align = 2, sort = 60)
-    private Integer subNumber;
+    private String subNumber;
 
     @ExcelField(title = "标准答案", align = 2, sort = 70)
     private String answer;
@@ -91,11 +91,11 @@ public class ObjectiveQuestionDTO implements QuestionDTO {
         this.mainNumber = mainNumber;
     }
 
-    public Integer getSubNumber() {
+    public String getSubNumber() {
         return subNumber;
     }
 
-    public void setSubNumber(Integer subNumber) {
+    public void setSubNumber(String subNumber) {
         this.subNumber = subNumber;
     }
 

stmms-web/src/main/java/cn/com/qmth/stmms/admin/dto/SubjectiveQuestionDTO.java

@@ -25,7 +25,7 @@ public class SubjectiveQuestionDTO implements QuestionDTO {
     private Integer mainNumber;
 
     @ExcelField(title = "小题号(只能用小写数字)", align = 2, sort = 50)
-    private Integer subNumber;
+    private String subNumber;
 
     @ExcelField(title = "小题满分", align = 2, sort = 60)
     private Double totalScore;
@@ -142,11 +142,11 @@ public class SubjectiveQuestionDTO implements QuestionDTO {
         this.title = title;
     }
 
-    public Integer getSubNumber() {
+    public String getSubNumber() {
         return subNumber;
     }
 
-    public void setSubNumber(Integer subNumber) {
+    public void setSubNumber(String subNumber) {
         this.subNumber = subNumber;
     }
 

stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/DataSyncController.java

@@ -181,7 +181,7 @@ public class DataSyncController extends BaseExamController {
                 questionDTO.setSubjectName(subject.getString("subjectName"));
                 questionDTO.setMainNumber(question.getInt("mainNumber"));
                 questionDTO.setTitle(question.getString("mainTitle"));
-                questionDTO.setSubNumber(question.getInt("subNumber"));
+                questionDTO.setSubNumber(question.getString("subNumber"));
                 questionDTO.setTotalScore(question.getDouble("totalScore"));
                 list.add(questionDTO);
             }