查询预算车辆驾驶员

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcBudgetCar.java

@@ -1,6 +1,8 @@
 package com.ruoyi.oa.domain;
 
 import java.math.BigDecimal;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -29,6 +31,8 @@ public class CmcBudgetCar extends BaseEntity
 
     private CmcCar car;
 
+    private SysUser driverUser;
+
     /** 天数 */
     @Excel(name = "天数")
     private Integer days;
@@ -85,6 +89,15 @@ public class CmcBudgetCar extends BaseEntity
     {
         return car;
     }
+    public void setDriverUser(SysUser driverUser)
+    {
+        this.driverUser = driverUser;
+    }
+
+    public SysUser getDriverUser()
+    {
+        return driverUser;
+    }
     public void setDays(Integer days) 
     {
         this.days = days;

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcProjectProgressMapper.java

@@ -17,7 +17,7 @@ public interface CmcProjectProgressMapper
      * @param projectId cmc项目进度主键
      * @return cmc项目进度
      */
-    public CmcProjectProgress selectCmcProjectProgressByProjectId(String projectId);
+    public List<CmcProjectProgress> selectCmcProjectProgressByProjectId(String projectId);
 
     /**
      * 查询cmc项目进度列表

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcProjectProgressService.java

@@ -17,7 +17,7 @@ public interface ICmcProjectProgressService
      * @param projectId cmc项目进度主键
      * @return cmc项目进度
      */
-    public CmcProjectProgress selectCmcProjectProgressByProjectId(String projectId);
+    public List<CmcProjectProgress> selectCmcProjectProgressByProjectId(String projectId);
 
     /**
      * 查询cmc项目进度列表

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcProjectProgressServiceImpl.java

@@ -26,7 +26,7 @@ public class CmcProjectProgressServiceImpl implements ICmcProjectProgressService
      * @return cmc项目进度
      */
     @Override
-    public CmcProjectProgress selectCmcProjectProgressByProjectId(String projectId)
+    public List<CmcProjectProgress> selectCmcProjectProgressByProjectId(String projectId)
     {
         return cmcProjectProgressMapper.selectCmcProjectProgressByProjectId(projectId);
     }

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcBudgetCarMapper.xml

@@ -15,17 +15,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="expense"    column="expense"    />
         <result property="remark"    column="remark"    />
         <association property="car"    javaType="CmcCar"         resultMap="CmcCarResult" />
+        <association property="driverUser"    javaType="SysUser"         resultMap="SysUserResult" />
     </resultMap>
 
     <resultMap type="CmcCar" id="CmcCarResult">
         <result property="carId"    column="car_id"    />
         <result property="licensePlate"    column="license_plate"    />
+        <result property="driver"    column="driver"    />
         <result property="dayCost"    column="day_cost"    />
     </resultMap>
 
+    <resultMap type="SysUser" id="SysUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="nick_name"    />
+    </resultMap>
+
     <sql id="selectCmcBudgetCarVo">
-        select bc.budget_car_id, bc.budget_id, bc.car_id, c.license_plate, c.day_cost, bc.days, bc.depreciation, bc.distance, bc.mileage, bc.expense, bc.remark from cmc_budget_car as bc
+        select bc.budget_car_id, bc.budget_id, bc.car_id, c.license_plate, c.driver, u.nick_name, c.day_cost, bc.days, bc.depreciation, bc.distance, bc.mileage, bc.expense, bc.remark from cmc_budget_car as bc
         left join cmc_car as c on c.car_id = bc.car_id
+        left join sys_user as u on c.driver = u.user_id
     </sql>
 
     <select id="selectCmcBudgetCarList" parameterType="CmcBudgetCar" resultMap="CmcBudgetCarResult">