From ecb9ece90cb766214e682f33d4c670b2d09b8ca3 Mon Sep 17 00:00:00 2001 From: jinlin <jinlin> Date: 星期三, 13 十二月 2023 18:03:56 +0800 Subject: [PATCH] 修改 --- modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml | 74 +++++++++++++++++++++++++++++++++++- 1 files changed, 71 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..1819532 100644 --- a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml +++ b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml @@ -5,16 +5,84 @@ <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(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 t.is_delete = 0 + AND i.id = t.circulat_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="changeSelectList" 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 + from config_item_warehouse_detail a + WHERE a.is_delete = 0 + and a.project_id = ${projectId} + and a.outbound_select_id IS NOT NULL + <if test="ids!=null and ids!=''"> + AND id not in (${ids}) + </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> + 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