bug

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

@@ -12,6 +12,9 @@ import com.idea.buildManage.model.MnpBuilding;
 import com.idea.buildManage.model.ParkRoom;
 import com.idea.buildManage.model.ParkRoomExample;
 import com.idea.buildManage.response.ParkRoomResponse;
+import com.idea.customerManagement.mapper.RoomSelectionInfoMapper;
+import com.idea.customerManagement.model.RoomSelectionInfo;
+import com.idea.customerManagement.model.RoomSelectionInfoExample;
 import com.rockstar.common.base.BaseService;
 import com.rockstar.common.conf.V2Config;
 import com.rockstar.common.support.Convert;
@@ -22,6 +25,7 @@ import com.rockstar.frame.model.extend.Tablepar;
 import com.rockstar.system.service.SysDictService;
 import com.rockstar.util.SnowflakeIdWorker;
 import com.rockstar.util.StringUtils;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -45,6 +49,8 @@ public class ParkRoomService implements BaseService<ParkRoom, ParkRoomExample> {
     private FrameDataMapper frameDataMapper;
     @Autowired
     private ParkRoomExtendMapper extendMapper;
+    @Autowired
+    private RoomSelectionInfoMapper roomSelectionInfoMapper;
 
     /**
      * 分页查询
@@ -196,7 +202,14 @@ public class ParkRoomService implements BaseService<ParkRoom, ParkRoomExample> {
 
     public int delete(String id){
 
-        // TODO: 2024/9/12 等待认购金业务 校验
+        // 已收取 已转 的定金
+        List<Integer> status = Arrays.asList(2,3);
+        RoomSelectionInfoExample example = new RoomSelectionInfoExample();
+        example.createCriteria().andHouseIdEqualTo(id).andStatusIn(status);
+        List<RoomSelectionInfo> list = roomSelectionInfoMapper.selectByExample(example);
+        if(CollectionUtils.isNotEmpty(list)){
+            throw new RuntimeException("该房间已收取认购金，无法删除");
+        }
         return deleteByPrimaryKey(id);
     }
 

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

@@ -1,10 +1,14 @@
 package com.idea.customerManagement.controller;
 
-import com.idea.customerManagement.dto.RoomSelectionInfoDto;
+import com.github.pagehelper.PageInfo;
+import com.idea.customerManagement.dto.IntentionalDepositDto;
 import com.idea.customerManagement.model.IntentionalDeposit;
 import com.idea.customerManagement.service.IntentionalDepositService;
 import com.rockstar.common.base.BaseController;
 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 io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -68,4 +72,38 @@ public class IntentionalDepositController extends BaseController {
         return modelService.getByCustomerManagementId(customerManagementId);
     }
 
+
+    @PostMapping(value = "list",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public Object list(Tablepar tablepar, IntentionalDepositDto model, DateTrans dt){
+        PageInfo<IntentionalDepositDto> page= modelService.listByModel(tablepar,model,dt);
+        TableSplitResult<IntentionalDepositDto> result = new TableSplitResult<IntentionalDepositDto>(page.getPageNum(), page.getTotal(), page.getList());
+        return  result;
+    }
+
+    /**
+     * 意向金转定金
+     * @param model
+     * @return
+     */
+    @PostMapping(value = "toDeposit",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public AjaxResult toDeposit(IntentionalDeposit model){
+        int result = modelService.toDeposit(model);
+        return result(result);
+    }
+
+    /**
+     * 退意向金
+     * @param model
+     * @return
+     */
+    @PostMapping(value = "refund",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public AjaxResult refund(IntentionalDeposit model){
+        int result = modelService.refund(model);
+        return result(result);
+    }
+
+
 }

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

@@ -1,9 +1,14 @@
 package com.idea.customerManagement.controller;
 
+import com.github.pagehelper.PageInfo;
+import com.idea.customerManagement.dto.ContractManageDto;
 import com.idea.customerManagement.dto.RoomSelectionInfoDto;
 import com.idea.customerManagement.service.RoomSelectionInfoService;
 import com.rockstar.common.base.BaseController;
 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 io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -98,4 +103,6 @@ public class RoomSelectionInfoController extends BaseController {
     }
 
 
+
+
 }

pro-base/src/main/java/com/idea/customerManagement/dto/IntentionalDepositDto.java

@@ -8,5 +8,12 @@ public class IntentionalDepositDto extends IntentionalDeposit {
 
     private String createdName;
 
+    private String groupDiscName;
+
+    private String buyerName;
+
+    private String houseName;
+
+
 
 }

pro-base/src/main/java/com/idea/customerManagement/mapper/IntentionalDepositExtendMapper.java

@@ -0,0 +1,15 @@
+package com.idea.customerManagement.mapper;
+
+import com.idea.customerManagement.dto.IntentionalDepositDto;
+import com.idea.customerManagement.model.IntentionalDeposit;
+import com.idea.customerManagement.model.IntentionalDepositExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface IntentionalDepositExtendMapper {
+
+
+    List<IntentionalDepositDto> listByModel(IntentionalDepositDto model);
+
+}

pro-base/src/main/java/com/idea/customerManagement/mapper/RoomSelectionInfoExtendMapper.java

@@ -12,5 +12,5 @@ public interface RoomSelectionInfoExtendMapper {
 
     List<RoomSelectionInfoDto> selectHouseListByCustomerId(@Param("customerManagementId") String customerManagementId);
 
-
+    List<RoomSelectionInfoDto> listByModel(RoomSelectionInfoDto record);
 }

pro-base/src/main/java/com/idea/customerManagement/model/IntentionalDeposit.java

@@ -14,6 +14,8 @@ public class IntentionalDeposit implements Serializable {
 
     private String discId;
 
+    private String houseId;
+
     private String customerManagementId;
 
     private BigDecimal receivableMoney;
@@ -24,6 +26,8 @@ public class IntentionalDeposit implements Serializable {
 
     private String serialNumber;
 
+    private String depositSerialNumber;
+
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date collectionTime;
@@ -34,16 +38,56 @@ public class IntentionalDeposit implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date createdAt;
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date updatedAt;
 
     private String updatedId;
 
+    private String handleId;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date handleDate;
+
+    private String refundHandleId;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date refundHandleDate;
+
     private String remark;
 
+    private String depositRemark;
+
+    private String refundRemark;
+
     private String fileList;
 
+    private String paperReceipts;
+
+    private Integer status;
+
+    private BigDecimal refundMoney;
+
     private static final long serialVersionUID = 1L;
 
+    public BigDecimal getRefundMoney() {
+        return refundMoney;
+    }
+
+    public void setRefundMoney(BigDecimal refundMoney) {
+        this.refundMoney = refundMoney;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
     public String getId() {
         return id;
     }
@@ -68,6 +112,14 @@ public class IntentionalDeposit implements Serializable {
         this.discId = discId == null ? null : discId.trim();
     }
 
+    public String getHouseId() {
+        return houseId;
+    }
+
+    public void setHouseId(String houseId) {
+        this.houseId = houseId == null ? null : houseId.trim();
+    }
+
     public String getCustomerManagementId() {
         return customerManagementId;
     }
@@ -108,6 +160,14 @@ public class IntentionalDeposit implements Serializable {
         this.serialNumber = serialNumber == null ? null : serialNumber.trim();
     }
 
+    public String getDepositSerialNumber() {
+        return depositSerialNumber;
+    }
+
+    public void setDepositSerialNumber(String depositSerialNumber) {
+        this.depositSerialNumber = depositSerialNumber == null ? null : depositSerialNumber.trim();
+    }
+
     public Date getCollectionTime() {
         return collectionTime;
     }
@@ -148,6 +208,38 @@ public class IntentionalDeposit implements Serializable {
         this.updatedId = updatedId == null ? null : updatedId.trim();
     }
 
+    public String getHandleId() {
+        return handleId;
+    }
+
+    public void setHandleId(String handleId) {
+        this.handleId = handleId == null ? null : handleId.trim();
+    }
+
+    public Date getHandleDate() {
+        return handleDate;
+    }
+
+    public void setHandleDate(Date handleDate) {
+        this.handleDate = handleDate;
+    }
+
+    public String getRefundHandleId() {
+        return refundHandleId;
+    }
+
+    public void setRefundHandleId(String refundHandleId) {
+        this.refundHandleId = refundHandleId == null ? null : refundHandleId.trim();
+    }
+
+    public Date getRefundHandleDate() {
+        return refundHandleDate;
+    }
+
+    public void setRefundHandleDate(Date refundHandleDate) {
+        this.refundHandleDate = refundHandleDate;
+    }
+
     public String getRemark() {
         return remark;
     }
@@ -156,6 +248,22 @@ public class IntentionalDeposit implements Serializable {
         this.remark = remark == null ? null : remark.trim();
     }
 
+    public String getDepositRemark() {
+        return depositRemark;
+    }
+
+    public void setDepositRemark(String depositRemark) {
+        this.depositRemark = depositRemark == null ? null : depositRemark.trim();
+    }
+
+    public String getRefundRemark() {
+        return refundRemark;
+    }
+
+    public void setRefundRemark(String refundRemark) {
+        this.refundRemark = refundRemark == null ? null : refundRemark.trim();
+    }
+
     public String getFileList() {
         return fileList;
     }
@@ -163,4 +271,12 @@ public class IntentionalDeposit implements Serializable {
     public void setFileList(String fileList) {
         this.fileList = fileList == null ? null : fileList.trim();
     }
+
+    public String getPaperReceipts() {
+        return paperReceipts;
+    }
+
+    public void setPaperReceipts(String paperReceipts) {
+        this.paperReceipts = paperReceipts == null ? null : paperReceipts.trim();
+    }
 }

pro-base/src/main/java/com/idea/customerManagement/model/IntentionalDepositExample.java

@@ -316,6 +316,76 @@ public class IntentionalDepositExample {
             return (Criteria) this;
         }
 
+        public Criteria andHouseIdIsNull() {
+            addCriterion("house_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdIsNotNull() {
+            addCriterion("house_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdEqualTo(String value) {
+            addCriterion("house_id =", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdNotEqualTo(String value) {
+            addCriterion("house_id <>", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdGreaterThan(String value) {
+            addCriterion("house_id >", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdGreaterThanOrEqualTo(String value) {
+            addCriterion("house_id >=", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdLessThan(String value) {
+            addCriterion("house_id <", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdLessThanOrEqualTo(String value) {
+            addCriterion("house_id <=", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdLike(String value) {
+            addCriterion("house_id like", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdNotLike(String value) {
+            addCriterion("house_id not like", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdIn(List<String> values) {
+            addCriterion("house_id in", values, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdNotIn(List<String> values) {
+            addCriterion("house_id not in", values, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdBetween(String value1, String value2) {
+            addCriterion("house_id between", value1, value2, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdNotBetween(String value1, String value2) {
+            addCriterion("house_id not between", value1, value2, "houseId");
+            return (Criteria) this;
+        }
+
         public Criteria andCustomerManagementIdIsNull() {
             addCriterion("customer_management_id is null");
             return (Criteria) this;
@@ -636,6 +706,76 @@ public class IntentionalDepositExample {
             return (Criteria) this;
         }
 
+        public Criteria andDepositSerialNumberIsNull() {
+            addCriterion("deposit_serial_number is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepositSerialNumberIsNotNull() {
+            addCriterion("deposit_serial_number is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepositSerialNumberEqualTo(String value) {
+            addCriterion("deposit_serial_number =", value, "depositSerialNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepositSerialNumberNotEqualTo(String value) {
+            addCriterion("deposit_serial_number <>", value, "depositSerialNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepositSerialNumberGreaterThan(String value) {
+            addCriterion("deposit_serial_number >", value, "depositSerialNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepositSerialNumberGreaterThanOrEqualTo(String value) {
+            addCriterion("deposit_serial_number >=", value, "depositSerialNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepositSerialNumberLessThan(String value) {
+            addCriterion("deposit_serial_number <", value, "depositSerialNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepositSerialNumberLessThanOrEqualTo(String value) {
+            addCriterion("deposit_serial_number <=", value, "depositSerialNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepositSerialNumberLike(String value) {
+            addCriterion("deposit_serial_number like", value, "depositSerialNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepositSerialNumberNotLike(String value) {
+            addCriterion("deposit_serial_number not like", value, "depositSerialNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepositSerialNumberIn(List<String> values) {
+            addCriterion("deposit_serial_number in", values, "depositSerialNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepositSerialNumberNotIn(List<String> values) {
+            addCriterion("deposit_serial_number not in", values, "depositSerialNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepositSerialNumberBetween(String value1, String value2) {
+            addCriterion("deposit_serial_number between", value1, value2, "depositSerialNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepositSerialNumberNotBetween(String value1, String value2) {
+            addCriterion("deposit_serial_number not between", value1, value2, "depositSerialNumber");
+            return (Criteria) this;
+        }
+
         public Criteria andCollectionTimeIsNull() {
             addCriterion("collection_time is null");
             return (Criteria) this;
@@ -955,6 +1095,386 @@ public class IntentionalDepositExample {
             addCriterion("updated_id not between", value1, value2, "updatedId");
             return (Criteria) this;
         }
+
+        public Criteria andHandleIdIsNull() {
+            addCriterion("handle_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHandleIdIsNotNull() {
+            addCriterion("handle_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHandleIdEqualTo(String value) {
+            addCriterion("handle_id =", value, "handleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHandleIdNotEqualTo(String value) {
+            addCriterion("handle_id <>", value, "handleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHandleIdGreaterThan(String value) {
+            addCriterion("handle_id >", value, "handleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHandleIdGreaterThanOrEqualTo(String value) {
+            addCriterion("handle_id >=", value, "handleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHandleIdLessThan(String value) {
+            addCriterion("handle_id <", value, "handleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHandleIdLessThanOrEqualTo(String value) {
+            addCriterion("handle_id <=", value, "handleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHandleIdLike(String value) {
+            addCriterion("handle_id like", value, "handleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHandleIdNotLike(String value) {
+            addCriterion("handle_id not like", value, "handleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHandleIdIn(List<String> values) {
+            addCriterion("handle_id in", values, "handleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHandleIdNotIn(List<String> values) {
+            addCriterion("handle_id not in", values, "handleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHandleIdBetween(String value1, String value2) {
+            addCriterion("handle_id between", value1, value2, "handleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHandleIdNotBetween(String value1, String value2) {
+            addCriterion("handle_id not between", value1, value2, "handleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHandleDateIsNull() {
+            addCriterion("handle_date is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHandleDateIsNotNull() {
+            addCriterion("handle_date is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHandleDateEqualTo(Date value) {
+            addCriterion("handle_date =", value, "handleDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andHandleDateNotEqualTo(Date value) {
+            addCriterion("handle_date <>", value, "handleDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andHandleDateGreaterThan(Date value) {
+            addCriterion("handle_date >", value, "handleDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andHandleDateGreaterThanOrEqualTo(Date value) {
+            addCriterion("handle_date >=", value, "handleDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andHandleDateLessThan(Date value) {
+            addCriterion("handle_date <", value, "handleDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andHandleDateLessThanOrEqualTo(Date value) {
+            addCriterion("handle_date <=", value, "handleDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andHandleDateIn(List<Date> values) {
+            addCriterion("handle_date in", values, "handleDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andHandleDateNotIn(List<Date> values) {
+            addCriterion("handle_date not in", values, "handleDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andHandleDateBetween(Date value1, Date value2) {
+            addCriterion("handle_date between", value1, value2, "handleDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andHandleDateNotBetween(Date value1, Date value2) {
+            addCriterion("handle_date not between", value1, value2, "handleDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundHandleIdIsNull() {
+            addCriterion("refund_handle_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundHandleIdIsNotNull() {
+            addCriterion("refund_handle_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundHandleIdEqualTo(String value) {
+            addCriterion("refund_handle_id =", value, "refundHandleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundHandleIdNotEqualTo(String value) {
+            addCriterion("refund_handle_id <>", value, "refundHandleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundHandleIdGreaterThan(String value) {
+            addCriterion("refund_handle_id >", value, "refundHandleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundHandleIdGreaterThanOrEqualTo(String value) {
+            addCriterion("refund_handle_id >=", value, "refundHandleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundHandleIdLessThan(String value) {
+            addCriterion("refund_handle_id <", value, "refundHandleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundHandleIdLessThanOrEqualTo(String value) {
+            addCriterion("refund_handle_id <=", value, "refundHandleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundHandleIdLike(String value) {
+            addCriterion("refund_handle_id like", value, "refundHandleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundHandleIdNotLike(String value) {
+            addCriterion("refund_handle_id not like", value, "refundHandleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundHandleIdIn(List<String> values) {
+            addCriterion("refund_handle_id in", values, "refundHandleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundHandleIdNotIn(List<String> values) {
+            addCriterion("refund_handle_id not in", values, "refundHandleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundHandleIdBetween(String value1, String value2) {
+            addCriterion("refund_handle_id between", value1, value2, "refundHandleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundHandleIdNotBetween(String value1, String value2) {
+            addCriterion("refund_handle_id not between", value1, value2, "refundHandleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundHandleDateIsNull() {
+            addCriterion("refund_handle_date is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundHandleDateIsNotNull() {
+            addCriterion("refund_handle_date is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundHandleDateEqualTo(Date value) {
+            addCriterion("refund_handle_date =", value, "refundHandleDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundHandleDateNotEqualTo(Date value) {
+            addCriterion("refund_handle_date <>", value, "refundHandleDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundHandleDateGreaterThan(Date value) {
+            addCriterion("refund_handle_date >", value, "refundHandleDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundHandleDateGreaterThanOrEqualTo(Date value) {
+            addCriterion("refund_handle_date >=", value, "refundHandleDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundHandleDateLessThan(Date value) {
+            addCriterion("refund_handle_date <", value, "refundHandleDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundHandleDateLessThanOrEqualTo(Date value) {
+            addCriterion("refund_handle_date <=", value, "refundHandleDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundHandleDateIn(List<Date> values) {
+            addCriterion("refund_handle_date in", values, "refundHandleDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundHandleDateNotIn(List<Date> values) {
+            addCriterion("refund_handle_date not in", values, "refundHandleDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundHandleDateBetween(Date value1, Date value2) {
+            addCriterion("refund_handle_date between", value1, value2, "refundHandleDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundHandleDateNotBetween(Date value1, Date value2) {
+            addCriterion("refund_handle_date not between", value1, value2, "refundHandleDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNull() {
+            addCriterion("status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNotNull() {
+            addCriterion("status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusEqualTo(Integer value) {
+            addCriterion("status =", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotEqualTo(Integer value) {
+            addCriterion("status <>", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThan(Integer value) {
+            addCriterion("status >", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("status >=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThan(Integer value) {
+            addCriterion("status <", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("status <=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIn(List<Integer> values) {
+            addCriterion("status in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotIn(List<Integer> values) {
+            addCriterion("status not in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusBetween(Integer value1, Integer value2) {
+            addCriterion("status between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("status not between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundMoneyIsNull() {
+            addCriterion("refund_money is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundMoneyIsNotNull() {
+            addCriterion("refund_money is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundMoneyEqualTo(BigDecimal value) {
+            addCriterion("refund_money =", value, "refundMoney");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundMoneyNotEqualTo(BigDecimal value) {
+            addCriterion("refund_money <>", value, "refundMoney");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundMoneyGreaterThan(BigDecimal value) {
+            addCriterion("refund_money >", value, "refundMoney");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundMoneyGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("refund_money >=", value, "refundMoney");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundMoneyLessThan(BigDecimal value) {
+            addCriterion("refund_money <", value, "refundMoney");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundMoneyLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("refund_money <=", value, "refundMoney");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundMoneyIn(List<BigDecimal> values) {
+            addCriterion("refund_money in", values, "refundMoney");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundMoneyNotIn(List<BigDecimal> values) {
+            addCriterion("refund_money not in", values, "refundMoney");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundMoneyBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("refund_money between", value1, value2, "refundMoney");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundMoneyNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("refund_money not between", value1, value2, "refundMoney");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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

@@ -13,6 +13,7 @@ import com.idea.customerManagement.dto.ContractManageDto;
 import com.idea.customerManagement.dto.CustomerManagementDto;
 import com.idea.customerManagement.mapper.ContractManageExtendMapper;
 import com.idea.customerManagement.mapper.ContractManageMapper;
+import com.idea.customerManagement.mapper.CustomerManagementMapper;
 import com.idea.customerManagement.model.*;
 import com.rockstar.common.base.BaseService;
 import com.rockstar.frame.model.extend.DateTrans;
@@ -40,6 +41,8 @@ public class ContractManageService implements BaseService<ContractManage, Contra
     private BuyerService buyerService;
     @Autowired
     private SysDictService sysDictService;
+    @Autowired
+    private CustomerManagementMapper customerManagementMapper;
 
     @Override
     public int deleteByPrimaryKey(String s) {
@@ -165,6 +168,10 @@ public class ContractManageService implements BaseService<ContractManage, Contra
             ParkRoom parkRoom = parkRoomService.selectByPrimaryKey(houseId);
             parkRoom.setSoldStatus(3);
             parkRoomService.updateByPrimaryKeySelective(parkRoom);
+            // 更新客户管理 购房状态 已签约
+            CustomerManagement customerManagement = customerManagementMapper.selectByPrimaryKey(model.getCustomerManagementId());
+            customerManagement.setStatus(3);
+            customerManagementMapper.updateByPrimaryKeySelective(customerManagement);
         }
         int result = updateByPrimaryKeySelective(model);
         return result;

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

@@ -176,12 +176,15 @@ public class CustomerManagementService implements BaseService<CustomerManagement
         }
         // 再新增
         List<Buyer> buyers = JSONObject.parseArray(buyerJson, Buyer.class);
+        int i = 1;
         for(Buyer buyer : buyers){
-
+            buyer.setOrderNum(i);
+            i++;
             buyer.setCustomerManagementId(id);
             buyer.setCreatedAt(date);
             buyer.setCreatedId(userId);
             buyerService.insertSelective(buyer);
+
         }
         model.setUpdatedAt(date);
         model.setUpdatedId(userId);
@@ -222,6 +225,7 @@ public class CustomerManagementService implements BaseService<CustomerManagement
         CustomerManagementDto result = new CustomerManagementDto();
         BeanUtil.copyProperties(customerManagement,result);
         BuyerExample buyerExample = new BuyerExample();
+        buyerExample.setOrderByClause("order_num asc");
         buyerExample.createCriteria().andCustomerManagementIdEqualTo(id);
         List<Buyer> buyers = buyerService.selectByExample(buyerExample);
         if(CollectionUtils.isNotEmpty(buyers)){

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

@@ -3,26 +3,34 @@ package com.idea.customerManagement.service;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.idea.buildManage.mapper.ParkFloorDiscMapper;
 import com.idea.buildManage.mapper.ParkInfoMapper;
+import com.idea.buildManage.mapper.ParkRoomExtendMapper;
+import com.idea.buildManage.mapper.ParkRoomMapper;
 import com.idea.buildManage.model.ParkFloorDisc;
 import com.idea.buildManage.model.ParkInfo;
+import com.idea.buildManage.model.ParkRoom;
 import com.idea.buildManage.response.ParkRoomResponse;
+import com.idea.customerManagement.dto.ContractManageDto;
 import com.idea.customerManagement.dto.IntentionalDepositDto;
 import com.idea.customerManagement.mapper.CustomerManagementMapper;
+import com.idea.customerManagement.mapper.IntentionalDepositExtendMapper;
 import com.idea.customerManagement.mapper.IntentionalDepositMapper;
-import com.idea.customerManagement.model.CustomerManagement;
-import com.idea.customerManagement.model.IntentionalDeposit;
-import com.idea.customerManagement.model.IntentionalDepositExample;
-import com.idea.customerManagement.model.RoomSelectionInfoExample;
+import com.idea.customerManagement.mapper.RoomSelectionInfoMapper;
+import com.idea.customerManagement.model.*;
 import com.rockstar.common.base.BaseService;
 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 org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -39,6 +47,14 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
     private ParkFloorDiscMapper parkFloorDiscMapper;
     @Autowired
     private FrameUserService frameUserService;
+    @Autowired
+    private IntentionalDepositExtendMapper extendMapper;
+    @Autowired
+    private ParkRoomExtendMapper roomExtendMapper;
+    @Autowired
+    private RoomSelectionInfoMapper roomSelectionInfoMapper;
+    @Autowired
+    private ParkRoomMapper parkRoomMapper;
 
 
     @Override
@@ -125,6 +141,8 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
     public int add(IntentionalDeposit model){
 
         CustomerManagement customerManagement = customerManagementMapper.selectByPrimaryKey(model.getCustomerManagementId());
+        // 已收取
+        model.setStatus(1);
         model.setGroupId(customerManagement.getGroupId());
         model.setDiscId(customerManagement.getDiscId());
         model.setCreatedAt(new Date());
@@ -171,6 +189,86 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
 
     }
 
+    /**
+     * 分页
+     * @param tablepar
+     * @param model
+     * @param dt
+     * @return
+     */
+    public PageInfo<IntentionalDepositDto> listByModel(Tablepar tablepar, IntentionalDepositDto model, DateTrans dt) {
+        PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
+        List<IntentionalDepositDto> list = extendMapper.listByModel(model);
+        PageInfo<IntentionalDepositDto> pageInfo = new PageInfo<>(list);
+        return pageInfo;
+    }
+
+    /**
+     * 意向金转定金
+     * @param model
+     * @return
+     */
+    public int toDeposit(IntentionalDeposit model) {
+
+        String houseId = model.getHouseId();
+        String customerManagementId = model.getCustomerManagementId();
+
+        CustomerManagement customerManagement = customerManagementMapper.selectByPrimaryKey(customerManagementId);
+        // 购房状态 已选房
+        customerManagement.setStatus(2);
+        customerManagement.setHouseId(houseId);
+        StringBuilder builder = new StringBuilder();
+
+        // 拼接房屋名称
+        ParkRoomResponse response = roomExtendMapper.getFullName(houseId);
+        builder.append(response.getBuildName()).append("-").append(response.getRoomNo()).append(",");
+        customerManagement.setHouseName(builder.toString());
+        customerManagementMapper.updateByPrimaryKeySelective(customerManagement);
+
+        // 新增选房信息
+        RoomSelectionInfo roomSelectionInfo = new RoomSelectionInfo();
+        roomSelectionInfo.setCustomerManagementId(customerManagementId);
+        roomSelectionInfo.setHouseId(response.getId());
+        roomSelectionInfo.setBuildId(response.getBuildId());
+        roomSelectionInfo.setDiscId(response.getDiscId());
+        roomSelectionInfo.setGroupId(response.getGroupId());
+        roomSelectionInfo.setCreatedAt(new Date());
+        roomSelectionInfo.setCreatedId(ShiroUtils.getUserId());
+        roomSelectionInfo.setReceivableMoney(response.getSubscriptionFunds());
+        // 收取状态 意向金转入
+        roomSelectionInfo.setStatus(3);
+        roomSelectionInfoMapper.insertSelective(roomSelectionInfo);
+
+        // 更新房间状态
+        ParkRoom parkRoom = new ParkRoom();
+        parkRoom.setId(response.getId());
+        parkRoom.setIsChoose(1);
+        parkRoomMapper.updateByPrimaryKeySelective(parkRoom);
+        if (builder.length() > 0) {
+            builder.deleteCharAt(builder.length() - 1);
+        }
+
+        // 转定金
+        model.setStatus(2);
+        modelMapper.updateByPrimaryKeySelective(model);
+
+        return 1;
+
+    }
+
+    /**
+     * 退意向金
+     * @param model
+     * @return
+     */
+    public int refund(IntentionalDeposit model){
+
+        // 退意向金
+        model.setStatus(3);
+        int result = modelMapper.updateByPrimaryKeySelective(model);
+        return result;
+    }
+
 
 
 }

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

@@ -1,11 +1,14 @@
 package com.idea.customerManagement.service;
 
 import cn.hutool.core.util.IdUtil;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.idea.buildManage.mapper.MnpBuildingMapper;
 import com.idea.buildManage.mapper.ParkRoomExtendMapper;
 import com.idea.buildManage.mapper.ParkRoomMapper;
 import com.idea.buildManage.model.ParkRoom;
 import com.idea.buildManage.response.ParkRoomResponse;
+import com.idea.customerManagement.dto.ContractManageDto;
 import com.idea.customerManagement.dto.RoomSelectionInfoDto;
 import com.idea.customerManagement.mapper.CustomerManagementMapper;
 import com.idea.customerManagement.mapper.RoomSelectionInfoExtendMapper;
@@ -14,6 +17,8 @@ import com.idea.customerManagement.model.*;
 import com.idea.util.DateUtils;
 import com.idea.util.ReplaceWord;
 import com.rockstar.common.base.BaseService;
+import com.rockstar.frame.model.extend.DateTrans;
+import com.rockstar.frame.model.extend.Tablepar;
 import com.rockstar.shiro.util.ShiroUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -256,4 +261,19 @@ public class RoomSelectionInfoService implements BaseService<RoomSelectionInfo,
     }
 
 
+    /**
+     * 定金列表
+     * @param tablepar
+     * @param model
+     * @param dt
+     * @return
+     */
+    public PageInfo<RoomSelectionInfoDto> listByModel(Tablepar tablepar, RoomSelectionInfoDto model, DateTrans dt) {
+        PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
+        List<RoomSelectionInfoDto> list = extendMapper.listByModel(model);
+        PageInfo<RoomSelectionInfoDto> pageInfo = new PageInfo<>(list);
+        return pageInfo;
+    }
+
+
 }

pro-base/src/main/java/com/idea/invoice/controller/InvoiceBankController.java

@@ -0,0 +1,85 @@
+package com.idea.invoice.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.github.pagehelper.PageInfo;
+import com.idea.invoice.model.InvoiceBank;
+import com.idea.invoice.service.InvoiceBankService;
+import com.rockstar.common.base.BaseController;
+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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@Controller
+@RequestMapping(value = "InvoiceBankController")
+@Api(value="开票销方开户行信息")
+public class InvoiceBankController extends BaseController {
+
+    //主表
+    @Autowired
+    private InvoiceBankService modelService;
+
+    @PostMapping(value = "list",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public Object list(Tablepar tablepar, InvoiceBank model, DateTrans dt){
+        PageInfo<InvoiceBank> page= modelService.list(tablepar,model,dt);
+        return new TableSplitResult<>(page.getPageNum(), page.getTotal(), page.getList());
+    }
+
+    @PostMapping(value = "listAll",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public Object listAll(InvoiceBank model, DateTrans dt){
+        return  modelService.listAll(model,dt);
+    }
+
+    @PostMapping(value = "add",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public AjaxResult add(InvoiceBank record){
+        record.setCreateUser(ShiroUtils.getUserId());
+        record.setUpdateUser(ShiroUtils.getUserId());
+        int result = modelService.add(record);
+        return result(result);
+    }
+
+    @PostMapping(value = "remove/{id}",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public AjaxResult remove(@PathVariable("id") String id){
+        int result = modelService.deleteByPrimaryKey(id);
+        return result(result);
+    }
+
+    @PostMapping(value = "edit",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public AjaxResult edit(InvoiceBank record){
+        record.setUpdateUser(ShiroUtils.getUserId());
+        int result = modelService.edit(record);
+        return result(result);
+    }
+
+    @PostMapping(value = "getById",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public InvoiceBank getById(String id) {
+        return modelService.selectByPrimaryKey(id);
+    }
+
+    @PostMapping(value = "getTreeData",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public JSONArray getTreeData() {
+        return modelService.getTreeData();
+    }
+
+    @PostMapping(value = "getBillType",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public JSONArray getBillType(String id) {
+        return modelService.getBillType(id);
+    }
+
+}

pro-base/src/main/java/com/idea/invoice/service/InvoiceBankService.java

@@ -213,9 +213,9 @@ public class InvoiceBankService implements BaseService<InvoiceBank, InvoiceBankE
     public JSONArray getBillType(String id) {
 
         // 账单类型
-        List<Map<String, String>> houseUsage = sysDictService.selectDictList("BILL_TYPE");
+        List<Map<String, String>> costType = sysDictService.selectDictList("COST_TYPE");
         JSONArray billJsonArray = new JSONArray();
-        for (Map<String, String> stringStringMap : houseUsage) {
+        for (Map<String, String> stringStringMap : costType) {
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("suitCostType",stringStringMap.get("label"));
             billJsonArray.add(jsonObject);

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

@@ -18,6 +18,9 @@
       <if test="saleStatus != null and saleStatus != ''">
         and r.sale_status in (${saleStatus})
       </if>
+      <if test="soldStatus != null and soldStatus != ''">
+        and r.sold_status in (${soldStatus})
+      </if>
       <if test="actualInternalArea != null and actualInternalArea != ''">
         and r.actual_internal_area = #{actualInternalArea}
       </if>

pro-base/src/main/resources/mybatis/customerManagement/IntentionalDepositExtendMapper.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.idea.customerManagement.mapper.IntentionalDepositExtendMapper">
+
+
+  <select id="listByModel" resultType="com.idea.customerManagement.dto.IntentionalDepositDto">
+    select intentional_deposit.*,customer_management.buyer_name,customer_management.house_name,frame_user.truename as createdName
+    from intentional_deposit
+    left join customer_management on customer_management.id = intentional_deposit.customer_management_id
+    left join frame_user on frame_user.id = intentional_deposit.created_id
+  </select>
+
+</mapper>

pro-base/src/main/resources/mybatis/customerManagement/IntentionalDepositMapper.xml

@@ -5,20 +5,31 @@
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="group_id" jdbcType="VARCHAR" property="groupId" />
     <result column="disc_id" jdbcType="VARCHAR" property="discId" />
+    <result column="house_id" jdbcType="VARCHAR" property="houseId" />
     <result column="customer_management_id" jdbcType="VARCHAR" property="customerManagementId" />
     <result column="receivable_money" jdbcType="DECIMAL" property="receivableMoney" />
     <result column="received_amount" jdbcType="DECIMAL" property="receivedAmount" />
     <result column="payment_method" jdbcType="INTEGER" property="paymentMethod" />
     <result column="serial_number" jdbcType="VARCHAR" property="serialNumber" />
+    <result column="deposit_serial_number" jdbcType="VARCHAR" property="depositSerialNumber" />
     <result column="collection_time" jdbcType="TIMESTAMP" property="collectionTime" />
     <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="handle_id" jdbcType="VARCHAR" property="handleId" />
+    <result column="handle_date" jdbcType="TIMESTAMP" property="handleDate" />
+    <result column="refund_handle_id" jdbcType="VARCHAR" property="refundHandleId" />
+    <result column="refund_handle_date" jdbcType="TIMESTAMP" property="refundHandleDate" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="refund_money" jdbcType="DECIMAL" property="refundMoney" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.idea.customerManagement.model.IntentionalDeposit">
     <result column="remark" jdbcType="LONGVARCHAR" property="remark" />
+    <result column="deposit_remark" jdbcType="LONGVARCHAR" property="depositRemark" />
+    <result column="refund_remark" jdbcType="LONGVARCHAR" property="refundRemark" />
     <result column="file_list" jdbcType="LONGVARCHAR" property="fileList" />
+    <result column="paper_receipts" jdbcType="LONGVARCHAR" property="paperReceipts" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -79,12 +90,13 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, group_id, disc_id, customer_management_id, receivable_money, received_amount, 
-    payment_method, serial_number, collection_time, created_id, created_at, updated_at, 
-    updated_id
+    id, group_id, disc_id, house_id, customer_management_id, receivable_money, received_amount,
+    payment_method, serial_number, deposit_serial_number, collection_time, created_id,
+    created_at, updated_at, updated_id, handle_id, handle_date, refund_handle_id, refund_handle_date,
+    status, refund_money
   </sql>
   <sql id="Blob_Column_List">
-    remark, file_list
+    remark, deposit_remark, refund_remark, file_list, paper_receipts
   </sql>
   <select id="selectByExampleWithBLOBs" parameterType="com.idea.customerManagement.model.IntentionalDepositExample" resultMap="ResultMapWithBLOBs">
     select
@@ -117,7 +129,7 @@
     </if>
   </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
-    select 
+    select
     <include refid="Base_Column_List" />
     ,
     <include refid="Blob_Column_List" />
@@ -135,18 +147,26 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.idea.customerManagement.model.IntentionalDeposit">
-    insert into intentional_deposit (id, group_id, disc_id, 
-      customer_management_id, receivable_money, 
-      received_amount, payment_method, serial_number, 
-      collection_time, created_id, created_at, 
-      updated_at, updated_id, remark, 
-      file_list)
-    values (#{id,jdbcType=VARCHAR}, #{groupId,jdbcType=VARCHAR}, #{discId,jdbcType=VARCHAR}, 
-      #{customerManagementId,jdbcType=VARCHAR}, #{receivableMoney,jdbcType=DECIMAL}, 
-      #{receivedAmount,jdbcType=DECIMAL}, #{paymentMethod,jdbcType=INTEGER}, #{serialNumber,jdbcType=VARCHAR}, 
-      #{collectionTime,jdbcType=TIMESTAMP}, #{createdId,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, 
-      #{updatedAt,jdbcType=TIMESTAMP}, #{updatedId,jdbcType=VARCHAR}, #{remark,jdbcType=LONGVARCHAR}, 
-      #{fileList,jdbcType=LONGVARCHAR})
+    insert into intentional_deposit (id, group_id, disc_id,
+                                     house_id, customer_management_id, receivable_money,
+                                     received_amount, payment_method, serial_number,
+                                     deposit_serial_number, collection_time,
+                                     created_id, created_at, updated_at,
+                                     updated_id, handle_id, handle_date,
+                                     refund_handle_id, refund_handle_date, status,
+                                     refund_money, remark, deposit_remark,
+                                     refund_remark, file_list, paper_receipts
+    )
+    values (#{id,jdbcType=VARCHAR}, #{groupId,jdbcType=VARCHAR}, #{discId,jdbcType=VARCHAR},
+            #{houseId,jdbcType=VARCHAR}, #{customerManagementId,jdbcType=VARCHAR}, #{receivableMoney,jdbcType=DECIMAL},
+            #{receivedAmount,jdbcType=DECIMAL}, #{paymentMethod,jdbcType=INTEGER}, #{serialNumber,jdbcType=VARCHAR},
+            #{depositSerialNumber,jdbcType=VARCHAR}, #{collectionTime,jdbcType=TIMESTAMP},
+            #{createdId,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP},
+            #{updatedId,jdbcType=VARCHAR}, #{handleId,jdbcType=VARCHAR}, #{handleDate,jdbcType=TIMESTAMP},
+            #{refundHandleId,jdbcType=VARCHAR}, #{refundHandleDate,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER},
+            #{refundMoney,jdbcType=DECIMAL}, #{remark,jdbcType=LONGVARCHAR}, #{depositRemark,jdbcType=LONGVARCHAR},
+            #{refundRemark,jdbcType=LONGVARCHAR}, #{fileList,jdbcType=LONGVARCHAR}, #{paperReceipts,jdbcType=LONGVARCHAR}
+           )
   </insert>
   <insert id="insertSelective" parameterType="com.idea.customerManagement.model.IntentionalDeposit">
     insert into intentional_deposit
@@ -160,6 +180,9 @@
       <if test="discId != null">
         disc_id,
       </if>
+      <if test="houseId != null">
+        house_id,
+      </if>
       <if test="customerManagementId != null">
         customer_management_id,
       </if>
@@ -175,6 +198,9 @@
       <if test="serialNumber != null">
         serial_number,
       </if>
+      <if test="depositSerialNumber != null">
+        deposit_serial_number,
+      </if>
       <if test="collectionTime != null">
         collection_time,
       </if>
@@ -190,12 +216,39 @@
       <if test="updatedId != null">
         updated_id,
       </if>
+      <if test="handleId != null">
+        handle_id,
+      </if>
+      <if test="handleDate != null">
+        handle_date,
+      </if>
+      <if test="refundHandleId != null">
+        refund_handle_id,
+      </if>
+      <if test="refundHandleDate != null">
+        refund_handle_date,
+      </if>
+      <if test="status != null">
+        status,
+      </if>
+      <if test="refundMoney != null">
+        refund_money,
+      </if>
       <if test="remark != null">
         remark,
       </if>
+      <if test="depositRemark != null">
+        deposit_remark,
+      </if>
+      <if test="refundRemark != null">
+        refund_remark,
+      </if>
       <if test="fileList != null">
         file_list,
       </if>
+      <if test="paperReceipts != null">
+        paper_receipts,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -207,6 +260,9 @@
       <if test="discId != null">
         #{discId,jdbcType=VARCHAR},
       </if>
+      <if test="houseId != null">
+        #{houseId,jdbcType=VARCHAR},
+      </if>
       <if test="customerManagementId != null">
         #{customerManagementId,jdbcType=VARCHAR},
       </if>
@@ -222,6 +278,9 @@
       <if test="serialNumber != null">
         #{serialNumber,jdbcType=VARCHAR},
       </if>
+      <if test="depositSerialNumber != null">
+        #{depositSerialNumber,jdbcType=VARCHAR},
+      </if>
       <if test="collectionTime != null">
         #{collectionTime,jdbcType=TIMESTAMP},
       </if>
@@ -237,12 +296,39 @@
       <if test="updatedId != null">
         #{updatedId,jdbcType=VARCHAR},
       </if>
+      <if test="handleId != null">
+        #{handleId,jdbcType=VARCHAR},
+      </if>
+      <if test="handleDate != null">
+        #{handleDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="refundHandleId != null">
+        #{refundHandleId,jdbcType=VARCHAR},
+      </if>
+      <if test="refundHandleDate != null">
+        #{refundHandleDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="refundMoney != null">
+        #{refundMoney,jdbcType=DECIMAL},
+      </if>
       <if test="remark != null">
         #{remark,jdbcType=LONGVARCHAR},
       </if>
+      <if test="depositRemark != null">
+        #{depositRemark,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="refundRemark != null">
+        #{refundRemark,jdbcType=LONGVARCHAR},
+      </if>
       <if test="fileList != null">
         #{fileList,jdbcType=LONGVARCHAR},
       </if>
+      <if test="paperReceipts != null">
+        #{paperReceipts,jdbcType=LONGVARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.idea.customerManagement.model.IntentionalDepositExample" resultType="java.lang.Long">
@@ -263,6 +349,9 @@
       <if test="record.discId != null">
         disc_id = #{record.discId,jdbcType=VARCHAR},
       </if>
+      <if test="record.houseId != null">
+        house_id = #{record.houseId,jdbcType=VARCHAR},
+      </if>
       <if test="record.customerManagementId != null">
         customer_management_id = #{record.customerManagementId,jdbcType=VARCHAR},
       </if>
@@ -278,6 +367,9 @@
       <if test="record.serialNumber != null">
         serial_number = #{record.serialNumber,jdbcType=VARCHAR},
       </if>
+      <if test="record.depositSerialNumber != null">
+        deposit_serial_number = #{record.depositSerialNumber,jdbcType=VARCHAR},
+      </if>
       <if test="record.collectionTime != null">
         collection_time = #{record.collectionTime,jdbcType=TIMESTAMP},
       </if>
@@ -293,12 +385,39 @@
       <if test="record.updatedId != null">
         updated_id = #{record.updatedId,jdbcType=VARCHAR},
       </if>
+      <if test="record.handleId != null">
+        handle_id = #{record.handleId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.handleDate != null">
+        handle_date = #{record.handleDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.refundHandleId != null">
+        refund_handle_id = #{record.refundHandleId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.refundHandleDate != null">
+        refund_handle_date = #{record.refundHandleDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.status != null">
+        status = #{record.status,jdbcType=INTEGER},
+      </if>
+      <if test="record.refundMoney != null">
+        refund_money = #{record.refundMoney,jdbcType=DECIMAL},
+      </if>
       <if test="record.remark != null">
         remark = #{record.remark,jdbcType=LONGVARCHAR},
       </if>
+      <if test="record.depositRemark != null">
+        deposit_remark = #{record.depositRemark,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="record.refundRemark != null">
+        refund_remark = #{record.refundRemark,jdbcType=LONGVARCHAR},
+      </if>
       <if test="record.fileList != null">
         file_list = #{record.fileList,jdbcType=LONGVARCHAR},
       </if>
+      <if test="record.paperReceipts != null">
+        paper_receipts = #{record.paperReceipts,jdbcType=LONGVARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -307,20 +426,31 @@
   <update id="updateByExampleWithBLOBs" parameterType="map">
     update intentional_deposit
     set id = #{record.id,jdbcType=VARCHAR},
-      group_id = #{record.groupId,jdbcType=VARCHAR},
-      disc_id = #{record.discId,jdbcType=VARCHAR},
-      customer_management_id = #{record.customerManagementId,jdbcType=VARCHAR},
-      receivable_money = #{record.receivableMoney,jdbcType=DECIMAL},
-      received_amount = #{record.receivedAmount,jdbcType=DECIMAL},
-      payment_method = #{record.paymentMethod,jdbcType=INTEGER},
-      serial_number = #{record.serialNumber,jdbcType=VARCHAR},
-      collection_time = #{record.collectionTime,jdbcType=TIMESTAMP},
-      created_id = #{record.createdId,jdbcType=VARCHAR},
-      created_at = #{record.createdAt,jdbcType=TIMESTAMP},
-      updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
-      updated_id = #{record.updatedId,jdbcType=VARCHAR},
-      remark = #{record.remark,jdbcType=LONGVARCHAR},
-      file_list = #{record.fileList,jdbcType=LONGVARCHAR}
+    group_id = #{record.groupId,jdbcType=VARCHAR},
+    disc_id = #{record.discId,jdbcType=VARCHAR},
+    house_id = #{record.houseId,jdbcType=VARCHAR},
+    customer_management_id = #{record.customerManagementId,jdbcType=VARCHAR},
+    receivable_money = #{record.receivableMoney,jdbcType=DECIMAL},
+    received_amount = #{record.receivedAmount,jdbcType=DECIMAL},
+    payment_method = #{record.paymentMethod,jdbcType=INTEGER},
+    serial_number = #{record.serialNumber,jdbcType=VARCHAR},
+    deposit_serial_number = #{record.depositSerialNumber,jdbcType=VARCHAR},
+    collection_time = #{record.collectionTime,jdbcType=TIMESTAMP},
+    created_id = #{record.createdId,jdbcType=VARCHAR},
+    created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+    updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+    updated_id = #{record.updatedId,jdbcType=VARCHAR},
+    handle_id = #{record.handleId,jdbcType=VARCHAR},
+    handle_date = #{record.handleDate,jdbcType=TIMESTAMP},
+    refund_handle_id = #{record.refundHandleId,jdbcType=VARCHAR},
+    refund_handle_date = #{record.refundHandleDate,jdbcType=TIMESTAMP},
+    status = #{record.status,jdbcType=INTEGER},
+    refund_money = #{record.refundMoney,jdbcType=DECIMAL},
+    remark = #{record.remark,jdbcType=LONGVARCHAR},
+    deposit_remark = #{record.depositRemark,jdbcType=LONGVARCHAR},
+    refund_remark = #{record.refundRemark,jdbcType=LONGVARCHAR},
+    file_list = #{record.fileList,jdbcType=LONGVARCHAR},
+    paper_receipts = #{record.paperReceipts,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -328,18 +458,26 @@
   <update id="updateByExample" parameterType="map">
     update intentional_deposit
     set id = #{record.id,jdbcType=VARCHAR},
-      group_id = #{record.groupId,jdbcType=VARCHAR},
-      disc_id = #{record.discId,jdbcType=VARCHAR},
-      customer_management_id = #{record.customerManagementId,jdbcType=VARCHAR},
-      receivable_money = #{record.receivableMoney,jdbcType=DECIMAL},
-      received_amount = #{record.receivedAmount,jdbcType=DECIMAL},
-      payment_method = #{record.paymentMethod,jdbcType=INTEGER},
-      serial_number = #{record.serialNumber,jdbcType=VARCHAR},
-      collection_time = #{record.collectionTime,jdbcType=TIMESTAMP},
-      created_id = #{record.createdId,jdbcType=VARCHAR},
-      created_at = #{record.createdAt,jdbcType=TIMESTAMP},
-      updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
-      updated_id = #{record.updatedId,jdbcType=VARCHAR}
+    group_id = #{record.groupId,jdbcType=VARCHAR},
+    disc_id = #{record.discId,jdbcType=VARCHAR},
+    house_id = #{record.houseId,jdbcType=VARCHAR},
+    customer_management_id = #{record.customerManagementId,jdbcType=VARCHAR},
+    receivable_money = #{record.receivableMoney,jdbcType=DECIMAL},
+    received_amount = #{record.receivedAmount,jdbcType=DECIMAL},
+    payment_method = #{record.paymentMethod,jdbcType=INTEGER},
+    serial_number = #{record.serialNumber,jdbcType=VARCHAR},
+    deposit_serial_number = #{record.depositSerialNumber,jdbcType=VARCHAR},
+    collection_time = #{record.collectionTime,jdbcType=TIMESTAMP},
+    created_id = #{record.createdId,jdbcType=VARCHAR},
+    created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+    updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+    updated_id = #{record.updatedId,jdbcType=VARCHAR},
+    handle_id = #{record.handleId,jdbcType=VARCHAR},
+    handle_date = #{record.handleDate,jdbcType=TIMESTAMP},
+    refund_handle_id = #{record.refundHandleId,jdbcType=VARCHAR},
+    refund_handle_date = #{record.refundHandleDate,jdbcType=TIMESTAMP},
+    status = #{record.status,jdbcType=INTEGER},
+    refund_money = #{record.refundMoney,jdbcType=DECIMAL}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -353,6 +491,9 @@
       <if test="discId != null">
         disc_id = #{discId,jdbcType=VARCHAR},
       </if>
+      <if test="houseId != null">
+        house_id = #{houseId,jdbcType=VARCHAR},
+      </if>
       <if test="customerManagementId != null">
         customer_management_id = #{customerManagementId,jdbcType=VARCHAR},
       </if>
@@ -368,6 +509,9 @@
       <if test="serialNumber != null">
         serial_number = #{serialNumber,jdbcType=VARCHAR},
       </if>
+      <if test="depositSerialNumber != null">
+        deposit_serial_number = #{depositSerialNumber,jdbcType=VARCHAR},
+      </if>
       <if test="collectionTime != null">
         collection_time = #{collectionTime,jdbcType=TIMESTAMP},
       </if>
@@ -383,47 +527,93 @@
       <if test="updatedId != null">
         updated_id = #{updatedId,jdbcType=VARCHAR},
       </if>
+      <if test="handleId != null">
+        handle_id = #{handleId,jdbcType=VARCHAR},
+      </if>
+      <if test="handleDate != null">
+        handle_date = #{handleDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="refundHandleId != null">
+        refund_handle_id = #{refundHandleId,jdbcType=VARCHAR},
+      </if>
+      <if test="refundHandleDate != null">
+        refund_handle_date = #{refundHandleDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="status != null">
+        status = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="refundMoney != null">
+        refund_money = #{refundMoney,jdbcType=DECIMAL},
+      </if>
       <if test="remark != null">
         remark = #{remark,jdbcType=LONGVARCHAR},
       </if>
+      <if test="depositRemark != null">
+        deposit_remark = #{depositRemark,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="refundRemark != null">
+        refund_remark = #{refundRemark,jdbcType=LONGVARCHAR},
+      </if>
       <if test="fileList != null">
         file_list = #{fileList,jdbcType=LONGVARCHAR},
       </if>
+      <if test="paperReceipts != null">
+        paper_receipts = #{paperReceipts,jdbcType=LONGVARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.idea.customerManagement.model.IntentionalDeposit">
     update intentional_deposit
     set group_id = #{groupId,jdbcType=VARCHAR},
-      disc_id = #{discId,jdbcType=VARCHAR},
-      customer_management_id = #{customerManagementId,jdbcType=VARCHAR},
-      receivable_money = #{receivableMoney,jdbcType=DECIMAL},
-      received_amount = #{receivedAmount,jdbcType=DECIMAL},
-      payment_method = #{paymentMethod,jdbcType=INTEGER},
-      serial_number = #{serialNumber,jdbcType=VARCHAR},
-      collection_time = #{collectionTime,jdbcType=TIMESTAMP},
-      created_id = #{createdId,jdbcType=VARCHAR},
-      created_at = #{createdAt,jdbcType=TIMESTAMP},
-      updated_at = #{updatedAt,jdbcType=TIMESTAMP},
-      updated_id = #{updatedId,jdbcType=VARCHAR},
-      remark = #{remark,jdbcType=LONGVARCHAR},
-      file_list = #{fileList,jdbcType=LONGVARCHAR}
+        disc_id = #{discId,jdbcType=VARCHAR},
+        house_id = #{houseId,jdbcType=VARCHAR},
+        customer_management_id = #{customerManagementId,jdbcType=VARCHAR},
+        receivable_money = #{receivableMoney,jdbcType=DECIMAL},
+        received_amount = #{receivedAmount,jdbcType=DECIMAL},
+        payment_method = #{paymentMethod,jdbcType=INTEGER},
+        serial_number = #{serialNumber,jdbcType=VARCHAR},
+        deposit_serial_number = #{depositSerialNumber,jdbcType=VARCHAR},
+        collection_time = #{collectionTime,jdbcType=TIMESTAMP},
+        created_id = #{createdId,jdbcType=VARCHAR},
+        created_at = #{createdAt,jdbcType=TIMESTAMP},
+        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+        updated_id = #{updatedId,jdbcType=VARCHAR},
+        handle_id = #{handleId,jdbcType=VARCHAR},
+        handle_date = #{handleDate,jdbcType=TIMESTAMP},
+        refund_handle_id = #{refundHandleId,jdbcType=VARCHAR},
+        refund_handle_date = #{refundHandleDate,jdbcType=TIMESTAMP},
+        status = #{status,jdbcType=INTEGER},
+        refund_money = #{refundMoney,jdbcType=DECIMAL},
+        remark = #{remark,jdbcType=LONGVARCHAR},
+        deposit_remark = #{depositRemark,jdbcType=LONGVARCHAR},
+        refund_remark = #{refundRemark,jdbcType=LONGVARCHAR},
+        file_list = #{fileList,jdbcType=LONGVARCHAR},
+        paper_receipts = #{paperReceipts,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.idea.customerManagement.model.IntentionalDeposit">
     update intentional_deposit
     set group_id = #{groupId,jdbcType=VARCHAR},
-      disc_id = #{discId,jdbcType=VARCHAR},
-      customer_management_id = #{customerManagementId,jdbcType=VARCHAR},
-      receivable_money = #{receivableMoney,jdbcType=DECIMAL},
-      received_amount = #{receivedAmount,jdbcType=DECIMAL},
-      payment_method = #{paymentMethod,jdbcType=INTEGER},
-      serial_number = #{serialNumber,jdbcType=VARCHAR},
-      collection_time = #{collectionTime,jdbcType=TIMESTAMP},
-      created_id = #{createdId,jdbcType=VARCHAR},
-      created_at = #{createdAt,jdbcType=TIMESTAMP},
-      updated_at = #{updatedAt,jdbcType=TIMESTAMP},
-      updated_id = #{updatedId,jdbcType=VARCHAR}
+        disc_id = #{discId,jdbcType=VARCHAR},
+        house_id = #{houseId,jdbcType=VARCHAR},
+        customer_management_id = #{customerManagementId,jdbcType=VARCHAR},
+        receivable_money = #{receivableMoney,jdbcType=DECIMAL},
+        received_amount = #{receivedAmount,jdbcType=DECIMAL},
+        payment_method = #{paymentMethod,jdbcType=INTEGER},
+        serial_number = #{serialNumber,jdbcType=VARCHAR},
+        deposit_serial_number = #{depositSerialNumber,jdbcType=VARCHAR},
+        collection_time = #{collectionTime,jdbcType=TIMESTAMP},
+        created_id = #{createdId,jdbcType=VARCHAR},
+        created_at = #{createdAt,jdbcType=TIMESTAMP},
+        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+        updated_id = #{updatedId,jdbcType=VARCHAR},
+        handle_id = #{handleId,jdbcType=VARCHAR},
+        handle_date = #{handleDate,jdbcType=TIMESTAMP},
+        refund_handle_id = #{refundHandleId,jdbcType=VARCHAR},
+        refund_handle_date = #{refundHandleDate,jdbcType=TIMESTAMP},
+        status = #{status,jdbcType=INTEGER},
+        refund_money = #{refundMoney,jdbcType=DECIMAL}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

pro-base/src/main/resources/mybatis/customerManagement/RoomSelectionInfoExtendMapper.xml

@@ -20,4 +20,15 @@
         </if>
     </where>
   </select>
+
+    <select id="listByModel" resultType="com.idea.customerManagement.dto.RoomSelectionInfoDto">
+        select room_selection_info.*,
+               mnp_building.build_num buildName,
+               park_room.room_no,
+               frame_user.truename createdName
+        from room_selection_info
+         left join mnp_building on mnp_building.id = room_selection_info.build_id
+         left join park_room on park_room.id = room_selection_info.house_id
+         left join frame_user on frame_user.id = room_selection_info.created_id
+    </select>
 </mapper>