Merge remote-tracking branch 'origin/dev_v2.1.0' into dev_v2.1.0

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/impl/TBExamStudentServiceImpl.java

@@ -230,11 +230,11 @@ public class TBExamStudentServiceImpl extends ServiceImpl<TBExamStudentMapper, T
      * @return
      */
     @Override
-    public IPage<TBStudentReportResult> reportList(IPage<Map> iPage, Long schoolId, Long examId, Long collegeId, String courseCode, Long clazzId, Boolean absent,String studentCode) {
+    public IPage<TBStudentReportResult> reportList(IPage<Map> iPage, Long schoolId, Long examId, Long collegeId, String courseCode, Long clazzId, Boolean absent, String studentCode) {
         if (schoolId == null) {
             schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         }
-        return tbExamStudentMapper.reportList(iPage, schoolId, examId, collegeId, courseCode, clazzId, absent,studentCode);
+        return tbExamStudentMapper.reportList(iPage, schoolId, examId, collegeId, courseCode, clazzId, absent, studentCode);
     }
 
     /**
@@ -322,7 +322,7 @@ public class TBExamStudentServiceImpl extends ServiceImpl<TBExamStudentMapper, T
             DiagnosisDetailResult diagnosisDetailResult = new DiagnosisDetailResult();
             diagnosisDetailResult.setName(moduleName);
             QueryWrapper<TAExamCourseRecordMod> examCourseRecordModQueryWrapper = new QueryWrapper<>();
-            examCourseRecordModQueryWrapper.lambda().eq(TAExamCourseRecordMod::getSchoolId, schoolId).eq(TAExamCourseRecordMod::getExamId, examId).eq(TAExamCourseRecordMod::getStudentCode, studentCode).eq(TAExamCourseRecordMod::getCourseCode, courseCode);
+            examCourseRecordModQueryWrapper.lambda().eq(TAExamCourseRecordMod::getSchoolId, schoolId).eq(TAExamCourseRecordMod::getExamId, examId).eq(TAExamCourseRecordMod::getStudentCode, studentCode).eq(TAExamCourseRecordMod::getCourseCode, courseCode).eq(TAExamCourseRecordMod::getModuleType, moduleName);
             List<TAExamCourseRecordMod> examCourseRecordMods = taExamCourseRecordModMapper.selectList(examCourseRecordModQueryWrapper);
             if (examCourseRecordMods.size() != 1) {
                 throw ExceptionResultEnum.ERROR.exception("获取数据异常，应该有且仅有一条数据");
@@ -373,16 +373,16 @@ public class TBExamStudentServiceImpl extends ServiceImpl<TBExamStudentMapper, T
             Collections.sort(subDios, new Comparator<DimensionDetailResult>() {
                 @Override
                 public int compare(DimensionDetailResult o1, DimensionDetailResult o2) {
-                    String o1StringPart = o1.getCode().replaceAll("\\d","");
-                    String o2StringPart = o2.getCode().replaceAll("\\d","");
-                    if(o1StringPart.equalsIgnoreCase(o2StringPart))
-                    {
+                    String o1StringPart = o1.getCode().replaceAll("\\d", "");
+                    String o2StringPart = o2.getCode().replaceAll("\\d", "");
+                    if (o1StringPart.equalsIgnoreCase(o2StringPart)) {
                         return extractInt(o1.getCode()) - extractInt(o2.getCode());
                     }
                     return o1.getCode().compareTo(o2.getCode());
                 }
+
                 int extractInt(String s) {
-                    String num = s.replaceAll("\\D","");
+                    String num = s.replaceAll("\\D", "");
                     return num.isEmpty() ? 0 : Integer.parseInt(num);
                 }
             });
@@ -395,8 +395,8 @@ public class TBExamStudentServiceImpl extends ServiceImpl<TBExamStudentMapper, T
                 DimensionMasterysResult dimensionMasterysResult = new DimensionMasterysResult();
                 dimensionMasterysResult.setLevel(moduleProficiency.getLevel());
                 List<Double> grades = new ArrayList<>();
-                grades.add(Double.valueOf(moduleProficiency.getMin()));
-                grades.add(Double.valueOf(moduleProficiency.getMax()));
+                grades.add(StringUtils.isNotBlank(moduleProficiency.getMin()) ? Double.valueOf(moduleProficiency.getMin()) : null);
+                grades.add(StringUtils.isNotBlank(moduleProficiency.getMax()) ? Double.valueOf(moduleProficiency.getMax()) : null);
                 dimensionMasterysResult.setGrade(grades);
                 dimensionMasterysResults.add(dimensionMasterysResult);
                 defines.add(moduleProficiency.getDefine());