From 6566e04fee5932942d44dfe17934807a076568ec Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 13 十二月 2023 09:10:44 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 47 insertions(+), 3 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml
index 142b7f5..859808c 100644
--- a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml
@@ -5,16 +5,60 @@
<select id="getList" resultType="com.zt.life.modules.configItemWarehouse.model.WarehouseConfigItem">
select a.*
- from warehouse_config_item a
+ from config_item_warehouse_detail a
<where>
a.is_delete = 0
- <if test="whereSql!=null">
- and ${whereSql}
+ <if test="warehouseId!=null">
+ and warehouse_id = ${warehouseId}
</if>
</where>
<if test="orderBySql!=null">
ORDER BY ${orderBySql}
</if>
</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(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
+ UNION
+ 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 (@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">
+ 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="ids!=null and ids!=''">
+ AND id not in (${ids})
+ </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