加入 房屋算费系数

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

@@ -18,7 +18,7 @@ public class RoomDto extends PageDto implements Serializable {
     public static final String STATE_FREE = "2002";
 
 
-    private String unitPrice;
+    private String feeCoefficient;
     private String section;
     private String remark;
     private String userId;
@@ -51,12 +51,12 @@ public class RoomDto extends PageDto implements Serializable {
     private String statusCd = "0";
 
 
-    public String getUnitPrice() {
-        return unitPrice;
+    public String getFeeCoefficient() {
+        return feeCoefficient;
     }
 
-    public void setUnitPrice(String unitPrice) {
-        this.unitPrice = unitPrice;
+    public void setFeeCoefficient(String feeCoefficient) {
+        this.feeCoefficient = feeCoefficient;
     }
 
     public String getSection() {

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

@@ -20,7 +20,7 @@ public class RoomPo implements Serializable {
     private String section;
     private String apartment;
     private String builtUpArea;
-    private String unitPrice;
+    private String feeCoefficient;
     private String userId;
     private String remark;
     private String state;
@@ -83,13 +83,7 @@ public class RoomPo implements Serializable {
         this.builtUpArea = builtUpArea;
     }
 
-    public String getUnitPrice() {
-        return unitPrice;
-    }
 
-    public void setUnitPrice(String unitPrice) {
-        this.unitPrice = unitPrice;
-    }
 
     public String getUserId() {
         return userId;
@@ -122,4 +116,12 @@ public class RoomPo implements Serializable {
     public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
+
+    public String getFeeCoefficient() {
+        return feeCoefficient;
+    }
+
+    public void setFeeCoefficient(String feeCoefficient) {
+        this.feeCoefficient = feeCoefficient;
+    }
 }

java110-bean/src/main/java/com/java110/vo/api/ApiRoomDataVo.java

@@ -15,7 +15,7 @@ import java.util.List;
  **/
 public class ApiRoomDataVo implements Serializable {
 
-    private String unitPrice;
+    private String feeCoefficient;
     private String section;
     private String remark;
     private String userName;
@@ -39,13 +39,12 @@ public class ApiRoomDataVo implements Serializable {
     private List<RoomAttrDto> roomAttrDto;
 
 
-
-    public String getUnitPrice() {
-        return unitPrice;
+    public String getFeeCoefficient() {
+        return feeCoefficient;
     }
 
-    public void setUnitPrice(String unitPrice) {
-        this.unitPrice = unitPrice;
+    public void setFeeCoefficient(String feeCoefficient) {
+        this.feeCoefficient = feeCoefficient;
     }
 
     public String getSection() {

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

@@ -7,9 +7,9 @@
     <!-- 保存小区房屋信息 add by wuxw 2018-07-03 -->
     <insert id="saveBusinessRoomInfo" parameterType="Map">
         insert into business_building_room(
-        unit_price,section,remark,user_id,room_id,layer,built_up_area,operate,room_num,unit_id,b_id,apartment,state,community_id
+        fee_coefficient,section,remark,user_id,room_id,layer,built_up_area,operate,room_num,unit_id,b_id,apartment,state,community_id
         ) values (
-        #{unitPrice},#{section},#{remark},#{userId},#{roomId},#{layer},#{builtUpArea},#{operate},#{roomNum},#{unitId},#{bId},#{apartment},#{state},
+        #{feeCoefficient},#{section},#{remark},#{userId},#{roomId},#{layer},#{builtUpArea},#{operate},#{roomNum},#{unitId},#{bId},#{apartment},#{state},
         #{communityId}
         )
     </insert>
@@ -17,14 +17,14 @@
 
     <!-- 查询小区房屋信息（Business） add by wuxw 2018-07-03 -->
     <select id="getBusinessRoomInfo" parameterType="Map" resultType="Map">
-        select t.unit_price,t.unit_price unitPrice,t.section,t.remark,t.user_id,t.user_id userId,t.room_id,t.room_id
+        select t.fee_coefficient,t.fee_coefficient feeCoefficient,t.section,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.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
         from business_building_room t
         where 1 =1
-        <if test="unitPrice !=null and unitPrice != ''">
-            and t.unit_price= #{unitPrice}
+        <if test="feeCoefficient !=null and feeCoefficient != ''">
+            and t.fee_coefficient= #{feeCoefficient}
         </if>
         <if test="section !=null and section != ''">
             and t.section= #{section}
@@ -72,12 +72,12 @@
     <!-- 保存小区房屋信息至 instance表中 add by wuxw 2018-07-03 -->
     <insert id="saveRoomInfoInstance" parameterType="Map">
         insert into building_room(
-        unit_price,section,status_cd,remark,user_id,room_id,layer,built_up_area,room_num,unit_id,b_id,apartment,state,community_id
+        fee_coefficient,section,status_cd,remark,user_id,room_id,layer,built_up_area,room_num,unit_id,b_id,apartment,state,community_id
         ) select
-        t.unit_price,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.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
         from business_building_room t where 1=1
-        <if test="unitPrice !=null and unitPrice != ''">
-            and t.unit_price= #{unitPrice}
+        <if test="feeCoefficient !=null and feeCoefficient != ''">
+            and t.fee_coefficient= #{feeCoefficient}
         </if>
         <if test="section !=null and section != ''">
             and t.section= #{section}
@@ -122,14 +122,14 @@
 
     <!-- 查询小区房屋信息 add by wuxw 2018-07-03 -->
     <select id="getRoomInfo" parameterType="Map" resultType="Map">
-        select t.unit_price,t.unit_price unitPrice,t.section,t.status_cd,t.status_cd
+        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
         from building_room t
         where 1 =1
-        <if test="unitPrice !=null and unitPrice != ''">
-            and t.unit_price= #{unitPrice}
+        <if test="feeCoefficient !=null and feeCoefficient != ''">
+            and t.fee_coefficient= #{feeCoefficient}
         </if>
         <if test="section !=null and section != ''">
             and t.section= #{section}
@@ -192,8 +192,8 @@
         <if test="newBId != null and newBId != ''">
             ,t.b_id = #{newBId}
         </if>
-        <if test="unitPrice !=null and unitPrice != ''">
-            , t.unit_price= #{unitPrice}
+        <if test="feeCoefficient !=null and feeCoefficient != ''">
+            , t.fee_coefficient= #{feeCoefficient}
         </if>
         <if test="section !=null and section != ''">
             , t.section= #{section}
@@ -240,8 +240,8 @@
         select count(1) count
         from building_room t
         where 1 =1
-        <if test="unitPrice !=null and unitPrice != ''">
-            and t.unit_price= #{unitPrice}
+        <if test="feeCoefficient !=null and feeCoefficient != ''">
+            and t.fee_coefficient= #{feeCoefficient}
         </if>
         <if test="section !=null and section != ''">
             and t.section= #{section}
@@ -301,8 +301,8 @@
         <if test="floorId !=null and floorId != ''">
             and f.`floor_id`= #{floorId}
         </if>
-        <if test="unitPrice !=null and unitPrice != ''">
-            and t.unit_price= #{unitPrice}
+        <if test="feeCoefficient !=null and feeCoefficient != ''">
+            and t.fee_coefficient= #{feeCoefficient}
         </if>
         <if test="section !=null and section != ''">
             and t.section= #{section}
@@ -361,8 +361,8 @@
         <if test="floorId !=null and floorId != ''">
             and f.`floor_id`= #{floorId}
         </if>
-        <if test="unitPrice !=null and unitPrice != ''">
-            and t.unit_price= #{unitPrice}
+        <if test="feeCoefficient !=null and feeCoefficient != ''">
+            and t.fee_coefficient= #{feeCoefficient}
         </if>
         <if test="section !=null and section != ''">
             and t.section= #{section}
@@ -422,8 +422,8 @@
         <if test="floorId !=null and floorId != ''">
             and f.`floor_id`= #{floorId}
         </if>
-        <if test="unitPrice !=null and unitPrice != ''">
-            and t.unit_price= #{unitPrice}
+        <if test="feeCoefficient !=null and feeCoefficient != ''">
+            and t.fee_coefficient= #{feeCoefficient}
         </if>
         <if test="section !=null and section != ''">
             and t.section= #{section}
@@ -471,7 +471,7 @@
 
     <!-- 查询小区房屋信息 add by wuxw 2018-07-03 -->
     <select id="getRoomInfoWithOutSellByCommunityId" parameterType="Map" resultType="Map">
-        SELECT t.unit_price,t.unit_price unitPrice,t.section,t.status_cd,t.status_cd statusCd,t.remark,t.user_id,
+        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,u.`unit_num` unitNum
         FROM
@@ -484,8 +484,8 @@
         <if test="floorId !=null and floorId != ''">
             and f.`floor_id`= #{floorId}
         </if>
-        <if test="unitPrice !=null and unitPrice != ''">
-            and t.unit_price= #{unitPrice}
+        <if test="feeCoefficient !=null and feeCoefficient != ''">
+            and t.fee_coefficient= #{feeCoefficient}
         </if>
         <if test="section !=null and section != ''">
             and t.section= #{section}
@@ -535,7 +535,7 @@
 
     <!-- 查询小区房屋信息 add by wuxw 2018-07-03 -->
     <select id="getRoomInfoWithSellByCommunityId" parameterType="Map" resultType="Map">
-        SELECT t.unit_price,t.unit_price unitPrice,t.section,t.status_cd,t.status_cd statusCd,t.remark,t.user_id,
+        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,u.`unit_num` unitNum
         FROM
@@ -548,8 +548,8 @@
         <if test="floorId !=null and floorId != ''">
             and f.`floor_id`= #{floorId}
         </if>
-        <if test="unitPrice !=null and unitPrice != ''">
-            and t.unit_price= #{unitPrice}
+        <if test="feeCoefficient !=null and feeCoefficient != ''">
+            and t.fee_coefficient= #{feeCoefficient}
         </if>
         <if test="section !=null and section != ''">
             and t.section= #{section}
@@ -600,7 +600,7 @@
 
     <!-- 查询小区房屋信息 add by wuxw 2018-07-03 -->
     <select id="getRoomInfoByCommunityId" parameterType="Map" resultType="Map">
-        SELECT t.unit_price,t.unit_price unitPrice,t.section,t.status_cd,t.status_cd statusCd,t.remark,t.user_id,
+        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,u.`unit_num` unitNum,
         u.unit_id unitId,f.floor_id floorId,f.floor_num floorNum
@@ -618,8 +618,8 @@
         <if test="floorNum !=null and floorNum != ''">
             and f.`floor_num`= #{floorNum}
         </if>
-        <if test="unitPrice !=null and unitPrice != ''">
-            and t.unit_price= #{unitPrice}
+        <if test="feeCoefficient !=null and feeCoefficient != ''">
+            and t.fee_coefficient= #{feeCoefficient}
         </if>
         <if test="section !=null and section != ''">
             and t.section= #{section}
@@ -678,7 +678,7 @@
     <!-- 根据业主查询房屋信息 -->
     <select id="getRoomInfoByOwner" parameterType="Map" resultType="Map">
         SELECT
-        t.unit_price,t.unit_price unitPrice,t.section,t.status_cd,t.status_cd statusCd,t.remark,t.user_id,
+        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,u.`unit_num`
         unitNum,f.`floor_num` floorNum
@@ -733,7 +733,7 @@
 
     <!-- 查询小区房屋信息 add by wuxw 2018-07-03 -->
     <select id="getRoomInfos" parameterType="Map" resultType="Map">
-        SELECT t.unit_price,t.unit_price unitPrice,t.section,t.status_cd,t.status_cd statusCd,t.remark,t.user_id,
+        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,u.`unit_num` unitNum
         FROM

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

@@ -38,7 +38,7 @@ public class BindingAddRoomBindingListener extends AbstractServiceApiPlusListene
         Assert.hasKeyByFlowData(infos, "addRoomView", "section", "必填，请填写房屋楼层");
         Assert.hasKeyByFlowData(infos, "addRoomView", "apartment", "必填，请选择房屋户型");
         Assert.hasKeyByFlowData(infos, "addRoomView", "builtUpArea", "必填，请填写房屋建筑面积");
-        Assert.hasKeyByFlowData(infos, "addRoomView", "unitPrice", "必填，请填写房屋每平米单价");
+        Assert.hasKeyByFlowData(infos, "addRoomView", "feeCoefficient", "必填，请填写房屋每平米单价");
         Assert.hasKeyByFlowData(infos, "addRoomView", "state", "必填，请选择房屋状态");
 
         JSONObject addRoomView = null;

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

@@ -56,11 +56,11 @@ public class SaveRoomListener extends AbstractServiceApiPlusListener {
         Assert.jsonObjectHaveKey(reqJson, "apartment", "请求报文中未包含apartment节点");
         Assert.jsonObjectHaveKey(reqJson, "state", "请求报文中未包含state节点");
         Assert.jsonObjectHaveKey(reqJson, "builtUpArea", "请求报文中未包含builtUpArea节点");
-        Assert.jsonObjectHaveKey(reqJson, "unitPrice", "请求报文中未包含unitPrice节点");
+        Assert.jsonObjectHaveKey(reqJson, "feeCoefficient", "请求报文中未包含feeCoefficient节点");
 
         Assert.isInteger(reqJson.getString("section"), "房间数不是有效数字");
         Assert.isMoney(reqJson.getString("builtUpArea"), "建筑面积数据格式错误");
-        Assert.isMoney(reqJson.getString("unitPrice"), "房屋单价数据格式错误");
+        Assert.isMoney(reqJson.getString("feeCoefficient"), "房屋单价数据格式错误");
 
         /*if (!"1010".equals(reqJson.getString("apartment")) && !"2020".equals(reqJson.getString("apartment"))) {
             throw new IllegalArgumentException("不是有效房屋户型 传入数据错误");

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

@@ -59,11 +59,11 @@ public class UpdateRoomListener extends AbstractServiceApiPlusListener {
         Assert.jsonObjectHaveKey(reqJson, "apartment", "请求报文中未包含apartment节点");
         Assert.jsonObjectHaveKey(reqJson, "builtUpArea", "请求报文中未包含builtUpArea节点");
         Assert.jsonObjectHaveKey(reqJson, "state", "请求报文中未包含state节点");
-        /* Assert.jsonObjectHaveKey(paramIn, "unitPrice", "请求报文中未包含unitPrice节点");*/
+        /* Assert.jsonObjectHaveKey(paramIn, "feeCoefficient", "请求报文中未包含feeCoefficient节点");*/
 
         Assert.isInteger(reqJson.getString("section"), "房间数不是有效数字");
         Assert.isMoney(reqJson.getString("builtUpArea"), "建筑面积数据格式错误");
-        Assert.isMoney(reqJson.getString("unitPrice"), "房屋单价数据格式错误");
+        Assert.isMoney(reqJson.getString("feeCoefficient"), "算费系数数据格式错误");
 
         /*if (!"1010".equals(reqJson.getString("apartment")) && !"2020".equals(reqJson.getString("apartment"))) {
             throw new IllegalArgumentException("不是有效房屋户型 传入数据错误");

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

@@ -37,7 +37,7 @@ public abstract class AbstractRoomBusinessServiceDataFlowListener extends Abstra
      */
     protected void flushBusinessRoomInfo(Map businessRoomInfo, String statusCd) {
         businessRoomInfo.put("newBId", businessRoomInfo.get("b_id"));
-        businessRoomInfo.put("unitPrice", businessRoomInfo.get("unit_price"));
+        businessRoomInfo.put("feeCoefficient", businessRoomInfo.get("fee_coefficient"));
         businessRoomInfo.put("section", businessRoomInfo.get("section"));
         businessRoomInfo.put("remark", businessRoomInfo.get("remark"));
         businessRoomInfo.put("userId", businessRoomInfo.get("user_id"));
@@ -74,7 +74,7 @@ public abstract class AbstractRoomBusinessServiceDataFlowListener extends Abstra
 
         currentRoomInfo.put("bId", business.getbId());
 
-        currentRoomInfo.put("unitPrice", currentRoomInfo.get("unit_price"));
+        currentRoomInfo.put("feeCoefficient", currentRoomInfo.get("fee_coefficient"));
         currentRoomInfo.put("section", currentRoomInfo.get("section"));
         currentRoomInfo.put("remark", currentRoomInfo.get("remark"));
         currentRoomInfo.put("userId", currentRoomInfo.get("user_id"));

service-front/src/main/java/com/java110/front/smo/assetImport/impl/AssetImportSMOImpl.java

@@ -296,7 +296,7 @@ public class AssetImportSMOImpl extends BaseComponentSMO implements IAssetImport
             paramIn.put("apartment", room.getSection());
             paramIn.put("state", "2002");
             paramIn.put("builtUpArea", room.getBuiltUpArea());
-            paramIn.put("unitPrice", "1000.00");
+            paramIn.put("fee_coefficient", "1.00");
 
 
             responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(), apiUrl, HttpMethod.POST);

service-front/src/main/java/com/java110/front/smo/impl/FrontFeeServiceSMOImpl.java

@@ -477,13 +477,13 @@ public class FrontFeeServiceSMOImpl extends BaseComponentSMO implements IFeeServ
         Assert.jsonObjectHaveKey(pd.getReqData(), "apartment", "请求报文中未包含apartment节点");
         Assert.jsonObjectHaveKey(pd.getReqData(), "builtUpArea", "请求报文中未包含builtUpArea节点");
         Assert.jsonObjectHaveKey(pd.getReqData(), "state", "请求报文中未包含state节点");
-        Assert.jsonObjectHaveKey(pd.getReqData(), "unitPrice", "请求报文中未包含unitPrice节点");
+        Assert.jsonObjectHaveKey(pd.getReqData(), "feeCoefficient", "请求报文中未包含feeCoefficient节点");
         JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
 
         Assert.hasLength(reqJson.getString("communityId"), "小区ID不能为空");
         Assert.isInteger(reqJson.getString("section"), "房间数不是有效数字");
         Assert.isMoney(reqJson.getString("builtUpArea"), "建筑面积数据格式错误");
-        Assert.isMoney(reqJson.getString("unitPrice"), "房屋单价数据格式错误");
+        Assert.isMoney(reqJson.getString("feeCoefficient"), "算费系数数据格式错误");
 
        /* if (!"1010".equals(reqJson.getString("apartment")) && !"2020".equals(reqJson.getString("apartment"))) {
             throw new IllegalArgumentException("不是有效房屋户型 传入数据错误");

service-front/src/main/java/com/java110/front/smo/impl/RoomServiceSMOImpl.java

@@ -436,7 +436,7 @@ public class RoomServiceSMOImpl extends BaseComponentSMO implements IRoomService
         Assert.hasLength(reqJson.getString("communityId"), "小区ID不能为空");
         Assert.isInteger(reqJson.getString("section"), "房间数不是有效数字");
         Assert.isMoney(reqJson.getString("builtUpArea"), "建筑面积数据格式错误");
-        Assert.isMoney(reqJson.getString("unitPrice"), "房屋单价数据格式错误");
+        Assert.isMoney(reqJson.getString("feeCoefficient"), "算费系数数据格式错误");
 
        /* if (!"1010".equals(reqJson.getString("apartment")) && !"2020".equals(reqJson.getString("apartment"))) {
             throw new IllegalArgumentException("不是有效房屋户型 传入数据错误");