From d7a0764e574098f8f4e9d59383cc794d77c30f02 Mon Sep 17 00:00:00 2001 From: jinlin <jinlin> Date: 星期四, 16 十一月 2023 11:15:56 +0800 Subject: [PATCH] Changes --- modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml | 27 +++++++++++++-------------- 1 files changed, 13 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..cbfe6a6 100644 --- a/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml +++ b/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml @@ -18,22 +18,21 @@ </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"> + SET @row_number = 0; + SELECT dd.dict_label as name, + (@row_number := @row_number + 1) AS no, + 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