联查预算详情

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBudgetCarController.java

@@ -62,10 +62,10 @@ public class CmcBudgetCarController extends BaseController
     /**
      * 获取cmc车辆预算详细信息
      */
-    @GetMapping(value = "/{budgetCarId}")
-    public AjaxResult getInfo(@PathVariable("budgetCarId") String budgetCarId)
+    @GetMapping(value = "/{budgetId}")
+    public AjaxResult getInfo(@PathVariable("budgetId") String budgetId)
     {
-        return success(cmcBudgetCarService.selectCmcBudgetCarByBudgetCarId(budgetCarId));
+        return success(cmcBudgetCarService.selectCmcBudgetCarByBudgetId(budgetId));
     }
 
     /**

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBudgetDeviceController.java

@@ -62,10 +62,10 @@ public class CmcBudgetDeviceController extends BaseController
     /**
      * 获取cmc设备预算详细信息
      */
-    @GetMapping(value = "/{budgetDeviceId}")
-    public AjaxResult getInfo(@PathVariable("budgetDeviceId") String budgetDeviceId)
+    @GetMapping(value = "/{budgetId}")
+    public AjaxResult getInfo(@PathVariable("budgetId") String budgetId)
     {
-        return success(cmcBudgetDeviceService.selectCmcBudgetDeviceByBudgetDeviceId(budgetDeviceId));
+        return success(cmcBudgetDeviceService.selectCmcBudgetDeviceByBudgetId(budgetId));
     }
 
     /**

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBudgetSettleController.java

@@ -62,10 +62,10 @@ public class CmcBudgetSettleController extends BaseController
     /**
      * 获取cmc预结算详细信息
      */
-    @GetMapping(value = "/{budgetSettleId}")
-    public AjaxResult getInfo(@PathVariable("budgetSettleId") String budgetSettleId)
+    @GetMapping(value = "/{budgetId}")
+    public AjaxResult getInfo(@PathVariable("budgetId") String budgetId)
     {
-        return success(cmcBudgetSettleService.selectCmcBudgetSettleByBudgetSettleId(budgetSettleId));
+        return success(cmcBudgetSettleService.selectCmcBudgetSettleByBudgetId(budgetId));
     }
 
     /**

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBudgetStaffController.java

@@ -62,10 +62,10 @@ public class CmcBudgetStaffController extends BaseController
     /**
      * 获取cmc人员预算详细信息
      */
-    @GetMapping(value = "/{budgetStaffId}")
-    public AjaxResult getInfo(@PathVariable("budgetStaffId") String budgetStaffId)
+    @GetMapping(value = "/{budgetId}")
+    public AjaxResult getInfo(@PathVariable("budgetId") String budgetId)
     {
-        return success(cmcBudgetStaffService.selectCmcBudgetStaffByBudgetStaffId(budgetStaffId));
+        return success(cmcBudgetStaffService.selectCmcBudgetStaffByBudgetId(budgetId));
     }
 
     /**

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

@@ -27,6 +27,8 @@ public class CmcBudgetCar extends BaseEntity
     @Excel(name = "车辆id")
     private Integer carId;
 
+    private CmcCar car;
+
     /** 天数 */
     @Excel(name = "天数")
     private Integer days;
@@ -74,6 +76,15 @@ public class CmcBudgetCar extends BaseEntity
     {
         return carId;
     }
