From 8225b2e184fc1e5555a70f33f3b9ff9fe475c13e Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 15 十月 2026 10:08:53 +0800
Subject: [PATCH] feat(method-verify): 增强方法验证表单与导出功能

---
 cnas-require/src/main/resources/mapper/FeStandardSubstanceRecordMapper.xml |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cnas-require/src/main/resources/mapper/FeStandardSubstanceRecordMapper.xml b/cnas-require/src/main/resources/mapper/FeStandardSubstanceRecordMapper.xml
index 315d743..97e1063 100644
--- a/cnas-require/src/main/resources/mapper/FeStandardSubstanceRecordMapper.xml
+++ b/cnas-require/src/main/resources/mapper/FeStandardSubstanceRecordMapper.xml
@@ -25,13 +25,13 @@
         ss.name,
         ss.model,
         ss.factory_num,
-        ss.quantity,
+        COALESCE(ssr.original_quantity, ss.quantity) AS quantity,
+        ss.unit,
+        COALESCE(ssr.borrow_quantity, ss.quantity) AS borrowQuantity,
+        COALESCE(ssr.remaining_quantity, 0) AS remainingQuantity,
         ssr.borrow_user,
         ssr.borrow_date,
-        ssr.return_date,
         ssr.integrity,
-        ssr.return_integrity,
-        ssr.returned_person,
         ss.remark
         FROM cnas_fe_standard_substance_record ssr
         LEFT JOIN cnas_fe_standard_substance ss on ss.id = ssr.substance_id

--
Gitblit v1.9.3