From 1772fc5e211f9e9e0ab4cdc6c29b436aac178c2a Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 23 二月 2024 12:19:55 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml | 42 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 38 insertions(+), 4 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..f6d1eea 100644
--- a/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml
@@ -4,11 +4,17 @@
<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="deptId!=null">
+ and p.biz_dept_id = #{deptId}
+ </if>
<if test="whereSql!=null">
and ${whereSql}
</if>
@@ -18,4 +24,32 @@
</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 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>
+ 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