From 5d2ac1105b10ea776dbb5b2360165996c77b6351 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 01 八月 2025 10:39:40 +0800
Subject: [PATCH] bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSamplingRecordController.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSamplingRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSamplingRecordController.java
index adeefcc..f343185 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSamplingRecordController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSamplingRecordController.java
@@ -400,6 +400,15 @@
samplingRecordOperation.setReceiptsTime(LocalDateTime.now());
}
samplingRecordOperationService.updateBatchById(samplingRecordOperations);
+
+ // 判断是否所有取样记录都收样了
+ List<TSamplingRecordOperation> allRecordOperations = samplingRecordOperationService.list(Wrappers.lambdaQuery(TSamplingRecordOperation.class)
+ .eq(TSamplingRecordOperation::getSamplingId, samplingRecordOperations.get(0).getSamplingId()));
+ if(allRecordOperations.stream().allMatch(e -> e.getStatus() == 3)){
+ samplingRecordService.update(Wrappers.lambdaUpdate(TSamplingRecord.class)
+ .set(TSamplingRecord::getStatus, 4)
+ .eq(TSamplingRecord::getId, samplingRecordOperations.get(0).getSamplingId()));
+ }
return R.ok();
}
--
Gitblit v1.7.1