From 28861950cf0af20668efa599489fef3f7ae2e427 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 16 十一月 2023 10:46:46 +0800
Subject: [PATCH] Changes
---
modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml b/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml
index 54e642d..c41583a 100644
--- a/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml
@@ -18,22 +18,19 @@
</if>
</select>
- <select id="getMeasuredDictList" resultType="com.zt.life.modules.project.model.SoftwareTestOrderMeasured">
- SELECT dd.dict_label as name,'1.0.0' as identify
+ <select id="dictList" resultType="com.zt.core.sys.dto.DictIstance">
+ SELECT dd.dict_label as name,
+ case when '${dictType}'='product_library_file' then concat(dd.REMARK,'-${projectCode}') else
+ '1.0.0' end as identify
FROM sys_dict_type dt
JOIN sys_dict_data dd ON dt.ID = dd.DICT_TYPE_ID
- WHERE dt.DICT_TYPE = 'testItem_type'
- and IS_DELETE = 0
- ORDER BY sort
- </select>
-
- <select id="getdeliverableDictList" resultType="com.zt.life.modules.project.model.SoftwareTestOrderDeliverable">
- SELECT dd.dict_label as name,'1.0.0' as identify
- FROM sys_dict_type dt
- JOIN sys_dict_data dd ON dt.ID = dd.DICT_TYPE_ID
- WHERE dt.DICT_TYPE = 'product_library_file'
- and IS_DELETE = 0
- ORDER BY sort
+ <where>
+ dd.IS_DELETE = 0
+ <if test="dictType != null and dictType != ''">
+ and dt.DICT_TYPE = #{dictType}
+ </if>
+ </where>
+ ORDER BY dd.sort
</select>
</mapper>
--
Gitblit v1.9.1