From d6e03c8b28806fe3e0523f9827bcd593c61454fb Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期三, 22 十一月 2023 11:45:42 +0800
Subject: [PATCH] 项目表

---
 modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml |   23 ++++++++++++++++++++---
 1 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml b/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml
index e90c64c..fd42f3c 100644
--- a/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml
@@ -5,10 +5,10 @@
 
     <select id="getList" resultType="com.zt.life.modules.project.model.SoftwareTestOrder">
         SELECT a.*, p.*
-        FROM project p
-        INNER JOIN software_test_order a ON p.id = a.project_id
+        FROM software_test_order a
+        INNER JOIN  project p ON p.id = a.project_id
         <where>
-            a.is_delete = 0
+            a.is_delete = 0 and p.is_delete = 0
             <if test="whereSql!=null">
                 and ${whereSql}
             </if>
@@ -18,4 +18,21 @@
         </if>
     </select>
 
+    <select id="dictList" resultType="com.zt.core.sys.dto.DictIstance">
+        SET @row_number = 0;
+        SELECT concat('${softName}', 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>
+            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