1
0
Эх сурвалжийг харах

修复没有客观题情况下选项分布问题

ting.yin 6 жил өмнө
parent
commit
48f7d96ed1

+ 2 - 2
stmms-biz/src/main/java/cn/com/qmth/stmms/biz/report/utils/module/SubjectModule.java

@@ -81,7 +81,7 @@ public class SubjectModule implements Module {
             }
             Set<String> paperTypeSet = context.getPaperType(subjectCode);
             String paperType = null;
-            if (paperTypeSet != null) {
+            if (paperTypeSet != null && paperTypeSet.size() > 0) {
                 paperType = paperTypeSet.iterator().next();
             }
             ExamQuestionSearchQuery query = new ExamQuestionSearchQuery();
@@ -92,7 +92,7 @@ public class SubjectModule implements Module {
             query.setObjective(true);
             query.setPaperType(paperType);
             long ObjectiveCcount = questionService.countByQuery(query);
-            subject.setQuestionCount((int) (subjectiveCcount+ObjectiveCcount));
+            subject.setQuestionCount((int) (subjectiveCcount + ObjectiveCcount));
             service.save(subject);
         }
     }

+ 5 - 3
stmms-web/src/main/java/cn/com/qmth/stmms/report/ReportController.java

@@ -205,9 +205,9 @@ public class ReportController {
         int total = (int) totalScore;
         for (int i = total; i >= 0; i--) {
             if (i % range == 0) {
-                if(i==0){
+                if (i == 0) {
                     rangeCount = jsonObject.getInt(String.valueOf(i));
-                }else{
+                } else {
                     rangeCount = getSumCount(jsonObject, i, i - range + 1);
                 }
                 sumCount = sumCount + rangeCount;
@@ -421,7 +421,9 @@ public class ReportController {
 
     private String getOptionJson(ReportSubjectQuery query, ReportSubject reportSubject) {
         JSONObject value = new JSONObject();
-        value.accumulate("options", reportSubject.getOptions().split(ANSWER_SPLIT));
+        if (reportSubject.getOptions() != null) {
+            value.accumulate("options", reportSubject.getOptions().split(ANSWER_SPLIT));
+        }
         JSONArray array = new JSONArray();
         query.setObjective(true);
         List<ReportSubjectQuestion> list = questionService.findByQuery(query);