预算导出编号转名字

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

@@ -26,9 +26,9 @@ public class CmcBudgetCar extends BaseEntity
     private String budgetId;
 
     /** 车辆id */
-    @Excel(name = "车辆id")
+    @Excel(name = "车牌号")
+    private String licensePlate;
     private Integer carId;
-
     private CmcCar car;
 
     private SysUser driverUser;
@@ -99,6 +99,7 @@ public class CmcBudgetCar extends BaseEntity
     public void setCar(CmcCar car)
     {
         this.car = car;
+        this.licensePlate = car == null ? "" : car.getLicensePlate();
     }
 
     public CmcCar getCar()

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

@@ -24,9 +24,13 @@ public class CmcBudgetDevice extends BaseEntity
     private String budgetId;
 
     /** 设备id */
-    @Excel(name = "设备id")
+    @Excel(name = "设备名称")
+    private String name;
+    @Excel(name = "品牌")
+    private String brand;
+    @Excel(name = "规格型号")
+    private String series;
     private Integer deviceId;
-
     private CmcDevice device;
 
     /** 天数 */
@@ -79,6 +83,11 @@ public class CmcBudgetDevice extends BaseEntity
     public void setDevice(CmcDevice device)
     {
         this.device = device;
+        if (device != null) {
+            this.brand = device.getBrand();
+            this.series = device.getSeries();
+            this.name = device.getName();
+        }
     }
 
     public CmcDevice getDevice()

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

@@ -27,7 +27,8 @@ public class CmcBudgetStaff extends BaseEntity
     private String budgetId;
 
     /** 人员id */
-    @Excel(name = "人员id")
+    @Excel(name = "人员")
+    private String nickName;
     private Long userId;
 
     private SysUser user;
@@ -108,6 +109,7 @@ public class CmcBudgetStaff extends BaseEntity
     public void setUser(SysUser user)
     {
         this.user = user;
+        this.nickName = user == null ? "" : user.getNickName();
     }
 
     public SysUser getUser()