会员管理中，区域数据的显示、编辑调整（改为从映射表获取数据）

src/main/java/com/charging/chargingparking/entity/ParkingMemberAPIPO.java

@@ -54,7 +54,7 @@ public class ParkingMemberAPIPO {
 	    
 	    private String parkingName;
 	    
-	    //area为0表示大楼，1表示创客公寓
+	    //area为0表示大楼，1表示创客公寓，2表示大楼门前
 	    private String area;  
 
 		public String getId() {

src/main/java/com/charging/chargingparking/mapper/mobile/ParkingMemberAPIMapper.java

@@ -4,6 +4,7 @@ import java.util.Map;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.charging.chargingparking.entity.ParkingMemberAPIPO;
+import com.charging.chargingparking.entity.ParkingMemberAPIVO;
 
 public interface ParkingMemberAPIMapper {
 
@@ -20,7 +21,7 @@ public interface ParkingMemberAPIMapper {
 	 * @param memberId
 	 * @return
 	 */
-	ParkingMemberAPIPO get(String memberId);
+	ParkingMemberAPIVO get(String memberId);
 	
 	
 	void del(String memberId);

src/main/java/com/charging/chargingparking/modules/mobileservice/ParkingMemberAPIService.java

@@ -4,6 +4,7 @@ import java.util.Map;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.charging.chargingparking.entity.ParkingMemberAPIPO;
+import com.charging.chargingparking.entity.ParkingMemberAPIVO;
 
 public interface ParkingMemberAPIService {
 
@@ -21,7 +22,7 @@ public interface ParkingMemberAPIService {
 	 * @param memberId
 	 * @return
 	 */
-	ParkingMemberAPIPO get(String memberId);
+	ParkingMemberAPIVO get(String memberId);
 	
 	void del(String memberId);
 	

src/main/java/com/charging/chargingparking/modules/mobileservice/impl/ParkingMemberAPIServiceImp.java

@@ -9,6 +9,7 @@ import org.springframework.transaction.annotation.Transactional;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.charging.chargingparking.entity.ParkingMemberAPIPO;
+import com.charging.chargingparking.entity.ParkingMemberAPIVO;
 import com.charging.chargingparking.mapper.mobile.ParkingMemberAPIMapper;
 import com.charging.chargingparking.modules.mobileservice.ParkingMemberAPIService;
 
@@ -30,7 +31,7 @@ public class ParkingMemberAPIServiceImp implements ParkingMemberAPIService {
 
 
 	@Override
-	public ParkingMemberAPIPO get(String memberId) {
+	public ParkingMemberAPIVO get(String memberId) {
 		return mapper.get(memberId);
 	}
 

src/main/resources/mapper/api/ParkingMemberAPIMapper.xml

@@ -6,13 +6,14 @@
     
     <!-- 查询会员记录 -->
     <select id="query"  resultType="java.util.HashMap">
-    	select pm.id,pi.parking_name, park_id,member_name,member_phone,member_car_num,
+    	select pm.id,pi.parking_name, pm.park_id,member_name,member_phone,member_car_num,
     	date_format(member_start_time,'%Y-%m-%d %H:%i:%s') start_time,
     	date_format(member_end_time,'%Y-%m-%d %H:%i:%s') end_time,
-    	member_type,cloud_del_flag,pm.area_,
+    	member_type,cloud_del_flag,pm.area_,pa.area_name,
     	(select real_name from sys_user where id_=pm.create_by limit 1) operator
 		from base_parking_member pm
 		left join base_parking_info pi on pm.park_id=pi.id
+		left join base_parking_area pa on pm.park_id=pa.park_id and pm.area_=pa.area_ and pa.del_flag=false
 		where pm.del_flag=false and pi.del_flag=false
 		
 		and pm.park_id in 
@@ -36,13 +37,14 @@
     </select>
     
     <!-- 获得单个会员记录 -->
-    <select id="get" resultType="com.charging.chargingparking.entity.ParkingMemberAPIPO">
-    	select pm.id,pi.parking_name, park_id,member_name,member_phone,member_car_num,member_start_time,member_end_time,
+    <select id="get" resultType="com.charging.chargingparking.entity.ParkingMemberAPIVO">
+    	select pm.id,pi.parking_name, pm.park_id,member_name,member_phone,member_car_num,member_start_time,member_end_time,
     	<!-- date_format(member_start_time,'%Y-%m-%d %H:%i:%s') start_time,
     	date_format(member_end_time,'%Y-%m-%d %H:%i:%s') end_time, -->
-    	member_type,cloud_del_flag,area_ area
+    	member_type,cloud_del_flag,pm.area_ area,pa.area_name
 		from base_parking_member pm
 		left join base_parking_info pi on pm.park_id=pi.id
+		left join base_parking_area pa on pm.park_id=pa.park_id and pm.area_=pa.area_ and pa.del_flag=false
 		where pm.del_flag=false and pi.del_flag=false  and pm.id=#{0}
     </select>