From 05e5ffa3d347218cfa12e8c4a58fae78d7146ff4 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期五, 16 十月 2026 14:57:30 +0800
Subject: [PATCH] 设备导出支持按筛选条件导出 - 仪器设备一览表导出: 支持设备名称/管理编号/状态/设备分类筛选, 无筛选时导出全部 - 设备使用记录导出: 支持样品编号/管理编号筛选; 未选中具体设备时可导出全部设备记录
---
cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceAcceptanceServiceImpl.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceAcceptanceServiceImpl.java b/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceAcceptanceServiceImpl.java
index edf0b99..e275cd5 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceAcceptanceServiceImpl.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceAcceptanceServiceImpl.java
@@ -53,6 +53,14 @@
@Override
public void addAcceptance(AcceptanceDto dto) {
FeStandardSubstanceAcceptance acceptance = dto.getAcceptance();
+ FeStandardSubstance substance = dto.getSubstance();
+ if (substance != null) {
+ if (substance.getId() == null) {
+ substance.setState(0);
+ feStandardSubstanceMapper.insert(substance);
+ }
+ acceptance.setSubstanceId(substance.getId());
+ }
this.baseMapper.insert(acceptance);
List<FeStandardSubstanceAcceptanceInspection> list = dto.getList();
if (CollectionUtils.isNotEmpty(list)) {
--
Gitblit v1.9.3