xiatian 8 månader sedan
förälder
incheckning
7c3b0af5f5

+ 4 - 3
src/main/java/cn/com/qmth/scancentral/controller/admin/AsyncTaskController.java

@@ -35,9 +35,10 @@ public class AsyncTaskController extends BaseController {
             throw new ParameterException("未找到导出任务");
             throw new ParameterException("未找到导出任务");
         }
         }
         vo.setProgress(Calculator.percentageDouble(vo.getProgressCount(), vo.getTotalCount()));
         vo.setProgress(Calculator.percentageDouble(vo.getProgressCount(), vo.getTotalCount()));
-        if (vo.getProgress() == 100 && vo.getProgressCount() != vo.getTotalCount()) {
-            vo.setProgress(99.99);
-        }
+        // if (vo.getProgress() == 100 && vo.getProgressCount() !=
+        // vo.getTotalCount()) {
+        // vo.setProgress(99.99);
+        // }
         AsyncProgressVo ret = new AsyncProgressVo();
         AsyncProgressVo ret = new AsyncProgressVo();
         ret.setErrMsg(vo.getErrMsg());
         ret.setErrMsg(vo.getErrMsg());
         ret.setProgress(vo.getProgress());
         ret.setProgress(vo.getProgress());

+ 3 - 3
src/main/java/cn/com/qmth/scancentral/service/impl/StudentServiceImpl.java

@@ -358,7 +358,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
                     concurrentService.getReadWriteLock(LockType.OMR_GROUP + "-" + g.getId()).readLock().lock();
                     concurrentService.getReadWriteLock(LockType.OMR_GROUP + "-" + g.getId()).readLock().lock();
                     omrTaskService.deleteByStudentIdAndGroupId(g.getId(), student.getId());
                     omrTaskService.deleteByStudentIdAndGroupId(g.getId(), student.getId());
                     // 默认分组重新生成识别对照任务,其他任务不生成
                     // 默认分组重新生成识别对照任务,其他任务不生成
-                    if(g.getFixed()){
+                    if (g.getFixed()) {
                         omrTaskService.saveTask(g, student.getId());
                         omrTaskService.saveTask(g, student.getId());
                     }
                     }
                     concurrentService.getReadWriteLock(LockType.OMR_GROUP + "-" + g.getId()).readLock().unlock();
                     concurrentService.getReadWriteLock(LockType.OMR_GROUP + "-" + g.getId()).readLock().unlock();
@@ -1744,7 +1744,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
                         student.setExamStatus(ExamStatus.OK);
                         student.setExamStatus(ExamStatus.OK);
                     }
                     }
                     saveOrUpdate(student);
                     saveOrUpdate(student);
-                    vo.setProgress(vo.getProgress() + 1);
+                    vo.setProgressCount(vo.getProgressCount() + 1);
                 } finally {
                 } finally {
                     concurrentService.getReadWriteLock(LockType.STUDENT + "-" + student.getId()).writeLock().unlock();
                     concurrentService.getReadWriteLock(LockType.STUDENT + "-" + student.getId()).writeLock().unlock();
                 }
                 }
@@ -1761,7 +1761,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
                         student.setExamStatus(ExamStatus.UNCHECK3);
                         student.setExamStatus(ExamStatus.UNCHECK3);
                     }
                     }
                     saveOrUpdate(student);
                     saveOrUpdate(student);
-                    vo.setProgress(vo.getProgress() + 1);
+                    vo.setProgressCount(vo.getProgressCount() + 1);
                 } finally {
                 } finally {
                     concurrentService.getReadWriteLock(LockType.STUDENT + "-" + student.getId()).writeLock().unlock();
                     concurrentService.getReadWriteLock(LockType.STUDENT + "-" + student.getId()).writeLock().unlock();
                 }
                 }