|
@@ -123,13 +123,14 @@ public class TrialService {
|
|
if (Objects.isNull(work)) {
|
|
if (Objects.isNull(work)) {
|
|
throw new Exception("没有此工作区,请检查workId是否正确");
|
|
throw new Exception("没有此工作区,请检查workId是否正确");
|
|
}
|
|
}
|
|
- //1.更新科目为处始状态并设置test为false
|
|
|
|
|
|
+ //1.更新科目为初始状态并设置test为false
|
|
work.getSubjects().stream().filter(o -> o.getId().toUpperCase().contains(subject.toString().toUpperCase()))
|
|
work.getSubjects().stream().filter(o -> o.getId().toUpperCase().contains(subject.toString().toUpperCase()))
|
|
.collect(Collectors.toList())
|
|
.collect(Collectors.toList())
|
|
.forEach(o -> {
|
|
.forEach(o -> {
|
|
o.setTest(TrialEnum.DEFAULT.getId());
|
|
o.setTest(TrialEnum.DEFAULT.getId());
|
|
o.setStage(MarkStage.INIT);
|
|
o.setStage(MarkStage.INIT);
|
|
o.setSampleCount(0);
|
|
o.setSampleCount(0);
|
|
|
|
+ o.setFormal(false);
|
|
markSubjectRepo.save(o);
|
|
markSubjectRepo.save(o);
|
|
});
|
|
});
|
|
//2.删除该科目下所有任务数据
|
|
//2.删除该科目下所有任务数据
|