From b364530ee03f8b28b64863f6a633daf05dc94e91 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 18 十二月 2024 15:55:19 +0800
Subject: [PATCH] 查询站点的检验时长+产量工时bug+检验任务提交撤销+首页待办查最近七天的信息+高低温检验增加检验表字段
---
cnas-server/src/main/resources/mapper/DataConfigMapper.xml | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/cnas-server/src/main/resources/mapper/DataConfigMapper.xml b/cnas-server/src/main/resources/mapper/DataConfigMapper.xml
index 69e1e5f..cb73e83 100644
--- a/cnas-server/src/main/resources/mapper/DataConfigMapper.xml
+++ b/cnas-server/src/main/resources/mapper/DataConfigMapper.xml
@@ -18,11 +18,12 @@
d.collect_url,
d.storage_url,
d.ip,
- d.mdb_entrust_code,
- d.mdb_sample_code,
+ d.entrust_code,
+ d.sample_code,
+ d.db_file_name,
ip.inspection_item,
if(ip.inspection_item_subclass is not null and ip.inspection_item_subclass != '',
- ip.inspection_item_subclass, ip.inspection_item) inspection_item_subclass,
+ ip.inspection_item_subclass, ip.inspection_item) inspection_item_subclass,
TRIM(BOTH '["]' FROM SUBSTRING_INDEX(REPLACE(ip.sample, '[["', ''), '"]]', 1)) sample,
ddc.formula,
ddc.referx,
@@ -30,7 +31,7 @@
ddc.x,
ddc.y,
ddc.id,
- ip.id structureItemParameterId
+ ip.id structureItemParameterId
FROM device d
left join structure_item_parameter ip on FIND_IN_SET(ip.id, d.ins_product_ids)
left join device_data_config ddc on ddc.device_id = d.id and ddc.structure_item_parameter_id = ip.id
--
Gitblit v1.9.3