|
@@ -45,8 +45,8 @@ public class MarkingService {
|
|
@Autowired
|
|
@Autowired
|
|
private LevelRepo levelRepo;
|
|
private LevelRepo levelRepo;
|
|
|
|
|
|
-// @Autowired
|
|
|
|
-// private MarkSubjectRepo markSubjectRepo;
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ MarkingService markingService;
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
MarkLogRepo markLogRepo;
|
|
MarkLogRepo markLogRepo;
|
|
@@ -149,6 +149,12 @@ public class MarkingService {
|
|
return markTask;
|
|
return markTask;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 档位落差值计算日志
|
|
|
|
+ *
|
|
|
|
+ * @param markTasks
|
|
|
|
+ * @param paper
|
|
|
|
+ */
|
|
private void levelsLog(List<MarkTask> markTasks, Paper paper) {
|
|
private void levelsLog(List<MarkTask> markTasks, Paper paper) {
|
|
//20191108wangliang加入档位落差值计算
|
|
//20191108wangliang加入档位落差值计算
|
|
Map<Long, String> levelsMap = markTasks.stream().collect(Collectors.toMap(MarkTask::getMarkerId, o -> o.getResult().toUpperCase()));
|
|
Map<Long, String> levelsMap = markTasks.stream().collect(Collectors.toMap(MarkTask::getMarkerId, o -> o.getResult().toUpperCase()));
|
|
@@ -204,6 +210,7 @@ public class MarkingService {
|
|
markTask.setResult(level);
|
|
markTask.setResult(level);
|
|
}
|
|
}
|
|
markTaskRepo.save(markTasks);
|
|
markTaskRepo.save(markTasks);
|
|
|
|
+ levelsLog(markTasks, paper);
|
|
return paper;
|
|
return paper;
|
|
}
|
|
}
|
|
|
|
|