fix bugs

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

@@ -128,7 +128,7 @@ public class ReportSubjectQuestionServiceImpl extends BaseQueryService<ReportSub
             public int compare(ReportSubjectQuestion o1, ReportSubjectQuestion o2) {
                 int i = o1.getMainNumber() - o2.getMainNumber();
                 if (i == 0) {
-                    if (o1.getSubNumber().contains("-")) {
+                    if (o1.getSubNumber().contains("-") && o2.getSubNumber().contains("-")) {
                         String[] o1s = o1.getSubNumber().split("-");
                         String[] o2s = o2.getSubNumber().split("-");
                         int j = Integer.parseUnsignedInt(o1s[0]) - Integer.parseUnsignedInt(o2s[0]);
@@ -137,6 +137,12 @@ public class ReportSubjectQuestionServiceImpl extends BaseQueryService<ReportSub
                         } else {
                             return j;
                         }
+                    } else if (o1.getSubNumber().contains("-") && !o2.getSubNumber().contains("-")) {
+                        String[] o1s = o1.getSubNumber().split("-");
+                        return Integer.parseUnsignedInt(o1s[0]) - Integer.parseUnsignedInt(o2.getSubNumber());
+                    } else if (!o1.getSubNumber().contains("-") && o2.getSubNumber().contains("-")) {
+                        String[] o2s = o2.getSubNumber().split("-");
+                        return Integer.parseUnsignedInt(o1.getSubNumber()) - Integer.parseUnsignedInt(o2s[0]);
                     } else {
                         return Integer.parseUnsignedInt(o1.getSubNumber())
                                 - Integer.parseUnsignedInt(o2.getSubNumber());

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

@@ -1,7 +1,6 @@
 package cn.com.qmth.stmms.admin.exam;
 
 import java.io.ByteArrayInputStream;
-import java.io.OutputStream;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -41,7 +40,6 @@ import cn.com.qmth.stmms.biz.exam.service.ExamService;
 import cn.com.qmth.stmms.biz.exam.service.ExamStudentService;
 import cn.com.qmth.stmms.biz.exam.service.ExamSubjectService;
 import cn.com.qmth.stmms.biz.exam.service.MarkGroupService;
-import cn.com.qmth.stmms.biz.file.enums.FormatType;
 import cn.com.qmth.stmms.biz.file.service.FileService;
 import cn.com.qmth.stmms.biz.utils.DoubleUtil;
 import cn.com.qmth.stmms.biz.utils.ScoreItem;