From 0117a966938d2f689e90eee907bd12bc9e123a18 Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期四, 16 十一月 2023 09:32:37 +0800
Subject: [PATCH] 编号

---
 modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml |   31 ++++++++-----------------------
 1 files changed, 8 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..c41583a 100644
--- a/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml
@@ -18,34 +18,19 @@
         </if>
     </select>
 
-    <select id="getMeasuredDictList" resultType="com.zt.life.modules.project.model.SoftwareTestOrderMeasured">
-        SELECT dd.*
+    <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';
         <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