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] 设备导出支持按筛选条件导出 - 仪器设备一览表导出: 支持设备名称/管理编号/状态/设备分类筛选, 无筛选时导出全部 - 设备使用记录导出: 支持样品编号/管理编号筛选; 未选中具体设备时可导出全部设备记录
---
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 798924f..3f6eabd 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -246,6 +246,7 @@
en_device_name,
specification_model,
management_number,
+ factory_no,
date_format(activation_date,'%Y-%m-%d')
latest_traceability
from device
@@ -416,7 +417,7 @@
from (select io2.id insOrderId,
io2.sample_view,
io2.production,
- io2.send_time,
+ io2.sample_date,
GROUP_CONCAT(DISTINCT isa.model SEPARATOR ' ') AS sample_model,
io2.prepare_user,
io2.entrust_code,
--
Gitblit v1.9.3