From 9aebd956b125867801614f38d6e9bc8bdf91b125 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 28 Jul 2026 13:03:03 +0800
Subject: [PATCH] =?UTF-8?q?2026-07-28=20=E5=BC=82=E5=B8=B8=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../schedule/service/impl/ScheduleServiceImpl.java   |  6 +++++-
 .../mapper/schedule/ScheduleTodoMessageMapper.xml    | 12 ++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
index 0362b28..49fcaaf 100644
--- a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
@@ -289,7 +289,7 @@ public class ScheduleServiceImpl implements ScheduleService {
             if (!StringUtils.hasText(rollNo)) {
                 throw new XJException(rowTag + "卷号不能为空");
             }
-            if (!StringUtils.hasText(mrbNo)) {
+            if (!todoAuditContext && !StringUtils.hasText(mrbNo)) {
                 throw new XJException(rowTag + "MRB不能为空");
             }
             if (!StringUtils.hasText(processExceptionNo)) {
@@ -3935,6 +3935,10 @@ public class ScheduleServiceImpl implements ScheduleService {
         query.put("todoStatus", trimToEmpty(inData == null ? null : inData.get("todoStatus")));
         query.put("status", trimToEmpty(inData == null ? null : inData.get("status")));
         query.put("matchRoleOnly", trimToEmpty(inData == null ? null : inData.get("matchRoleOnly")));
+        query.put("auditTimeStart", trimToEmpty(inData == null ? null : inData.get("auditTimeStart")));
+        query.put("auditTimeEnd", trimToEmpty(inData == null ? null : inData.get("auditTimeEnd")));
+        query.put("triggerTimeStart", trimToEmpty(inData == null ? null : inData.get("triggerTimeStart")));
+        query.put("triggerTimeEnd", trimToEmpty(inData == null ? null : inData.get("triggerTimeEnd")));
 
         if (includePaging) {
             int pageNo = toPositiveInt(inData == null ? null : inData.get("page"), 1);
diff --git a/src/main/resources/mapper/schedule/ScheduleTodoMessageMapper.xml b/src/main/resources/mapper/schedule/ScheduleTodoMessageMapper.xml
index 39c54d8..9e4c4dd 100644
--- a/src/main/resources/mapper/schedule/ScheduleTodoMessageMapper.xml
+++ b/src/main/resources/mapper/schedule/ScheduleTodoMessageMapper.xml
@@ -176,6 +176,18 @@
                     </when>
                 </choose>
             </if>
+            <if test="query.auditTimeStart != null and query.auditTimeStart != ''">
+                AND stm.audit_time <![CDATA[>=]]> #{query.auditTimeStart}
+            </if>
+            <if test="query.auditTimeEnd != null and query.auditTimeEnd != ''">
+                AND stm.audit_time <![CDATA[<=]]> #{query.auditTimeEnd}
+            </if>
+            <if test="query.triggerTimeStart != null and query.triggerTimeStart != ''">
+                AND stm.created_time <![CDATA[>=]]> #{query.triggerTimeStart}
+            </if>
+            <if test="query.triggerTimeEnd != null and query.triggerTimeEnd != ''">
+                AND stm.created_time <![CDATA[<=]]> #{query.triggerTimeEnd}
+            </if>
         </where>
     </sql>