From de02e2ab7f6b63ce92f712bf81de829c97289ca8 Mon Sep 17 00:00:00 2001 From: jinlin <jinlin> Date: 星期三, 15 十一月 2023 15:50:23 +0800 Subject: [PATCH] Changes --- modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml | 29 ++++++----------------------- 1 files changed, 6 insertions(+), 23 deletions(-) diff --git a/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml b/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml index c5ccaa5..d5df0b8 100644 --- a/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml +++ b/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml @@ -18,34 +18,17 @@ </if> </select> - <select id="getMeasuredDictList" resultType="com.zt.life.modules.project.model.SoftwareTestOrderMeasured"> - SELECT dd.* + <select id="dictList" resultType="com.zt.life.modules.project.model.DictList"> + 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 = 'testItem_type'; <where> - <if test="whereSql!=null"> - and ${whereSql} + dd.IS_DELETE = 0 + <if test="dictType != null and dictType != ''"> + and dt.DICT_TYPE = #{dictType} </if> </where> - <if test="orderBySql!=null"> - ORDER BY ${orderBySql} - </if> - </select> - - <select id="getdeliverableDictList" resultType="com.zt.life.modules.project.model.SoftwareTestOrderDeliverable"> - SELECT dd.* - FROM sys_dict_type dt - JOIN sys_dict_data dd ON dt.ID = dd.DICT_TYPE_ID - WHERE dt.DICT_TYPE = 'product_library_file'; - <where> - <if test="whereSql!=null"> - and ${whereSql} - </if> - </where> - <if test="orderBySql!=null"> - ORDER BY ${orderBySql} - </if> + ORDER BY dd.sort </select> </mapper> -- Gitblit v1.9.1