Merge branch 'test'

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

@@ -3,6 +3,7 @@ package com.idea.buildManage.controller;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageInfo;
+import com.idea.buildManage.dto.ProjectHouseAllVo;
 import com.idea.buildManage.dto.ProjectHouseVo;
 import com.idea.buildManage.excel.*;
 import com.idea.buildManage.model.*;
@@ -238,5 +239,16 @@ public class ParkRoomController extends BaseController {
     }
 
 
+    /**
+     * 房间全信息导出
+     * @return
+     */
+    @PostMapping(value = "projectHouseAllVoList")
+    @ResponseBody
+    public Object projectHouseAllVoList(ParkRoomResponse model) {
+        List<ProjectHouseAllVo> result = modelService.projectHouseAllVoList(model);
+        return success(result);
+    }
+
 
 }

pro-base/src/main/java/com/idea/buildManage/dto/ProjectHouseAllVo.java

@@ -0,0 +1,78 @@
+package com.idea.buildManage.dto;
+
+import com.idea.buildManage.model.ParkRoom;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class ProjectHouseAllVo extends ParkRoom {
+
+    /**
+     * 施工号
+     */
+    private String constructionNum;
+
+    /**
+     * 楼盘面积测绘状态
+     */
+    private String areaStatus;
+
+    private Date roomSelectionDate;
+
+    private String batchNumber;
+
+    private String roomSelectionNumber;
+
+    private String recordNumber;
+
+    private String contractNumber;
+
+    private Date signingDate;
+
+    private String buyerName;
+
+    private String buyerIdentityCard;
+
+    /**
+     * 合同面积状态
+     */
+    private String contractAreaStatus;
+
+    /**
+     * 合同面积
+     */
+    private String contractArea;
+
+    /**
+     * 合同总价
+     */
+    private BigDecimal contractTotalPrice;
+
+    /**
+     * 已付款金额
+     */
+    private BigDecimal receivedMoney;
+
+    private String payInfo;
+
+    /**
+     * 合同联系人
+     */
+    private String contractContact;
+
+    /**
+     * 入住时间
+     */
+    private Date checkInDate;
+
+    private String contractId;
+
+    private String customerManagementId;
+    
+
+
+
+
+}

pro-base/src/main/java/com/idea/buildManage/mapper/ParkRoomExtendMapper.java

@@ -1,5 +1,6 @@
 package com.idea.buildManage.mapper;
 
+import com.idea.buildManage.dto.ProjectHouseAllVo;
 import com.idea.buildManage.model.MnpBuilding;
 import com.idea.buildManage.model.ParkRoom;
 import com.idea.buildManage.model.ParkRoomExample;
@@ -26,4 +27,6 @@ public interface ParkRoomExtendMapper {
 
     List<ParkRoomResponse> reportList(ParkRoomResponse record);
 
+    List<ProjectHouseAllVo> projectHouseAllVoList(ParkRoomResponse model);
+
 }

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

