From 499dfffcf6e41f558e80f57e16860e6fb2bdcb31 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 30 十一月 2023 10:40:16 +0800
Subject: [PATCH] 6
---
modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml | 37 ++++++++++++++++++++++++++-----------
1 files changed, 26 insertions(+), 11 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..fb58609 100644
--- a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml
@@ -16,17 +16,32 @@
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>
</mapper>
--
Gitblit v1.9.1