1098226878@qq.com 4 anni fa
parent
commit
9e6ebde0c6

+ 45 - 2
java110-bean/src/main/java/com/java110/dto/parkingSpaceApply/ParkingSpaceApplyDto.java

@@ -30,8 +30,11 @@ private String endTime;
 private String state;
 private String communityId;
 private String feeId;
-
-
+private String num;
+private String paId;
+private String parkingTypeName;
+private String stateName;
+private String carId;
     private Date createTime;
 
     private String statusCd = "0";
@@ -152,4 +155,44 @@ public void setCommunityId(String communityId) {
     public void setFeeId(String feeId) {
         this.feeId = feeId;
     }
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+
+    public String getPaId() {
+        return paId;
+    }
+
+    public void setPaId(String paId) {
+        this.paId = paId;
+    }
+
+    public String getParkingTypeName() {
+        return parkingTypeName;
+    }
+
+    public void setParkingTypeName(String parkingTypeName) {
+        this.parkingTypeName = parkingTypeName;
+    }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
+
+    public String getCarId() {
+        return carId;
+    }
+
+    public void setCarId(String carId) {
+        this.carId = carId;
+    }
 }

+ 7 - 1
java110-db/src/main/resources/mapper/community/ParkingSpaceApplyV1ServiceDaoImplMapper.xml

@@ -23,8 +23,14 @@
         carType,t.create_time,t.create_time createTime,t.config_id,t.config_id
         configId,t.apply_person_link,t.apply_person_link applyPersonLink,t.start_time,t.start_time
         startTime,t.apply_person_id,t.apply_person_id applyPersonId,t.end_time,t.end_time
-        endTime,t.state,t.community_id,t.community_id communityId
+        endTime,t.state,t.community_id,t.community_id communityId,
+        t1.num ,t1.pa_id paId,t3.name parkingTypeName,t4.name stateName,
+        t2.car_id carId
         from parking_space_apply t
+        left join parking_space t1 on t.ps_id = t1.ps_id  and t1.status_cd =0
+        left join owner_car t2 on t.apply_person_id = t2.owner_id and t.community_id =t2.community_id  and t.car_num = t2.car_num and t2.status_cd =0
+        left join t_dict t3 on t1.parking_type  = t3.status_cd and t3.table_name ='parking_space' and t3.table_columns ='parking_type'
+        left join t_dict t4 on t1.state  = t4.status_cd and t4.table_name ='parking_space' and t4.table_columns ='state'
         where 1 =1
         <if test="carBrand !=null and carBrand != ''">
             and t.car_brand= #{carBrand}