Pārlūkot izejas kodu

预算导出编号转名字

lamphua 2 mēnešus atpakaļ
vecāks
revīzija
c70a24c6b1

+ 3
- 2
oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcBudgetCar.java Parādīt failu

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

+ 11
- 2
oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcBudgetDevice.java Parādīt failu

24
     private String budgetId;
24
     private String budgetId;
25
 
25
 
26
     /** 设备id */
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
     private Integer deviceId;
33
     private Integer deviceId;
29
-
30
     private CmcDevice device;
34
     private CmcDevice device;
31
 
35
 
32
     /** 天数 */
36
     /** 天数 */
79
     public void setDevice(CmcDevice device)
83
     public void setDevice(CmcDevice device)
80
     {
84
     {
81
         this.device = device;
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
     public CmcDevice getDevice()
93
     public CmcDevice getDevice()

+ 3
- 1
oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcBudgetStaff.java Parādīt failu

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

Notiek ielāde…
Atcelt
Saglabāt