From ba516ff41f9bdc9c0b76205ccc897b552e13d8b9 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 11 十二月 2023 14:57:23 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml | 33 ++++++++++++++++++---------------
1 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml
index 50b7939..92dfa12 100644
--- a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml
@@ -18,37 +18,40 @@
</select>
<select id="itemList" resultType="com.zt.life.modules.configItemWarehouse.model.WarehouseConfigItem">
SELECT p.secret_class,
- SUBSTRING(m.name, LOCATE('杞欢', m.name) , LENGTH(m.name)) AS itemName,
- m.identify AS version,
- m.name AS Item_identify
+ SUBSTRING(m.name, LOCATE('杞欢', m.name), LENGTH(m.name)) AS itemName,
+ m.identify AS version,
+ m.name AS Item_identify
FROM software_test_order s
JOIN software_test_order_measured m ON s.project_id = ${projectId}
JOIN project p ON p.id = ${projectId}
WHERE s.is_delete = 0
- AND s.id = m.order_id
+ AND s.id = m.order_id
UNION
- SELECT NULL AS secretClass,
+ SELECT NULL AS secretClass,
'杞欢娴嬭瘯濮旀墭鍗�' AS itemName,
- NULL AS version,
- s.code AS itemIdentify
+ NULL AS version,
+ s.code AS itemIdentify
FROM software_test_order s
WHERE s.is_delete = 0
- AND s.project_id = ${projectId}
+ AND s.project_id = ${projectId}
UNION
- SELECT NULL AS secretClass,
+ SELECT NULL AS secretClass,
'鐗╁搧娴佽浆鍗�' AS itemName,
- NULL AS version,
- i.code AS itemIdentify
+ NULL AS version,
+ i.code AS itemIdentify
FROM item_circulat_order i
WHERE i.is_delete = 0
- AND i.project_id = ${projectId}
+ AND i.project_id = ${projectId}
</select>
<select id="warehouseList" resultType="com.zt.life.modules.configItemWarehouse.model.WarehouseConfigItem">
- select a.*
+ select a.item_name,a.item_identify,a.version as retrospect_version,a.secret_class,a.project_id,a.id as select_id
from config_item_warehouse_detail a
- JOIN config_item_warehouse w ON w.project_id = ${projectId}
WHERE a.is_delete = 0
- AND w.id = a.warehouse_id
+ and a.project_id = ${projectId}
+ and a.id NOT IN (SELECT select_id FROM config_item_warehouse_detail)
+ <if test="ids!=null and ids!=''">
+ AND id not in (${ids})
+ </if>
</select>
</mapper>
--
Gitblit v1.9.1