From 2fa7f761cf80802f54f727381b282d3b264501a7 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 08 十月 2026 11:11:26 +0800
Subject: [PATCH] 提交最新代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSamplingRecordController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 ad1ee7e..f8a83a9 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
@@ -335,6 +335,7 @@
TProjectProposal projectProposal = projectProposalService.getById(experimentDispatch.getProposalId());
if(Objects.nonNull(projectProposal)){
experimentDispatch.setProjectName(projectProposal.getProjectName());
+ experimentDispatch.setProjectCode(projectProposal.getProjectCode());
}
}
samplingRecordVO.setExperimentDispatch(experimentDispatch);
@@ -350,8 +351,15 @@
@DeleteMapping(value = "/open/t-sampling-record/deleteById")
public R<Boolean> deleteById(@RequestParam String id) {
// 删除取样操作记录
- samplingRecordOperationService.remove(Wrappers.lambdaQuery(TSamplingRecordOperation.class).eq(TSamplingRecordOperation::getSamplingId, id));
- return R.ok(samplingRecordService.removeById(id));
+ TSamplingRecord samplingRecord = samplingRecordService.getById(id);
+ if (Objects.nonNull(samplingRecord)) {
+ samplingRecordOperationService.remove(Wrappers.lambdaQuery(TSamplingRecordOperation.class)
+ .eq(TSamplingRecordOperation::getSamplingId, id));
+ samplingRecordService.removeById(id);
+ } else {
+ samplingRecordOperationService.removeById(id);
+ }
+ return R.ok();
}
/**
--
Gitblit v1.7.1