+    public void setCar(CmcCar car)
+    {
+        this.car = car;
+    }
+
+    public CmcCar getCar()
+    {
+        return car;
+    }
     public void setDays(Integer days) 
     {
         this.days = days;

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

@@ -27,6 +27,8 @@ public class CmcBudgetDevice extends BaseEntity
     @Excel(name = "设备id")
     private Integer deviceId;
 
+    private CmcDevice device;
+
     /** 天数 */
     @Excel(name = "天数")
     private Integer days;
@@ -62,6 +64,15 @@ public class CmcBudgetDevice extends BaseEntity
     {
         return deviceId;
     }
+    public void setDevice(CmcDevice device)
+    {
+        this.device = device;
+    }
+
+    public CmcDevice getDevice()
+    {
+        return device;
+    }
     public void setDays(Integer days) 
     {
         this.days = days;

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

@@ -27,6 +27,8 @@ public class CmcBudgetSettle extends BaseEntity
     @Excel(name = "结算单价id")
     private Integer priceId;
 
+    private CmcPrice price;
+
     /** 工作量 */
     @Excel(name = "工作量")
     private Long workload;
@@ -66,6 +68,15 @@ public class CmcBudgetSettle extends BaseEntity
     {
         return priceId;
     }
+    public void setPrice(CmcPrice price)
+    {
+        this.price = price;
+    }
+
+    public CmcPrice getPrice()
+    {
+        return price;
+    }
     public void setWorkload(Long workload) 
     {
         this.workload = workload;

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcBudgetStaff.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;
@@ -27,12 +29,14 @@ public class CmcBudgetStaff extends BaseEntity
     @Excel(name = "人员id")
     private Long userId;
 
+    private SysUser user;
+
     /** 天数 */
     @Excel(name = "天数")
     private Integer days;
 
-    /** 固定成本 */
-    @Excel(name = "固定成本")
+    /** 人员成本 */
+    @Excel(name = "人员成本")
     private BigDecimal staffCost;
 
     /** 进出场单价 */
@@ -70,6 +74,15 @@ public class CmcBudgetStaff extends BaseEntity
     {
         return userId;
     }
+    public void setUser(SysUser user)
+    {
+        this.user = user;
+    }
+
+    public SysUser getUser()
+    {
+        return user;
+    }
     public void setDays(Integer days) 
     {
         this.days = days;

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

@@ -14,10 +14,10 @@ public interface CmcBudgetCarMapper
     /**
      * 查询cmc车辆预算
      * 
-     * @param budgetCarId cmc车辆预算主键
+     * @param budgetId cmc预算id
      * @return cmc车辆预算
      */
-    public CmcBudgetCar selectCmcBudgetCarByBudgetCarId(String budgetCarId);
+    public List<CmcBudgetCar> selectCmcBudgetCarByBudgetId(String budgetId);
 
     /**
      * 查询cmc车辆预算列表

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

@@ -14,10 +14,10 @@ public interface CmcBudgetDeviceMapper
     /**
      * 查询cmc设备预算
      * 
-     * @param budgetDeviceId cmc设备预算主键
+     * @param budgetId cmc预算id
      * @return cmc设备预算
      */
-    public CmcBudgetDevice selectCmcBudgetDeviceByBudgetDeviceId(String budgetDeviceId);
+    public List<CmcBudgetDevice> selectCmcBudgetDeviceByBudgetId(String budgetId);
 
     /**
      * 查询cmc设备预算列表

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

@@ -14,10 +14,10 @@ public interface CmcBudgetSettleMapper
     /**
      * 查询cmc预结算
      * 
-     * @param budgetSettleId cmc预结算主键
+     * @param budgetId cmc预算id
      * @return cmc预结算
      */
-    public CmcBudgetSettle selectCmcBudgetSettleByBudgetSettleId(String budgetSettleId);
+    public List<CmcBudgetSettle> selectCmcBudgetSettleByBudgetId(String budgetId);
 
     /**
      * 查询cmc预结算列表

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

@@ -14,10 +14,10 @@ public interface CmcBudgetStaffMapper
     /**
      * 查询cmc人员预算
      * 
-     * @param budgetStaffId cmc人员预算主键
+     * @param budgetId cmc预算id
      * @return cmc人员预算
      */
-    public CmcBudgetStaff selectCmcBudgetStaffByBudgetStaffId(String budgetStaffId);
+    public List<CmcBudgetStaff> selectCmcBudgetStaffByBudgetId(String budgetId);
 
     /**
      * 查询cmc人员预算列表

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

@@ -14,10 +14,10 @@ public interface ICmcBudgetCarService
     /**
      * 查询cmc车辆预算
      * 
-     * @param budgetCarId cmc车辆预算主键
+     * @param budgetId cmc预算id
      * @return cmc车辆预算
      */
-    public CmcBudgetCar selectCmcBudgetCarByBudgetCarId(String budgetCarId);
+    public List<CmcBudgetCar> selectCmcBudgetCarByBudgetId(String budgetId);
 
     /**
      * 查询cmc车辆预算列表
@@ -46,16 +46,16 @@ public interface ICmcBudgetCarService
     /**
      * 批量删除cmc车辆预算
      * 
-     * @param budgetCarIds 需要删除的cmc车辆预算主键集合
+     * @param budgetIds 需要删除的cmc车辆预算主键集合
      * @return 结果
      */
-    public int deleteCmcBudgetCarByBudgetCarIds(String[] budgetCarIds);
+    public int deleteCmcBudgetCarByBudgetCarIds(String[] budgetIds);
 
     /**
      * 删除cmc车辆预算信息
      * 
-     * @param budgetCarId cmc车辆预算主键
+     * @param budgetId cmc车辆预算主键
      * @return 结果
      */
-    public int deleteCmcBudgetCarByBudgetCarId(String budgetCarId);
+    public int deleteCmcBudgetCarByBudgetCarId(String budgetId);
 }

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

@@ -14,10 +14,10 @@ public interface ICmcBudgetDeviceService
     /**
      * 查询cmc设备预算
      * 
-     * @param budgetDeviceId cmc设备预算主键
+     * @param budgetId cmc预算id
      * @return cmc设备预算
      */
-    public CmcBudgetDevice selectCmcBudgetDeviceByBudgetDeviceId(String budgetDeviceId);
+    public List<CmcBudgetDevice> selectCmcBudgetDeviceByBudgetId(String budgetId);
 
     /**
      * 查询cmc设备预算列表

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

@@ -14,10 +14,10 @@ public interface ICmcBudgetSettleService
     /**
      * 查询cmc预结算
      * 
-     * @param budgetSettleId cmc预结算主键
+     * @param budgetId cmc预算id
      * @return cmc预结算
      */
-    public CmcBudgetSettle selectCmcBudgetSettleByBudgetSettleId(String budgetSettleId);
+    public List<CmcBudgetSettle> selectCmcBudgetSettleByBudgetId(String budgetId);
 
     /**
      * 查询cmc预结算列表

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

@@ -14,10 +14,10 @@ public interface ICmcBudgetStaffService
     /**
      * 查询cmc人员预算
      * 
-     * @param budgetStaffId cmc人员预算主键
+     * @param budgetId cmc预算id
      * @return cmc人员预算
      */
-    public CmcBudgetStaff selectCmcBudgetStaffByBudgetStaffId(String budgetStaffId);
+    public List<CmcBudgetStaff> selectCmcBudgetStaffByBudgetId(String budgetId);
 
     /**
      * 查询cmc人员预算列表

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

@@ -22,13 +22,13 @@ public class CmcBudgetCarServiceImpl implements ICmcBudgetCarService
     /**
      * 查询cmc车辆预算
      * 
-     * @param budgetCarId cmc车辆预算主键
+     * @param budgetId cmc预算id
      * @return cmc车辆预算
      */
     @Override
-    public CmcBudgetCar selectCmcBudgetCarByBudgetCarId(String budgetCarId)
+    public List<CmcBudgetCar> selectCmcBudgetCarByBudgetId(String budgetId)
     {
-        return cmcBudgetCarMapper.selectCmcBudgetCarByBudgetCarId(budgetCarId);
+        return cmcBudgetCarMapper.selectCmcBudgetCarByBudgetId(budgetId);
     }
 
     /**

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

@@ -22,13 +22,13 @@ public class CmcBudgetDeviceServiceImpl implements ICmcBudgetDeviceService
     /**
      * 查询cmc设备预算
      * 
-     * @param budgetDeviceId cmc设备预算主键
+     * @param budgetId cmc预算id
      * @return cmc设备预算
      */
     @Override
-    public CmcBudgetDevice selectCmcBudgetDeviceByBudgetDeviceId(String budgetDeviceId)
+    public List<CmcBudgetDevice> selectCmcBudgetDeviceByBudgetId(String budgetId)
     {
-        return cmcBudgetDeviceMapper.selectCmcBudgetDeviceByBudgetDeviceId(budgetDeviceId);
+        return cmcBudgetDeviceMapper.selectCmcBudgetDeviceByBudgetId(budgetId);
     }
 
     /**

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

@@ -22,13 +22,13 @@ public class CmcBudgetSettleServiceImpl implements ICmcBudgetSettleService
     /**
      * 查询cmc预结算
      * 
-     * @param budgetSettleId cmc预结算主键
+     * @param budgetId cmc预算id
      * @return cmc预结算
      */
     @Override
-    public CmcBudgetSettle selectCmcBudgetSettleByBudgetSettleId(String budgetSettleId)
+    public List<CmcBudgetSettle> selectCmcBudgetSettleByBudgetId(String budgetId)
     {
-        return cmcBudgetSettleMapper.selectCmcBudgetSettleByBudgetSettleId(budgetSettleId);
+        return cmcBudgetSettleMapper.selectCmcBudgetSettleByBudgetId(budgetId);
     }
 
     /**

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

@@ -22,13 +22,13 @@ public class CmcBudgetStaffServiceImpl implements ICmcBudgetStaffService
     /**
      * 查询cmc人员预算
      * 
-     * @param budgetStaffId cmc人员预算主键
+     * @param budgetId cmc预算id
      * @return cmc人员预算
      */
     @Override
-    public CmcBudgetStaff selectCmcBudgetStaffByBudgetStaffId(String budgetStaffId)
+    public List<CmcBudgetStaff> selectCmcBudgetStaffByBudgetId(String budgetId)
     {
-        return cmcBudgetStaffMapper.selectCmcBudgetStaffByBudgetStaffId(budgetStaffId);
+        return cmcBudgetStaffMapper.selectCmcBudgetStaffByBudgetId(budgetId);
     }
 
     /**

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

@@ -13,28 +13,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="distance"    column="distance"    />
         <result property="mileage"    column="mileage"    />
         <result property="expense"    column="expense"    />
+        <association property="car"    javaType="CmcCar"         resultMap="CmcCarResult" />
+    </resultMap>
+
+    <resultMap type="CmcCar" id="CmcCarResult">
+        <result property="carId"    column="car_id"    />
+        <result property="licensePlate"    column="license_plate"    />
     </resultMap>
 
     <sql id="selectCmcBudgetCarVo">
-        select budget_car_id, budget_id, car_id, days, depreciation, distance, mileage, expense from cmc_budget_car
+        select bc.budget_car_id, bc.budget_id, bc.car_id, c.license_plate, bc.days, bc.depreciation, bc.distance, bc.mileage, bc.expense from cmc_budget_car as bc
+        left join cmc_car as c on c.car_id = bc.car_id
     </sql>
 
     <select id="selectCmcBudgetCarList" parameterType="CmcBudgetCar" resultMap="CmcBudgetCarResult">
         <include refid="selectCmcBudgetCarVo"/>
         <where>  
-            <if test="budgetId != null  and budgetId != ''"> and budget_id = #{budgetId}</if>
-            <if test="carId != null "> and car_id = #{carId}</if>
-            <if test="days != null "> and days = #{days}</if>
-            <if test="depreciation != null "> and depreciation = #{depreciation}</if>
-            <if test="distance != null "> and distance = #{distance}</if>
-            <if test="mileage != null "> and mileage = #{mileage}</if>
-            <if test="expense != null "> and expense = #{expense}</if>
+            <if test="budgetId != null  and budgetId != ''"> and bc.budget_id = #{budgetId}</if>
+            <if test="carId != null "> and bc.car_id = #{carId}</if>
+            <if test="days != null "> and bc.days = #{days}</if>
+            <if test="depreciation != null "> and bc.depreciation = #{depreciation}</if>
+            <if test="distance != null "> and bc.distance = #{distance}</if>
+            <if test="mileage != null "> and bc.mileage = #{mileage}</if>
+            <if test="expense != null "> and bc.expense = #{expense}</if>
         </where>
     </select>
     
-    <select id="selectCmcBudgetCarByBudgetCarId" parameterType="String" resultMap="CmcBudgetCarResult">
+    <select id="selectCmcBudgetCarByBudgetId" parameterType="String" resultMap="CmcBudgetCarResult">
         <include refid="selectCmcBudgetCarVo"/>
-        where budget_car_id = #{budgetCarId}
+        where bc.budget_id = #{budgetId}
     </select>
         
     <insert id="insertCmcBudgetCar" parameterType="CmcBudgetCar">

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

@@ -10,25 +10,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deviceId"    column="device_id"    />
         <result property="days"    column="days"    />
         <result property="depreciation"    column="depreciation"    />
+        <association property="device"    javaType="CmcDevice"         resultMap="CmcDeviceResult" />
+    </resultMap>
+
+    <resultMap type="CmcDevice" id="CmcDeviceResult">
+        <result property="deviceId"    column="device_id"    />
+        <result property="code"    column="code"    />
+        <result property="name"    column="name"    />
+        <result property="series"    column="series"    />
+        <result property="brand"    column="brand"    />
     </resultMap>
 
     <sql id="selectCmcBudgetDeviceVo">
-        select budget_device_id, budget_id, device_id, days, depreciation from cmc_budget_device
+        select bd.budget_device_id, bd.budget_id, d.code, d.name, d.series, d.brand, bd.device_id, bd.days, bd.depreciation from cmc_budget_device as bd
+        left join cmc_device as d on d.device_id = bd.device_id
     </sql>
 
     <select id="selectCmcBudgetDeviceList" parameterType="CmcBudgetDevice" resultMap="CmcBudgetDeviceResult">
         <include refid="selectCmcBudgetDeviceVo"/>
         <where>  
-            <if test="budgetId != null  and budgetId != ''"> and budget_id = #{budgetId}</if>
-            <if test="deviceId != null "> and device_id = #{deviceId}</if>
-            <if test="days != null "> and days = #{days}</if>
-            <if test="depreciation != null "> and depreciation = #{depreciation}</if>
+            <if test="budgetId != null  and budgetId != ''"> and bd.budget_id = #{budgetId}</if>
+            <if test="deviceId != null "> and bd.device_id = #{deviceId}</if>
+            <if test="days != null "> and bd.days = #{days}</if>
+            <if test="depreciation != null "> and bd.depreciation = #{depreciation}</if>
         </where>
     </select>
     
-    <select id="selectCmcBudgetDeviceByBudgetDeviceId" parameterType="String" resultMap="CmcBudgetDeviceResult">
+    <select id="selectCmcBudgetDeviceByBudgetId" parameterType="String" resultMap="CmcBudgetDeviceResult">
         <include refid="selectCmcBudgetDeviceVo"/>
-        where budget_device_id = #{budgetDeviceId}
+        where bd.budget_id = #{budgetId}
     </select>
         
     <insert id="insertCmcBudgetDevice" parameterType="CmcBudgetDevice">

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

@@ -11,26 +11,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="workload"    column="workload"    />
         <result property="coefficient"    column="coefficient"    />
         <result property="settle"    column="settle"    />
+        <association property="price"    javaType="CmcPrice"         resultMap="CmcPriceResult" />
+    </resultMap>
+
+    <resultMap type="CmcPrice" id="CmcPriceResult">
+        <result property="id"    column="id"    />
+        <result property="workType"    column="work_type"    />
+        <result property="workItem"    column="work_item"    />
+        <result property="subItem"    column="sub_item"    />
+        <result property="scaleGrade"    column="scale_grade"    />
+        <result property="unit"    column="unit"    />
     </resultMap>
 
     <sql id="selectCmcBudgetSettleVo">
-        select budget_settle_id, budget_id, price_id, workload, coefficient, settle from cmc_budget_settle
+        select bs.budget_settle_id, bs.budget_id, bs.price_id, p.work_type, p.work_item, p.sub_item, p.scale_grade, p.unit, bs.workload, bs.coefficient, bs.settle from cmc_budget_settle as bs
+        left join cmc_price as p on p.id = bs.price_id
     </sql>
 
     <select id="selectCmcBudgetSettleList" parameterType="CmcBudgetSettle" resultMap="CmcBudgetSettleResult">
         <include refid="selectCmcBudgetSettleVo"/>
         <where>  
-            <if test="budgetId != null  and budgetId != ''"> and budget_id = #{budgetId}</if>
-            <if test="priceId != null "> and price_id = #{priceId}</if>
-            <if test="workload != null "> and workload = #{workload}</if>
-            <if test="coefficient != null "> and coefficient = #{coefficient}</if>
-            <if test="settle != null "> and settle = #{settle}</if>
+            <if test="budgetId != null  and budgetId != ''"> and bs.budget_id = #{budgetId}</if>
+            <if test="priceId != null "> and bs.price_id = #{priceId}</if>
+            <if test="workload != null "> and bs.workload = #{workload}</if>
+            <if test="coefficient != null "> and bs.coefficient = #{coefficient}</if>
+            <if test="settle != null "> and bs.settle = #{settle}</if>
         </where>
     </select>
     
-    <select id="selectCmcBudgetSettleByBudgetSettleId" parameterType="String" resultMap="CmcBudgetSettleResult">
+    <select id="selectCmcBudgetSettleByBudgetId" parameterType="String" resultMap="CmcBudgetSettleResult">
         <include refid="selectCmcBudgetSettleVo"/>
-        where budget_settle_id = #{budgetSettleId}
+        where bs.budget_id = #{budgetId}
     </select>
         
     <insert id="insertCmcBudgetSettle" parameterType="CmcBudgetSettle">

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

@@ -12,27 +12,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="staffCost"    column="staff_cost"    />
         <result property="inOutPrice"    column="in_out_price"    />
         <result property="inOutExpense"    column="in_out_expense"    />
+        <association property="user"    javaType="SysUser"         resultMap="SysUserResult" />
+    </resultMap>
+
+    <resultMap type="SysUser" id="SysUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="nick_name"    />
     </resultMap>
 
     <sql id="selectCmcBudgetStaffVo">
-        select budget_staff_id, budget_id, user_id, days, staff_cost, in_out_price, in_out_expense from cmc_budget_staff
+        select bs.budget_staff_id, bs.budget_id, bs.user_id, u.nick_name, bs.days, bs.staff_cost, bs.in_out_price, bs.in_out_expense from cmc_budget_staff as bs
+        left join sys_user as u on u.user_id = bs.user_id
     </sql>
 
     <select id="selectCmcBudgetStaffList" parameterType="CmcBudgetStaff" resultMap="CmcBudgetStaffResult">
         <include refid="selectCmcBudgetStaffVo"/>
         <where>  
-            <if test="budgetId != null  and budgetId != ''"> and budget_id = #{budgetId}</if>
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="days != null "> and days = #{days}</if>
-            <if test="staffCost != null "> and staff_cost = #{staffCost}</if>
-            <if test="inOutPrice != null "> and in_out_price = #{inOutPrice}</if>
-            <if test="inOutExpense != null "> and in_out_expense = #{inOutExpense}</if>
+            <if test="budgetId != null  and budgetId != ''"> and bs.budget_id = #{budgetId}</if>
+            <if test="userId != null "> and bs.user_id = #{userId}</if>
+            <if test="days != null "> and bs.days = #{days}</if>
+            <if test="staffCost != null "> and bs.staff_cost = #{staffCost}</if>
+            <if test="inOutPrice != null "> and bs.in_out_price = #{inOutPrice}</if>
+            <if test="inOutExpense != null "> and bs.in_out_expense = #{inOutExpense}</if>
         </where>
     </select>
     
-    <select id="selectCmcBudgetStaffByBudgetStaffId" parameterType="String" resultMap="CmcBudgetStaffResult">
+    <select id="selectCmcBudgetStaffByBudgetId" parameterType="String" resultMap="CmcBudgetStaffResult">
         <include refid="selectCmcBudgetStaffVo"/>
-        where budget_staff_id = #{budgetStaffId}
+        where bs.budget_id = #{budgetId}
     </select>
         
     <insert id="insertCmcBudgetStaff" parameterType="CmcBudgetStaff">

oa-ui/src/views/flowable/form/budget/budgetInfo.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-03 16:28:09
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-08 17:15:44
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-04-08 18:07:49
 -->
 <template>
   <div>
@@ -165,12 +165,21 @@ export default {
       listBudget({ pageNum: 1, pageSize: 20, projectId: this.taskForm.formId }).then(res => {
         console.log(res);
         this.budgetForm = res.rows[0];
-        listBudgetDevice({ pageNum: 1, pageSize: 20, budgetId: this.budgetForm.budgetId }).then(res => {
+        getBudgetDevice(this.budgetForm.budgetId).then(res => {
           console.log(res);
           this.chooseDevice = res.rows;
         })
-        listBudgetStaff({ pageNum: 1, pageSize: 20, budgetId: this.budgetForm.budgetId }).then(result => {
+        getBudgetStaff(this.budgetForm.budgetId).then(result => {
           console.log(result);
+          this.chooseUser = res.rows;
+        })
+        getBudgetCar(this.budgetForm.budgetId).then(result => {
+          console.log(result);
+          this.chooseCar = res.rows;
+        })
+        getBudgetSettle(this.budgetForm.budgetId).then(result => {
+          console.log(result);
+          this.workList = res.rows;
         })
       });
     },