From dfd3903f59e4d5d32ffa5be546b00458d3e76477 Mon Sep 17 00:00:00 2001 From: wente <329538422@qq.com> Date: 星期一, 11 十二月 2023 14:26:44 +0800 Subject: [PATCH] 项目表 --- modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml | 42 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 39 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..8fd3706 100644 --- a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml +++ b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml @@ -5,16 +5,52 @@ <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"> + 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} + <if test="ids!=null and ids!=''"> + AND id not in (${ids}) + </if> + </select> </mapper> -- Gitblit v1.9.1