Merge branch 'master' of https://github.com/java110/MicroCommunity

CommunityService/src/main/java/com/java110/community/smo/impl/RoomInnerServiceSMOImpl.java

@@ -1,6 +1,7 @@
 package com.java110.community.smo.impl;
 
 
+import com.java110.utils.cache.MappingCache;
 import com.java110.utils.constant.StatusConstant;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.community.dao.IRoomAttrServiceDao;
@@ -227,6 +228,7 @@ public class RoomInnerServiceSMOImpl extends BaseServiceSMO implements IRoomInne
         if (rooms == null || rooms.size() == 0) {
             return rooms;
         }
+
         String[] roomIds = getRoomIds(rooms);
         Map attrParamInfo = new HashMap();
         attrParamInfo.put("roomIds", roomIds);
@@ -238,6 +240,8 @@ public class RoomInnerServiceSMOImpl extends BaseServiceSMO implements IRoomInne
         List<UserDto> users = userInnerServiceSMOImpl.getUserInfo(userIds);
 
         for (RoomDto room : rooms) {
+            //处理下户型转义问题
+            room.setApartment(MappingCache.getValue(room.getApartment().substring(0,2).toString())+MappingCache.getValue(room.getApartment().substring(2,5).toString()));
             refreshRoom(room, users, roomAttrDtos);
         }
         return rooms;

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

@@ -95,10 +95,10 @@
 
     <!-- 查询停车位信息 add by wuxw 2018-07-03 -->
     <select id="getParkingSpaceInfo" parameterType="Map" resultType="Map">
-        select t.area,t.type_cd,t.type_cd typeCd,t.num,t.ps_id,t.ps_id psId,t.remark,t.status_cd,t.status_cd
-        statusCd,t.state,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.user_id,t.user_id userId
-        from p_parking_space t
-        where 1 =1
+        select t.area,t1.name type_cd,t1.name typeCd,t.num,t.ps_id,t.ps_id psId,t.remark,t.status_cd,t.status_cd
+        statusCd,t2.name state,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.user_id,t.user_id userId
+        from p_parking_space t,t_dict t1,t_dict t2 where t.type_cd=t1.status_cd and t1.table_name='p_parking_space'
+        and t.state = t2.status_cd and t2.table_name='p_parking_space'
         <if test="area !=null and area != ''">
             and t.area= #{area}
         </if>

java110-db/src/main/resources/mapper/user/OwnerCarServiceDaoImplMapper.xml

@@ -101,12 +101,11 @@
 
     <!-- 查询车辆管理信息 add by wuxw 2018-07-03 -->
     <select id="getOwnerCarInfo" parameterType="Map" resultType="Map">
-        select t.car_color,t.car_color carColor,t.car_brand,t.car_brand carBrand,t.car_type,t.car_type carType,
+        select t.car_color,t.car_color carColor,t.car_brand,t.car_brand carBrand,t1.name car_type,t1.name carType,
         t.car_num,t.car_num carNum,t.ps_id,t.ps_id psId,t.remark,t.status_cd,t.status_cd statusCd,t.owner_id,
         t.owner_id ownerId,t.b_id,t.b_id bId,t.user_id,t.user_id userId,t.car_id,t.car_id carId ,t.create_time
         createTime
-        from owner_car t
-        where 1 =1
+        from owner_car t,t_dict t1 where t.car_type=t1.status_cd and t1.table_name='owner_car'
         <if test="carColor !=null and carColor != ''">
             and t.car_color= #{carColor}
         </if>