From 5d2d6fdff67f8f9a7e65abdbb4b87dba07dcb32b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 02 九月 2025 10:23:02 +0800
Subject: [PATCH] 上传修改
---
ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetMapper.xml | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetMapper.xml
index 4d31210..c090ee2 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetMapper.xml
@@ -6,6 +6,7 @@
<resultMap id="BaseResultMap" type="com.ruoyi.system.model.TTestMethodConfirmSheet">
<id column="id" property="id" />
<result column="dispatch_id" property="dispatchId" />
+ <result column="commit_user_id" property="commitUserId" />
<result column="confirm_sign" property="confirmSign" />
<result column="sign_time" property="signTime" />
<result column="audit_status" property="auditStatus" />
@@ -21,10 +22,10 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, dispatch_id, confirm_sign, sign_time, audit_status, audit_person_id, audit_sign, audit_time, create_time, update_time, create_by, update_by, disabled
+ id, dispatch_id,commit_user_id, confirm_sign, sign_time, audit_status, audit_person_id, audit_sign, audit_time, create_time, update_time, create_by, update_by, disabled
</sql>
<select id="pageList" resultType="com.ruoyi.system.vo.TTestMethodConfirmSheetVO">
- select tmcs.id, tmcs.dispatch_id, tmcs.confirm_sign, tmcs.sign_time, tmcs.audit_status, tmcs.audit_person_id,
+ select tmcs.id, tmcs.dispatch_id,tmcs.commit_user_id, tmcs.confirm_sign, tmcs.sign_time, tmcs.audit_status, tmcs.audit_person_id,
tmcs.audit_sign, tmcs.audit_time, tmcs.create_time, tmcs.update_time, tmcs.create_by, tmcs.update_by, tmcs.disabled,
tpp.project_name AS projectName, ted.experiment_name AS experimentName, ted.experiment_code AS experimentCode
from t_test_method_confirm_sheet tmcs
@@ -43,12 +44,21 @@
<if test="query.auditStatus != null">
and tmcs.audit_status = #{query.auditStatus}
</if>
- <if test="query.auditStatus == null">
- and tmcs.audit_status != -1
+ <if test="query.roleType != null and (query.roleType == 3 or query.roleType == 4 or query.roleType == 5)">
+ AND tmcs.audit_status != 5
+ </if>
+ <if test="query.dispatchIds != null and query.dispatchIds.size() > 0">
+ and tmcs.dispatch_id in
+ <foreach item="item" collection="query.dispatchIds" separator="," close=")" index="index" open="(">
+ #{item}
+ </foreach>
</if>
<if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
AND tmcs.create_time BETWEEN #{query.startTime} AND #{query.endTime}
</if>
+ <if test="query.auditStatus == null">
+ and tmcs.audit_status != -1
+ </if>
AND tmcs.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
</where>
ORDER BY tmcs.create_time DESC
--
Gitblit v1.7.1