From b5d05005ead969319589c2d5e2bb44d95c9b6783 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 19 十二月 2023 14:40:25 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml
index 859808c..c710225 100644
--- a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml
@@ -20,14 +20,14 @@
SET @row_number = 0;
SELECT (@row_number := @row_number + 1) AS no,
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}
+ 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 (@row_number := @row_number + 1) AS no,
NULL AS secretClass,
@@ -47,18 +47,17 @@
WHERE i.is_delete = 0
AND i.project_id = ${projectId}
</select>
- <select id="warehouseList" resultType="com.zt.life.modules.configItemWarehouse.model.WarehouseConfigItem">
+ <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
+ 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}
+ and a.select_id is NULL
<if test="ids!=null and ids!=''">
AND id not in (${ids})
+ and a.id NOT IN (select select_id from config_item_warehouse_detail where select_id is not null)
</if>
- and a.id NOT IN (SELECT select_id FROM config_item_warehouse_detail WHERE (SELECT count(*) FROM
- config_item_warehouse_detail WHERE id = select_id) > 0)
</select>
-
</mapper>
--
Gitblit v1.9.1