From bb3bc1c8508dc28d1780c2b0e068595baedb5100 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 12 一月 2024 16:42:17 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml | 24 +++++++++++++++++++-----
1 files changed, 19 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 cbfe6a6..0fb1267 100644
--- a/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml
@@ -4,11 +4,14 @@
<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
+ 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="secretClass!=null">
+ and p.secret_class <= #{secretClass}
+ </if>
<if test="whereSql!=null">
and ${whereSql}
</if>
@@ -18,9 +21,20 @@
</if>
</select>
+ <select id="selectOrderId" resultType="java.lang.String">
+ SELECT code
+ FROM software_test_order
+ <where>
+ is_delete = 0
+ <if test="projectId != null and projectId != ''">
+ and project_id = ${projectId}
+ </if>
+ </where>
+ </select>
+
<select id="dictList" resultType="com.zt.core.sys.dto.DictIstance">
SET @row_number = 0;
- SELECT dd.dict_label as name,
+ 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
--
Gitblit v1.9.1