From e19c5c816f8abfbbdb197e698cae285ab434fddb Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期六, 29 三月 2025 18:01:10 +0800
Subject: [PATCH] 质量监督监控添加退回流程

---
 cnas-device/src/main/resources/mapper/DataConfigMapper.xml |   29 ++++-------------------------
 1 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/cnas-device/src/main/resources/mapper/DataConfigMapper.xml b/cnas-device/src/main/resources/mapper/DataConfigMapper.xml
index d5782b9..a24e029 100644
--- a/cnas-device/src/main/resources/mapper/DataConfigMapper.xml
+++ b/cnas-device/src/main/resources/mapper/DataConfigMapper.xml
@@ -13,31 +13,10 @@
     </resultMap>
 
     <select id="selectDataConfigList" resultType="com.ruoyi.device.dto.DeviceConfigDtoPage">
-        SELECT d.device_name,
-               d.file_type,
-               d.collect_url,
-               d.storage_url,
-               d.ip,
-               d.entrust_code,
-               d.sample_code,
-               d.db_file_name,
-               ip.inspection_item,
-               ip.inspection_item_class,
-               if(ip.inspection_item_subclass is not null and ip.inspection_item_subclass != '',
-                  ip.inspection_item_subclass, ip.inspection_item)                            inspection_item_subclass,
-               ip.sample,
-               ddc.formula,
-               ddc.referx,
-               ddc.refery,
-               ddc.x,
-               ddc.y,
-               ddc.another_name,
-               ddc.matching_name,
-               ddc.id,
-               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
+        SELECT ddc.*,
+               d.device_name
+        FROM device_data_config ddc
+                 left join device d on ddc.device_id = d.id
         where d.id = #{deviceId}
     </select>
 

--
Gitblit v1.9.3