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

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/service/Impl/MarkCronService.java

@@ -231,8 +231,9 @@ public class MarkCronService {
     private void buildFormalLibrary(MarkGroup group) {
         int pageSize = 100;
         try {
-            log.info("start create library for examId=" + group.getExamId() + ", subjectCode=" + group.getSubjectCode()
-                    + ", groupNumber=" + group.getNumber());
+            // log.info("start create library for examId=" + group.getExamId() +
+            // ", subjectCode=" + group.getSubjectCode()
+            // + ", groupNumber=" + group.getNumber());
             lockService.watch(LockType.GROUP, group.getExamId(), group.getSubjectCode(), group.getNumber());
             // 上锁后重复验证分组状态
             if (!groupService.validateStatus(group.getExamId(), group.getSubjectCode(), group.getNumber(),
@@ -302,8 +303,10 @@ public class MarkCronService {
                 studentList = studentService.findUnLibraryStudent(group.getExamId(), group.getSubjectCode(),
                         group.getNumber(), pageSize);
             }
-            log.info("finish create " + count + " library for examId=" + group.getExamId() + ", subjectCode="
-                    + group.getSubjectCode() + ", groupNumber=" + group.getNumber());
+            if (count != 0) {
+                log.info("finish create " + count + " library for examId=" + group.getExamId() + ", subjectCode="
+                        + group.getSubjectCode() + ", groupNumber=" + group.getNumber());
+            }
         } catch (Exception e) {
             log.error(
                     "build formal library error for examId=" + group.getExamId() + ", subjectCode="

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/service/Impl/MarkLibraryServiceImpl.java

@@ -53,10 +53,9 @@ public class MarkLibraryServiceImpl extends BaseQueryService<MarkLibrary> implem
         query.setPageNumber(pageNumber);
         query.setPageSize(pageSize);
 
-        return filterClass ?
-                libraryDao
-                        .findUnMarkedFilterClass(examId, subjectCode, groupNumber, markerId, userId, statusSet, query) :
-                libraryDao.findUnMarked(examId, subjectCode, groupNumber, markerId, statusSet, query);
+        return filterClass ? libraryDao.findUnMarkedFilterClass(examId, subjectCode, groupNumber, markerId, userId,
+                statusSet, query) : libraryDao.findUnMarked(examId, subjectCode, groupNumber, markerId, statusSet,
+                query);
     }
 
     @Override
@@ -152,12 +151,12 @@ public class MarkLibraryServiceImpl extends BaseQueryService<MarkLibrary> implem
                     predicates.add(cb.or(predicate1, predicate2));
                 }
                 if (StringUtils.isNotBlank(query.getQuestionScore())) {
-                    Predicate predicate1 = cb
-                            .like(root.get("markerScoreList").as(String.class), query.getQuestionScore() + ",%");
-                    Predicate predicate2 = cb
-                            .like(root.get("markerScoreList").as(String.class), "%," + query.getQuestionScore());
-                    Predicate predicate3 = cb
-                            .like(root.get("markerScoreList").as(String.class), "%," + query.getQuestionScore() + ",%");
+                    Predicate predicate1 = cb.like(root.get("markerScoreList").as(String.class),
+                            query.getQuestionScore() + ",%");
+                    Predicate predicate2 = cb.like(root.get("markerScoreList").as(String.class),
+                            "%," + query.getQuestionScore());
+                    Predicate predicate3 = cb.like(root.get("markerScoreList").as(String.class),
+                            "%," + query.getQuestionScore() + ",%");
                     Predicate predicate4 = cb.equal(root.get("markerScoreList"), query.getQuestionScore());
                     predicates.add(cb.or(predicate1, predicate2, predicate3, predicate4));
                 }
@@ -165,7 +164,7 @@ public class MarkLibraryServiceImpl extends BaseQueryService<MarkLibrary> implem
                     predicates.add(cb.equal(root.get("headerId"), query.getHeaderId()));
                 }
                 if (StringUtils.isNotBlank(query.getRejectReason())) {
-                    predicates.add(cb.like(root.get("rejectReason").as(String.class), query.getRejectReason() + ":%"));
+                    predicates.add(cb.like(root.get("rejectReason").as(String.class), query.getRejectReason() + "%"));
                 }
                 if (StringUtils.isNotBlank(query.getSubjectCodeIn())) {
                     String[] list = query.getSubjectCodeIn().split(",");
@@ -177,9 +176,8 @@ public class MarkLibraryServiceImpl extends BaseQueryService<MarkLibrary> implem
                         predicates.add(cb.or(sub));
                     }
                 }
-                return predicates.isEmpty() ?
-                        cb.conjunction() :
-                        cb.and(predicates.toArray(new Predicate[predicates.size()]));
+                return predicates.isEmpty() ? cb.conjunction() : cb.and(predicates.toArray(new Predicate[predicates
+                        .size()]));
             }
         };
     }
@@ -322,9 +320,8 @@ public class MarkLibraryServiceImpl extends BaseQueryService<MarkLibrary> implem
                     Predicate predicate2 = cb.le(root.get("markerScore"), query.getEndScore());
                     predicates.add(predicate2);
                 }
-                return predicates.isEmpty() ?
-                        cb.conjunction() :
-                        cb.and(predicates.toArray(new Predicate[predicates.size()]));
+                return predicates.isEmpty() ? cb.conjunction() : cb.and(predicates.toArray(new Predicate[predicates
+                        .size()]));
             }
         };
     }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/service/Impl/MarkServiceImpl.java

@@ -167,7 +167,7 @@ public class MarkServiceImpl implements MarkService {
     private LockService lockService;
 
     private Map<Integer, Long> markerLastUpdateTime = new ConcurrentHashMap<>();
-    
+
     @Autowired
     private InspectedService inspectedService;
 
@@ -367,6 +367,8 @@ public class MarkServiceImpl implements MarkService {
         if (group.getStatus() == MarkStatus.TRIAL) {
             trialLibraryDao.deleteByExamIdAndSubjectCodeAndGroupNumber(group.getExamId(), group.getSubjectCode(),
                     group.getNumber());
+            libraryDao.deleteByExamIdAndSubjectCodeAndGroupNumber(group.getExamId(), group.getSubjectCode(),
+                    group.getNumber());
         }
         updateLibraryCount(group);
         groupDao.updateBuildTime(group.getExamId(), group.getSubjectCode(), group.getNumber(), null);