From 46fb684ba924ada80ed9c0a57ef7151efe432149 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 13 十二月 2023 15:44:33 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml | 12 +++++++-----
1 files changed, 7 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 c41583a..eb6db4d 100644
--- a/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml
@@ -4,11 +4,11 @@
<mapper namespace="com.zt.life.modules.project.dao.SoftwareTestOrderDao">
<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
+ SELECT a.*, p.software_name,p.software_identity
+ 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>
@@ -19,7 +19,9 @@
</select>
<select id="dictList" resultType="com.zt.core.sys.dto.DictIstance">
- SELECT dd.dict_label as name,
+ 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
--
Gitblit v1.9.1