From a38a1ac77bb6ac9ea8bf0cf5f5f6b68d0e6e6974 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 02 一月 2024 08:44:10 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml | 42 ++++++++++++++++++++----------------------
1 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml b/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml
index c5ccaa5..b5b8bf9 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>
@@ -18,34 +18,32 @@
</if>
</select>
- <select id="getMeasuredDictList" resultType="com.zt.life.modules.project.model.SoftwareTestOrderMeasured">
- SELECT dd.*
- FROM sys_dict_type dt
- JOIN sys_dict_data dd ON dt.ID = dd.DICT_TYPE_ID
- WHERE dt.DICT_TYPE = 'testItem_type';
+ <select id="selectOrderId" resultType="java.lang.String">
+ SELECT code
+ FROM software_test_order
<where>
- <if test="whereSql!=null">
- and ${whereSql}
+ is_delete = 0
+ <if test="projectId != null and projectId != ''">
+ and project_id = ${projectId}
</if>
</where>
- <if test="orderBySql!=null">
- ORDER BY ${orderBySql}
- </if>
</select>
- <select id="getdeliverableDictList" resultType="com.zt.life.modules.project.model.SoftwareTestOrderDeliverable">
- SELECT dd.*
+ <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 dt.DICT_TYPE = 'product_library_file';
<where>
- <if test="whereSql!=null">
- and ${whereSql}
+ dd.IS_DELETE = 0
+ <if test="dictType != null and dictType != ''">
+ and dt.DICT_TYPE = #{dictType}
</if>
</where>
- <if test="orderBySql!=null">
- ORDER BY ${orderBySql}
- </if>
+ ORDER BY dd.sort
</select>
</mapper>
--
Gitblit v1.9.1