From e2cef6c358e57c2bc63e67a05c88c52585bb96db Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期五, 29 十二月 2023 11:22:29 +0800
Subject: [PATCH] 项目表
---
modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml | 83 ++++++++++++++++++-----------------------
1 files changed, 37 insertions(+), 46 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml
index 1819532..7dfea64 100644
--- a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml
@@ -18,71 +18,62 @@
</select>
<select id="itemList" resultType="com.zt.life.modules.configItemWarehouse.model.WarehouseConfigItem">
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
+ 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,
+ t.id as src_id
FROM item_circulat_order_technical t
- JOIN item_circulat_order i ON i.project_id = ${projectId}
- JOIN project p ON p.id = ${projectId}
+ JOIN item_circulat_order i ON i.project_id = ${projectId}
+ JOIN project p ON p.id = ${projectId}
WHERE t.is_delete = 0
- AND i.id = t.circulat_order_id
+ AND i.id = t.circulat_order_id
+ <if test="ids!=null and ids!=''">
+ AND t.id not in (${ids})
+ </if>
UNION
SELECT (@row_number := @row_number + 1) AS no,
- NULL AS secretClass,
- '杞欢娴嬭瘯濮旀墭鍗�' AS itemName,
- NULL AS version,
- s.code AS itemIdentify
+ NULL AS secretClass,
+ '杞欢娴嬭瘯濮旀墭鍗�' AS itemName,
+ NULL AS version,
+ s.code AS itemIdentify,
+ s.id as src_id
FROM software_test_order s
WHERE s.is_delete = 0
- AND s.project_id = ${projectId}
+ AND s.project_id = ${projectId}
+ <if test="ids!=null and ids!=''">
+ AND s.id not in (${ids})
+ </if>
UNION
SELECT (@row_number := @row_number + 1) AS no,
- NULL AS secretClass,
- '鐗╁搧娴佽浆鍗�' AS itemName,
- NULL AS version,
- i.code AS itemIdentify
+ NULL AS secretClass,
+ '鐗╁搧娴佽浆鍗�' AS itemName,
+ NULL AS version,
+ i.code AS itemIdentify,
+ i.id as src_id
FROM item_circulat_order i
WHERE i.is_delete = 0
- AND i.project_id = ${projectId}
+ AND i.project_id = ${projectId}
+ <if test="ids!=null and ids!=''">
+ AND i.id not in (${ids})
+ </if>
</select>
- <select id="changeSelectList" 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 change_select_id
+ a.item_name,a.item_identify,a.version as retrospect_version,a.secret_class,a.project_id,a.id as
+ select_id,a.library_type
from config_item_warehouse_detail a
WHERE a.is_delete = 0
and a.project_id = ${projectId}
- and a.outbound_select_id IS NOT NULL
+ 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 change_select_id FROM config_item_warehouse_detail
- WHERE
- ( SELECT count(*) FROM config_item_warehouse_detail WHERE id IN (SELECT
- change_select_id
- FROM
- config_item_warehouse_detail) ) > 0)
- </select>
- <select id="outboundSelectList" 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,a.secret_class,a.project_id,a.id as outbound_select_id
- from config_item_warehouse_detail a
- WHERE a.is_delete = 0
- and a.project_id = ${projectId}
- and a.change_select_id IS NOT NULL
- <if test="ids!=null and ids!=''">
- AND id not in (${ids})
+ <if test="type!=null and type!=''">
+ and a.library_type=${type}
</if>
- and a.id NOT IN (SELECT outbound_select_id FROM config_item_warehouse_detail
- WHERE
- ( SELECT count(*) FROM config_item_warehouse_detail WHERE id IN (SELECT
- outbound_select_id
- FROM
- config_item_warehouse_detail) ) > 0)
</select>
-
-
</mapper>
--
Gitblit v1.9.1