Merge branch 'dev_190618' of http://git.qmth.com.cn/luoshi/stmms-ft into dev_190618

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/report/utils/module/SubjectClassGroupModule.java

@@ -49,7 +49,7 @@ public class SubjectClassGroupModule extends SubjectGroupModule implements Modul
                 String paperType = null;
                 Set<String> paperTypeSet = context.getPaperType(subjectCode);
                 int questionCount = 0;
-                if (paperTypeSet != null && objective) {
+                if (objective && paperTypeSet != null && paperTypeSet.size() > 0) {
                     paperType = paperTypeSet.iterator().next();
                     questionCount = (int) questionService.countByExamAndSubjectAndObjectiveAndMainNumberAndPaperType(
                             context.getExamId(), subjectCode, objective, mainNumber, paperType);

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/report/utils/module/SubjectClassRangeModule.java

@@ -41,7 +41,7 @@ public class SubjectClassRangeModule implements Module {
         for (String key : this.counters.keySet()) {
             RangeCounter counter = counters.get(key);
             String s[] = key.split("\t");
-            if(s.length > 1){
+            if (s.length > 1) {
                 String subjectCode = s[0];
                 String className = s[1];
                 ReportSubjectClass r = service.findOne(this.context.getExamId(), subjectCode, className);
@@ -49,10 +49,10 @@ public class SubjectClassRangeModule implements Module {
                 rangeLevel.accumulate("highScore", counter.countGeAndLt(100 - context.getHighValueConfig(), null));
                 rangeLevel.accumulate("lowScore", counter.countGeAndLt(null, context.getLowValueConfig()));
                 r.setRangeLevel(rangeLevel.toString());
-                
+
                 JSONObject scoreRange = new JSONObject();
                 for (int i = 0; i <= context.getSubject(subjectCode).getTotalScore(); i++) {
-                    scoreRange.accumulate(String.valueOf(i), counter.countGeAndLt((double) i, (double) (i + 1)));
+                    scoreRange.accumulate(String.valueOf(i), counter.countGtAndLe((double) (i - 1), (double) i));
                 }
                 r.setScoreRange(scoreRange.toString());
                 service.save(r);

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/report/utils/module/SubjectGroupModule.java

@@ -105,7 +105,7 @@ public class SubjectGroupModule implements Module {
                 String paperType = null;
                 Set<String> paperTypeSet = context.getPaperType(subjectCode);
                 int questionCount = 0;
-                if (paperTypeSet != null && objective) {
+                if (objective && paperTypeSet != null && paperTypeSet.size() > 0) {
                     paperType = paperTypeSet.iterator().next();
                     questionCount = (int) questionService.countByExamAndSubjectAndObjectiveAndMainNumberAndPaperType(
                             context.getExamId(), subjectCode, objective, mainNumber, paperType);