浏览代码

预算导出编号转名字

lamphua 1 个月前
父节点
当前提交
c70a24c6b1

+ 3
- 2
oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcBudgetCar.java 查看文件

@@ -26,9 +26,9 @@ public class CmcBudgetCar extends BaseEntity
26 26
     private String budgetId;
27 27
 
28 28
     /** 车辆id */
29
-    @Excel(name = "车辆id")
29
+    @Excel(name = "车牌号")
30
+    private String licensePlate;
30 31
     private Integer carId;
31
-
32 32
     private CmcCar car;
33 33
 
34 34
     private SysUser driverUser;
@@ -99,6 +99,7 @@ public class CmcBudgetCar extends BaseEntity
99 99
     public void setCar(CmcCar car)
100 100
     {
101 101
         this.car = car;
102
+        this.licensePlate = car == null ? "" : car.getLicensePlate();
102 103
     }
103 104
 
104 105
     public CmcCar getCar()

+ 11
- 2
oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcBudgetDevice.java 查看文件

@@ -24,9 +24,13 @@ public class CmcBudgetDevice extends BaseEntity
24 24
     private String budgetId;
25 25
 
26 26
     /** 设备id */
27
-    @Excel(name = "设备id")
27
+    @Excel(name = "设备名称")
28
+    private String name;
29
+    @Excel(name = "品牌")
30
+    private String brand;
31
+    @Excel(name = "规格型号")
32
+    private String series;
28 33
     private Integer deviceId;
29
-
30 34
     private CmcDevice device;
31 35
 
32 36
     /** 天数 */
@@ -79,6 +83,11 @@ public class CmcBudgetDevice extends BaseEntity
79 83
     public void setDevice(CmcDevice device)
80 84
     {
81 85
         this.device = device;
86
+        if (device != null) {
87
+            this.brand = device.getBrand();
88
+            this.series = device.getSeries();
89
+            this.name = device.getName();
90
+        }
82 91
     }
83 92
 
84 93
     public CmcDevice getDevice()

+ 3
- 1
oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcBudgetStaff.java 查看文件

@@ -27,7 +27,8 @@ public class CmcBudgetStaff extends BaseEntity
27 27
     private String budgetId;
28 28
 
29 29
     /** 人员id */
30
-    @Excel(name = "人员id")
30
+    @Excel(name = "人员")
31
+    private String nickName;
31 32
     private Long userId;
32 33
 
33 34
     private SysUser user;
@@ -108,6 +109,7 @@ public class CmcBudgetStaff extends BaseEntity
108 109
     public void setUser(SysUser user)
109 110
     {
110 111
         this.user = user;
112
+        this.nickName = user == null ? "" : user.getNickName();
111 113
     }
112 114
 
113 115
     public SysUser getUser()

正在加载...
取消
保存