From 206448b84aada479c24576ff69a669146cb73114 Mon Sep 17 00:00:00 2001
From: wangguangyuan <wangguangyuan@163.com>
Date: Fri, 19 Sep 2025 15:24:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=8D=E5=85=B4=E5=B7=A1=E8=A7=86=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=96=B0=E5=A2=9E=E5=8C=BA=E5=9F=9F=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../taskstatus/domain/PatrolTaskStatus.java     |  3 +++
 .../mapper/task/PatrolTaskStatusMapper.xml      | 17 ++++++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/domain/PatrolTaskStatus.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/domain/PatrolTaskStatus.java
index bb82a5d..ee64a13 100644
--- a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/domain/PatrolTaskStatus.java
+++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/domain/PatrolTaskStatus.java
@@ -26,6 +26,8 @@ public class PatrolTaskStatus extends BaseEntity {
             name = "任务名称"
     )
     private String taskName;
+
+    private String areaTaskName;
     @Excel(
             name = "任务编码"
     )
@@ -125,6 +127,7 @@ public class PatrolTaskStatus extends BaseEntity {
                 "lineId=" + lineId +
                 ", taskPatrolledId='" + taskPatrolledId + '\'' +
                 ", taskName='" + taskName + '\'' +
+                ", areaTaskName='" + areaTaskName + '\'' +
                 ", taskCode='" + taskCode + '\'' +
                 ", taskState='" + taskState + '\'' +
                 ", planStartTime=" + planStartTime +
diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskStatusMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskStatusMapper.xml
index 4432eda..096581a 100644
--- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskStatusMapper.xml
+++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskStatusMapper.xml
@@ -84,7 +84,22 @@
         <where>
             <if test="taskPatrolledId != null  and taskPatrolledId != ''">and a.task_patrolled_id = #{taskPatrolledId}
             </if>
-            <if test="taskName != null  and taskName != ''">and a.task_name like concat('%', #{taskName}, '%')</if>
+            <choose>
+                <!-- 当taskName和areaTaskName都有值时 -->
+                <when test="taskName != null and taskName != '' and areaTaskName != null and areaTaskName != ''">
+                    and (a.task_name like concat('%', #{taskName}, '%')
+                    or a.task_name like concat('%', #{areaTaskName}, '%'))
+                </when>
+                <otherwise>
+                    <!-- 只有一个参数有值时 -->
+                    <if test="taskName != null and taskName != ''">
+                        and a.task_name like concat('%', #{taskName}, '%')
+                    </if>
+                    <if test="areaTaskName != null and areaTaskName != ''">
+                        and a.task_name like concat('%', #{areaTaskName}, '%')
+                    </if>
+                </otherwise>
+            </choose>
             <if test="taskCode != null  and taskCode != ''">and a.task_code = #{taskCode}</if>
             <if test="taskState != null  and taskState != ''">and a.task_state = #{taskState}</if>
             <if test="planStartTime != null ">and a.plan_start_time = #{planStartTime}</if>