楼栋和单元加入 面积信息

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

@@ -28,6 +28,8 @@ public class UnitDto extends PageDto implements Serializable {
      */
     private String unitNum;
 
+    private String unitArea;
+
     /**
      * 名称
      */
@@ -141,4 +143,12 @@ public class UnitDto extends PageDto implements Serializable {
     public void setUnitIds(String[] unitIds) {
         this.unitIds = unitIds;
     }
+
+    public String getUnitArea() {
+        return unitArea;
+    }
+
+    public void setUnitArea(String unitArea) {
+        this.unitArea = unitArea;
+    }
 }

java110-bean/src/main/java/com/java110/po/unit/UnitPo.java

@@ -19,6 +19,7 @@ public class UnitPo implements Serializable {
     private String lift;
     private String userId;
     private String remark;
+    private String unitArea;
 
     public String getUnitId() {
         return unitId;
@@ -75,4 +76,12 @@ public class UnitPo implements Serializable {
     public void setRemark(String remark) {
         this.remark = remark;
     }
+
+    public String getUnitArea() {
+        return unitArea;
+    }
+
+    public void setUnitArea(String unitArea) {
+        this.unitArea = unitArea;
+    }
 }

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

@@ -33,6 +33,8 @@ public class ApiUnitVo implements Serializable {
     //备注
     private String remark;
 
+    private String unitArea;
+
     //创建时间
     private String createTime;
 
@@ -100,4 +102,12 @@ public class ApiUnitVo implements Serializable {
     public void setCreateTime(String createTime) {
         this.createTime = createTime;
     }
+
+    public String getUnitArea() {
+        return unitArea;
+    }
+
+    public void setUnitArea(String unitArea) {
+        this.unitArea = unitArea;
+    }
 }

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

@@ -7,9 +7,9 @@
     <!-- 保存小区单元信息 add by wuxw 2018-07-03 -->
     <insert id="saveBusinessUnitInfo" parameterType="Map">
         insert into business_building_unit(
-        floor_id,operate,layer_count,unit_id,unit_num,lift,remark,b_id,user_id
+        floor_id,operate,layer_count,unit_id,unit_num,lift,remark,b_id,user_id,unit_area
         ) values (
-        #{floorId},#{operate},#{layerCount},#{unitId},#{unitNum},#{lift},#{remark},#{bId},#{userId}
+        #{floorId},#{operate},#{layerCount},#{unitId},#{unitNum},#{lift},#{remark},#{bId},#{userId},#{unitArea}
         )
     </insert>
 
@@ -17,7 +17,8 @@
     <!-- 查询小区单元信息（Business） add by wuxw 2018-07-03 -->
     <select id="getBusinessUnitInfo" parameterType="Map" resultType="Map">
         select t.floor_id,t.floor_id floorId,t.operate,t.layer_count,t.layer_count layerCount,t.unit_id,t.unit_id
-        unitId,t.unit_num,t.unit_num unitNum,t.lift,t.remark,t.b_id,t.b_id bId,t.user_id,t.user_id userId
+        unitId,t.unit_num,t.unit_num unitNum,t.lift,t.remark,t.b_id,t.b_id bId,t.user_id,t.user_id userId,
+        t.unit_area,t.unit_area unitArea
         from business_building_unit t
         where 1 =1
         <if test="floorId !=null and floorId != ''">
@@ -55,8 +56,9 @@
     <!-- 保存小区单元信息至 instance表中 add by wuxw 2018-07-03 -->
     <insert id="saveUnitInfoInstance" parameterType="Map">
         insert into building_unit(
-        floor_id,layer_count,unit_id,unit_num,lift,status_cd,remark,b_id,user_id
-        ) select t.floor_id,t.layer_count,t.unit_id,t.unit_num,t.lift,'0',t.remark,t.b_id,t.user_id from
+        floor_id,layer_count,unit_id,unit_num,lift,status_cd,remark,b_id,user_id,unit_area
+        ) select t.floor_id,t.layer_count,t.unit_id,t.unit_num,t.lift,'0',t.remark,t.b_id,t.user_id,t.unit_area
+        from
         business_building_unit t where 1=1
         <if test="floorId !=null and floorId != ''">
             and t.floor_id= #{floorId}
@@ -91,7 +93,7 @@
     <select id="getUnitInfo" parameterType="Map" resultType="Map">
         select t.floor_id,t.floor_id floorId,t.layer_count,t.layer_count layerCount,t.unit_id,t.unit_id
         unitId,t.unit_num,t.unit_num unitNum,t.lift,t.status_cd,t.status_cd statusCd,t.remark,t.b_id,t.b_id
-        bId,t.user_id,t.user_id userId
+        bId,t.user_id,t.user_id userId,t.unit_area,t.unit_area unitArea
         from building_unit t
         <if test="communityId!=null and communityId != ''">
             ,f_floor ff
@@ -158,6 +160,9 @@
         <if test="remark !=null and remark != ''">
             , t.remark= #{remark}
         </if>
+        <if test="unitArea !=null and unitArea != ''">
+            , t.unit_area= #{unitArea}
+        </if>
         <if test="userId !=null and userId != ''">
             , t.user_id= #{userId}
         </if>
@@ -210,7 +215,7 @@
     <select id="queryUnitsByCommunityId" parameterType="Map" resultType="Map">
         select t.floor_id,t.floor_id floorId,t.layer_count,t.layer_count layerCount,t.unit_id,t.unit_id
         unitId,t.unit_num,t.unit_num unitNum,t.lift,t.status_cd,t.status_cd statusCd,t.remark,t.b_id,t.b_id
-        bId,t.user_id,t.user_id userId
+        bId,t.user_id,t.user_id userId,t.unit_area,t.unit_area unitArea
         from building_unit t,f_floor f
         where 1 =1
         and t.floor_id = f.floor_id

service-api/src/main/java/com/java110/api/bmo/floor/impl/FloorBMOImpl.java

@@ -83,6 +83,7 @@ public class FloorBMOImpl extends ApiBaseBMO implements IFloorBMO {
         businessFloor.put("userId", paramInJson.getString("userId"));
         businessFloor.put("floorNum", paramInJson.getString("floorNum"));
         businessFloor.put("communityId", paramInJson.getString("communityId"));
+        businessFloor.put("floorArea", paramInJson.getString("floorArea"));
 
         FloorPo floorPo = BeanConvertUtil.covertBean(businessFloor, FloorPo.class);
         super.update(context, floorPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_FLOOR_INFO);
@@ -103,6 +104,7 @@ public class FloorBMOImpl extends ApiBaseBMO implements IFloorBMO {
         businessFloor.put("userId", paramInJson.getString("userId"));
         businessFloor.put("floorNum", paramInJson.getString("floorNum"));
         businessFloor.put("communityId", paramInJson.getString("communityId"));
+        businessFloor.put("floorArea", paramInJson.getString("floorArea"));
         FloorPo floorPo = BeanConvertUtil.covertBean(businessFloor, FloorPo.class);
         super.insert(context, floorPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FLOOR_INFO);
     }

service-api/src/main/java/com/java110/api/bmo/unit/impl/UnitBMOImpl.java

@@ -52,6 +52,7 @@ public class UnitBMOImpl extends ApiBaseBMO implements IUnitBMO {
         businessUnit.put("unitNum", paramInJson.getString("unitNum"));
         businessUnit.put("lift", paramInJson.getString("lift"));
         businessUnit.put("remark", paramInJson.getString("remark"));
+        businessUnit.put("unitArea", paramInJson.getString("unitArea"));
         businessUnit.put("userId", dataFlowContext.getRequestCurrentHeaders().get(CommonConstant.HTTP_USER_ID));
         UnitPo unitPo = BeanConvertUtil.covertBean(businessUnit, UnitPo.class);
 
@@ -74,6 +75,7 @@ public class UnitBMOImpl extends ApiBaseBMO implements IUnitBMO {
         businessUnit.put("unitNum", paramInJson.getString("unitNum"));
         businessUnit.put("lift", paramInJson.getString("lift"));
         businessUnit.put("remark", paramInJson.getString("remark"));
+        businessUnit.put("unitArea", paramInJson.getString("unitArea"));
         businessUnit.put("userId", dataFlowContext.getRequestCurrentHeaders().get(CommonConstant.HTTP_USER_ID));
         UnitPo unitPo = BeanConvertUtil.covertBean(businessUnit, UnitPo.class);
 

service-community/src/main/java/com/java110/community/listener/unit/AbstractUnitBusinessServiceDataFlowListener.java

@@ -45,6 +45,7 @@ public abstract class AbstractUnitBusinessServiceDataFlowListener extends Abstra
         businessUnitInfo.put("lift", businessUnitInfo.get("lift"));
         businessUnitInfo.put("remark", businessUnitInfo.get("remark"));
         businessUnitInfo.put("userId", businessUnitInfo.get("user_id"));
+        businessUnitInfo.put("unitArea", businessUnitInfo.get("unit_area"));
         //删除bId
         businessUnitInfo.remove("bId");
 
@@ -79,6 +80,7 @@ public abstract class AbstractUnitBusinessServiceDataFlowListener extends Abstra
         currentUnitInfo.put("lift", currentUnitInfo.get("lift"));
         currentUnitInfo.put("remark", currentUnitInfo.get("remark"));
         currentUnitInfo.put("userId", currentUnitInfo.get("user_id"));
+        currentUnitInfo.put("unitArea", currentUnitInfo.get("unit_area"));
 
 
         currentUnitInfo.put("operate", StatusConstant.OPERATE_DEL);