fix:用户登录及车辆列表展示优化

wlzboy

2025-10-26 ed209eeb52e8d778ab2b3e8c86a3e63a924e53ec

fix:用户登录及车辆列表展示优化

 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 + '\'' +
                '}';
    }
}

 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">