为了更好的支持 园区 房屋加入 租金 房屋类型字段

java110-bean/src/main/java/com/java110/dto/RoomDto.java

@@ -26,6 +26,10 @@ public class RoomDto extends PageDto implements Serializable {
     public static final String ROOM_TYPE_ROOM = "1010301";//普通房屋
     public static final String ROOM_TYPE_SHOPS = "2020602";//商铺
 
+    public static final String ROOM_SUB_TYPE_PERSON = "110";
+    public static final String ROOM_SUB_TYPE_WORK = "119";
+    public static final String ROOM_SUB_TYPE_HOUSE = "120";
+
 
     private String feeCoefficient;
     private String section;
@@ -51,7 +55,9 @@ public class RoomDto extends PageDto implements Serializable {
     private String idCard;
     private String link;
     private String roomType;
-
+    private String roomSubType;
+    private String roomRent;
+    private String roomArea;
 
     private String state;
     private String[] states;
@@ -326,4 +332,28 @@ public class RoomDto extends PageDto implements Serializable {
     public void setLayers(String[] layers) {
         this.layers = layers;
     }
+
+    public String getRoomSubType() {
+        return roomSubType;
+    }
+
+    public void setRoomSubType(String roomSubType) {
+        this.roomSubType = roomSubType;
+    }
+
+    public String getRoomRent() {
+        return roomRent;
+    }
+
+    public void setRoomRent(String roomRent) {
+        this.roomRent = roomRent;
+    }
+
+    public String getRoomArea() {
+        return roomArea;
+    }
+
+    public void setRoomArea(String roomArea) {
+        this.roomArea = roomArea;
+    }
 }

java110-bean/src/main/java/com/java110/po/room/RoomPo.java

@@ -27,6 +27,9 @@ public class RoomPo implements Serializable {
     private String communityId;
     private String roomType;
     private String statusCd;
+    private String roomSubType;
+    private String roomRent;
+    private String roomArea;
 
 
     public String getRoomId() {
@@ -141,4 +144,28 @@ public class RoomPo implements Serializable {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getRoomSubType() {
+        return roomSubType;
+    }
+
+    public void setRoomSubType(String roomSubType) {
+        this.roomSubType = roomSubType;
+    }
+
+    public String getRoomRent() {
+        return roomRent;
+    }
+
+    public void setRoomRent(String roomRent) {
+        this.roomRent = roomRent;
+    }
+
+    public String getRoomArea() {
+        return roomArea;
+    }
+
+    public void setRoomArea(String roomArea) {
+        this.roomArea = roomArea;
+    }
 }

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

@@ -8,10 +8,10 @@
     <insert id="saveBusinessRoomInfo" parameterType="Map">
         insert into business_building_room(
         fee_coefficient,section,remark,user_id,room_id,layer,built_up_area,operate,room_num,unit_id,b_id,apartment,state,community_id,
-        room_type
+        room_type,room_sub_type,room_rent,room_area
         ) values (
         #{feeCoefficient},#{section},#{remark},#{userId},#{roomId},#{layer},#{builtUpArea},#{operate},#{roomNum},#{unitId},#{bId},#{apartment},#{state},
-        #{communityId},#{roomType}
+        #{communityId},#{roomType},#{roomSubType},#{roomRent},#{roomArea}
         )
     </insert>
 
@@ -22,7 +22,7 @@
         userId,t.room_id,t.room_id
         roomId,t.layer,t.built_up_area,t.built_up_area builtUpArea,t.operate,t.room_num,t.room_num
         roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,t.community_id,t.community_id
-        communityId,t.room_type,t.room_type roomType
+        communityId,t.room_type,t.room_type roomType,t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type roomSubType,t.room_rent roomRent,t.room_area roomArea
         from business_building_room t
         where 1 =1
         <if test="feeCoefficient !=null and feeCoefficient != ''">
@@ -67,6 +67,9 @@
         <if test="roomType !=null and roomType != ''">
             and t.room_type= #{roomType}
         </if>
+        <if test="roomSubType !=null and roomSubType != ''">
+            and t.room_sub_type= #{roomSubType}
+        </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
@@ -78,10 +81,10 @@
     <insert id="saveRoomInfoInstance" parameterType="Map">
         insert into building_room(
         fee_coefficient,section,status_cd,remark,user_id,room_id,layer,built_up_area,room_num,unit_id,b_id,apartment,state,community_id,
-        room_type
+        room_type,room_sub_type,room_rent,room_area
         ) select
         t.fee_coefficient,t.section,'0',t.remark,t.user_id,t.room_id,t.layer,t.built_up_area,t.room_num,t.unit_id,t.b_id,t.apartment,t.state,t.community_id,
-        t.room_type
+        t.room_type,t.room_sub_type,t.room_rent,t.room_area
         from business_building_room t where 1=1
         <if test="feeCoefficient !=null and feeCoefficient != ''">
             and t.fee_coefficient= #{feeCoefficient}
@@ -123,6 +126,9 @@
         <if test="roomType !=null and roomType != ''">
             and t.room_type= #{roomType}
         </if>
+        <if test="roomSubType !=null and roomSubType != ''">
+            and t.room_sub_type= #{roomSubType}
+        </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
@@ -135,7 +141,8 @@
         select t.fee_coefficient,t.fee_coefficient feeCoefficient,t.section,t.status_cd,t.status_cd
         statusCd,t.remark,t.user_id,t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area
         builtUpArea,t.room_num,t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id
-        bId,t.apartment,t.state,t.community_id,t.community_id communityId,t.room_type,t.room_type roomType
+        bId,t.apartment,t.state,t.community_id,t.community_id communityId,t.room_type,t.room_type roomType,
+        t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type roomSubType,t.room_rent roomRent,t.room_area roomArea
         from building_room t
         where 1 =1
         <if test="feeCoefficient !=null and feeCoefficient != ''">
@@ -187,6 +194,9 @@
         <if test="roomType !=null and roomType != ''">
             and t.room_type= #{roomType}
         </if>
+        <if test="roomSubType !=null and roomSubType != ''">
+            and t.room_sub_type= #{roomSubType}
+        </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
@@ -235,6 +245,15 @@
         <if test="state !=null and state != ''">
             , t.state= #{state}
         </if>
+        <if test="roomSubType !=null and roomSubType != ''">
+            , t.room_sub_type= #{roomSubType}
+        </if>
+        <if test="roomRent !=null and roomRent != ''">
+            , t.room_rent= #{roomRent}
+        </if>
+        <if test="roomArea !=null and roomArea != ''">
+            , t.room_area= #{roomArea}
+        </if>
         where 1=1
         <if test="roomId !=null and roomId != ''">
             and t.room_id= #{roomId}
@@ -298,6 +317,10 @@
         <if test="roomType !=null and roomType != ''">
             and t.room_type= #{roomType}
         </if>
+        <if test="roomSubType !=null and roomSubType != ''">
+            and t.room_sub_type= #{roomSubType}
+        </if>
+
 
 
     </select>
@@ -358,6 +381,9 @@
         <if test="roomType !=null and roomType != ''">
             and t.room_type= #{roomType}
         </if>
+        <if test="roomSubType !=null and roomSubType != ''">
+            and t.room_sub_type= #{roomSubType}
+        </if>
         <if test="states != null">
             and t.state in
             <foreach collection="states" item="item" open="(" close=")" separator=",">
@@ -435,6 +461,9 @@
         <if test="roomType !=null and roomType != ''">
             and t.room_type= #{roomType}
         </if>
+        <if test="roomSubType !=null and roomSubType != ''">
+            and t.room_sub_type= #{roomSubType}
+        </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
@@ -500,6 +529,9 @@
         <if test="roomType !=null and roomType != ''">
             and t.room_type= #{roomType}
         </if>
+        <if test="roomSubType !=null and roomSubType != ''">
+            and t.room_sub_type= #{roomSubType}
+        </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
@@ -514,7 +546,7 @@
         statusCd,t.remark,t.user_id,
         t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area builtUpArea,t.room_num,
         t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,u.`unit_num` unitNum,
-        t.room_type roomType,t.room_type
+        t.room_type roomType,t.room_type,t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type roomSubType,t.room_rent roomRent,t.room_area roomArea
         FROM
         building_room t
         INNER JOIN building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
@@ -568,6 +600,9 @@
         <if test="roomType !=null and roomType != ''">
             and t.room_type= #{roomType}
         </if>
+        <if test="roomSubType !=null and roomSubType != ''">
+            and t.room_sub_type= #{roomSubType}
+        </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
@@ -584,7 +619,7 @@
         statusCd,t.remark,t.user_id,
         t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area builtUpArea,t.room_num,
         t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,u.`unit_num` unitNum,
-        t.room_type roomType,t.room_type
+        t.room_type roomType,t.room_type,t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type roomSubType,t.room_rent roomRent,t.room_area roomArea
         FROM
         building_room t
         INNER JOIN building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
@@ -638,6 +673,9 @@
         <if test="roomType !=null and roomType != ''">
             and t.room_type= #{roomType}
         </if>
+        <if test="roomSubType !=null and roomSubType != ''">
+            and t.room_sub_type= #{roomSubType}
+        </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
@@ -657,6 +695,7 @@
         t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,u.`unit_num` unitNum,
         u.unit_id unitId,f.floor_id floorId,f.floor_num floorNum,f.floor_area floorArea,u.unit_area unitArea,td.name
         stateName,t.room_type roomType,t.room_type,t.`community_id` communityId
+        ,t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type roomSubType,t.room_rent roomRent,t.room_area roomArea
         FROM building_room t
         inner join building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
         inner JOIN f_floor f on u.`floor_id` = f.`floor_id` AND f.`community_id` = t.`community_id` AND f.`status_cd` =
@@ -726,6 +765,9 @@
         <if test="roomType !=null and roomType != ''">
             and t.room_type= #{roomType}
         </if>
+        <if test="roomSubType !=null and roomSubType != ''">
+            and t.room_sub_type= #{roomSubType}
+        </if>
         <if test="states != null">
             and t.state in
             <foreach collection="states" item="item" open="(" close=")" separator=",">
@@ -750,6 +792,7 @@
         t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area builtUpArea,t.room_num,
         t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,u.`unit_num`
         unitNum,f.`floor_num` floorNum,t.room_type roomType,t.room_type,f.floor_id floorId
+        ,t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type roomSubType,t.room_rent roomRent,t.room_area roomArea
         FROM
         building_owner bo,building_room t,building_owner_room_rel borr,building_unit u,f_floor f
         WHERE
@@ -765,6 +808,9 @@
         <if test="roomType !=null and roomType != ''">
             and t.room_type= #{roomType}
         </if>
+        <if test="roomSubType !=null and roomSubType != ''">
+            and t.room_sub_type= #{roomSubType}
+        </if>
         <if test="statusCd !=null and statusCd != ''">
             and borr.`status_cd` = #{statusCd}
         </if>
@@ -811,6 +857,7 @@
         t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area builtUpArea,t.room_num,
         t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,u.`unit_num` unitNum,
         t.room_type roomType,t.room_type,f.floor_num floorNum
+        ,t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type roomSubType,t.room_rent roomRent,t.room_area roomArea
         FROM
         building_room t
         INNER JOIN building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
@@ -847,6 +894,9 @@
         <if test="roomType !=null and roomType != ''">
             and t.room_type= #{roomType}
         </if>
+        <if test="roomSubType !=null and roomSubType != ''">
+            and t.room_sub_type= #{roomSubType}
+        </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>

service-api/src/main/java/com/java110/api/listener/room/SaveRoomListener.java

@@ -63,6 +63,18 @@ public class SaveRoomListener extends AbstractServiceApiPlusListener {
         Assert.isMoney(reqJson.getString("builtUpArea"), "建筑面积数据格式错误");
         Assert.isMoney(reqJson.getString("feeCoefficient"), "房屋单价数据格式错误");
 
+        if (!reqJson.containsKey("roomSubType")) {
+            reqJson.put("roomSubType", RoomDto.ROOM_SUB_TYPE_PERSON);
+        }
+
+        if (!reqJson.containsKey("roomRent")) {
+            reqJson.put("roomRent", "0");
+        }
+
+        if (!reqJson.containsKey("roomArea")) {
+            reqJson.put("roomRent", reqJson.getString("builtUpArea"));
+        }
+
         /*if (!"1010".equals(reqJson.getString("apartment")) && !"2020".equals(reqJson.getString("apartment"))) {
             throw new IllegalArgumentException("不是有效房屋户型 传入数据错误");
         }*/

service-api/src/main/java/com/java110/api/listener/room/SaveShopsListener.java

@@ -79,6 +79,18 @@ public class SaveShopsListener extends AbstractServiceApiPlusListener {
         Assert.isMoney(reqJson.getString("builtUpArea"), "建筑面积数据格式错误");
         Assert.isMoney(reqJson.getString("feeCoefficient"), "房屋单价数据格式错误");
 
+        if (!reqJson.containsKey("roomSubType")) {
+            reqJson.put("roomSubType", RoomDto.ROOM_SUB_TYPE_WORK);
+        }
+
+        if (!reqJson.containsKey("roomRent")) {
+            reqJson.put("roomRent", "0");
+        }
+
+        if (!reqJson.containsKey("roomArea")) {
+            reqJson.put("roomRent", reqJson.getString("builtUpArea"));
+        }
+
     }
 
     @Override

service-community/src/main/java/com/java110/community/listener/room/AbstractRoomBusinessServiceDataFlowListener.java

@@ -51,6 +51,9 @@ public abstract class AbstractRoomBusinessServiceDataFlowListener extends Abstra
         businessRoomInfo.put("apartment", businessRoomInfo.get("apartment"));
         businessRoomInfo.put("communityId", businessRoomInfo.get("community_id"));
         businessRoomInfo.put("roomType", businessRoomInfo.get("room_type"));
+        businessRoomInfo.put("roomSubType", businessRoomInfo.get("room_sub_type"));
+        businessRoomInfo.put("roomRent", businessRoomInfo.get("room_rent"));
+        businessRoomInfo.put("roomArea", businessRoomInfo.get("room_area"));
         businessRoomInfo.remove("bId");
         businessRoomInfo.put("statusCd", statusCd);
     }
@@ -89,6 +92,9 @@ public abstract class AbstractRoomBusinessServiceDataFlowListener extends Abstra
         currentRoomInfo.put("apartment", currentRoomInfo.get("apartment"));
         currentRoomInfo.put("communityId", currentRoomInfo.get("community_id"));
         currentRoomInfo.put("roomType", currentRoomInfo.get("room_type"));
+        currentRoomInfo.put("roomSubType", currentRoomInfo.get("room_sub_type"));
+        currentRoomInfo.put("roomRent", currentRoomInfo.get("room_rent"));
+        currentRoomInfo.put("roomArea", currentRoomInfo.get("room_area"));
 
         currentRoomInfo.put("operate", StatusConstant.OPERATE_DEL);
         getRoomServiceDaoImpl().saveBusinessRoomInfo(currentRoomInfo);