车辆信息展示修改

liujun001
1 parent 07e2cf74
Showing 4 changed files with 25 additions and 2 deletions
trash-admin/src/main/resources/static/car_1.png
trash-admin/src/main/resources/static/car_2.png
trash-admin/src/main/resources/static/car_3.png
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/OrderDto.java
 package com.trash.garbage.pojo.dto;
  
-import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
+import org.apache.commons.lang3.StringUtils;
  
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
@@ -102,6 +102,8 @@ public class OrderDto {
         /**
          * 车子类型
          */
+        private String carType;
+        private Integer id;
         private String garOrderCarType;
  
         public Integer getGarOrderCarNumber() {
@@ -113,13 +115,34 @@ public class OrderDto {
         }
  
         public String getGarOrderCarType() {
+            if(StringUtils.isEmpty(garOrderCarType)){
+                garOrderCarType = carType;
+            }
             return garOrderCarType;
         }
  
         public void setGarOrderCarType(String garOrderCarType) {
-            this.garOrderCarType = garOrderCarType;
+             this.garOrderCarType = garOrderCarType;
         }
  
+        public String getCarType() {
+            return carType;
+        }
+
+        public void setCarType(String carType) {
+            this.carType = carType;
+        }
+
+        public Integer getId() {
+            return id;
+        }
+
+        public void setId(Integer id) {
+            this.id = id;
+        }
+
+
+
     }
  
     public List<CarInfo> getGarCarInfoList() {