完成6.6供应商模块

zss

2024-12-27 ebede85283906f52dd45d0755d22140538038ac3

 cnas-server/src/main/resources/mapper/DataConfigMapper.xml

@@ -18,9 +18,12 @@
               d.collect_url,
               d.storage_url,
               d.ip,
               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,
@@ -28,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