房间管理

pro-base/src/main/java/com/idea/buildManage/controller/HouseTypeController.java

@@ -0,0 +1,29 @@
+package com.idea.buildManage.controller;
+
+import com.idea.buildManage.model.HouseType;
+import com.idea.buildManage.service.HouseTypeService;
+import com.rockstar.common.base.BaseController;
+import com.rockstar.frame.model.extend.DateTrans;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@Controller
+@RequestMapping(value = "HouseTypeController")
+@Api(tags = "户型库管理")
+public class HouseTypeController extends BaseController {
+
+    @Autowired
+    private HouseTypeService modelService;
+
+    @PostMapping(value = "listAll", produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public Object listAll(HouseType model, DateTrans dt) {
+        return modelService.listAll(model, dt);
+    }
+
+
+}

pro-base/src/main/java/com/idea/buildManage/controller/ParkRoomController.java

@@ -9,6 +9,7 @@ import com.rockstar.common.domain.AjaxResult;
 import com.rockstar.frame.model.extend.DateTrans;
 import com.rockstar.frame.model.extend.TableSplitResult;
 import com.rockstar.frame.model.extend.Tablepar;
+import com.rockstar.shiro.util.ShiroUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,6 +56,9 @@ public class ParkRoomController extends BaseController {
     @ResponseBody
     public AjaxResult add(ParkRoom record){
         record.setCreatedAt(new Date());
+        record.setCreatedId(ShiroUtils.getUserId());
+        // 默认待售
+        record.setSoldStatus(1);
         int result = modelService.insert(record);
         return result(result);
     }
@@ -71,6 +75,8 @@ public class ParkRoomController extends BaseController {
     @PostMapping(value = "edit",produces = {"application/json;charset=UTF-8"})
     @ResponseBody
     public AjaxResult editSave(ParkRoom model){
+        model.setUpdatedAt(new Date());
+        model.setUpdatedId(ShiroUtils.getUserId());
         int result = modelService.edit(model);
         return result(result);
     }
@@ -98,13 +104,6 @@ public class ParkRoomController extends BaseController {
         return success(modelService.excelList(model,null));
     }
 
-    @ApiOperation(value = "房间导出")
-    @PostMapping(value = "excellist",produces = {"application/json;charset=UTF-8"})
-    @ResponseBody
-    public Object excellist(ParkRoomResponse model, HttpServletResponse response){
-        return success(modelService.excelList(model));
-    }
-
 
     /**
      * 获取房屋面积

pro-base/src/main/java/com/idea/buildManage/model/ParkRoom.java

@@ -40,7 +40,7 @@ public class ParkRoom implements Serializable {
 
     private String houseTypeId;
 
-    private String planPicture;
+    private String houseTypePicture;
 
     private String createdId;
 
@@ -50,7 +50,9 @@ public class ParkRoom implements Serializable {
 
     private String updatedId;
 
-    private String state;
+    private Integer saleStatus;
+
+    private Integer soldStatus;
 
     private String twoPointTwo;
 
@@ -202,12 +204,12 @@ public class ParkRoom implements Serializable {
         this.houseTypeId = houseTypeId == null ? null : houseTypeId.trim();
     }
 
-    public String getPlanPicture() {
-        return planPicture;
+    public String getHouseTypePicture() {
+        return houseTypePicture;
     }
 
-    public void setPlanPicture(String planPicture) {
-        this.planPicture = planPicture == null ? null : planPicture.trim();
+    public void setHouseTypePicture(String houseTypePicture) {
+        this.houseTypePicture = houseTypePicture == null ? null : houseTypePicture.trim();
     }
 
     public String getCreatedId() {
@@ -242,12 +244,20 @@ public class ParkRoom implements Serializable {
         this.updatedId = updatedId == null ? null : updatedId.trim();
     }
 
-    public String getState() {
-        return state;
+    public Integer getSaleStatus() {
+        return saleStatus;
+    }
+
+    public void setSaleStatus(Integer saleStatus) {
+        this.saleStatus = saleStatus;
+    }
+
+    public Integer getSoldStatus() {
+        return soldStatus;
     }
 
-    public void setState(String state) {
-        this.state = state == null ? null : state.trim();
+    public void setSoldStatus(Integer soldStatus) {
+        this.soldStatus = soldStatus;
     }
 
     public String getTwoPointTwo() {

pro-base/src/main/java/com/idea/buildManage/model/ParkRoomExample.java

@@ -1265,73 +1265,73 @@ public class ParkRoomExample {
             return (Criteria) this;
         }
 
-        public Criteria andPlanPictureIsNull() {
-            addCriterion("plan_picture is null");
+        public Criteria andHouseTypePictureIsNull() {
+            addCriterion("house_type_picture is null");
             return (Criteria) this;
         }
 
-        public Criteria andPlanPictureIsNotNull() {
-            addCriterion("plan_picture is not null");
+        public Criteria andHouseTypePictureIsNotNull() {
+            addCriterion("house_type_picture is not null");
             return (Criteria) this;
         }
 
-        public Criteria andPlanPictureEqualTo(String value) {
-            addCriterion("plan_picture =", value, "planPicture");
+        public Criteria andHouseTypePictureEqualTo(String value) {
+            addCriterion("house_type_picture =", value, "houseTypePicture");
             return (Criteria) this;
         }
 
-        public Criteria andPlanPictureNotEqualTo(String value) {
-            addCriterion("plan_picture <>", value, "planPicture");
+        public Criteria andHouseTypePictureNotEqualTo(String value) {
+            addCriterion("house_type_picture <>", value, "houseTypePicture");
             return (Criteria) this;
         }
 
-        public Criteria andPlanPictureGreaterThan(String value) {
-            addCriterion("plan_picture >", value, "planPicture");
+        public Criteria andHouseTypePictureGreaterThan(String value) {
+            addCriterion("house_type_picture >", value, "houseTypePicture");
             return (Criteria) this;
         }
 
-        public Criteria andPlanPictureGreaterThanOrEqualTo(String value) {
-            addCriterion("plan_picture >=", value, "planPicture");
+        public Criteria andHouseTypePictureGreaterThanOrEqualTo(String value) {
+            addCriterion("house_type_picture >=", value, "houseTypePicture");
             return (Criteria) this;
         }
 
-        public Criteria andPlanPictureLessThan(String value) {
-            addCriterion("plan_picture <", value, "planPicture");
+        public Criteria andHouseTypePictureLessThan(String value) {
+            addCriterion("house_type_picture <", value, "houseTypePicture");
             return (Criteria) this;
         }
 
-        public Criteria andPlanPictureLessThanOrEqualTo(String value) {
-            addCriterion("plan_picture <=", value, "planPicture");
+        public Criteria andHouseTypePictureLessThanOrEqualTo(String value) {
+            addCriterion("house_type_picture <=", value, "houseTypePicture");
             return (Criteria) this;
         }
 
-        public Criteria andPlanPictureLike(String value) {
-            addCriterion("plan_picture like", value, "planPicture");
+        public Criteria andHouseTypePictureLike(String value) {
+            addCriterion("house_type_picture like", value, "houseTypePicture");
             return (Criteria) this;
         }
 
-        public Criteria andPlanPictureNotLike(String value) {
-            addCriterion("plan_picture not like", value, "planPicture");
+        public Criteria andHouseTypePictureNotLike(String value) {
+            addCriterion("house_type_picture not like", value, "houseTypePicture");
             return (Criteria) this;
         }
 
-        public Criteria andPlanPictureIn(List<String> values) {
-            addCriterion("plan_picture in", values, "planPicture");
+        public Criteria andHouseTypePictureIn(List<String> values) {
+            addCriterion("house_type_picture in", values, "houseTypePicture");
             return (Criteria) this;
         }
 
-        public Criteria andPlanPictureNotIn(List<String> values) {
-            addCriterion("plan_picture not in", values, "planPicture");
+        public Criteria andHouseTypePictureNotIn(List<String> values) {
+            addCriterion("house_type_picture not in", values, "houseTypePicture");
             return (Criteria) this;
         }
 
-        public Criteria andPlanPictureBetween(String value1, String value2) {
-            addCriterion("plan_picture between", value1, value2, "planPicture");
+        public Criteria andHouseTypePictureBetween(String value1, String value2) {
+            addCriterion("house_type_picture between", value1, value2, "houseTypePicture");
             return (Criteria) this;
         }
 
-        public Criteria andPlanPictureNotBetween(String value1, String value2) {
-            addCriterion("plan_picture not between", value1, value2, "planPicture");
+        public Criteria andHouseTypePictureNotBetween(String value1, String value2) {
+            addCriterion("house_type_picture not between", value1, value2, "houseTypePicture");
             return (Criteria) this;
         }
 
@@ -1595,73 +1595,123 @@ public class ParkRoomExample {
             return (Criteria) this;
         }
 
-        public Criteria andStateIsNull() {
-            addCriterion("state is null");
+        public Criteria andSaleStatusIsNull() {
+            addCriterion("sale_status is null");
             return (Criteria) this;
         }
 
-        public Criteria andStateIsNotNull() {
-            addCriterion("state is not null");
+        public Criteria andSaleStatusIsNotNull() {
+            addCriterion("sale_status is not null");
             return (Criteria) this;
         }
 
-        public Criteria andStateEqualTo(String value) {
-            addCriterion("state =", value, "state");
+        public Criteria andSaleStatusEqualTo(Integer value) {
+            addCriterion("sale_status =", value, "saleStatus");
             return (Criteria) this;
         }
 
-        public Criteria andStateNotEqualTo(String value) {
-            addCriterion("state <>", value, "state");
+        public Criteria andSaleStatusNotEqualTo(Integer value) {
+            addCriterion("sale_status <>", value, "saleStatus");
             return (Criteria) this;
         }
 
-        public Criteria andStateGreaterThan(String value) {
-            addCriterion("state >", value, "state");
+        public Criteria andSaleStatusGreaterThan(Integer value) {
+            addCriterion("sale_status >", value, "saleStatus");
             return (Criteria) this;
         }
 
-        public Criteria andStateGreaterThanOrEqualTo(String value) {
-            addCriterion("state >=", value, "state");
+        public Criteria andSaleStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("sale_status >=", value, "saleStatus");
             return (Criteria) this;
         }
 
-        public Criteria andStateLessThan(String value) {
-            addCriterion("state <", value, "state");
+        public Criteria andSaleStatusLessThan(Integer value) {
+            addCriterion("sale_status <", value, "saleStatus");
             return (Criteria) this;
         }
 
-        public Criteria andStateLessThanOrEqualTo(String value) {
-            addCriterion("state <=", value, "state");
+        public Criteria andSaleStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("sale_status <=", value, "saleStatus");
             return (Criteria) this;
         }
 
-        public Criteria andStateLike(String value) {
-            addCriterion("state like", value, "state");
+        public Criteria andSaleStatusIn(List<Integer> values) {
+            addCriterion("sale_status in", values, "saleStatus");
             return (Criteria) this;
         }
 
-        public Criteria andStateNotLike(String value) {
-            addCriterion("state not like", value, "state");
+        public Criteria andSaleStatusNotIn(List<Integer> values) {
+            addCriterion("sale_status not in", values, "saleStatus");
             return (Criteria) this;
         }
 
-        public Criteria andStateIn(List<String> values) {
-            addCriterion("state in", values, "state");
+        public Criteria andSaleStatusBetween(Integer value1, Integer value2) {
+            addCriterion("sale_status between", value1, value2, "saleStatus");
             return (Criteria) this;
         }
 
-        public Criteria andStateNotIn(List<String> values) {
-            addCriterion("state not in", values, "state");
+        public Criteria andSaleStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("sale_status not between", value1, value2, "saleStatus");
             return (Criteria) this;
         }
 
-        public Criteria andStateBetween(String value1, String value2) {
-            addCriterion("state between", value1, value2, "state");
+        public Criteria andSoldStatusIsNull() {
+            addCriterion("sold_status is null");
             return (Criteria) this;
         }
 
-        public Criteria andStateNotBetween(String value1, String value2) {
-            addCriterion("state not between", value1, value2, "state");
+        public Criteria andSoldStatusIsNotNull() {
+            addCriterion("sold_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSoldStatusEqualTo(Integer value) {
+            addCriterion("sold_status =", value, "soldStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andSoldStatusNotEqualTo(Integer value) {
+            addCriterion("sold_status <>", value, "soldStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andSoldStatusGreaterThan(Integer value) {
+            addCriterion("sold_status >", value, "soldStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andSoldStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("sold_status >=", value, "soldStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andSoldStatusLessThan(Integer value) {
+            addCriterion("sold_status <", value, "soldStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andSoldStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("sold_status <=", value, "soldStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andSoldStatusIn(List<Integer> values) {
+            addCriterion("sold_status in", values, "soldStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andSoldStatusNotIn(List<Integer> values) {
+            addCriterion("sold_status not in", values, "soldStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andSoldStatusBetween(Integer value1, Integer value2) {
+            addCriterion("sold_status between", value1, value2, "soldStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andSoldStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("sold_status not between", value1, value2, "soldStatus");
             return (Criteria) this;
         }
 

pro-base/src/main/java/com/idea/buildManage/service/HouseTypeService.java

@@ -2,9 +2,10 @@ package com.idea.buildManage.service;
 
 import cn.hutool.core.util.IdUtil;
 import com.idea.buildManage.mapper.HouseTypeMapper;
-import com.idea.buildManage.model.HouseType;
-import com.idea.buildManage.model.HouseTypeExample;
+import com.idea.buildManage.model.*;
 import com.rockstar.common.base.BaseService;
+import com.rockstar.frame.model.extend.DateTrans;
+import com.rockstar.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -65,4 +66,26 @@ public class HouseTypeService implements BaseService<HouseType, HouseTypeExample
     public int deleteByExample(HouseTypeExample houseTypeExample) {
         return modelMapper.deleteByExample(houseTypeExample);
     }
+
+
+    /**
+     * 查询指定
+     *
+     * @return
+     */
+    public List<HouseType> listAll(HouseType model, DateTrans dt) {
+        return modelMapper.selectByExample(getCondition(model, dt));
+    }
+
+    private HouseTypeExample getCondition(HouseType model, DateTrans dt) {
+        HouseTypeExample ex = new HouseTypeExample();
+        HouseTypeExample.Criteria criteria = ex.createCriteria();
+        if(StringUtils.isNotEmpty(model.getDiscId())){
+            criteria.andDiscIdEqualTo(model.getDiscId());
+        }
+
+        return ex;
+    }
+
+
 }

pro-base/src/main/java/com/idea/buildManage/service/ParkInfoService.java

@@ -218,7 +218,6 @@ public class ParkInfoService implements BaseService<ParkInfo, ParkInfoExample> {
                     children.put("value", parkFloorDisc.getId());
                     //楼栋
                     MnpBuildingExample buildingExample = new MnpBuildingExample();
-                    buildingExample.setOrderByClause("order_num asc");
                     buildingExample.createCriteria().andDiscIdEqualTo(parkFloorDisc.getId());
                     List<MnpBuilding> parkBuilds = mnpBuildingService.selectByExample(buildingExample);
                     if (null != parkBuilds && parkBuilds.size() > 0) {
@@ -230,7 +229,6 @@ public class ParkInfoService implements BaseService<ParkInfo, ParkInfoExample> {
                             parkBuildChildren.put("value", parkBuild.getId());
                             //房间
                             ParkRoomExample parkRoomExample = new ParkRoomExample();
-                            parkRoomExample.setOrderByClause("order_num asc,room_no asc");
                             parkRoomExample.createCriteria().andBuildIdEqualTo(parkBuild.getId());
                             List<ParkRoom> parkRooms = parkRoomService.selectByExample(parkRoomExample);
                             if (null != parkRooms && parkRooms.size() > 0) {

pro-base/src/main/java/com/idea/buildManage/service/ParkRoomService.java

@@ -172,33 +172,6 @@ public class ParkRoomService implements BaseService<ParkRoom, ParkRoomExample> {
     }
 
 
-    //导出数据
-    public String excelList(ParkRoomResponse model) {
-        List<ParkRoomResponse> list = extendMapper.selectByModel(model);
-        //组装数据
-        List<List<String>> rows = new ArrayList<>();
-        List<String> titleList = CollUtil.newArrayList("楼栋号|地号", "区域", "楼层", "房号", "面积", "朝向", "用途",
-                "出租指导价", "当前状态", "租赁状态", "最后更新时间", "可用状态", "可用状态变更时间", "创建时间");
-        rows.add(titleList);
-        for (ParkRoomResponse parkRoomResponse : list) {
-            List<String> row = new ArrayList<>();
-            rows.add(row);
-        }
-        String filePath = V2Config.getProfile() + new SimpleDateFormat("yyyyMMddHHmmssSSS").format(new Date())
-                + RandomUtil.randomInt(10000) + ".xlsx";
-        ExcelWriter writer = ExcelUtil.getWriter(filePath);
-        writer.merge(5, "房间列表");
-        writer.write(rows);
-        writer.close();
-        FrameData frameData = new FrameData();
-        String fdId = SnowflakeIdWorker.getUUID();
-        frameData.setId(fdId);
-        frameData.setFilePath(filePath);
-        frameData.setCreatedAt(new Date());
-        frameDataMapper.insertSelective(frameData);
-        return "FileController/download/" + fdId;
-    }
-
     // 获取房屋面积
     public Double getAreaByIds(String ids) {
 

pro-base/src/main/resources/mybatis/buildManage/ParkRoomExtendMapper.xml

@@ -4,6 +4,41 @@
 
 
   <select id="selectByModel" resultType="com.idea.buildManage.response.ParkRoomResponse">
-    select * from park_room
+    select r.*,b.build_num buildName from park_room r
+    left join mnp_building b on b.id = r.build_id
+    left join park_floor_disc d on d.id = r.disc_id
+    left join park_info p on p.id = r.group_id
+    <where>
+      <if test="roomUse != null and roomUse != ''">
+        and r.room_use in (${roomUse})
+      </if>
+      <if test="decorationSituation != null and decorationSituation != ''">
+        and r.decoration_situation in (${decorationSituation})
+      </if>
+      <if test="saleStatus != null and saleStatus != ''">
+        and r.sale_status in (${saleStatus})
+      </if>
+      <if test="actualInternalArea != null and actualInternalArea != ''">
+        and r.actual_internal_area = #{actualInternalArea}
+      </if>
+      <if test="actualBuildArea != null and actualBuildArea != ''">
+        and r.actual_build_area = #{actualBuildArea}
+      </if>
+      <if test="roomNo != null and roomNo != ''">
+        and r.room_no like concat('%',#{roomNo},'%')
+      </if>
+      <if test="level == 1">
+        and p.id = #{nodeId}
+      </if>
+      <if test="level == 2">
+        and d.id = #{nodeId}
+      </if>
+      <if test="level == 3">
+        and b.id = #{nodeId}
+      </if>
+      <if test="level == 4">
+        and r.id = #{nodeId}
+      </if>
+    </where>
   </select>
 </mapper>

pro-base/src/main/resources/mybatis/buildManage/ParkRoomMapper.xml

@@ -20,12 +20,13 @@
     <result column="room_number" jdbcType="VARCHAR" property="roomNumber" />
     <result column="decoration_situation" jdbcType="INTEGER" property="decorationSituation" />
     <result column="house_type_id" jdbcType="VARCHAR" property="houseTypeId" />
-    <result column="plan_picture" jdbcType="VARCHAR" property="planPicture" />
+    <result column="house_type_picture" jdbcType="VARCHAR" property="houseTypePicture" />
     <result column="created_id" jdbcType="VARCHAR" property="createdId" />
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
     <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
     <result column="updated_id" jdbcType="VARCHAR" property="updatedId" />
-    <result column="state" jdbcType="VARCHAR" property="state" />
+    <result column="sale_status" jdbcType="INTEGER" property="saleStatus" />
+    <result column="sold_status" jdbcType="INTEGER" property="soldStatus" />
     <result column="two_point_two" jdbcType="VARCHAR" property="twoPointTwo" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.idea.buildManage.model.ParkRoom">
@@ -93,8 +94,8 @@
     id, build_id, disc_id, group_id, room_no, floor, prediction_internal_area, prediction_share_area,
     prediction_build_area, prediction_land_area, actual_internal_area, actual_share_area,
     actual_build_area, actual_land_area, room_use, room_number, decoration_situation,
-    house_type_id, plan_picture, created_id, created_at, updated_at, updated_id, state,
-    two_point_two
+    house_type_id, house_type_picture, created_id, created_at, updated_at, updated_id,
+    sale_status, sold_status, two_point_two
   </sql>
   <sql id="Blob_Column_List">
     remark
@@ -154,20 +155,20 @@
                            prediction_build_area, prediction_land_area,
                            actual_internal_area, actual_share_area, actual_build_area,
                            actual_land_area, room_use, room_number,
-                           decoration_situation, house_type_id, plan_picture,
+                           decoration_situation, house_type_id, house_type_picture,
                            created_id, created_at, updated_at,
-                           updated_id, state, two_point_two,
-                           remark)
+                           updated_id, sale_status, sold_status,
+                           two_point_two, remark)
     values (#{id,jdbcType=VARCHAR}, #{buildId,jdbcType=VARCHAR}, #{discId,jdbcType=VARCHAR},
             #{groupId,jdbcType=VARCHAR}, #{roomNo,jdbcType=VARCHAR}, #{floor,jdbcType=VARCHAR},
             #{predictionInternalArea,jdbcType=DOUBLE}, #{predictionShareArea,jdbcType=DOUBLE},
             #{predictionBuildArea,jdbcType=DOUBLE}, #{predictionLandArea,jdbcType=DOUBLE},
             #{actualInternalArea,jdbcType=DOUBLE}, #{actualShareArea,jdbcType=DOUBLE}, #{actualBuildArea,jdbcType=DOUBLE},
             #{actualLandArea,jdbcType=DOUBLE}, #{roomUse,jdbcType=INTEGER}, #{roomNumber,jdbcType=VARCHAR},
-            #{decorationSituation,jdbcType=INTEGER}, #{houseTypeId,jdbcType=VARCHAR}, #{planPicture,jdbcType=VARCHAR},
+            #{decorationSituation,jdbcType=INTEGER}, #{houseTypeId,jdbcType=VARCHAR}, #{houseTypePicture,jdbcType=VARCHAR},
             #{createdId,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP},
-            #{updatedId,jdbcType=VARCHAR}, #{state,jdbcType=VARCHAR}, #{twoPointTwo,jdbcType=VARCHAR},
-            #{remark,jdbcType=LONGVARCHAR})
+            #{updatedId,jdbcType=VARCHAR}, #{saleStatus,jdbcType=INTEGER}, #{soldStatus,jdbcType=INTEGER},
+            #{twoPointTwo,jdbcType=VARCHAR}, #{remark,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.idea.buildManage.model.ParkRoom">
     insert into park_room
@@ -226,8 +227,8 @@
       <if test="houseTypeId != null">
         house_type_id,
       </if>
-      <if test="planPicture != null">
-        plan_picture,
+      <if test="houseTypePicture != null">
+        house_type_picture,
       </if>
       <if test="createdId != null">
         created_id,
@@ -241,8 +242,11 @@
       <if test="updatedId != null">
         updated_id,
       </if>
-      <if test="state != null">
-        state,
+      <if test="saleStatus != null">
+        sale_status,
+      </if>
+      <if test="soldStatus != null">
+        sold_status,
       </if>
       <if test="twoPointTwo != null">
         two_point_two,
@@ -306,8 +310,8 @@
       <if test="houseTypeId != null">
         #{houseTypeId,jdbcType=VARCHAR},
       </if>
-      <if test="planPicture != null">
-        #{planPicture,jdbcType=VARCHAR},
+      <if test="houseTypePicture != null">
+        #{houseTypePicture,jdbcType=VARCHAR},
       </if>
       <if test="createdId != null">
         #{createdId,jdbcType=VARCHAR},
@@ -321,8 +325,11 @@
       <if test="updatedId != null">
         #{updatedId,jdbcType=VARCHAR},
       </if>
-      <if test="state != null">
-        #{state,jdbcType=VARCHAR},
+      <if test="saleStatus != null">
+        #{saleStatus,jdbcType=INTEGER},
+      </if>
+      <if test="soldStatus != null">
+        #{soldStatus,jdbcType=INTEGER},
       </if>
       <if test="twoPointTwo != null">
         #{twoPointTwo,jdbcType=VARCHAR},
@@ -395,8 +402,8 @@
       <if test="record.houseTypeId != null">
         house_type_id = #{record.houseTypeId,jdbcType=VARCHAR},
       </if>
-      <if test="record.planPicture != null">
-        plan_picture = #{record.planPicture,jdbcType=VARCHAR},
+      <if test="record.houseTypePicture != null">
+        house_type_picture = #{record.houseTypePicture,jdbcType=VARCHAR},
       </if>
       <if test="record.createdId != null">
         created_id = #{record.createdId,jdbcType=VARCHAR},
@@ -410,8 +417,11 @@
       <if test="record.updatedId != null">
         updated_id = #{record.updatedId,jdbcType=VARCHAR},
       </if>
-      <if test="record.state != null">
-        state = #{record.state,jdbcType=VARCHAR},
+      <if test="record.saleStatus != null">
+        sale_status = #{record.saleStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.soldStatus != null">
+        sold_status = #{record.soldStatus,jdbcType=INTEGER},
       </if>
       <if test="record.twoPointTwo != null">
         two_point_two = #{record.twoPointTwo,jdbcType=VARCHAR},
@@ -444,12 +454,13 @@
     room_number = #{record.roomNumber,jdbcType=VARCHAR},
     decoration_situation = #{record.decorationSituation,jdbcType=INTEGER},
     house_type_id = #{record.houseTypeId,jdbcType=VARCHAR},
-    plan_picture = #{record.planPicture,jdbcType=VARCHAR},
+    house_type_picture = #{record.houseTypePicture,jdbcType=VARCHAR},
     created_id = #{record.createdId,jdbcType=VARCHAR},
     created_at = #{record.createdAt,jdbcType=TIMESTAMP},
     updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
     updated_id = #{record.updatedId,jdbcType=VARCHAR},
-    state = #{record.state,jdbcType=VARCHAR},
+    sale_status = #{record.saleStatus,jdbcType=INTEGER},
+    sold_status = #{record.soldStatus,jdbcType=INTEGER},
     two_point_two = #{record.twoPointTwo,jdbcType=VARCHAR},
     remark = #{record.remark,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
@@ -476,12 +487,13 @@
     room_number = #{record.roomNumber,jdbcType=VARCHAR},
     decoration_situation = #{record.decorationSituation,jdbcType=INTEGER},
     house_type_id = #{record.houseTypeId,jdbcType=VARCHAR},
-    plan_picture = #{record.planPicture,jdbcType=VARCHAR},
+    house_type_picture = #{record.houseTypePicture,jdbcType=VARCHAR},
     created_id = #{record.createdId,jdbcType=VARCHAR},
     created_at = #{record.createdAt,jdbcType=TIMESTAMP},
     updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
     updated_id = #{record.updatedId,jdbcType=VARCHAR},
-    state = #{record.state,jdbcType=VARCHAR},
+    sale_status = #{record.saleStatus,jdbcType=INTEGER},
+    sold_status = #{record.soldStatus,jdbcType=INTEGER},
     two_point_two = #{record.twoPointTwo,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -541,8 +553,8 @@
       <if test="houseTypeId != null">
         house_type_id = #{houseTypeId,jdbcType=VARCHAR},
       </if>
-      <if test="planPicture != null">
-        plan_picture = #{planPicture,jdbcType=VARCHAR},
+      <if test="houseTypePicture != null">
+        house_type_picture = #{houseTypePicture,jdbcType=VARCHAR},
       </if>
       <if test="createdId != null">
         created_id = #{createdId,jdbcType=VARCHAR},
@@ -556,8 +568,11 @@
       <if test="updatedId != null">
         updated_id = #{updatedId,jdbcType=VARCHAR},
       </if>
-      <if test="state != null">
-        state = #{state,jdbcType=VARCHAR},
+      <if test="saleStatus != null">
+        sale_status = #{saleStatus,jdbcType=INTEGER},
+      </if>
+      <if test="soldStatus != null">
+        sold_status = #{soldStatus,jdbcType=INTEGER},
       </if>
       <if test="twoPointTwo != null">
         two_point_two = #{twoPointTwo,jdbcType=VARCHAR},
@@ -587,12 +602,13 @@
         room_number = #{roomNumber,jdbcType=VARCHAR},
         decoration_situation = #{decorationSituation,jdbcType=INTEGER},
         house_type_id = #{houseTypeId,jdbcType=VARCHAR},
-        plan_picture = #{planPicture,jdbcType=VARCHAR},
+        house_type_picture = #{houseTypePicture,jdbcType=VARCHAR},
         created_id = #{createdId,jdbcType=VARCHAR},
         created_at = #{createdAt,jdbcType=TIMESTAMP},
         updated_at = #{updatedAt,jdbcType=TIMESTAMP},
         updated_id = #{updatedId,jdbcType=VARCHAR},
-        state = #{state,jdbcType=VARCHAR},
+        sale_status = #{saleStatus,jdbcType=INTEGER},
+        sold_status = #{soldStatus,jdbcType=INTEGER},
         two_point_two = #{twoPointTwo,jdbcType=VARCHAR},
         remark = #{remark,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=VARCHAR}
@@ -616,12 +632,13 @@
         room_number = #{roomNumber,jdbcType=VARCHAR},
         decoration_situation = #{decorationSituation,jdbcType=INTEGER},
         house_type_id = #{houseTypeId,jdbcType=VARCHAR},
-        plan_picture = #{planPicture,jdbcType=VARCHAR},
+        house_type_picture = #{houseTypePicture,jdbcType=VARCHAR},
         created_id = #{createdId,jdbcType=VARCHAR},
         created_at = #{createdAt,jdbcType=TIMESTAMP},
         updated_at = #{updatedAt,jdbcType=TIMESTAMP},
         updated_id = #{updatedId,jdbcType=VARCHAR},
-        state = #{state,jdbcType=VARCHAR},
+        sale_status = #{saleStatus,jdbcType=INTEGER},
+        sold_status = #{soldStatus,jdbcType=INTEGER},
         two_point_two = #{twoPointTwo,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>