diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileAssistentController.java b/lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileAssistentController.java index 026a909..6446272 100644 --- a/lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileAssistentController.java +++ b/lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileAssistentController.java @@ -51,7 +51,10 @@ public class QualityFileAssistentController extends BladeController { file.setId(assistentId); // 处理文件实体与关联 Set fileRels = file.getFiles(); - fileRels.forEach(dto -> dto.setAssistantId(file.getId())); + fileRels.forEach(dto -> { + dto.setStorageFileId(dto.getStorageFileId()); + dto.setAssistantId(file.getId()); + }); //重新保存文件与存储关联关系 qualityStorageFileRelService.saveBatch(new ArrayList<>(fileRels)); diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/TaskBlueprintServiceImpl.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/TaskBlueprintServiceImpl.java index 8fffda4..0d78df6 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/TaskBlueprintServiceImpl.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/TaskBlueprintServiceImpl.java @@ -59,11 +59,6 @@ public class TaskBlueprintServiceImpl extends BaseServiceImpl wrapper1 = new LambdaQueryWrapper<>(); - wrapper1.eq(Simple::getEntrustId, taskBlueprint.getEntrustId()); - wrapper1.orderByAsc(Simple::getSort); - List simples = simpleService.list(wrapper1); // 如果是追加检验计划提交 if (taskBlueprint.getIsContinue() != null && taskBlueprint.getIsContinue() == 1) { @@ -95,6 +90,14 @@ public class TaskBlueprintServiceImpl extends BaseServiceImpl wrapper1 = new LambdaQueryWrapper<>(); + wrapper1.eq(Simple::getEntrustId, taskBlueprint.getEntrustId()); + wrapper1.eq(Simple::getSimpleName, examine.getSimpleName()); + wrapper1.orderByAsc(Simple::getSort); + List simples = simpleService.list(wrapper1); + SimpleDoExamineLog log = new SimpleDoExamineLog(); log.setExamineId(examine.getId()); log.setIsFinished(0); @@ -120,6 +123,7 @@ public class TaskBlueprintServiceImpl extends BaseServiceImpl examines = eTask.getExamines(); for (Examine examine : examines) { + + // 获取委托单所有样品 + LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); + wrapper1.eq(Simple::getEntrustId, taskBlueprint.getEntrustId()); + wrapper1.eq(Simple::getSimpleName, examine.getSimpleName()); + wrapper1.orderByAsc(Simple::getSort); + List simples = simpleService.list(wrapper1); + SimpleDoExamineLog log = new SimpleDoExamineLog(); log.setExamineId(examine.getId()); log.setIsFinished(0); @@ -184,6 +196,7 @@ public class TaskBlueprintServiceImpl extends BaseServiceImpl