@@ -1,6 +1,10 @@
 package com.idea.buildManage.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 public class ParkRoom implements Serializable {
@@ -52,6 +56,8 @@ public class ParkRoom implements Serializable {
 
     private String createdId;
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date createdAt;
 
     private Date updatedAt;
@@ -76,8 +82,18 @@ public class ParkRoom implements Serializable {
 
     private String remark;
 
+    private BigDecimal houseTotalPrice;
+
     private static final long serialVersionUID = 1L;
 
+    public BigDecimal getHouseTotalPrice() {
+        return houseTotalPrice;
+    }
+
+    public void setHouseTotalPrice(BigDecimal houseTotalPrice) {
+        this.houseTotalPrice = houseTotalPrice;
+    }
+
     public String getId() {
         return id;
     }

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

@@ -1,5 +1,6 @@
 package com.idea.buildManage.model;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -1615,6 +1616,66 @@ public class ParkRoomExample {
             return (Criteria) this;
         }
 
+        public Criteria andHouseTotalPriceIsNull() {
+            addCriterion("house_total_price is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseTotalPriceIsNotNull() {
+            addCriterion("house_total_price is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseTotalPriceEqualTo(BigDecimal value) {
+            addCriterion("house_total_price =", value, "houseTotalPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseTotalPriceNotEqualTo(BigDecimal value) {
+            addCriterion("house_total_price <>", value, "houseTotalPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseTotalPriceGreaterThan(BigDecimal value) {
+            addCriterion("house_total_price >", value, "houseTotalPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseTotalPriceGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("house_total_price >=", value, "houseTotalPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseTotalPriceLessThan(BigDecimal value) {
+            addCriterion("house_total_price <", value, "houseTotalPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseTotalPriceLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("house_total_price <=", value, "houseTotalPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseTotalPriceIn(List<BigDecimal> values) {
+            addCriterion("house_total_price in", values, "houseTotalPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseTotalPriceNotIn(List<BigDecimal> values) {
+            addCriterion("house_total_price not in", values, "houseTotalPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseTotalPriceBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("house_total_price between", value1, value2, "houseTotalPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseTotalPriceNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("house_total_price not between", value1, value2, "houseTotalPrice");
+            return (Criteria) this;
+        }
+
         public Criteria andCreatedIdIsNull() {
             addCriterion("created_id is null");
             return (Criteria) this;

pro-base/src/main/java/com/idea/buildManage/response/ParkRoomResponse.java

@@ -9,6 +9,8 @@ import java.util.List;
 @Data
 public class ParkRoomResponse extends ParkRoom {
 
+    private String createdName;
+
     private String organizationalCode;
 
     private String buildName;

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

@@ -13,6 +13,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.idea.buildManage.constant.ConstantNodeType;
+import com.idea.buildManage.dto.ProjectHouseAllVo;
 import com.idea.buildManage.dto.ProjectHouseVo;
 import com.idea.buildManage.excel.MnpBuildingExcel;
 import com.idea.buildManage.excel.ParkRoomExcel;
@@ -27,15 +28,19 @@ import com.idea.buildManage.vo.ParkRoomNode;
 import com.idea.buyingMore.mapper.BuyingMoreMapper;
 import com.idea.buyingMore.model.BuyingMore;
 import com.idea.buyingMore.model.BuyingMoreExample;
+import com.idea.buyingMore.service.BuyingMoreService;
+import com.idea.customerManagement.dto.ContractManageDto;
 import com.idea.customerManagement.mapper.BuyerMapper;
 import com.idea.customerManagement.mapper.ContractManageMapper;
 import com.idea.customerManagement.mapper.CustomerManagementMapper;
 import com.idea.customerManagement.mapper.RoomSelectionInfoMapper;
 import com.idea.customerManagement.model.*;
+import com.idea.customerManagement.service.BuyerService;
 import com.idea.invoice.mapper.InvoiceManageMapper;
 import com.idea.invoice.model.InvoiceManage;
 import com.idea.invoice.model.InvoiceManageExample;
 import com.idea.invoice.util.InvoiceUtil;
+import com.idea.paymentManagement.mapper.PayLogExtendMapper;
 import com.idea.paymentManagement.mapper.PayLogMapper;
 import com.idea.paymentManagement.mapper.RefundManageMapper;
 import com.idea.paymentManagement.model.PayLog;
@@ -114,7 +119,11 @@ public class ParkRoomService implements BaseService<ParkRoom, ParkRoomExample> {
     @Autowired
     private PayLogMapper payLogMapper;
     @Autowired
+    private PayLogExtendMapper payLogExtendMapper;
+    @Autowired
     private HouseTypeMapper houseTypeMapper;
+    @Autowired
+    private BuyerService buyerService;
 
 
     /**
@@ -220,8 +229,8 @@ public class ParkRoomService implements BaseService<ParkRoom, ParkRoomExample> {
             log.info("推送房间修改详情:{}", json.toJSONString());
             // 给nc推送修改载体数据
             InvoiceUtil.defdocUpdate(json);
-        }catch (Exception e){
-            log.error("推送修改房间失败",e);
+        } catch (Exception e) {
+            log.error("推送修改房间失败", e);
         }
         return updateByPrimaryKeySelective(model);
     }
@@ -315,8 +324,8 @@ public class ParkRoomService implements BaseService<ParkRoom, ParkRoomExample> {
             JSONObject json = new JSONObject();
             json.put("ncid", parkRoom.getNcid());
             InvoiceUtil.defdocDisable(json);
-        }catch (Exception e){
-            log.error("房间禁用失败:",e);
+        } catch (Exception e) {
+            log.error("房间禁用失败:", e);
         }
 
         return result;
@@ -704,7 +713,7 @@ public class ParkRoomService implements BaseService<ParkRoom, ParkRoomExample> {
                 ParkRoomResponse roomResponse = new ParkRoomResponse();
                 roomResponse.setRoomNo(room.getRoomNo());
                 // 已选房 待售
-                if (room.getIsChoose() == 1 && room.getSoldStatus() == 2) {
+                if (room.getIsChoose() == 1 && room.getSoldStatus() == 1) {
                     roomResponse.setProjectStatusStr("已选房");
                 }
                 // 已签约
@@ -740,4 +749,45 @@ public class ParkRoomService implements BaseService<ParkRoom, ParkRoomExample> {
     }
 
 
+    public List<ProjectHouseAllVo> projectHouseAllVoList(ParkRoomResponse model) {
+
+        // 买受人
+        List<Buyer> buyers = buyerService.selectByExample(new BuyerExample());
+        Map<String, List<Buyer>> buyerMap = buyers.stream().collect(Collectors.groupingBy(Buyer::getCustomerManagementId));
+        // 入住信息
+        List<CheckIn> checkIns = checkInMapper.selectByExample(new CheckInExample());
+        Map<String, CheckIn> checkInMap = checkIns.stream().collect(Collectors.toMap(CheckIn::getContractManageId, item -> item, (existing, replacement) -> existing));
+        // 付款信息
+        ContractManageDto contractManageDto = new ContractManageDto();
+        contractManageDto.setPayType("1");
+        List<ContractManageDto> contractManages = payLogExtendMapper.listByModel(contractManageDto);
+        Map<String, ContractManageDto> contractManageMap = contractManages.stream().collect(Collectors.toMap(ContractManageDto::getId, item -> item, (existing, replacement) -> existing));
+
+        List<ProjectHouseAllVo> projectHouseAllVos = extendMapper.projectHouseAllVoList(model);
+        for(ProjectHouseAllVo houseAllVo: projectHouseAllVos){
+            if (buyerMap.containsKey(houseAllVo.getCustomerManagementId())){
+                StringBuilder builder = new StringBuilder();
+                List<Buyer> buyerInfo = buyerMap.get(houseAllVo.getCustomerManagementId());
+                for(Buyer buyer : buyerInfo){
+                    builder.append(buyer.getName())
+                            .append(",");
+                }
+                if(builder.length() > 0){
+                    builder.deleteCharAt(builder.length()-1);
+                }
+                houseAllVo.setBuyerName(builder.toString());
+            }
+            if (checkInMap.containsKey(houseAllVo.getContractId())){
+                CheckIn checkIn = checkInMap.get(houseAllVo.getContractId());
+                houseAllVo.setCheckInDate(checkIn.getInDate());
+            }
+            if(contractManageMap.containsKey(houseAllVo.getContractId())){
+                ContractManageDto contractManage = contractManageMap.get(houseAllVo.getContractId());
+                houseAllVo.setReceivedMoney(contractManage.getReceivedMoney());
+            }
+        }
+        return projectHouseAllVos;
+    }
+
+
 }

pro-base/src/main/java/com/idea/customerManagement/controller/RoomSelectionInfoController.java

@@ -98,6 +98,14 @@ public class RoomSelectionInfoController extends BaseController {
         return modelService.getById(id);
     }
 
+
+    @PostMapping(value = "getByHouseId",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public Object getByHouseId(String houseId,String customerManagementId){
+        return modelService.getByHouseId(houseId,customerManagementId);
+    }
+
+
     /**
      * 房源确认单 下载
      * @param model

pro-base/src/main/java/com/idea/customerManagement/service/RoomSelectionInfoService.java

@@ -1,5 +1,6 @@
 package com.idea.customerManagement.service;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.IdUtil;
@@ -32,8 +33,10 @@ import com.idea.util.ReplaceWord;
 import com.idea.util.WordToPdfUtil;
 import com.rockstar.common.base.BaseService;
 import com.rockstar.common.domain.AjaxResult;
+import com.rockstar.frame.model.FrameUser;
 import com.rockstar.frame.model.extend.DateTrans;
 import com.rockstar.frame.model.extend.Tablepar;
+import com.rockstar.frame.service.FrameUserService;
 import com.rockstar.shiro.util.ShiroUtils;
 import com.rockstar.system.service.SysDictService;
 import com.rockstar.util.StringUtils;
@@ -76,6 +79,8 @@ public class RoomSelectionInfoService implements BaseService<RoomSelectionInfo,
     private SysDictService sysDictService;
     @Autowired
     private ParkInfoMapper parkInfoMapper;
+    @Autowired
+    private FrameUserService frameUserService;
 
 
     @Override
@@ -364,6 +369,29 @@ public class RoomSelectionInfoService implements BaseService<RoomSelectionInfo,
         return selectByPrimaryKey(id);
     }
 
+    public ParkRoomResponse getByHouseId(String houseId,String customerManagementId) {
+
+        ParkRoom parkRoom = parkRoomMapper.selectByPrimaryKey(houseId);
+        RoomSelectionInfoExample example = new RoomSelectionInfoExample();
+        example.createCriteria().andHouseIdEqualTo(houseId).andCustomerManagementIdEqualTo(customerManagementId);
+        List<RoomSelectionInfo> list = selectByExample(example);
+        RoomSelectionInfo roomSelectionInfo = list.get(0);
+        String createdId = roomSelectionInfo.getCreatedId();
+        Date createdAt = roomSelectionInfo.getCreatedAt();
+        parkRoom.setCreatedAt(createdAt);
+        FrameUser frameUser = frameUserService.selectByPrimaryKey(createdId);
+
+        ParkRoomResponse response = new ParkRoomResponse();
+        BeanUtil.copyProperties(parkRoom, response);
+        response.setCreatedName(frameUser.getTruename());
+        response.setCreatedAt(createdAt);
+
+
+        return response;
+    }
+
+
+
     /**
      * 房源确认单 下载
      *

pro-base/src/main/java/com/idea/util/OAUtil.java

@@ -37,23 +37,24 @@ public class OAUtil {
 
     public static String receiveRequestInfoByJson(Map<String, Object> parma) {
 
-        String url = prefix + "/rest/ofs/ReceiveRequestInfoByJson";
-        String body = JSON.toJSONString(parma);
-        // 发送POST请求
-        HttpResponse response = HttpRequest.post(url)
-                .header(headers)
-                .body(body)
-                .execute();
-
-//        System.out.println("请求参数:" + JSON.toJSONString(parma));
-        // 获取响应状态码
-        int statusCode = response.getStatus();
-//        System.out.println("Status Code: " + statusCode);
-
-        // 获取响应体
-        String responseBody = response.body();
-//        System.out.println("Response Body: " + responseBody);
-        return responseBody;
+//        String url = prefix + "/rest/ofs/ReceiveRequestInfoByJson";
+//        String body = JSON.toJSONString(parma);
+//        // 发送POST请求
+//        HttpResponse response = HttpRequest.post(url)
+//                .header(headers)
+//                .body(body)
+//                .execute();
+//
+////        System.out.println("请求参数:" + JSON.toJSONString(parma));
+//        // 获取响应状态码
+//        int statusCode = response.getStatus();
+////        System.out.println("Status Code: " + statusCode);
+//
+//        // 获取响应体
+//        String responseBody = response.body();
+////        System.out.println("Response Body: " + responseBody);
+//        return responseBody;
+        return "";
     }
 
     public static void main(String[] args) {

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

@@ -172,5 +172,27 @@
     order by p.group_name ,d.name,b.build_num + 0,r.room_no + 0
   </select>
 
+    <select id="projectHouseAllVoList" resultType="com.idea.buildManage.dto.ProjectHouseAllVo">
+      select r.*,c.id contractId,c.customer_management_id
+      from park_room r
+      left join contract_manage c on r.id = c.house_id
+      and c.created_at = (select max(created_at) from contract_manage where contract_manage.house_id = r.id)
+      <where>
+        <if test="groupId != null and groupId != ''">
+          and r.group_id = #{groupId}
+        </if>
+        <if test="discId != null and discId != ''">
+          and r.disc_id = #{discId}
+        </if>
+        <if test="buildId != null and buildId != ''">
+          and r.build_id = #{buildId}
+        </if>
+        <if test="roomNo != null and roomNo != ''">
+          and r.room_no = #{roomNo}
+        </if>
+      </where>
+      order by r.group_name , r.disc_name , r.build_name , r.room_no + 0
+    </select>
+
 
 </mapper>

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

@@ -25,6 +25,7 @@
         <result column="decoration_situation" jdbcType="INTEGER" property="decorationSituation" />
         <result column="house_type_id" jdbcType="VARCHAR" property="houseTypeId" />
         <result column="house_type_picture" jdbcType="VARCHAR" property="houseTypePicture" />
+        <result column="house_total_price" jdbcType="DECIMAL" property="houseTotalPrice" />
         <result column="created_id" jdbcType="VARCHAR" property="createdId" />
         <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
         <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
@@ -103,9 +104,9 @@
         id, build_id, build_name, disc_id, disc_name, group_id, group_name, room_no, nature,
     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, house_type_picture, created_id,
-    created_at, updated_at, updated_id, sale_status, sold_status, two_point_two, order_num,
-    is_choose, ncid, nc_code, del_flag
+    room_number, decoration_situation, house_type_id, house_type_picture, house_total_price,
+    created_id, created_at, updated_at, updated_id, sale_status, sold_status, two_point_two,
+    order_num, is_choose, ncid, nc_code, del_flag
     </sql>
     <sql id="Blob_Column_List">
         remark
@@ -167,11 +168,11 @@
                                actual_internal_area, actual_share_area, actual_build_area,
                                actual_land_area, room_use, room_number,
                                decoration_situation, house_type_id, house_type_picture,
-                               created_id, created_at, updated_at,
-                               updated_id, sale_status, sold_status,
-                               two_point_two, order_num, is_choose,
-                               ncid, nc_code, del_flag,
-                               remark)
+                               house_total_price, created_id, created_at,
+                               updated_at, updated_id, sale_status,
+                               sold_status, two_point_two, order_num,
+                               is_choose, ncid, nc_code,
+                               del_flag, remark)
         values (#{id,jdbcType=VARCHAR}, #{buildId,jdbcType=VARCHAR}, #{buildName,jdbcType=VARCHAR},
                 #{discId,jdbcType=VARCHAR}, #{discName,jdbcType=VARCHAR}, #{groupId,jdbcType=VARCHAR},
                 #{groupName,jdbcType=VARCHAR}, #{roomNo,jdbcType=VARCHAR}, #{nature,jdbcType=VARCHAR},
@@ -180,11 +181,11 @@
                 #{actualInternalArea,jdbcType=DOUBLE}, #{actualShareArea,jdbcType=DOUBLE}, #{actualBuildArea,jdbcType=DOUBLE},
                 #{actualLandArea,jdbcType=DOUBLE}, #{roomUse,jdbcType=INTEGER}, #{roomNumber,jdbcType=VARCHAR},
                 #{decorationSituation,jdbcType=INTEGER}, #{houseTypeId,jdbcType=VARCHAR}, #{houseTypePicture,jdbcType=VARCHAR},
-                #{createdId,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP},
-                #{updatedId,jdbcType=VARCHAR}, #{saleStatus,jdbcType=INTEGER}, #{soldStatus,jdbcType=INTEGER},
-                #{twoPointTwo,jdbcType=VARCHAR}, #{orderNum,jdbcType=VARCHAR}, #{isChoose,jdbcType=INTEGER},
-                #{ncid,jdbcType=VARCHAR}, #{ncCode,jdbcType=VARCHAR}, #{delFlag,jdbcType=VARCHAR},
-                #{remark,jdbcType=LONGVARCHAR})
+                #{houseTotalPrice,jdbcType=DECIMAL}, #{createdId,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP},
+                #{updatedAt,jdbcType=TIMESTAMP}, #{updatedId,jdbcType=VARCHAR}, #{saleStatus,jdbcType=INTEGER},
+                #{soldStatus,jdbcType=INTEGER}, #{twoPointTwo,jdbcType=VARCHAR}, #{orderNum,jdbcType=VARCHAR},
+                #{isChoose,jdbcType=INTEGER}, #{ncid,jdbcType=VARCHAR}, #{ncCode,jdbcType=VARCHAR},
+                #{delFlag,jdbcType=VARCHAR}, #{remark,jdbcType=LONGVARCHAR})
     </insert>
     <insert id="insertSelective" parameterType="com.idea.buildManage.model.ParkRoom">
         insert into park_room
@@ -258,6 +259,9 @@
             <if test="houseTypePicture != null">
                 house_type_picture,
             </if>
+            <if test="houseTotalPrice != null">
+                house_total_price,
+            </if>
             <if test="createdId != null">
                 created_id,
             </if>
@@ -368,6 +372,9 @@
             <if test="houseTypePicture != null">
                 #{houseTypePicture,jdbcType=VARCHAR},
             </if>
+            <if test="houseTotalPrice != null">
+                #{houseTotalPrice,jdbcType=DECIMAL},
+            </if>
             <if test="createdId != null">
                 #{createdId,jdbcType=VARCHAR},
             </if>
@@ -487,6 +494,9 @@
             <if test="record.houseTypePicture != null">
                 house_type_picture = #{record.houseTypePicture,jdbcType=VARCHAR},
             </if>
+            <if test="record.houseTotalPrice != null">
+                house_total_price = #{record.houseTotalPrice,jdbcType=DECIMAL},
+            </if>
             <if test="record.createdId != null">
                 created_id = #{record.createdId,jdbcType=VARCHAR},
             </if>
@@ -556,6 +566,7 @@
         decoration_situation = #{record.decorationSituation,jdbcType=INTEGER},
         house_type_id = #{record.houseTypeId,jdbcType=VARCHAR},
         house_type_picture = #{record.houseTypePicture,jdbcType=VARCHAR},
+        house_total_price = #{record.houseTotalPrice,jdbcType=DECIMAL},
         created_id = #{record.createdId,jdbcType=VARCHAR},
         created_at = #{record.createdAt,jdbcType=TIMESTAMP},
         updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
@@ -598,6 +609,7 @@
         decoration_situation = #{record.decorationSituation,jdbcType=INTEGER},
         house_type_id = #{record.houseTypeId,jdbcType=VARCHAR},
         house_type_picture = #{record.houseTypePicture,jdbcType=VARCHAR},
+        house_total_price = #{record.houseTotalPrice,jdbcType=DECIMAL},
         created_id = #{record.createdId,jdbcType=VARCHAR},
         created_at = #{record.createdAt,jdbcType=TIMESTAMP},
         updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
@@ -683,6 +695,9 @@
             <if test="houseTypePicture != null">
                 house_type_picture = #{houseTypePicture,jdbcType=VARCHAR},
             </if>
+            <if test="houseTotalPrice != null">
+                house_total_price = #{houseTotalPrice,jdbcType=DECIMAL},
+            </if>
             <if test="createdId != null">
                 created_id = #{createdId,jdbcType=VARCHAR},
             </if>
@@ -749,6 +764,7 @@
             decoration_situation = #{decorationSituation,jdbcType=INTEGER},
             house_type_id = #{houseTypeId,jdbcType=VARCHAR},
             house_type_picture = #{houseTypePicture,jdbcType=VARCHAR},
+            house_total_price = #{houseTotalPrice,jdbcType=DECIMAL},
             created_id = #{createdId,jdbcType=VARCHAR},
             created_at = #{createdAt,jdbcType=TIMESTAMP},
             updated_at = #{updatedAt,jdbcType=TIMESTAMP},
@@ -788,6 +804,7 @@
             decoration_situation = #{decorationSituation,jdbcType=INTEGER},
             house_type_id = #{houseTypeId,jdbcType=VARCHAR},
             house_type_picture = #{houseTypePicture,jdbcType=VARCHAR},
+            house_total_price = #{houseTotalPrice,jdbcType=DECIMAL},
             created_id = #{createdId,jdbcType=VARCHAR},
             created_at = #{createdAt,jdbcType=TIMESTAMP},
             updated_at = #{updatedAt,jdbcType=TIMESTAMP},