fixbugs

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

@@ -215,7 +215,7 @@ public interface ExamStudentDao extends PagingAndSortingRepository<ExamStudent,
     public List<String> findDistinctSubjectCodeByCollege(int examId, String college);
 
     @Query("select min(s.inspectCount) from ExamStudent s where s.examId=?1 and s.subjectCode=?2  and s.upload=true and s.absent=false and s.breach=false ")
-    public int findMinInspectCountByExamIdAndSubjectCode(int examId, String subjectCode);
+    public Integer findMinInspectCountByExamIdAndSubjectCode(int examId, String subjectCode);
 
     @Modifying
     @Query("update ExamStudent s set s.inspectCount=?2 where s.id=?1 ")

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

@@ -1007,9 +1007,8 @@ public class ExamStudentServiceImpl extends BaseQueryService<ExamStudent> implem
                 // 取第一个显示区域相对裁切图的位置
                 MarkConfigItem config = configList.get(0);
                 OriginTag tag = new OriginTag(format.format(score), config.getI(), config.getX(), config.getY());
-                //兼容比例模式，且元素在裁切坐标内
-                if (config.getX() <= 1 && config.getY() <= 1 
-                        && config.getI() <= sliceConfig.size()
+                // 兼容比例模式，且元素在裁切坐标内
+                if (config.getX() <= 1 && config.getY() <= 1 && config.getI() <= sliceConfig.size()
                         && sliceConfig.get(config.getI() - 1).getW() > 0
                         && sliceConfig.get(config.getI() - 1).getH() > 0) {
                     tag = new OriginTag(format.format(score), config.getI(), config.getX()
@@ -1148,7 +1147,8 @@ public class ExamStudentServiceImpl extends BaseQueryService<ExamStudent> implem
 
     @Override
     public int findMinInspectCountByExamIdAndSubjectCode(int examId, String subjectCode) {
-        return studentDao.findMinInspectCountByExamIdAndSubjectCode(examId, subjectCode);
+        Integer count = studentDao.findMinInspectCountByExamIdAndSubjectCode(examId, subjectCode);
+        return count == null ? 0 : count;
     }
 
     @Transactional