From ebab2501fa485c8d62d90b67aabe6f6d81847636 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 06 十二月 2023 16:12:05 +0800
Subject: [PATCH] 6
---
modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml b/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml
index d5df0b8..e5b8ec0 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,8 +18,12 @@
</if>
</select>
- <select id="dictList" resultType="com.zt.life.modules.project.model.DictList">
- 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 concat('${softIdentity}', 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>
--
Gitblit v1.9.1