From 926d28578c8f0add38dcf0b9508a96429bf7fd29 Mon Sep 17 00:00:00 2001
From: swj <1211312234@qq.com>
Date: Tue, 27 Sep 2022 21:38:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=96=87=E4=BB=B6=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E8=A7=A3=E5=86=B3=E5=B0=8F=E9=97=AE=E9=A2=98=20+=20?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=A4=9A=E7=A7=8D=E6=A0=B7=E5=93=81=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=AF=8F=E4=B8=AA=E6=A3=80=E9=AA=8C=E7=9A=84=E6=A3=80?=
 =?UTF-8?q?=E6=B5=8B=E7=BC=96=E5=8F=B7=E9=83=BD=E9=87=8D=E5=A4=8D=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../QualityFileAssistentController.java       |  5 +++-
 .../impl/TaskBlueprintServiceImpl.java        | 24 ++++++++++++++-----
 2 files changed, 22 insertions(+), 7 deletions(-)

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<QualityStorageFileRelDTO> 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<TaskBlueprintMappe
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean addBluePrint(TaskBlueprint taskBlueprint) {
-        // 获取委托单所有样品
-        LambdaQueryWrapper<Simple> wrapper1 = new LambdaQueryWrapper<>();
-        wrapper1.eq(Simple::getEntrustId, taskBlueprint.getEntrustId());
-        wrapper1.orderByAsc(Simple::getSort);
-        List<Simple> simples = simpleService.list(wrapper1);
 
         // 如果是追加检验计划提交
         if (taskBlueprint.getIsContinue() != null && taskBlueprint.getIsContinue() == 1) {
@@ -95,6 +90,14 @@ public class TaskBlueprintServiceImpl extends BaseServiceImpl<TaskBlueprintMappe
                     if (!"".equals(examine.getExperieNum())) {
                         continue;
                     }
+
+                    // 获取委托单所有样品
+                    LambdaQueryWrapper<Simple> wrapper1 = new LambdaQueryWrapper<>();
+                    wrapper1.eq(Simple::getEntrustId, taskBlueprint.getEntrustId());
+                    wrapper1.eq(Simple::getSimpleName, examine.getSimpleName());
+                    wrapper1.orderByAsc(Simple::getSort);
+                    List<Simple> simples = simpleService.list(wrapper1);
+
                     SimpleDoExamineLog log = new SimpleDoExamineLog();
                     log.setExamineId(examine.getId());
                     log.setIsFinished(0);
@@ -120,6 +123,7 @@ public class TaskBlueprintServiceImpl extends BaseServiceImpl<TaskBlueprintMappe
                     examine.setDemandCompletionTime(taskBlueprint.getDemandCompletionTime());
                     examine.setDeptId(eTask.getDeptId());
                     examine.setSimpleCurrPlace(simpleCurrPlace);
+                    simpleService.updateBatchById(simples);
                 }
                 examineService.updateBatchById(examines);
             }
@@ -161,6 +165,14 @@ public class TaskBlueprintServiceImpl extends BaseServiceImpl<TaskBlueprintMappe
                 eTask.setUpdateTime(new Date());
                 List<Examine> examines = eTask.getExamines();
                 for (Examine examine : examines) {
+
+                    // 获取委托单所有样品
+                    LambdaQueryWrapper<Simple> wrapper1 = new LambdaQueryWrapper<>();
+                    wrapper1.eq(Simple::getEntrustId, taskBlueprint.getEntrustId());
+                    wrapper1.eq(Simple::getSimpleName, examine.getSimpleName());
+                    wrapper1.orderByAsc(Simple::getSort);
+                    List<Simple> simples = simpleService.list(wrapper1);
+
                     SimpleDoExamineLog log = new SimpleDoExamineLog();
                     log.setExamineId(examine.getId());
                     log.setIsFinished(0);
@@ -184,6 +196,7 @@ public class TaskBlueprintServiceImpl extends BaseServiceImpl<TaskBlueprintMappe
                     examine.setIsFinished("-1");
                     examine.setDemandCompletionTime(taskBlueprint.getDemandCompletionTime());
                     examine.setDeptId(eTask.getDeptId());
+                    simpleService.updateBatchById(simples);
                 }
                 examineService.updateBatchById(examines);
             }
@@ -209,7 +222,6 @@ public class TaskBlueprintServiceImpl extends BaseServiceImpl<TaskBlueprintMappe
             this.save(taskBlueprint);
         }
 
-        simpleService.updateBatchById(simples);
         Entrust entrust = new Entrust();
         entrust.setId(taskBlueprint.getEntrustId());
         entrust.setEntrustStatus("111");