From 3ca07e5ec7b9986dfdd9ddf666ef40d2889be95d Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期三, 13 八月 2025 13:56:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'huliguo/master'
---
guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TaskDetailMapper.xml | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TaskDetailMapper.xml b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TaskDetailMapper.xml
index 39d15ba..976464a 100644
--- a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TaskDetailMapper.xml
+++ b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TaskDetailMapper.xml
@@ -59,7 +59,12 @@
left join (select task_detail_id, count(1) as num from t_task_detail_vehicles where `status` = 4 group by task_detail_id) e on (a.id = e.task_detail_id)
left join (select task_detail_id, count(1) as num from t_task_detail_vehicles where `status` = 3 group by task_detail_id) f on (a.id = f.task_detail_id)
left join (select task_detail_id, count(1) as num from t_task_detail_vehicles where `status` = 5 group by task_detail_id) g on (a.id = g.task_detail_id)
- left join (select task_detail_id, count(1) as num from t_task_detail_vehicles_channel where artificial_status = 1 group by task_detail_id) h on (a.id = h.task_detail_id)
+ left join (select task_detail_id, count(1) as num from t_task_detail_vehicles_channel
+ where artificial_status = 1
+ <if test="null != item.sysStatus">
+ and sys_status = #{item.sysStatus}
+ </if>
+ group by task_detail_id) h on (a.id = h.task_detail_id)
where a.del_flag = 0
<if test="null != item.code and '' != item.code">
and a.code like CONCAT('%', #{item.code}, '%')
@@ -114,8 +119,11 @@
<if test="null != code and '' != code">
and b.code like CONCAT('%', #{code}, '%')
</if>
- <if test="null != status">
- and b.status = #{status}
+ <if test="null != status and status.size() > 0">
+ and b.status in
+ <foreach collection="status" item="item" index="index" open="(" separator="," close=")">
+ #{item}
+ </foreach>
</if>
<if test="null != sysStatus">
and d.sys_status = #{sysStatus}
--
Gitblit v1.7.1