From 0dff85a422669f41ef6d8e88fa24bf26ca164cbd Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 12 十二月 2023 10:38:03 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml | 49 +++++++++++++++++++++++++++++++++++++------------
1 files changed, 37 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 4a7a84f..92dfa12 100644
--- a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml
@@ -5,7 +5,7 @@
<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="warehouseId!=null">
@@ -16,17 +16,42 @@
ORDER BY ${orderBySql}
</if>
</select>
- <select id="itemList" resultType="com.zt.core.sys.dto.DictIstance">
- SELECT m.*, p.secret_class
- FROM software_test_order_measured m
- JOIN software_test_order s ON s.id = m.order_id
- JOIN project p ON p.id = ${projectId}
- <where>
- s.is_delete = 0 and m.is_delete = 0
- <if test="projectId!=null">
- and s.project_id = ${projectId}
- </if>
- </where>
+ <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}
+ JOIN project p ON p.id = ${projectId}
+ WHERE s.is_delete = 0
+ AND s.id = m.order_id
+ UNION
+ SELECT 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
+ 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
+ from config_item_warehouse_detail a
+ WHERE a.is_delete = 0
+ 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