From 48009ac677243ce3ce974feb173c85a752623874 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 18 十二月 2023 17:08:28 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml | 53 ++++++++++++++++++++++++++++-------------------------
1 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml
index 95fb716..ddbcb48 100644
--- a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml
@@ -17,43 +17,46 @@
</if>
</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
- FROM software_test_order s
- JOIN software_test_order_measured m ON s.project_id = ${projectId}
+ SET @row_number = 0;
+ SELECT (@row_number := @row_number + 1) AS no,
+ p.secret_class,
+ SUBSTRING(t.name, LOCATE('杞欢', t.name), LENGTH(t.name)) AS itemName,
+ t.identify AS version,
+ t.name AS Item_identify
+ FROM item_circulat_order_technical t
+ JOIN item_circulat_order i ON i.project_id = ${projectId}
JOIN project p ON p.id = ${projectId}
- WHERE s.is_delete = 0
- AND s.id = m.order_id
+ WHERE t.is_delete = 0
+ AND i.id = t.circulat_order_id
UNION
- SELECT NULL AS secretClass,
- '杞欢娴嬭瘯濮旀墭鍗�' AS itemName,
- NULL AS version,
- s.code AS itemIdentify
+ SELECT (@row_number := @row_number + 1) AS no,
+ NULL AS secretClass,
+ '杞欢娴嬭瘯濮旀墭鍗�' AS itemName,
+ NULL AS version,
+ s.code AS itemIdentify
FROM software_test_order s
WHERE s.is_delete = 0
AND s.project_id = ${projectId}
UNION
- SELECT NULL AS secretClass,
- '鐗╁搧娴佽浆鍗�' AS itemName,
- NULL AS version,
- i.code AS itemIdentify
+ SELECT (@row_number := @row_number + 1) AS no,
+ NULL AS secretClass,
+ '鐗╁搧娴佽浆鍗�' AS itemName,
+ NULL AS version,
+ i.code AS itemIdentify
FROM item_circulat_order i
WHERE i.is_delete = 0
AND i.project_id = ${projectId}
</select>
- <select id="warehouseList" resultType="com.zt.life.modules.configItemWarehouse.model.WarehouseConfigItem">
- select a.item_name,a.item_identify,a.version as retrospect_version,a.secret_class,a.project_id,a.id as select_id
+ <select id="selectList" resultType="com.zt.life.modules.configItemWarehouse.model.WarehouseConfigItem">
+ SET @row_number = 0;
+ SELECT (@row_number := @row_number + 1) AS no,
+ 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
WHERE a.is_delete = 0
- and a.project_id = ${projectId}
- <if test="warehouse_id!=null">
- AND id not in (select id from config_item_warehouse_detail where is_delete = 0 and warehouse_id = ${warehouseId})
+ and a.project_id = ${projectId}
+ <if test="ids!=null and ids!=''">
+ AND id not in (${ids})
</if>
- <if test="selectIds!=null">
- AND id not in (${selectIds})
- </if>
+ and a.id NOT IN (select select_id from config_item_warehouse_detail where select_id is not null)
</select>
-
</mapper>
--
Gitblit v1.9.1