优化代码

java110-bean/src/main/java/com/java110/dto/rentingPool/RentingPoolDto.java

@@ -36,6 +36,9 @@ public class RentingPoolDto extends PageDto implements Serializable {
     private String rentingId;
     private String roomId;
     private String roomName;
+    private String builtUpArea;
+    private String section;
+
     private String paymentType;
     private String paymentTypeName;
     private String ownerName;
@@ -44,6 +47,7 @@ public class RentingPoolDto extends PageDto implements Serializable {
     private String stateName;
     private String[] states;
     private String communityId;
+    private String communityName;
     private String longitude;
 
     private String rentingType;
@@ -286,4 +290,28 @@ public class RentingPoolDto extends PageDto implements Serializable {
     public void setRentingFormula(String rentingFormula) {
         this.rentingFormula = rentingFormula;
     }
+
+    public String getBuiltUpArea() {
+        return builtUpArea;
+    }
+
+    public void setBuiltUpArea(String builtUpArea) {
+        this.builtUpArea = builtUpArea;
+    }
+
+    public String getSection() {
+        return section;
+    }
+
+    public void setSection(String section) {
+        this.section = section;
+    }
+
+    public String getCommunityName() {
+        return communityName;
+    }
+
+    public void setCommunityName(String communityName) {
+        this.communityName = communityName;
+    }
 }

java110-bean/src/main/java/com/java110/po/rentingPool/RentingPoolPo.java

@@ -18,6 +18,7 @@ public class RentingPoolPo implements Serializable {
     private String price;
     private String state;
     private String communityId;
+    private String communityName;
     private String longitude;
 
     public String getLatitude() {
@@ -140,5 +141,11 @@ public class RentingPoolPo implements Serializable {
         this.longitude = longitude;
     }
 
+    public String getCommunityName() {
+        return communityName;
+    }
 
+    public void setCommunityName(String communityName) {
+        this.communityName = communityName;
+    }
 }

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

@@ -8,9 +8,11 @@
     <!-- 保存房屋出租信息 add by wuxw 2018-07-03 -->
     <insert id="saveRentingPoolInfo" parameterType="Map">
         insert into renting_pool(
-        latitude,owner_tel,renting_config_id,renting_desc,renting_title,check_in,renting_id,room_id,payment_type,owner_name,price,state,community_id,longitude
+        latitude,owner_tel,renting_config_id,renting_desc,renting_title,check_in,renting_id,room_id,payment_type,owner_name,
+        price,state,community_id,longitude,community_name
         ) values (
-        #{latitude},#{ownerTel},#{rentingConfigId},#{rentingDesc},#{rentingTitle},#{checkIn},#{rentingId},#{roomId},#{paymentType},#{ownerName},#{price},#{state},#{communityId},#{longitude}
+        #{latitude},#{ownerTel},#{rentingConfigId},#{rentingDesc},#{rentingTitle},#{checkIn},#{rentingId},#{roomId},
+        #{paymentType},#{ownerName},#{price},#{state},#{communityId},#{longitude},#{communityName}
         )
     </insert>
 
@@ -24,7 +26,8 @@
         paymentType,t.owner_name,t.owner_name ownerName,t.price,t.state,t.community_id,t.community_id
         communityId,t.longitude,td.name stateName,td2.name paymentTypeName,rc.renting_type rentingType,
         rc.service_owner_rate serviceOwnerRate,rc.service_tenant_rate serviceTenantRate,rc.admin_separate_rate adminSeparateRate,
-        rc.proxy_separate_rate proxySeparateRate,rc.property_separate_rate propertySeparateRate,rc.service_price servicePrice,rc.renting_formula rentingFormula
+        rc.proxy_separate_rate proxySeparateRate,rc.property_separate_rate propertySeparateRate,rc.service_price servicePrice,rc.renting_formula rentingFormula,
+        t.community_name communityName
         from renting_pool t
         left join t_dict td on td.status_cd = t.state and td.table_name = 'renting_pool' and td.table_columns = 'state'
         left join t_dict td2 on td2.status_cd = t.payment_type and td2.table_name = 'renting_pool' and td2.table_columns = 'payment_type'
@@ -83,6 +86,9 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
+        <if test="communityName !=null and communityName != ''">
+            and t.community_name like concat('%',#{communityName},'%')
+        </if>
         <if test="longitude !=null and longitude != ''">
             and t.longitude= #{longitude}
         </if>
@@ -207,6 +213,9 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
+        <if test="communityName !=null and communityName != ''">
+            and t.community_name like concat('%',#{communityName},'%')
+        </if>
         <if test="longitude !=null and longitude != ''">
             and t.longitude= #{longitude}
         </if>

service-user/src/main/java/com/java110/user/api/RentingApi.java

@@ -169,6 +169,7 @@ public class RentingApi {
         Assert.hasKeyAndValue(reqJson, "rentingTitle", "请求报文中未包含rentingTitle");
         Assert.hasKeyAndValue(reqJson, "roomId", "请求报文中未包含roomId");
         Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
+        Assert.hasKeyAndValue(reqJson, "communityName", "请求报文中未包含communityName");
         Assert.hasKeyAndValue(reqJson, "price", "请求报文中未包含price");
         Assert.hasKeyAndValue(reqJson, "paymentType", "请求报文中未包含paymentType");
         Assert.hasKeyAndValue(reqJson, "checkIn", "请求报文中未包含checkIn");
@@ -237,6 +238,7 @@ public class RentingApi {
      */
     @RequestMapping(value = "/queryRentingPool", method = RequestMethod.GET)
     public ResponseEntity<String> queryRentingPool(@RequestParam(value = "communityId", required = false) String communityId,
+                                                   @RequestParam(value = "communityName", required = false) String communityName,
                                                    @RequestParam(value = "page") int page,
                                                    @RequestParam(value = "row") int row,
                                                    @RequestParam(value = "state", required = false) String state,
@@ -247,6 +249,7 @@ public class RentingApi {
         rentingPoolDto.setPage(page);
         rentingPoolDto.setRow(row);
         rentingPoolDto.setCommunityId(communityId);
+        rentingPoolDto.setCommunityName(communityName);
         rentingPoolDto.setRentingId(rentingId);
         rentingPoolDto.setRentingType(rentingType);
         if (!StringUtils.isEmpty(state) && state.contains(",")) {

service-user/src/main/java/com/java110/user/bmo/rentingPool/impl/GetRentingPoolBMOImpl.java

@@ -2,6 +2,7 @@ package com.java110.user.bmo.rentingPool.impl;
 
 import com.java110.dto.RoomDto;
 import com.java110.dto.rentingPool.RentingPoolDto;
+import com.java110.intf.community.ICommunityInnerServiceSMO;
 import com.java110.intf.community.IRoomInnerServiceSMO;
 import com.java110.intf.user.IRentingPoolInnerServiceSMO;
 import com.java110.user.bmo.rentingPool.IGetRentingPoolBMO;
@@ -23,6 +24,7 @@ public class GetRentingPoolBMOImpl implements IGetRentingPoolBMO {
     @Autowired
     private IRoomInnerServiceSMO roomInnerServiceSMOImpl;
 
+
     /**
      * @param rentingPoolDto
      * @return 订单服务能够接受的报文
@@ -52,7 +54,6 @@ public class GetRentingPoolBMOImpl implements IGetRentingPoolBMO {
     private void refreshRoomInfo(List<RentingPoolDto> rentingPoolDtos) {
         List<String> roomIds = new ArrayList<>();
 
-
         for (RentingPoolDto rentingPoolDto : rentingPoolDtos) {
             roomIds.add(rentingPoolDto.getRoomId());
         }
@@ -68,6 +69,8 @@ public class GetRentingPoolBMOImpl implements IGetRentingPoolBMO {
             for (RentingPoolDto rentingPoolDto : rentingPoolDtos) {
                 if (tmpRoomDto.getRoomId().equals(rentingPoolDto.getRoomId())) {
                     rentingPoolDto.setRoomName(tmpRoomDto.getFloorNum() + "栋" + tmpRoomDto.getUnitNum() + "单元" + tmpRoomDto.getRoomNum() + "室");
+                    rentingPoolDto.setBuiltUpArea(tmpRoomDto.getBuiltUpArea());
+                    rentingPoolDto.setSection(tmpRoomDto.getSection());
                 }
             }
         }