From 1c52e77d77d0e924a1df0725c0748afde172ad68 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期五, 30 十月 2026 16:51:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-process/src/main/resources/mapper/ProcessMethodSearchNewMapper.xml | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/cnas-process/src/main/resources/mapper/ProcessMethodSearchNewMapper.xml b/cnas-process/src/main/resources/mapper/ProcessMethodSearchNewMapper.xml
index 7be9498..3d05316 100644
--- a/cnas-process/src/main/resources/mapper/ProcessMethodSearchNewMapper.xml
+++ b/cnas-process/src/main/resources/mapper/ProcessMethodSearchNewMapper.xml
@@ -4,10 +4,16 @@
<!-- 鏍囧噯鏌ユ柊鍒嗛〉鏌ヨ -->
<select id="pageMethodSearchNew" resultType="com.ruoyi.process.pojo.ProcessMethodSearchNew">
- select *
+ select a.*,
+ CASE WHEN a.search_new_time IS NOT NULL THEN
+ (select u.name from user u where u.id = a.search_new_user_id)
+ END as searchNewUserName,
+ COALESCE(a.next_search_date_override,
+ DATE_ADD(DATE(COALESCE(a.search_new_time, a.create_time)), INTERVAL 3 MONTH)) as nextSearchDate
from (select *
from cnas_process_method_search_new
<where>
+ and is_auto_archived = 0
<if test="beginDate != null and beginDate != '' and endDate != null and endDate != ''">
and create_time between #{beginDate} and #{endDate}
</if>
@@ -18,4 +24,5 @@
${ew.customSqlSegment}
</if>
</select>
+
</mapper>
--
Gitblit v1.9.3