修复车位显示问题

WebService/src/main/resources/components/parkingSpacePackage/show-owner-parkingSpaces/showOwnerParkingSpace.html

@@ -28,7 +28,7 @@
                         <div class="col-sm-4">
                             <div class="form-group">
                                 <label class="col-form-label">车位类型：</label>
-                                <label class="">{{parkingSpaceInfo.typeCd}}</label>
+                                <label class="">{{parkingSpaceInfo.typeCdName}}</label>
                             </div>
                         </div>
 
@@ -38,7 +38,7 @@
                         <div class="col-sm-4">
                             <div class="form-group">
                                 <label class="col-form-label">车位状态：</label>
-                                <label class="">{{parkingSpaceInfo.state}}</label>
+                                <label class="">{{parkingSpaceInfo.stateName}}</label>
                             </div>
                         </div>
                         <div class="col-sm-4">

java110-bean/src/main/java/com/java110/dto/OwnerCarDto.java

@@ -14,14 +14,15 @@ import java.util.Date;
 public class OwnerCarDto extends PageDto implements Serializable {
 
     private String carColor;
-private String carBrand;
-private String carType;
-private String carNum;
-private String psId;
-private String remark;
-private String ownerId;
-private String userId;
-private String carId;
+    private String carBrand;
+    private String carType;
+    private String carTypeName;
+    private String carNum;
+    private String psId;
+    private String remark;
+    private String ownerId;
+    private String userId;
+    private String carId;
 
 
     private Date createTime;
@@ -32,55 +33,72 @@ private String carId;
     public String getCarColor() {
         return carColor;
     }
-public void setCarColor(String carColor) {
+
+    public void setCarColor(String carColor) {
         this.carColor = carColor;
     }
-public String getCarBrand() {
+
+    public String getCarBrand() {
         return carBrand;
     }
-public void setCarBrand(String carBrand) {
+
+    public void setCarBrand(String carBrand) {
         this.carBrand = carBrand;
     }
-public String getCarType() {
+
+    public String getCarType() {
         return carType;
     }
-public void setCarType(String carType) {
+
+    public void setCarType(String carType) {
         this.carType = carType;
     }
-public String getCarNum() {
+
+    public String getCarNum() {
         return carNum;
     }
-public void setCarNum(String carNum) {
+
+    public void setCarNum(String carNum) {
         this.carNum = carNum;
     }
-public String getPsId() {
+
+    public String getPsId() {
         return psId;
     }
-public void setPsId(String psId) {
+
+    public void setPsId(String psId) {
         this.psId = psId;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getOwnerId() {
+
+    public String getOwnerId() {
         return ownerId;
     }
-public void setOwnerId(String ownerId) {
+
+    public void setOwnerId(String ownerId) {
         this.ownerId = ownerId;
     }
-public String getUserId() {
+
+    public String getUserId() {
         return userId;
     }
-public void setUserId(String userId) {
+
+    public void setUserId(String userId) {
         this.userId = userId;
     }
-public String getCarId() {
+
+    public String getCarId() {
         return carId;
     }
-public void setCarId(String carId) {
+
+    public void setCarId(String carId) {
         this.carId = carId;
     }
 
@@ -100,4 +118,12 @@ public void setCarId(String carId) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getCarTypeName() {
+        return carTypeName;
+    }
+
+    public void setCarTypeName(String carTypeName) {
+        this.carTypeName = carTypeName;
+    }
 }

java110-bean/src/main/java/com/java110/dto/ParkingSpaceDto.java

@@ -15,6 +15,7 @@ public class ParkingSpaceDto extends PageDto implements Serializable {
 
     private String area;
     private String typeCd;
+    private String typeCdName;
     private String num;
     private String psId;
     private String remark;
@@ -138,4 +139,12 @@ public class ParkingSpaceDto extends PageDto implements Serializable {
     public void setStateName(String stateName) {
         this.stateName = stateName;
     }
+
+    public String getTypeCdName() {
+        return typeCdName;
+    }
+
+    public void setTypeCdName(String typeCdName) {
+        this.typeCdName = typeCdName;
+    }
 }

java110-bean/src/main/java/com/java110/vo/api/ApiParkingSpaceDataVo.java

@@ -16,6 +16,7 @@ public class ApiParkingSpaceDataVo extends Vo {
      */
     private String area;
     private String typeCd;
+    private String typeCdName;
     private String num;
     private String psId;
     private String state;
@@ -34,6 +35,7 @@ public class ApiParkingSpaceDataVo extends Vo {
 
     private String carBrand;
     private String carType;
+    private String carTypeName;
 
     public String getArea() {
         return area;
@@ -154,4 +156,20 @@ public class ApiParkingSpaceDataVo extends Vo {
     public void setStateName(String stateName) {
         this.stateName = stateName;
     }
+
+    public String getCarTypeName() {
+        return carTypeName;
+    }
+
+    public void setCarTypeName(String carTypeName) {
+        this.carTypeName = carTypeName;
+    }
+
+    public String getTypeCdName() {
+        return typeCdName;
+    }
+
+    public void setTypeCdName(String typeCdName) {
+        this.typeCdName = typeCdName;
+    }
 }

java110-db/src/main/resources/mapper/community/ParkingSpaceServiceDaoImplMapper.xml

@@ -112,13 +112,17 @@
             t.b_id bId,
             t.user_id,
             t.user_id userId,
-            td.name stateName
+            td.name stateName,
+            td1.name typeCdName
         FROM
-          p_parking_space t,t_dict td
+          p_parking_space t,t_dict td,t_dict td1
         <where>
             t.state = td.status_cd
             and td.table_name='p_parking_space'
             and td.table_columns='state'
+            and t.type_cd = td1.status_cd
+            and td1.table_name='p_parking_space'
+            and td1.table_columns='type_cd'
             <if test="area !=null and area != ''">
                 and t.area= #{area}
             </if>