From ed209eeb52e8d778ab2b3e8c86a3e63a924e53ec Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期日, 26 十月 2025 19:03:26 +0800
Subject: [PATCH] fix:用户登录及车辆列表展示优化
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTaskVehicle.java | 26 ++++++++++++++++++++++++++
ruoyi-system/src/main/resources/mapper/system/SysTaskVehicleMapper.xml | 6 +++++-
2 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTaskVehicle.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTaskVehicle.java
index 9344047..41fa216 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTaskVehicle.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTaskVehicle.java
@@ -58,6 +58,14 @@
@Excel(name = "褰掑睘閮ㄩ棬")
private String deptName;
+ /** 浠诲姟缂栧彿 */
+ @Excel(name = "浠诲姟缂栧彿")
+ private String taskCode;
+
+ /** 浠诲姟绫诲瀷 */
+ @Excel(name = "浠诲姟绫诲瀷")
+ private String taskType;
+
public void setId(Long id) {
this.id = id;
}
@@ -146,6 +154,22 @@
return deptName;
}
+ public void setTaskCode(String taskCode) {
+ this.taskCode = taskCode;
+ }
+
+ public String getTaskCode() {
+ return taskCode;
+ }
+
+ public void setTaskType(String taskType) {
+ this.taskType = taskType;
+ }
+
+ public String getTaskType() {
+ return taskType;
+ }
+
@Override
public String toString() {
return "SysTaskVehicle{" +
@@ -160,6 +184,8 @@
", vehicleBrand='" + vehicleBrand + '\'' +
", vehicleModel='" + vehicleModel + '\'' +
", deptName='" + deptName + '\'' +
+ ", taskCode='" + taskCode + '\'' +
+ ", taskType='" + taskType + '\'' +
'}';
}
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysTaskVehicleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysTaskVehicleMapper.xml
index 44f44e3..89ef050 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysTaskVehicleMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysTaskVehicleMapper.xml
@@ -17,14 +17,18 @@
<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 sys_task t on tv.task_id = t.task_id
</sql>
<select id="selectSysTaskVehicleList" parameterType="SysTaskVehicle" resultMap="SysTaskVehicleResult">
--
Gitblit v1.9.1