From af8cab142a6b15c06e131a8474574dd5b00df982 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期四, 04 十二月 2025 22:09:58 +0800
Subject: [PATCH] feat: 改造微信accesstoken存放在系统配置表中
---
ruoyi-system/src/main/resources/mapper/system/SysTaskVehicleMapper.xml | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysTaskVehicleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysTaskVehicleMapper.xml
index 44f44e3..fc52b17 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysTaskVehicleMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysTaskVehicleMapper.xml
@@ -17,21 +17,28 @@
<result property="vehicleBrand" column="vehicle_brand" />
<result property="vehicleModel" column="vehicle_model" />
<result property="deptName" column="dept_name" />
+ <result property="taskCode" column="task_code" />
+ <result property="taskType" column="task_type" />
</resultMap>
<sql id="selectSysTaskVehicleVo">
select tv.id, tv.task_id, tv.vehicle_id, tv.assign_time, tv.assign_by, tv.status, tv.remark,
- v.vehicle_no, v.vehicle_type, v.vehicle_brand, v.vehicle_model, d.dept_name
+ v.vehicle_no, v.vehicle_type, v.vehicle_brand, v.vehicle_model, d.dept_name,
+ t.task_code, t.task_type
from sys_task_vehicle tv
left join tb_vehicle_info v on tv.vehicle_id = v.vehicle_id
- left join sys_dept d on v.dept_id = d.dept_id
+ left join tb_vehicle_dept vd on v.vehicle_id = vd.vehicle_id
+ left join sys_dept d on vd.dept_id = d.dept_id
+ left join sys_task t on tv.task_id = t.task_id
</sql>
<select id="selectSysTaskVehicleList" parameterType="SysTaskVehicle" resultMap="SysTaskVehicleResult">
<include refid="selectSysTaskVehicleVo"/>
<where>
<if test="taskId != null "> and tv.task_id = #{taskId}</if>
+ <if test="taskCode != null and taskCode != ''"> and t.task_code like concat('%', #{taskCode}, '%')</if>
<if test="vehicleId != null "> and tv.vehicle_id = #{vehicleId}</if>
+ <if test="vehicleNo != null and vehicleNo != ''"> and v.vehicle_no like concat('%', #{vehicleNo}, '%')</if>
<if test="status != null and status != ''"> and tv.status = #{status}</if>
<if test="assignBy != null and assignBy != ''"> and tv.assign_by like concat('%', #{assignBy}, '%')</if>
</where>
@@ -113,4 +120,4 @@
<delete id="deleteSysTaskVehicleByTaskIdAndVehicleId">
delete from sys_task_vehicle where task_id = #{taskId} and vehicle_id = #{vehicleId}
</delete>
-</mapper>
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.1