wuxw лет назад: 3
Родитель
Сommit
0bcbb423da

+ 14 - 5
java110-bean/src/main/java/com/java110/dto/communitySpacePerson/CommunitySpacePersonDto.java

@@ -17,11 +17,11 @@ import java.util.List;
  **/
 public class CommunitySpacePersonDto extends PageDto implements Serializable {
 
-    public static final String STATE_S = "预约成功";
-    public static final String STATE_F = "预约失败";
-    public static final String STATE_W = "待审核";
-    public static final String STATE_WP = "待支付";
-    public static final String STATE_CL = "取消预约";
+    public static final String STATE_S = "S"; //预约成功
+    public static final String STATE_F = "F";//预约失败
+    public static final String STATE_W = "W";//待审核
+    public static final String STATE_WP = "WP";//待支付
+    public static final String STATE_CL = "CL";//取消预约
 
     private String receivableAmount;
     private String payWay;
@@ -31,6 +31,7 @@ public class CommunitySpacePersonDto extends PageDto implements Serializable {
     private String personName;
     private String spaceId;
     private String venueId;
+    private String venueName;
 
     private String spaceName;
     private String cspId;
@@ -212,4 +213,12 @@ public class CommunitySpacePersonDto extends PageDto implements Serializable {
     public void setOrderId(String orderId) {
         this.orderId = orderId;
     }
+
+    public String getVenueName() {
+        return venueName;
+    }
+
+    public void setVenueName(String venueName) {
+        this.venueName = venueName;
+    }
 }

+ 3 - 3
java110-db/src/main/resources/mapper/community/CommunitySpacePersonV1ServiceDaoImplMapper.xml

@@ -17,17 +17,17 @@
 
     <!-- 查询小区场地预约信息 add by wuxw 2018-07-03 -->
     <select id="getCommunitySpacePersonInfo" parameterType="Map" resultType="Map">
-        select t.receivable_amount,t.receivable_amount receivableAmount,t.pay_way,t.pay_way
+        sselect t.receivable_amount,t.receivable_amount receivableAmount,t.pay_way,t.pay_way
         payWay,t.remark,t.status_cd,t.status_cd statusCd,t.received_amount,t.received_amount
         receivedAmount,t.person_name,t.person_name personName,t.space_id,t.space_id spaceId,t.csp_id,t.csp_id
         cspId,t.appointment_time,t.appointment_time appointmentTime,t.person_id,t.person_id
         personId,t.state,t.person_tel,t.person_tel personTel,t.community_id,t.community_id communityId,td.name stateName,td1.name payWayName,
-        cs.name spaceName,t.create_time createTime
+        cs.name spaceName,t.create_time createTime,cv.`name` venueName
         from community_space_person t
         left join community_space cs on t.space_id = cs.space_id and cs.status_cd = '0'
+        left join community_venue cv on cs.venue_id = cv.venue_id and cv.status_cd = '0'
         left join t_dict td on t.state = td.status_cd and td.table_name = 'community_space_person' and td.table_columns = 'state'
         left join t_dict td1 on t.pay_way = td1.status_cd and td1.table_name = 'community_space_person' and td1.table_columns = 'pay_way'
-
         where 1 =1
         <if test="receivableAmount !=null and receivableAmount != ''">
             and t.receivable_amount= #{receivableAmount}