客户管理

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

@@ -16,4 +16,6 @@ public interface ParkRoomExtendMapper {
 
     int insertBatch(@Param("list") List<ParkRoom> record);
 
+    ParkRoomResponse getFullName(String houseId);
+
 }

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

@@ -1,16 +1,24 @@
 package com.idea.buildManage.response;
 
 import com.idea.buildManage.model.ParkRoom;
+import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
+@Data
 public class ParkRoomResponse extends ParkRoom {
 
     private String buildName;
 
     private String groupName;
 
-    private String floorName;
+    /**
+     * 楼盘名称
+     */
+    private String discName;
+
+//    private String floorName;
 
     //add - 逻辑字段 - 租赁公司
     public String enterpriseName;
@@ -25,10 +33,6 @@ public class ParkRoomResponse extends ParkRoom {
      */
     private List<String> directions;
 
-    /**
-     * 楼盘名称
-     */
-    private String floorDiscName;
 
     /**
      * 房屋楼盘名称集合
@@ -78,155 +82,6 @@ public class ParkRoomResponse extends ParkRoom {
 
     private String sizeEnd;
 
-    public String getSizeStart() {
-        return sizeStart;
-    }
-
-    public void setSizeStart(String sizeStart) {
-        this.sizeStart = sizeStart;
-    }
-
-    public String getSizeEnd() {
-        return sizeEnd;
-    }
-
-    public void setSizeEnd(String sizeEnd) {
-        this.sizeEnd = sizeEnd;
-    }
-
-    public String getYearMonth() {
-        return yearMonth;
-    }
-
-    public void setYearMonth(String yearMonth) {
-        this.yearMonth = yearMonth;
-    }
-
-    public String getYearMonthDay() {
-        return yearMonthDay;
-    }
-
-    public void setYearMonthDay(String yearMonthDay) {
-        this.yearMonthDay = yearMonthDay;
-    }
-
-    public String getFloorName() {
-        return floorName;
-    }
-
-    public void setFloorName(String floorName) {
-        this.floorName = floorName;
-    }
-
-    public List<String> getCurrentStates() {
-        return currentStates;
-    }
-
-    public void setCurrentStates(List<String> currentStates) {
-        this.currentStates = currentStates;
-    }
-
-    public String getNodeId() {
-        return nodeId;
-    }
-
-    public void setNodeId(String nodeId) {
-        this.nodeId = nodeId;
-    }
-
-    public String getLevel() {
-        return level;
-    }
-
-    public void setLevel(String level) {
-        this.level = level;
-    }
-
-    public String getBuildName() {
-        return buildName;
-    }
-
-    public void setBuildName(String buildName) {
-        this.buildName = buildName;
-    }
-
-    public String getGroupName() {
-        return groupName;
-    }
-
-    public void setGroupName(String groupName) {
-        this.groupName = groupName;
-    }
-
-    public String getEnterpriseName() {
-        return enterpriseName;
-    }
-
-    public void setEnterpriseName(String enterpriseName) {
-        this.enterpriseName = enterpriseName;
-    }
-
-    public String getManageName() {
-        return manageName;
-    }
-
-    public void setManageName(String manageName) {
-        this.manageName = manageName;
-    }
-
-    public List<String> getDirections() {
-        return directions;
-    }
-
-    public void setDirections(List<String> directions) {
-        this.directions = directions;
-    }
-
-    public String getFloorDiscName() {
-        return floorDiscName;
-    }
-
-    public void setFloorDiscName(String floorDiscName) {
-        this.floorDiscName = floorDiscName;
-    }
-
-    public List<String> getFloorDiscNames() {
-        return floorDiscNames;
-    }
-
-    public void setFloorDiscNames(List<String> floorDiscNames) {
-        this.floorDiscNames = floorDiscNames;
-    }
-
-    public List<String> getStates() {
-        return states;
-    }
-
-    public void setStates(List<String> states) {
-        this.states = states;
-    }
-
-    public List<String> getRoomUses() {
-        return roomUses;
-    }
-
-    public void setRoomUses(List<String> roomUses) {
-        this.roomUses = roomUses;
-    }
-
-    public List<String> getIsEnables() {
-        return isEnables;
-    }
-
-    public void setIsEnables(List<String> isEnables) {
-        this.isEnables = isEnables;
-    }
-
-    public List<String> getPropertyNatures() {
-        return propertyNatures;
-    }
+    private BigDecimal subscriptionFunds;
 
-    public void setPropertyNatures(List<String> propertyNatures) {
-        this.propertyNatures = propertyNatures;
-    }
 }

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

@@ -0,0 +1,89 @@
+package com.idea.customerManagement.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.idea.buildManage.model.ParkRoom;
+import com.idea.customerManagement.dto.CustomerManagementDto;
+import com.idea.customerManagement.service.CustomerManagementService;
+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 io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.Date;
+
+@Controller
+@RequestMapping(value = "HouseTypeController")
+@Api(tags = "客户管理")
+public class CustomerManagementController extends BaseController {
+
+    @Autowired
+    private CustomerManagementService modelService;
+
+    /**
+     * 分页
+     * @param tablepar
+     * @param model
+     * @param dt
+     * @return
+     */
+    @PostMapping(value = "list",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public Object list(Tablepar tablepar, CustomerManagementDto model, DateTrans dt){
+        PageInfo<CustomerManagementDto> page= modelService.listByModel(tablepar,model,dt);
+        TableSplitResult<CustomerManagementDto> result = new TableSplitResult<CustomerManagementDto>(page.getPageNum(), page.getTotal(), page.getList());
+        return  result;
+    }
+
+    /**
+     * 新增轮号客户
+     * @param record
+     * @return
+     */
+    @PostMapping(value = "add",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public AjaxResult add(CustomerManagementDto record){
+        int result = modelService.add(record);
+        return result(result);
+    }
+
+    /**
+     * 编辑轮号客户
+     * @param record
+     * @return
+     */
+    @PostMapping(value = "edit",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public AjaxResult edit(CustomerManagementDto record){
+        int result = modelService.edit(record);
+        return result(result);
+    }
+
+    /**
+     * 删除轮号客户
+     * @param id
+     * @return
+     */
+    @PostMapping(value = "delete",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public AjaxResult delete(String id){
+        int result = modelService.delete(id);
+        return result(result);
+    }
+
+    @PostMapping(value = "getById",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public Object getById(String id){
+        return getById(id);
+    }
+
+
+}

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

@@ -0,0 +1,96 @@
+package com.idea.customerManagement.controller;
+
+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 io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+
+@Controller
+@RequestMapping(value = "RoomSelectionInfoController")
+@Api(tags = "选房管理")
+public class RoomSelectionInfoController extends BaseController {
+
+    @Autowired
+    private RoomSelectionInfoService modelService;
+
+    /**
+     * 选房列表回显
+     * @param customerManagementId
+     * @return
+     */
+    @PostMapping(value = "listAll",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public Object list(String customerManagementId){
+        List<RoomSelectionInfoDto> result = modelService.listAll(customerManagementId);
+        return result;
+    }
+
+    /**
+     * 选房提交
+     * @param houseIds
+     * @param customerManagementId
+     * @return
+     */
+    @PostMapping(value = "submit",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public AjaxResult submit(String houseIds, String customerManagementId){
+        int result = modelService.submit(houseIds,customerManagementId);
+        return result(result);
+    }
+
+    /**
+     * 获取定金流水号
+     * @param houseId
+     * @return
+     */
+    @PostMapping(value = "getSerialNumber",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public String getSerialNumber(String houseId) {
+        return modelService.getSerialNumber(houseId);
+    }
+
+    /**
+     * 认购金登记
+     * @param model
+     * @return
+     */
+    @PostMapping(value = "add",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public AjaxResult add(RoomSelectionInfoDto model){
+        int result = modelService.add(model);
+        return result(result);
+    }
+
+    /**
+     * 认购金修改
+     * @param model
+     * @return
+     */
+    @PostMapping(value = "edit",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public AjaxResult edit(RoomSelectionInfoDto model){
+        int result = modelService.edit(model);
+        return result(result);
+    }
+
+    /**
+     * 查看详情
+     * @param id
+     * @return
+     */
+    @PostMapping(value = "getById",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public Object getById(String id){
+        return modelService.getById(id);
+    }
+
+
+}

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

@@ -0,0 +1,11 @@
+package com.idea.customerManagement.dto;
+
+import com.idea.customerManagement.model.CustomerManagement;
+import lombok.Data;
+
+@Data
+public class CustomerManagementDto extends CustomerManagement {
+
+    private String buyerJson;
+
+}

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

@@ -0,0 +1,39 @@
+package com.idea.customerManagement.dto;
+
+import com.idea.customerManagement.model.RoomSelectionInfo;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class RoomSelectionInfoDto extends RoomSelectionInfo {
+
+    /**
+     * 单元/楼栋号
+     */
+    private String buildNum;
+
+    /**
+     * 户室号
+     */
+    private String roomNo;
+
+    /**
+     * 套内面积（㎡)
+     */
+    private Double actualInternalArea;
+
+    /**
+     * 建筑面积（㎡)
+     */
+    private Double actualBuildArea;
+
+    /**
+     * 装修情况
+     */
+    private Double decorationSituation;
+
+}

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

@@ -0,0 +1,36 @@
+package com.idea.customerManagement.mapper;
+
+import com.idea.customerManagement.model.ContractManage;
+import com.idea.customerManagement.model.ContractManageExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface ContractManageMapper {
+    long countByExample(ContractManageExample example);
+
+    int deleteByExample(ContractManageExample example);
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(ContractManage record);
+
+    int insertSelective(ContractManage record);
+
+    List<ContractManage> selectByExampleWithBLOBs(ContractManageExample example);
+
+    List<ContractManage> selectByExample(ContractManageExample example);
+
+    ContractManage selectByPrimaryKey(String id);
+
+    int updateByExampleSelective(@Param("record") ContractManage record, @Param("example") ContractManageExample example);
+
+    int updateByExampleWithBLOBs(@Param("record") ContractManage record, @Param("example") ContractManageExample example);
+
+    int updateByExample(@Param("record") ContractManage record, @Param("example") ContractManageExample example);
+
+    int updateByPrimaryKeySelective(ContractManage record);
+
+    int updateByPrimaryKeyWithBLOBs(ContractManage record);
+
+    int updateByPrimaryKey(ContractManage record);
+}

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

@@ -0,0 +1,19 @@
+package com.idea.customerManagement.mapper;
+
+import com.idea.customerManagement.dto.CustomerManagementDto;
+import com.idea.customerManagement.model.CustomerManagement;
+import com.idea.customerManagement.model.CustomerManagementExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface CustomerManagementExtendMapper {
+
+    List<CustomerManagementDto> listByModel(CustomerManagementDto record);
+
+
+
+
+
+
+}

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

@@ -0,0 +1,37 @@
+package com.idea.customerManagement.mapper;
+
+import java.util.List;
+
+import com.idea.customerManagement.model.IntentionalDeposit;
+import com.idea.customerManagement.model.IntentionalDepositExample;
+import org.apache.ibatis.annotations.Param;
+
+public interface IntentionalDepositMapper {
+    long countByExample(IntentionalDepositExample example);
+
+    int deleteByExample(IntentionalDepositExample example);
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(IntentionalDeposit record);
+
+    int insertSelective(IntentionalDeposit record);
+
+    List<IntentionalDeposit> selectByExampleWithBLOBs(IntentionalDepositExample example);
+
+    List<IntentionalDeposit> selectByExample(IntentionalDepositExample example);
+
+    IntentionalDeposit selectByPrimaryKey(String id);
+
+    int updateByExampleSelective(@Param("record") IntentionalDeposit record, @Param("example") IntentionalDepositExample example);
+
+    int updateByExampleWithBLOBs(@Param("record") IntentionalDeposit record, @Param("example") IntentionalDepositExample example);
+
+    int updateByExample(@Param("record") IntentionalDeposit record, @Param("example") IntentionalDepositExample example);
+
+    int updateByPrimaryKeySelective(IntentionalDeposit record);
+
+    int updateByPrimaryKeyWithBLOBs(IntentionalDeposit record);
+
+    int updateByPrimaryKey(IntentionalDeposit record);
+}

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

@@ -0,0 +1,16 @@
+package com.idea.customerManagement.mapper;
+
+import com.idea.buildManage.response.ParkRoomResponse;
+import com.idea.customerManagement.dto.RoomSelectionInfoDto;
+import com.idea.customerManagement.model.RoomSelectionInfo;
+import com.idea.customerManagement.model.RoomSelectionInfoExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface RoomSelectionInfoExtendMapper {
+
+    List<RoomSelectionInfoDto> selectHouseListByCustomerId(String CustomerManagementId);
+
+
+}

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

@@ -0,0 +1,36 @@
+package com.idea.customerManagement.mapper;
+
+import com.idea.customerManagement.model.RoomSelectionInfo;
+import com.idea.customerManagement.model.RoomSelectionInfoExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface RoomSelectionInfoMapper {
+    long countByExample(RoomSelectionInfoExample example);
+
+    int deleteByExample(RoomSelectionInfoExample example);
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(RoomSelectionInfo record);
+
+    int insertSelective(RoomSelectionInfo record);
+
+    List<RoomSelectionInfo> selectByExampleWithBLOBs(RoomSelectionInfoExample example);
+
+    List<RoomSelectionInfo> selectByExample(RoomSelectionInfoExample example);
+
+    RoomSelectionInfo selectByPrimaryKey(String id);
+
+    int updateByExampleSelective(@Param("record") RoomSelectionInfo record, @Param("example") RoomSelectionInfoExample example);
+
+    int updateByExampleWithBLOBs(@Param("record") RoomSelectionInfo record, @Param("example") RoomSelectionInfoExample example);
+
+    int updateByExample(@Param("record") RoomSelectionInfo record, @Param("example") RoomSelectionInfoExample example);
+
+    int updateByPrimaryKeySelective(RoomSelectionInfo record);
+
+    int updateByPrimaryKeyWithBLOBs(RoomSelectionInfo record);
+
+    int updateByPrimaryKey(RoomSelectionInfo record);
+}

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

@@ -1,8 +1,11 @@
 package com.idea.customerManagement.model;
 
+import io.swagger.annotations.ApiModel;
+
 import java.io.Serializable;
 import java.util.Date;
 
+@ApiModel("买受人")
 public class Buyer implements Serializable {
     private String id;
 

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

@@ -0,0 +1,232 @@
+package com.idea.customerManagement.model;
+
+import io.swagger.annotations.ApiModel;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel("合同")
+public class ContractManage implements Serializable {
+    private String id;
+
+    private String recordNumber;
+
+    private String contractNumber;
+
+    private String seller;
+
+    private String houseId;
+
+    private String houseName;
+
+    private Double actualBuildArea;
+
+    private Double actualInternalArea;
+
+    private Double actualShareArea;
+
+    private String institution;
+
+    private Date signingDate;
+
+    private BigDecimal housePrice;
+
+    private BigDecimal totalPrice;
+
+    private Double buyerProportion;
+
+    private BigDecimal buyerMoney;
+
+    private Integer paymentMethod;
+
+    private Date deadline;
+
+    private BigDecimal maintenanceFunds;
+
+    private BigDecimal maintenanceTotalPrice;
+
+    private String remark;
+
+    private String contractOriginal;
+
+    private String contractOther;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    public String getRecordNumber() {
+        return recordNumber;
+    }
+
+    public void setRecordNumber(String recordNumber) {
+        this.recordNumber = recordNumber == null ? null : recordNumber.trim();
+    }
+
+    public String getContractNumber() {
+        return contractNumber;
+    }
+
+    public void setContractNumber(String contractNumber) {
+        this.contractNumber = contractNumber == null ? null : contractNumber.trim();
+    }
+
+    public String getSeller() {
+        return seller;
+    }
+
+    public void setSeller(String seller) {
+        this.seller = seller == null ? null : seller.trim();
+    }
+
+    public String getHouseId() {
+        return houseId;
+    }
+
+    public void setHouseId(String houseId) {
+        this.houseId = houseId == null ? null : houseId.trim();
+    }
+
+    public String getHouseName() {
+        return houseName;
+    }
+
+    public void setHouseName(String houseName) {
+        this.houseName = houseName == null ? null : houseName.trim();
+    }
+
+    public Double getActualBuildArea() {
+        return actualBuildArea;
+    }
+
+    public void setActualBuildArea(Double actualBuildArea) {
+        this.actualBuildArea = actualBuildArea;
+    }
+
+    public Double getActualInternalArea() {
+        return actualInternalArea;
+    }
+
+    public void setActualInternalArea(Double actualInternalArea) {
+        this.actualInternalArea = actualInternalArea;
+    }
+
+    public Double getActualShareArea() {
+        return actualShareArea;
+    }
+
+    public void setActualShareArea(Double actualShareArea) {
+        this.actualShareArea = actualShareArea;
+    }
+
+    public String getInstitution() {
+        return institution;
+    }
+
+    public void setInstitution(String institution) {
+        this.institution = institution == null ? null : institution.trim();
+    }
+
+    public Date getSigningDate() {
+        return signingDate;
+    }
+
+    public void setSigningDate(Date signingDate) {
+        this.signingDate = signingDate;
+    }
+
+    public BigDecimal getHousePrice() {
+        return housePrice;
+    }
+
+    public void setHousePrice(BigDecimal housePrice) {
+        this.housePrice = housePrice;
+    }
+
+    public BigDecimal getTotalPrice() {
+        return totalPrice;
+    }
+
+    public void setTotalPrice(BigDecimal totalPrice) {
+        this.totalPrice = totalPrice;
+    }
+
+    public Double getBuyerProportion() {
+        return buyerProportion;
+    }
+
+    public void setBuyerProportion(Double buyerProportion) {
+        this.buyerProportion = buyerProportion;
+    }
+
+    public BigDecimal getBuyerMoney() {
+        return buyerMoney;
+    }
+
+    public void setBuyerMoney(BigDecimal buyerMoney) {
+        this.buyerMoney = buyerMoney;
+    }
+
+    public Integer getPaymentMethod() {
+        return paymentMethod;
+    }
+
+    public void setPaymentMethod(Integer paymentMethod) {
+        this.paymentMethod = paymentMethod;
+    }
+
+    public Date getDeadline() {
+        return deadline;
+    }
+
+    public void setDeadline(Date deadline) {
+        this.deadline = deadline;
+    }
+
+    public BigDecimal getMaintenanceFunds() {
+        return maintenanceFunds;
+    }
+
+    public void setMaintenanceFunds(BigDecimal maintenanceFunds) {
+        this.maintenanceFunds = maintenanceFunds;
+    }
+
+    public BigDecimal getMaintenanceTotalPrice() {
+        return maintenanceTotalPrice;
+    }
+
+    public void setMaintenanceTotalPrice(BigDecimal maintenanceTotalPrice) {
+        this.maintenanceTotalPrice = maintenanceTotalPrice;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public String getContractOriginal() {
+        return contractOriginal;
+    }
+
+    public void setContractOriginal(String contractOriginal) {
+        this.contractOriginal = contractOriginal == null ? null : contractOriginal.trim();
+    }
+
+    public String getContractOther() {
+        return contractOther;
+    }
+
+    public void setContractOther(String contractOther) {
+        this.contractOther = contractOther == null ? null : contractOther.trim();
+    }
+}

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

@@ -1,8 +1,13 @@
 package com.idea.customerManagement.model;
 
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
 
+@ApiModel("客户管理")
+@Data
 public class CustomerManagement implements Serializable {
     private String id;
 
@@ -18,7 +23,7 @@ public class CustomerManagement implements Serializable {
 
     private Integer status;
 
-    private Integer houseId;
+    private String houseId;
 
     private String houseName;
 
@@ -36,133 +41,8 @@ public class CustomerManagement implements Serializable {
 
     private String abandonmentFileList;
 
-    private static final long serialVersionUID = 1L;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id == null ? null : id.trim();
-    }
-
-    public String getGroupId() {
-        return groupId;
-    }
-
-    public void setGroupId(String groupId) {
-        this.groupId = groupId == null ? null : groupId.trim();
-    }
-
-    public String getDiscId() {
-        return discId;
-    }
-
-    public void setDiscId(String discId) {
-        this.discId = discId == null ? null : discId.trim();
-    }
-
-    public String getBatchNumber() {
-        return batchNumber;
-    }
-
-    public void setBatchNumber(String batchNumber) {
-        this.batchNumber = batchNumber == null ? null : batchNumber.trim();
-    }
-
-    public String getRoomSelectionNumber() {
-        return roomSelectionNumber;
-    }
-
-    public void setRoomSelectionNumber(String roomSelectionNumber) {
-        this.roomSelectionNumber = roomSelectionNumber == null ? null : roomSelectionNumber.trim();
-    }
-
-    public Date getRoomSelectionDate() {
-        return roomSelectionDate;
-    }
-
-    public void setRoomSelectionDate(Date roomSelectionDate) {
-        this.roomSelectionDate = roomSelectionDate;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public Integer getHouseId() {
-        return houseId;
-    }
+    private String buyerName;
 
-    public void setHouseId(Integer houseId) {
-        this.houseId = houseId;
-    }
-
-    public String getHouseName() {
-        return houseName;
-    }
-
-    public void setHouseName(String houseName) {
-        this.houseName = houseName == null ? null : houseName.trim();
-    }
-
-    public String getCreatedId() {
-        return createdId;
-    }
-
-    public void setCreatedId(String createdId) {
-        this.createdId = createdId == null ? null : createdId.trim();
-    }
-
-    public Date getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(Date createdAt) {
-        this.createdAt = createdAt;
-    }
-
-    public Date getUpdatedAt() {
-        return updatedAt;
-    }
-
-    public void setUpdatedAt(Date updatedAt) {
-        this.updatedAt = updatedAt;
-    }
-
-    public String getUpdatedId() {
-        return updatedId;
-    }
-
-    public void setUpdatedId(String updatedId) {
-        this.updatedId = updatedId == null ? null : updatedId.trim();
-    }
-
-    public Date getAbandonmentDate() {
-        return abandonmentDate;
-    }
-
-    public void setAbandonmentDate(Date abandonmentDate) {
-        this.abandonmentDate = abandonmentDate;
-    }
-
-    public String getAbandonmentRemark() {
-        return abandonmentRemark;
-    }
-
-    public void setAbandonmentRemark(String abandonmentRemark) {
-        this.abandonmentRemark = abandonmentRemark == null ? null : abandonmentRemark.trim();
-    }
-
-    public String getAbandonmentFileList() {
-        return abandonmentFileList;
-    }
+    private static final long serialVersionUID = 1L;
 
-    public void setAbandonmentFileList(String abandonmentFileList) {
-        this.abandonmentFileList = abandonmentFileList == null ? null : abandonmentFileList.trim();
-    }
 }

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

@@ -585,52 +585,62 @@ public class CustomerManagementExample {
             return (Criteria) this;
         }
 
-        public Criteria andHouseIdEqualTo(Integer value) {
+        public Criteria andHouseIdEqualTo(String value) {
             addCriterion("house_id =", value, "houseId");
             return (Criteria) this;
         }
 
-        public Criteria andHouseIdNotEqualTo(Integer value) {
+        public Criteria andHouseIdNotEqualTo(String value) {
             addCriterion("house_id <>", value, "houseId");
             return (Criteria) this;
         }
 
-        public Criteria andHouseIdGreaterThan(Integer value) {
+        public Criteria andHouseIdGreaterThan(String value) {
             addCriterion("house_id >", value, "houseId");
             return (Criteria) this;
         }
 
-        public Criteria andHouseIdGreaterThanOrEqualTo(Integer value) {
+        public Criteria andHouseIdGreaterThanOrEqualTo(String value) {
             addCriterion("house_id >=", value, "houseId");
             return (Criteria) this;
         }
 
-        public Criteria andHouseIdLessThan(Integer value) {
+        public Criteria andHouseIdLessThan(String value) {
             addCriterion("house_id <", value, "houseId");
             return (Criteria) this;
         }
 
-        public Criteria andHouseIdLessThanOrEqualTo(Integer value) {
+        public Criteria andHouseIdLessThanOrEqualTo(String value) {
             addCriterion("house_id <=", value, "houseId");
             return (Criteria) this;
         }
 
-        public Criteria andHouseIdIn(List<Integer> values) {
+        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<Integer> values) {
+        public Criteria andHouseIdNotIn(List<String> values) {
             addCriterion("house_id not in", values, "houseId");
             return (Criteria) this;
         }
 
-        public Criteria andHouseIdBetween(Integer value1, Integer value2) {
+        public Criteria andHouseIdBetween(String value1, String value2) {
             addCriterion("house_id between", value1, value2, "houseId");
             return (Criteria) this;
         }
 
-        public Criteria andHouseIdNotBetween(Integer value1, Integer value2) {
+        public Criteria andHouseIdNotBetween(String value1, String value2) {
             addCriterion("house_id not between", value1, value2, "houseId");
             return (Criteria) this;
         }
@@ -705,6 +715,76 @@ public class CustomerManagementExample {
             return (Criteria) this;
         }
 
+        public Criteria andBuyerNameIsNull() {
+            addCriterion("buyer_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuyerNameIsNotNull() {
+            addCriterion("buyer_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuyerNameEqualTo(String value) {
+            addCriterion("buyer_name =", value, "buyerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuyerNameNotEqualTo(String value) {
+            addCriterion("buyer_name <>", value, "buyerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuyerNameGreaterThan(String value) {
+            addCriterion("buyer_name >", value, "buyerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuyerNameGreaterThanOrEqualTo(String value) {
+            addCriterion("buyer_name >=", value, "buyerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuyerNameLessThan(String value) {
+            addCriterion("buyer_name <", value, "buyerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuyerNameLessThanOrEqualTo(String value) {
+            addCriterion("buyer_name <=", value, "buyerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuyerNameLike(String value) {
+            addCriterion("buyer_name like", value, "buyerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuyerNameNotLike(String value) {
+            addCriterion("buyer_name not like", value, "buyerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuyerNameIn(List<String> values) {
+            addCriterion("buyer_name in", values, "buyerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuyerNameNotIn(List<String> values) {
+            addCriterion("buyer_name not in", values, "buyerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuyerNameBetween(String value1, String value2) {
+            addCriterion("buyer_name between", value1, value2, "buyerName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuyerNameNotBetween(String value1, String value2) {
+            addCriterion("buyer_name not between", value1, value2, "buyerName");
+            return (Criteria) this;
+        }
+
         public Criteria andCreatedIdIsNull() {
             addCriterion("created_id is null");
             return (Criteria) this;

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

@@ -0,0 +1,152 @@
+package com.idea.customerManagement.model;
+
+import io.swagger.annotations.ApiModel;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel("意向金")
+public class IntentionalDeposit implements Serializable {
+    private String id;
+
+    private String customerManagementId;
+
+    private BigDecimal receivableMoney;
+
+    private BigDecimal receivedAmount;
+
+    private Integer paymentMethod;
+
+    private String serialNumber;
+
+    private String number;
+
+    private Date collectionTime;
+
+    private String createdId;
+
+    private Date createdAt;
+
+    private Date updatedAt;
+
+    private String updatedId;
+
+    private String remark;
+
+    private String fileList;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    public String getCustomerManagementId() {
+        return customerManagementId;
+    }
+
+    public void setCustomerManagementId(String customerManagementId) {
+        this.customerManagementId = customerManagementId == null ? null : customerManagementId.trim();
+    }
+
+    public BigDecimal getReceivableMoney() {
+        return receivableMoney;
+    }
+
+    public void setReceivableMoney(BigDecimal receivableMoney) {
+        this.receivableMoney = receivableMoney;
+    }
+
+    public BigDecimal getReceivedAmount() {
+        return receivedAmount;
+    }
+
+    public void setReceivedAmount(BigDecimal receivedAmount) {
+        this.receivedAmount = receivedAmount;
+    }
+
+    public Integer getPaymentMethod() {
+        return paymentMethod;
+    }
+
+    public void setPaymentMethod(Integer paymentMethod) {
+        this.paymentMethod = paymentMethod;
+    }
+
+    public String getSerialNumber() {
+        return serialNumber;
+    }
+
+    public void setSerialNumber(String serialNumber) {
+        this.serialNumber = serialNumber == null ? null : serialNumber.trim();
+    }
+
+    public String getNumber() {
+        return number;
+    }
+
+    public void setNumber(String number) {
+        this.number = number == null ? null : number.trim();
+    }
+
+    public Date getCollectionTime() {
+        return collectionTime;
+    }
+
+    public void setCollectionTime(Date collectionTime) {
+        this.collectionTime = collectionTime;
+    }
+
+    public String getCreatedId() {
+        return createdId;
+    }
+
+    public void setCreatedId(String createdId) {
+        this.createdId = createdId == null ? null : createdId.trim();
+    }
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    public String getUpdatedId() {
+        return updatedId;
+    }
+
+    public void setUpdatedId(String updatedId) {
+        this.updatedId = updatedId == null ? null : updatedId.trim();
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public String getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(String fileList) {
+        this.fileList = fileList == null ? null : fileList.trim();
+    }
+}

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

@@ -0,0 +1,982 @@
+package com.idea.customerManagement.model;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class IntentionalDepositExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public IntentionalDepositExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdIsNull() {
+            addCriterion("customer_management_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdIsNotNull() {
+            addCriterion("customer_management_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdEqualTo(String value) {
+            addCriterion("customer_management_id =", value, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdNotEqualTo(String value) {
+            addCriterion("customer_management_id <>", value, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdGreaterThan(String value) {
+            addCriterion("customer_management_id >", value, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdGreaterThanOrEqualTo(String value) {
+            addCriterion("customer_management_id >=", value, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdLessThan(String value) {
+            addCriterion("customer_management_id <", value, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdLessThanOrEqualTo(String value) {
+            addCriterion("customer_management_id <=", value, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdLike(String value) {
+            addCriterion("customer_management_id like", value, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdNotLike(String value) {
+            addCriterion("customer_management_id not like", value, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdIn(List<String> values) {
+            addCriterion("customer_management_id in", values, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdNotIn(List<String> values) {
+            addCriterion("customer_management_id not in", values, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdBetween(String value1, String value2) {
+            addCriterion("customer_management_id between", value1, value2, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdNotBetween(String value1, String value2) {
+            addCriterion("customer_management_id not between", value1, value2, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceivableMoneyIsNull() {
+            addCriterion("receivable_money is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceivableMoneyIsNotNull() {
+            addCriterion("receivable_money is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceivableMoneyEqualTo(BigDecimal value) {
+            addCriterion("receivable_money =", value, "receivableMoney");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceivableMoneyNotEqualTo(BigDecimal value) {
+            addCriterion("receivable_money <>", value, "receivableMoney");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceivableMoneyGreaterThan(BigDecimal value) {
+            addCriterion("receivable_money >", value, "receivableMoney");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceivableMoneyGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("receivable_money >=", value, "receivableMoney");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceivableMoneyLessThan(BigDecimal value) {
+            addCriterion("receivable_money <", value, "receivableMoney");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceivableMoneyLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("receivable_money <=", value, "receivableMoney");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceivableMoneyIn(List<BigDecimal> values) {
+            addCriterion("receivable_money in", values, "receivableMoney");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceivableMoneyNotIn(List<BigDecimal> values) {
+            addCriterion("receivable_money not in", values, "receivableMoney");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceivableMoneyBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("receivable_money between", value1, value2, "receivableMoney");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceivableMoneyNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("receivable_money not between", value1, value2, "receivableMoney");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceivedAmountIsNull() {
+            addCriterion("received_amount is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceivedAmountIsNotNull() {
+            addCriterion("received_amount is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceivedAmountEqualTo(BigDecimal value) {
+            addCriterion("received_amount =", value, "receivedAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceivedAmountNotEqualTo(BigDecimal value) {
+            addCriterion("received_amount <>", value, "receivedAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceivedAmountGreaterThan(BigDecimal value) {
+            addCriterion("received_amount >", value, "receivedAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceivedAmountGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("received_amount >=", value, "receivedAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceivedAmountLessThan(BigDecimal value) {
+            addCriterion("received_amount <", value, "receivedAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceivedAmountLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("received_amount <=", value, "receivedAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceivedAmountIn(List<BigDecimal> values) {
+            addCriterion("received_amount in", values, "receivedAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceivedAmountNotIn(List<BigDecimal> values) {
+            addCriterion("received_amount not in", values, "receivedAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceivedAmountBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("received_amount between", value1, value2, "receivedAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceivedAmountNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("received_amount not between", value1, value2, "receivedAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andPaymentMethodIsNull() {
+            addCriterion("payment_method is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPaymentMethodIsNotNull() {
+            addCriterion("payment_method is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPaymentMethodEqualTo(Integer value) {
+            addCriterion("payment_method =", value, "paymentMethod");
+            return (Criteria) this;
+        }
+
+        public Criteria andPaymentMethodNotEqualTo(Integer value) {
+            addCriterion("payment_method <>", value, "paymentMethod");
+            return (Criteria) this;
+        }
+
+        public Criteria andPaymentMethodGreaterThan(Integer value) {
+            addCriterion("payment_method >", value, "paymentMethod");
+            return (Criteria) this;
+        }
+
+        public Criteria andPaymentMethodGreaterThanOrEqualTo(Integer value) {
+            addCriterion("payment_method >=", value, "paymentMethod");
+            return (Criteria) this;
+        }
+
+        public Criteria andPaymentMethodLessThan(Integer value) {
+            addCriterion("payment_method <", value, "paymentMethod");
+            return (Criteria) this;
+        }
+
+        public Criteria andPaymentMethodLessThanOrEqualTo(Integer value) {
+            addCriterion("payment_method <=", value, "paymentMethod");
+            return (Criteria) this;
+        }
+
+        public Criteria andPaymentMethodIn(List<Integer> values) {
+            addCriterion("payment_method in", values, "paymentMethod");
+            return (Criteria) this;
+        }
+
+        public Criteria andPaymentMethodNotIn(List<Integer> values) {
+            addCriterion("payment_method not in", values, "paymentMethod");
+            return (Criteria) this;
+        }
+
+        public Criteria andPaymentMethodBetween(Integer value1, Integer value2) {
+            addCriterion("payment_method between", value1, value2, "paymentMethod");
+            return (Criteria) this;
+        }
+
+        public Criteria andPaymentMethodNotBetween(Integer value1, Integer value2) {
+            addCriterion("payment_method not between", value1, value2, "paymentMethod");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerialNumberIsNull() {
+            addCriterion("serial_number is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerialNumberIsNotNull() {
+            addCriterion("serial_number is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerialNumberEqualTo(String value) {
+            addCriterion("serial_number =", value, "serialNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerialNumberNotEqualTo(String value) {
+            addCriterion("serial_number <>", value, "serialNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerialNumberGreaterThan(String value) {
+            addCriterion("serial_number >", value, "serialNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerialNumberGreaterThanOrEqualTo(String value) {
+            addCriterion("serial_number >=", value, "serialNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerialNumberLessThan(String value) {
+            addCriterion("serial_number <", value, "serialNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerialNumberLessThanOrEqualTo(String value) {
+            addCriterion("serial_number <=", value, "serialNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerialNumberLike(String value) {
+            addCriterion("serial_number like", value, "serialNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerialNumberNotLike(String value) {
+            addCriterion("serial_number not like", value, "serialNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerialNumberIn(List<String> values) {
+            addCriterion("serial_number in", values, "serialNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerialNumberNotIn(List<String> values) {
+            addCriterion("serial_number not in", values, "serialNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerialNumberBetween(String value1, String value2) {
+            addCriterion("serial_number between", value1, value2, "serialNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerialNumberNotBetween(String value1, String value2) {
+            addCriterion("serial_number not between", value1, value2, "serialNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberIsNull() {
+            addCriterion("number is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberIsNotNull() {
+            addCriterion("number is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberEqualTo(String value) {
+            addCriterion("number =", value, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberNotEqualTo(String value) {
+            addCriterion("number <>", value, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberGreaterThan(String value) {
+            addCriterion("number >", value, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberGreaterThanOrEqualTo(String value) {
+            addCriterion("number >=", value, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberLessThan(String value) {
+            addCriterion("number <", value, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberLessThanOrEqualTo(String value) {
+            addCriterion("number <=", value, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberLike(String value) {
+            addCriterion("number like", value, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberNotLike(String value) {
+            addCriterion("number not like", value, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberIn(List<String> values) {
+            addCriterion("number in", values, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberNotIn(List<String> values) {
+            addCriterion("number not in", values, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberBetween(String value1, String value2) {
+            addCriterion("number between", value1, value2, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberNotBetween(String value1, String value2) {
+            addCriterion("number not between", value1, value2, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andCollectionTimeIsNull() {
+            addCriterion("collection_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCollectionTimeIsNotNull() {
+            addCriterion("collection_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCollectionTimeEqualTo(Date value) {
+            addCriterion("collection_time =", value, "collectionTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCollectionTimeNotEqualTo(Date value) {
+            addCriterion("collection_time <>", value, "collectionTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCollectionTimeGreaterThan(Date value) {
+            addCriterion("collection_time >", value, "collectionTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCollectionTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("collection_time >=", value, "collectionTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCollectionTimeLessThan(Date value) {
+            addCriterion("collection_time <", value, "collectionTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCollectionTimeLessThanOrEqualTo(Date value) {
+            addCriterion("collection_time <=", value, "collectionTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCollectionTimeIn(List<Date> values) {
+            addCriterion("collection_time in", values, "collectionTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCollectionTimeNotIn(List<Date> values) {
+            addCriterion("collection_time not in", values, "collectionTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCollectionTimeBetween(Date value1, Date value2) {
+            addCriterion("collection_time between", value1, value2, "collectionTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCollectionTimeNotBetween(Date value1, Date value2) {
+            addCriterion("collection_time not between", value1, value2, "collectionTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdIsNull() {
+            addCriterion("created_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdIsNotNull() {
+            addCriterion("created_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdEqualTo(String value) {
+            addCriterion("created_id =", value, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdNotEqualTo(String value) {
+            addCriterion("created_id <>", value, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdGreaterThan(String value) {
+            addCriterion("created_id >", value, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdGreaterThanOrEqualTo(String value) {
+            addCriterion("created_id >=", value, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdLessThan(String value) {
+            addCriterion("created_id <", value, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdLessThanOrEqualTo(String value) {
+            addCriterion("created_id <=", value, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdLike(String value) {
+            addCriterion("created_id like", value, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdNotLike(String value) {
+            addCriterion("created_id not like", value, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdIn(List<String> values) {
+            addCriterion("created_id in", values, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdNotIn(List<String> values) {
+            addCriterion("created_id not in", values, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdBetween(String value1, String value2) {
+            addCriterion("created_id between", value1, value2, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdNotBetween(String value1, String value2) {
+            addCriterion("created_id not between", value1, value2, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNull() {
+            addCriterion("created_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNotNull() {
+            addCriterion("created_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtEqualTo(Date value) {
+            addCriterion("created_at =", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotEqualTo(Date value) {
+            addCriterion("created_at <>", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThan(Date value) {
+            addCriterion("created_at >", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("created_at >=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThan(Date value) {
+            addCriterion("created_at <", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("created_at <=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIn(List<Date> values) {
+            addCriterion("created_at in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotIn(List<Date> values) {
+            addCriterion("created_at not in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtBetween(Date value1, Date value2) {
+            addCriterion("created_at between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("created_at not between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNull() {
+            addCriterion("updated_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNotNull() {
+            addCriterion("updated_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtEqualTo(Date value) {
+            addCriterion("updated_at =", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotEqualTo(Date value) {
+            addCriterion("updated_at <>", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThan(Date value) {
+            addCriterion("updated_at >", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("updated_at >=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThan(Date value) {
+            addCriterion("updated_at <", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("updated_at <=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIn(List<Date> values) {
+            addCriterion("updated_at in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotIn(List<Date> values) {
+            addCriterion("updated_at not in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtBetween(Date value1, Date value2) {
+            addCriterion("updated_at between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("updated_at not between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdIsNull() {
+            addCriterion("updated_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdIsNotNull() {
+            addCriterion("updated_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdEqualTo(String value) {
+            addCriterion("updated_id =", value, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdNotEqualTo(String value) {
+            addCriterion("updated_id <>", value, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdGreaterThan(String value) {
+            addCriterion("updated_id >", value, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdGreaterThanOrEqualTo(String value) {
+            addCriterion("updated_id >=", value, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdLessThan(String value) {
+            addCriterion("updated_id <", value, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdLessThanOrEqualTo(String value) {
+            addCriterion("updated_id <=", value, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdLike(String value) {
+            addCriterion("updated_id like", value, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdNotLike(String value) {
+            addCriterion("updated_id not like", value, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdIn(List<String> values) {
+            addCriterion("updated_id in", values, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdNotIn(List<String> values) {
+            addCriterion("updated_id not in", values, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdBetween(String value1, String value2) {
+            addCriterion("updated_id between", value1, value2, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdNotBetween(String value1, String value2) {
+            addCriterion("updated_id not between", value1, value2, "updatedId");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

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

@@ -0,0 +1,53 @@
+package com.idea.customerManagement.model;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel("选房详情、认购金")
+@Data
+public class RoomSelectionInfo implements Serializable {
+    private String id;
+
+    private String customerManagementId;
+
+    private String groupId;
+
+    private String discId;
+
+    private String buildId;
+
+    private String houseId;
+
+    private Integer status;
+
+    private BigDecimal receivableMoney;
+
+    private BigDecimal receivedAmount;
+
+    private Integer paymentMethod;
+
+    private String serialNumber;
+
+    private Date collectionTime;
+
+    private String createdId;
+
+    private Date createdAt;
+
+    private Date updatedAt;
+
+    private String updatedId;
+
+    private String remark;
+
+    private String fileList;
+
+    private String depositNumber;
+
+    private static final long serialVersionUID = 1L;
+
+}

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

@@ -1,5 +1,6 @@
 package com.idea.customerManagement.service;
 
+import cn.hutool.core.util.IdUtil;
 import com.idea.customerManagement.mapper.BuyerMapper;
 import com.idea.customerManagement.model.Buyer;
 import com.idea.customerManagement.model.BuyerExample;
@@ -23,6 +24,7 @@ public class BuyerService implements BaseService<Buyer, BuyerExample> {
 
     @Override
     public int insertSelective(Buyer buyer) {
+        buyer.setId(IdUtil.simpleUUID());
         return modelMapper.insertSelective(buyer);
     }
 

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

@@ -1,13 +1,28 @@
 package com.idea.customerManagement.service;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.IdUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.idea.customerManagement.dto.CustomerManagementDto;
+import com.idea.customerManagement.mapper.CustomerManagementExtendMapper;
 import com.idea.customerManagement.mapper.CustomerManagementMapper;
+import com.idea.customerManagement.model.Buyer;
+import com.idea.customerManagement.model.BuyerExample;
 import com.idea.customerManagement.model.CustomerManagement;
 import com.idea.customerManagement.model.CustomerManagementExample;
 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 com.rockstar.util.StringUtils;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -16,6 +31,10 @@ public class CustomerManagementService implements BaseService<CustomerManagement
 
     @Autowired
     private CustomerManagementMapper modelMapper;
+    @Autowired
+    private CustomerManagementExtendMapper extendMapper;
+    @Autowired
+    private BuyerService buyerService;
 
     @Override
     public int deleteByPrimaryKey(String s) {
@@ -66,4 +85,114 @@ public class CustomerManagementService implements BaseService<CustomerManagement
     public int deleteByExample(CustomerManagementExample customerManagementExample) {
         return modelMapper.deleteByExample(customerManagementExample);
     }
+
+    /**
+     * 分页查询
+     *
+     * @return
+     */
+    public PageInfo<CustomerManagementDto> listByModel(Tablepar tablepar, CustomerManagementDto model, DateTrans dt) {
+        PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
+        List<CustomerManagementDto> list = extendMapper.listByModel(model);
+        PageInfo<CustomerManagementDto> pageInfo = new PageInfo<>(list);
+        return pageInfo;
+    }
+
+    /**
+     * 新增轮号客户
+     * @param model
+     * @return
+     */
+    public int add(CustomerManagementDto model){
+
+        String buyerJson = model.getBuyerJson();
+        String id = IdUtil.simpleUUID();
+        String userId = ShiroUtils.getUserId();
+        Date date = new Date();
+        List<Buyer> buyers = JSONObject.parseArray(buyerJson, Buyer.class);
+        for(Buyer buyer : buyers){
+
+            buyer.setCustomerManagementId(id);
+            buyer.setCreatedAt(date);
+            buyer.setCreatedId(userId);
+            buyerService.insertSelective(buyer);
+        }
+        model.setCreatedAt(date);
+        model.setCreatedId(userId);
+        return insertWithOutId(model);
+
+    }
+
+
+    /**
+     * 编辑轮号客户
+     * @param model
+     * @return
+     */
+    public int edit(CustomerManagementDto model){
+
+        String buyerJson = model.getBuyerJson();
+        String id = model.getId();
+        String userId = ShiroUtils.getUserId();
+        Date date = new Date();
+
+        // 先删除
+        BuyerExample buyerExample = new BuyerExample();
+        buyerExample.createCriteria().andCustomerManagementIdEqualTo(id);
+        List<Buyer> oldBuyers = buyerService.selectByExample(buyerExample);
+        for(Buyer buyer : oldBuyers){
+            buyerService.deleteByPrimaryKey(buyer.getId());
+        }
+        // 再新增
+        List<Buyer> buyers = JSONObject.parseArray(buyerJson, Buyer.class);
+        for(Buyer buyer : buyers){
+
+            buyer.setCustomerManagementId(id);
+            buyer.setCreatedAt(date);
+            buyer.setCreatedId(userId);
+            buyerService.insertSelective(buyer);
+        }
+        model.setUpdatedAt(date);
+        model.setUpdatedId(userId);
+        return updateByPrimaryKeySelective(model);
+
+    }
+
+
+
+
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
+    public int delete(String id){
+
+        CustomerManagement customerManagement = selectByPrimaryKey(id);
+        String houseId = customerManagement.getHouseId();
+        if(StringUtils.isNotEmpty(houseId)){
+            throw new RuntimeException("该数据已在别的业务中引用，无法删除!!!");
+        }
+        return deleteByPrimaryKey(id);
+    }
+
+    /**
+     * 查看详情
+     * @param id
+     * @return
+     */
+    public CustomerManagementDto getById(String id){
+        CustomerManagement customerManagement = selectByPrimaryKey(id);
+        CustomerManagementDto result = new CustomerManagementDto();
+        BeanUtil.copyProperties(customerManagement,result);
+        BuyerExample buyerExample = new BuyerExample();
+        buyerExample.createCriteria().andCustomerManagementIdEqualTo(id);
+        List<Buyer> buyers = buyerService.selectByExample(buyerExample);
+        if(CollectionUtils.isNotEmpty(buyers)){
+            String json = JSON.toJSON(buyers).toString();
+            result.setBuyerJson(json);
+        }
+        return result;
+    }
+
 }

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

@@ -0,0 +1,4 @@
+package com.idea.customerManagement.service;
+
+public class IntentionalDepositService {
+}

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

@@ -0,0 +1,209 @@
+package com.idea.customerManagement.service;
+
+import cn.hutool.core.util.IdUtil;
+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.RoomSelectionInfoDto;
+import com.idea.customerManagement.mapper.CustomerManagementMapper;
+import com.idea.customerManagement.mapper.RoomSelectionInfoExtendMapper;
+import com.idea.customerManagement.mapper.RoomSelectionInfoMapper;
+import com.idea.customerManagement.model.CustomerManagement;
+import com.idea.customerManagement.model.RoomSelectionInfo;
+import com.idea.customerManagement.model.RoomSelectionInfoExample;
+import com.rockstar.common.base.BaseService;
+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;
+
+@Service
+public class RoomSelectionInfoService implements BaseService<RoomSelectionInfo, RoomSelectionInfoExample> {
+
+    @Autowired
+    private RoomSelectionInfoMapper modelMapper;
+    @Autowired
+    private RoomSelectionInfoExtendMapper extendMapper;
+    @Autowired
+    private CustomerManagementMapper customerManagementMapper;
+    @Autowired
+    private MnpBuildingMapper buildingMapper;
+    @Autowired
+    private ParkRoomMapper roomMapper;
+    @Autowired
+    private ParkRoomExtendMapper roomExtendMapper;
+
+
+    @Override
+    public int deleteByPrimaryKey(String s) {
+        return modelMapper.deleteByPrimaryKey(s);
+    }
+
+    @Override
+    public int insertSelective(RoomSelectionInfo roomSelectionInfo) {
+        roomSelectionInfo.setId(IdUtil.simpleUUID());
+        return modelMapper.insertSelective(roomSelectionInfo);
+    }
+
+    public int insertWithoutId(RoomSelectionInfo roomSelectionInfo) {
+        return modelMapper.insertSelective(roomSelectionInfo);
+    }
+
+    @Override
+    public RoomSelectionInfo selectByPrimaryKey(String s) {
+        return modelMapper.selectByPrimaryKey(s);
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(RoomSelectionInfo roomSelectionInfo) {
+        return modelMapper.updateByPrimaryKeySelective(roomSelectionInfo);
+    }
+
+    @Override
+    public int updateByExampleSelective(RoomSelectionInfo roomSelectionInfo, RoomSelectionInfoExample roomSelectionInfoExample) {
+        return modelMapper.updateByExampleSelective(roomSelectionInfo, roomSelectionInfoExample);
+    }
+
+    @Override
+    public int updateByExample(RoomSelectionInfo roomSelectionInfo, RoomSelectionInfoExample roomSelectionInfoExample) {
+        return modelMapper.updateByExample(roomSelectionInfo, roomSelectionInfoExample);
+    }
+
+    @Override
+    public List<RoomSelectionInfo> selectByExample(RoomSelectionInfoExample roomSelectionInfoExample) {
+        return modelMapper.selectByExample(roomSelectionInfoExample);
+    }
+
+    @Override
+    public long countByExample(RoomSelectionInfoExample roomSelectionInfoExample) {
+        return modelMapper.countByExample(roomSelectionInfoExample);
+    }
+
+    @Override
+    public int deleteByExample(RoomSelectionInfoExample roomSelectionInfoExample) {
+        return modelMapper.deleteByExample(roomSelectionInfoExample);
+    }
+
+    /**
+     * 选房信息列表
+     *
+     * @param CustomerManagementId
+     * @return
+     */
+    public List<RoomSelectionInfoDto> listAll(String CustomerManagementId) {
+        List<RoomSelectionInfoDto> result = extendMapper.selectHouseListByCustomerId(CustomerManagementId);
+        return result;
+    }
+
+    /**
+     * 提交选房
+     *
+     * @param houseIds
+     * @param customerManagementId
+     * @return
+     */
+    public int submit(String houseIds, String customerManagementId) {
+
+        CustomerManagement customerManagement = customerManagementMapper.selectByPrimaryKey(customerManagementId);
+        customerManagement.setHouseId(houseIds);
+        String[] split = houseIds.split(",");
+        StringBuilder builder = new StringBuilder();
+        // 先删除
+        RoomSelectionInfoExample example = new RoomSelectionInfoExample();
+        example.createCriteria().andCustomerManagementIdEqualTo(customerManagementId).andHouseIdIn(Arrays.asList(split));
+        List<RoomSelectionInfo> list = selectByExample(example);
+        if (CollectionUtils.isNotEmpty(list)) {
+            for (RoomSelectionInfo info : list) {
+                deleteByPrimaryKey(info.getId());
+            }
+        }
+        // 再新增
+        for (String s : split) {
+            // 拼接房屋名称
+            ParkRoomResponse response = roomExtendMapper.getFullName(s);
+            builder.append(response.getBuildName()).append("-").append(response.getRoomNo()).append(",");
+            // 新增选房信息
+            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.setId(ShiroUtils.getUserId());
+            roomSelectionInfo.setReceivableMoney(response.getSubscriptionFunds());
+            insertSelective(roomSelectionInfo);
+        }
+        if (builder.length() > 0) {
+            builder.deleteCharAt(builder.length() - 1);
+        }
+        customerManagement.setHouseName(builder.toString());
+        customerManagementMapper.updateByPrimaryKeySelective(customerManagement);
+        return 1;
+    }
+
+    /**
+     * 获取收据流水号（定金编号）
+     * @param houseId
+     * @return
+     */
+    public String getSerialNumber(String houseId){
+        ParkRoomResponse response = roomExtendMapper.getFullName(houseId);
+        String groupId = response.getGroupId();
+        // 查找这个小区已收取认购金的 数据量
+        RoomSelectionInfoExample example = new RoomSelectionInfoExample();
+        example.createCriteria().andGroupIdEqualTo(groupId).andStatusEqualTo(2);
+        Long count = countByExample(example);
+        String number = "";
+        if(count.doubleValue() == 0){
+            number = "00001";
+        }else {
+            count ++;
+            number = String.format(count.toString(), "%05d", 1);
+        }
+        String serialNumber = response.getGroupName()+ response.getDiscName() + "DJ" + number;
+        return serialNumber;
+    }
+
+    /**
+     * 认购金登记
+     * @param model
+     * @return
+     */
+    public int add(RoomSelectionInfoDto model){
+
+        model.setUpdatedAt(new Date());
+        model.setUpdatedId(ShiroUtils.getUserId());
+        model.setStatus(2);
+        return updateByPrimaryKeySelective(model);
+    }
+
+    /**
+     * 认购金修改
+     * @param model
+     * @return
+     */
+    public int edit(RoomSelectionInfoDto model){
+
+        model.setUpdatedAt(new Date());
+        model.setUpdatedId(ShiroUtils.getUserId());
+        return updateByPrimaryKeySelective(model);
+    }
+
+    /**
+     * 查看详情
+     * @param id
+     * @return
+     */
+    public RoomSelectionInfo getById(String id){
+        return selectByPrimaryKey(id);
+    }
+
+
+}

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

@@ -71,6 +71,24 @@
   </insert>
 
 
+  <select id="getFullName" resultType="com.idea.buildManage.response.ParkRoomResponse">
+    SELECT
+      park_info.group_name groupName,
+      park_floor_disc.`name` discName,
+      mnp_building.build_num buildName,
+      park_room.room_no,
+      park_info.id groupId,
+      park_floor_disc.id discId,
+      mnp_building.id buildId,
+      park_room.id,
+      park_floor_disc.subscription_funds
+    FROM
+      park_room
+        LEFT JOIN mnp_building ON mnp_building.id = park_room.build_id
+        LEFT JOIN park_floor_disc ON park_floor_disc.id = park_room.disc_id
+        LEFT JOIN park_info ON park_info.id = park_room.group_id
+    where park_room.id = #{houseId}
+  </select>
 
 
 

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

@@ -0,0 +1,551 @@
+<?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.ContractManageMapper">
+  <resultMap id="BaseResultMap" type="com.idea.customerManagement.model.ContractManage">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="record_number" jdbcType="VARCHAR" property="recordNumber" />
+    <result column="contract_number" jdbcType="VARCHAR" property="contractNumber" />
+    <result column="seller" jdbcType="VARCHAR" property="seller" />
+    <result column="house_id" jdbcType="VARCHAR" property="houseId" />
+    <result column="house_name" jdbcType="VARCHAR" property="houseName" />
+    <result column="actual_build_area" jdbcType="DOUBLE" property="actualBuildArea" />
+    <result column="actual_internal_area" jdbcType="DOUBLE" property="actualInternalArea" />
+    <result column="actual_share_area" jdbcType="DOUBLE" property="actualShareArea" />
+    <result column="institution" jdbcType="VARCHAR" property="institution" />
+    <result column="signing_date" jdbcType="TIMESTAMP" property="signingDate" />
+    <result column="house_price" jdbcType="DECIMAL" property="housePrice" />
+    <result column="total_price" jdbcType="DECIMAL" property="totalPrice" />
+    <result column="buyer_proportion" jdbcType="DOUBLE" property="buyerProportion" />
+    <result column="buyer_money" jdbcType="DECIMAL" property="buyerMoney" />
+    <result column="payment_method" jdbcType="INTEGER" property="paymentMethod" />
+    <result column="deadline" jdbcType="TIMESTAMP" property="deadline" />
+    <result column="maintenance_funds" jdbcType="DECIMAL" property="maintenanceFunds" />
+    <result column="maintenance_total_price" jdbcType="DECIMAL" property="maintenanceTotalPrice" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.idea.customerManagement.model.ContractManage">
+    <result column="remark" jdbcType="LONGVARCHAR" property="remark" />
+    <result column="contract_original" jdbcType="LONGVARCHAR" property="contractOriginal" />
+    <result column="contract_other" jdbcType="LONGVARCHAR" property="contractOther" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, record_number, contract_number, seller, house_id, house_name, actual_build_area, 
+    actual_internal_area, actual_share_area, institution, signing_date, house_price, 
+    total_price, buyer_proportion, buyer_money, payment_method, deadline, maintenance_funds, 
+    maintenance_total_price
+  </sql>
+  <sql id="Blob_Column_List">
+    remark, contract_original, contract_other
+  </sql>
+  <select id="selectByExampleWithBLOBs" parameterType="com.idea.customerManagement.model.ContractManageExample" resultMap="ResultMapWithBLOBs">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from contract_manage
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByExample" parameterType="com.idea.customerManagement.model.ContractManageExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from contract_manage
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
+    select 
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from contract_manage
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from contract_manage
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.idea.customerManagement.model.ContractManageExample">
+    delete from contract_manage
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.idea.customerManagement.model.ContractManage">
+    insert into contract_manage (id, record_number, contract_number, 
+      seller, house_id, house_name, 
+      actual_build_area, actual_internal_area, actual_share_area, 
+      institution, signing_date, house_price, 
+      total_price, buyer_proportion, buyer_money, 
+      payment_method, deadline, maintenance_funds, 
+      maintenance_total_price, remark, contract_original, 
+      contract_other)
+    values (#{id,jdbcType=VARCHAR}, #{recordNumber,jdbcType=VARCHAR}, #{contractNumber,jdbcType=VARCHAR}, 
+      #{seller,jdbcType=VARCHAR}, #{houseId,jdbcType=VARCHAR}, #{houseName,jdbcType=VARCHAR}, 
+      #{actualBuildArea,jdbcType=DOUBLE}, #{actualInternalArea,jdbcType=DOUBLE}, #{actualShareArea,jdbcType=DOUBLE}, 
+      #{institution,jdbcType=VARCHAR}, #{signingDate,jdbcType=TIMESTAMP}, #{housePrice,jdbcType=DECIMAL}, 
+      #{totalPrice,jdbcType=DECIMAL}, #{buyerProportion,jdbcType=DOUBLE}, #{buyerMoney,jdbcType=DECIMAL}, 
+      #{paymentMethod,jdbcType=INTEGER}, #{deadline,jdbcType=TIMESTAMP}, #{maintenanceFunds,jdbcType=DECIMAL}, 
+      #{maintenanceTotalPrice,jdbcType=DECIMAL}, #{remark,jdbcType=LONGVARCHAR}, #{contractOriginal,jdbcType=LONGVARCHAR}, 
+      #{contractOther,jdbcType=LONGVARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.idea.customerManagement.model.ContractManage">
+    insert into contract_manage
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="recordNumber != null">
+        record_number,
+      </if>
+      <if test="contractNumber != null">
+        contract_number,
+      </if>
+      <if test="seller != null">
+        seller,
+      </if>
+      <if test="houseId != null">
+        house_id,
+      </if>
+      <if test="houseName != null">
+        house_name,
+      </if>
+      <if test="actualBuildArea != null">
+        actual_build_area,
+      </if>
+      <if test="actualInternalArea != null">
+        actual_internal_area,
+      </if>
+      <if test="actualShareArea != null">
+        actual_share_area,
+      </if>
+      <if test="institution != null">
+        institution,
+      </if>
+      <if test="signingDate != null">
+        signing_date,
+      </if>
+      <if test="housePrice != null">
+        house_price,
+      </if>
+      <if test="totalPrice != null">
+        total_price,
+      </if>
+      <if test="buyerProportion != null">
+        buyer_proportion,
+      </if>
+      <if test="buyerMoney != null">
+        buyer_money,
+      </if>
+      <if test="paymentMethod != null">
+        payment_method,
+      </if>
+      <if test="deadline != null">
+        deadline,
+      </if>
+      <if test="maintenanceFunds != null">
+        maintenance_funds,
+      </if>
+      <if test="maintenanceTotalPrice != null">
+        maintenance_total_price,
+      </if>
+      <if test="remark != null">
+        remark,
+      </if>
+      <if test="contractOriginal != null">
+        contract_original,
+      </if>
+      <if test="contractOther != null">
+        contract_other,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="recordNumber != null">
+        #{recordNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="contractNumber != null">
+        #{contractNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="seller != null">
+        #{seller,jdbcType=VARCHAR},
+      </if>
+      <if test="houseId != null">
+        #{houseId,jdbcType=VARCHAR},
+      </if>
+      <if test="houseName != null">
+        #{houseName,jdbcType=VARCHAR},
+      </if>
+      <if test="actualBuildArea != null">
+        #{actualBuildArea,jdbcType=DOUBLE},
+      </if>
+      <if test="actualInternalArea != null">
+        #{actualInternalArea,jdbcType=DOUBLE},
+      </if>
+      <if test="actualShareArea != null">
+        #{actualShareArea,jdbcType=DOUBLE},
+      </if>
+      <if test="institution != null">
+        #{institution,jdbcType=VARCHAR},
+      </if>
+      <if test="signingDate != null">
+        #{signingDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="housePrice != null">
+        #{housePrice,jdbcType=DECIMAL},
+      </if>
+      <if test="totalPrice != null">
+        #{totalPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="buyerProportion != null">
+        #{buyerProportion,jdbcType=DOUBLE},
+      </if>
+      <if test="buyerMoney != null">
+        #{buyerMoney,jdbcType=DECIMAL},
+      </if>
+      <if test="paymentMethod != null">
+        #{paymentMethod,jdbcType=INTEGER},
+      </if>
+      <if test="deadline != null">
+        #{deadline,jdbcType=TIMESTAMP},
+      </if>
+      <if test="maintenanceFunds != null">
+        #{maintenanceFunds,jdbcType=DECIMAL},
+      </if>
+      <if test="maintenanceTotalPrice != null">
+        #{maintenanceTotalPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="contractOriginal != null">
+        #{contractOriginal,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="contractOther != null">
+        #{contractOther,jdbcType=LONGVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.idea.customerManagement.model.ContractManageExample" resultType="java.lang.Long">
+    select count(*) from contract_manage
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update contract_manage
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.recordNumber != null">
+        record_number = #{record.recordNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="record.contractNumber != null">
+        contract_number = #{record.contractNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="record.seller != null">
+        seller = #{record.seller,jdbcType=VARCHAR},
+      </if>
+      <if test="record.houseId != null">
+        house_id = #{record.houseId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.houseName != null">
+        house_name = #{record.houseName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.actualBuildArea != null">
+        actual_build_area = #{record.actualBuildArea,jdbcType=DOUBLE},
+      </if>
+      <if test="record.actualInternalArea != null">
+        actual_internal_area = #{record.actualInternalArea,jdbcType=DOUBLE},
+      </if>
+      <if test="record.actualShareArea != null">
+        actual_share_area = #{record.actualShareArea,jdbcType=DOUBLE},
+      </if>
+      <if test="record.institution != null">
+        institution = #{record.institution,jdbcType=VARCHAR},
+      </if>
+      <if test="record.signingDate != null">
+        signing_date = #{record.signingDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.housePrice != null">
+        house_price = #{record.housePrice,jdbcType=DECIMAL},
+      </if>
+      <if test="record.totalPrice != null">
+        total_price = #{record.totalPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="record.buyerProportion != null">
+        buyer_proportion = #{record.buyerProportion,jdbcType=DOUBLE},
+      </if>
+      <if test="record.buyerMoney != null">
+        buyer_money = #{record.buyerMoney,jdbcType=DECIMAL},
+      </if>
+      <if test="record.paymentMethod != null">
+        payment_method = #{record.paymentMethod,jdbcType=INTEGER},
+      </if>
+      <if test="record.deadline != null">
+        deadline = #{record.deadline,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.maintenanceFunds != null">
+        maintenance_funds = #{record.maintenanceFunds,jdbcType=DECIMAL},
+      </if>
+      <if test="record.maintenanceTotalPrice != null">
+        maintenance_total_price = #{record.maintenanceTotalPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="record.remark != null">
+        remark = #{record.remark,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="record.contractOriginal != null">
+        contract_original = #{record.contractOriginal,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="record.contractOther != null">
+        contract_other = #{record.contractOther,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExampleWithBLOBs" parameterType="map">
+    update contract_manage
+    set id = #{record.id,jdbcType=VARCHAR},
+      record_number = #{record.recordNumber,jdbcType=VARCHAR},
+      contract_number = #{record.contractNumber,jdbcType=VARCHAR},
+      seller = #{record.seller,jdbcType=VARCHAR},
+      house_id = #{record.houseId,jdbcType=VARCHAR},
+      house_name = #{record.houseName,jdbcType=VARCHAR},
+      actual_build_area = #{record.actualBuildArea,jdbcType=DOUBLE},
+      actual_internal_area = #{record.actualInternalArea,jdbcType=DOUBLE},
+      actual_share_area = #{record.actualShareArea,jdbcType=DOUBLE},
+      institution = #{record.institution,jdbcType=VARCHAR},
+      signing_date = #{record.signingDate,jdbcType=TIMESTAMP},
+      house_price = #{record.housePrice,jdbcType=DECIMAL},
+      total_price = #{record.totalPrice,jdbcType=DECIMAL},
+      buyer_proportion = #{record.buyerProportion,jdbcType=DOUBLE},
+      buyer_money = #{record.buyerMoney,jdbcType=DECIMAL},
+      payment_method = #{record.paymentMethod,jdbcType=INTEGER},
+      deadline = #{record.deadline,jdbcType=TIMESTAMP},
+      maintenance_funds = #{record.maintenanceFunds,jdbcType=DECIMAL},
+      maintenance_total_price = #{record.maintenanceTotalPrice,jdbcType=DECIMAL},
+      remark = #{record.remark,jdbcType=LONGVARCHAR},
+      contract_original = #{record.contractOriginal,jdbcType=LONGVARCHAR},
+      contract_other = #{record.contractOther,jdbcType=LONGVARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update contract_manage
+    set id = #{record.id,jdbcType=VARCHAR},
+      record_number = #{record.recordNumber,jdbcType=VARCHAR},
+      contract_number = #{record.contractNumber,jdbcType=VARCHAR},
+      seller = #{record.seller,jdbcType=VARCHAR},
+      house_id = #{record.houseId,jdbcType=VARCHAR},
+      house_name = #{record.houseName,jdbcType=VARCHAR},
+      actual_build_area = #{record.actualBuildArea,jdbcType=DOUBLE},
+      actual_internal_area = #{record.actualInternalArea,jdbcType=DOUBLE},
+      actual_share_area = #{record.actualShareArea,jdbcType=DOUBLE},
+      institution = #{record.institution,jdbcType=VARCHAR},
+      signing_date = #{record.signingDate,jdbcType=TIMESTAMP},
+      house_price = #{record.housePrice,jdbcType=DECIMAL},
+      total_price = #{record.totalPrice,jdbcType=DECIMAL},
+      buyer_proportion = #{record.buyerProportion,jdbcType=DOUBLE},
+      buyer_money = #{record.buyerMoney,jdbcType=DECIMAL},
+      payment_method = #{record.paymentMethod,jdbcType=INTEGER},
+      deadline = #{record.deadline,jdbcType=TIMESTAMP},
+      maintenance_funds = #{record.maintenanceFunds,jdbcType=DECIMAL},
+      maintenance_total_price = #{record.maintenanceTotalPrice,jdbcType=DECIMAL}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.idea.customerManagement.model.ContractManage">
+    update contract_manage
+    <set>
+      <if test="recordNumber != null">
+        record_number = #{recordNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="contractNumber != null">
+        contract_number = #{contractNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="seller != null">
+        seller = #{seller,jdbcType=VARCHAR},
+      </if>
+      <if test="houseId != null">
+        house_id = #{houseId,jdbcType=VARCHAR},
+      </if>
+      <if test="houseName != null">
+        house_name = #{houseName,jdbcType=VARCHAR},
+      </if>
+      <if test="actualBuildArea != null">
+        actual_build_area = #{actualBuildArea,jdbcType=DOUBLE},
+      </if>
+      <if test="actualInternalArea != null">
+        actual_internal_area = #{actualInternalArea,jdbcType=DOUBLE},
+      </if>
+      <if test="actualShareArea != null">
+        actual_share_area = #{actualShareArea,jdbcType=DOUBLE},
+      </if>
+      <if test="institution != null">
+        institution = #{institution,jdbcType=VARCHAR},
+      </if>
+      <if test="signingDate != null">
+        signing_date = #{signingDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="housePrice != null">
+        house_price = #{housePrice,jdbcType=DECIMAL},
+      </if>
+      <if test="totalPrice != null">
+        total_price = #{totalPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="buyerProportion != null">
+        buyer_proportion = #{buyerProportion,jdbcType=DOUBLE},
+      </if>
+      <if test="buyerMoney != null">
+        buyer_money = #{buyerMoney,jdbcType=DECIMAL},
+      </if>
+      <if test="paymentMethod != null">
+        payment_method = #{paymentMethod,jdbcType=INTEGER},
+      </if>
+      <if test="deadline != null">
+        deadline = #{deadline,jdbcType=TIMESTAMP},
+      </if>
+      <if test="maintenanceFunds != null">
+        maintenance_funds = #{maintenanceFunds,jdbcType=DECIMAL},
+      </if>
+      <if test="maintenanceTotalPrice != null">
+        maintenance_total_price = #{maintenanceTotalPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="contractOriginal != null">
+        contract_original = #{contractOriginal,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="contractOther != null">
+        contract_other = #{contractOther,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.idea.customerManagement.model.ContractManage">
+    update contract_manage
+    set record_number = #{recordNumber,jdbcType=VARCHAR},
+      contract_number = #{contractNumber,jdbcType=VARCHAR},
+      seller = #{seller,jdbcType=VARCHAR},
+      house_id = #{houseId,jdbcType=VARCHAR},
+      house_name = #{houseName,jdbcType=VARCHAR},
+      actual_build_area = #{actualBuildArea,jdbcType=DOUBLE},
+      actual_internal_area = #{actualInternalArea,jdbcType=DOUBLE},
+      actual_share_area = #{actualShareArea,jdbcType=DOUBLE},
+      institution = #{institution,jdbcType=VARCHAR},
+      signing_date = #{signingDate,jdbcType=TIMESTAMP},
+      house_price = #{housePrice,jdbcType=DECIMAL},
+      total_price = #{totalPrice,jdbcType=DECIMAL},
+      buyer_proportion = #{buyerProportion,jdbcType=DOUBLE},
+      buyer_money = #{buyerMoney,jdbcType=DECIMAL},
+      payment_method = #{paymentMethod,jdbcType=INTEGER},
+      deadline = #{deadline,jdbcType=TIMESTAMP},
+      maintenance_funds = #{maintenanceFunds,jdbcType=DECIMAL},
+      maintenance_total_price = #{maintenanceTotalPrice,jdbcType=DECIMAL},
+      remark = #{remark,jdbcType=LONGVARCHAR},
+      contract_original = #{contractOriginal,jdbcType=LONGVARCHAR},
+      contract_other = #{contractOther,jdbcType=LONGVARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.idea.customerManagement.model.ContractManage">
+    update contract_manage
+    set record_number = #{recordNumber,jdbcType=VARCHAR},
+      contract_number = #{contractNumber,jdbcType=VARCHAR},
+      seller = #{seller,jdbcType=VARCHAR},
+      house_id = #{houseId,jdbcType=VARCHAR},
+      house_name = #{houseName,jdbcType=VARCHAR},
+      actual_build_area = #{actualBuildArea,jdbcType=DOUBLE},
+      actual_internal_area = #{actualInternalArea,jdbcType=DOUBLE},
+      actual_share_area = #{actualShareArea,jdbcType=DOUBLE},
+      institution = #{institution,jdbcType=VARCHAR},
+      signing_date = #{signingDate,jdbcType=TIMESTAMP},
+      house_price = #{housePrice,jdbcType=DECIMAL},
+      total_price = #{totalPrice,jdbcType=DECIMAL},
+      buyer_proportion = #{buyerProportion,jdbcType=DOUBLE},
+      buyer_money = #{buyerMoney,jdbcType=DECIMAL},
+      payment_method = #{paymentMethod,jdbcType=INTEGER},
+      deadline = #{deadline,jdbcType=TIMESTAMP},
+      maintenance_funds = #{maintenanceFunds,jdbcType=DECIMAL},
+      maintenance_total_price = #{maintenanceTotalPrice,jdbcType=DECIMAL}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

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

@@ -0,0 +1,24 @@
+<?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.CustomerManagementExtendMapper">
+
+
+  <select id="listByModel" resultType="com.idea.customerManagement.dto.CustomerManagementDto">
+    select * from customer_management
+    <where>
+      <if test="buyerName != null and buyerName != ''">
+        and buyerName like concat ('%',#{buyerName},'%')
+      </if>
+      <if test="status != null and status != ''">
+        and status = #{status}
+      </if>
+      <if test="groupId != null and groupId != ''">
+        and group_id = #{groupId}
+      </if>
+      <if test="discId != null and discId != ''">
+        and disc_id = #{discId}
+      </if>
+    </where>
+    order by batch_number desc,room_selection_number asc
+  </select>
+</mapper>

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

@@ -9,8 +9,9 @@
     <result column="room_selection_number" jdbcType="VARCHAR" property="roomSelectionNumber" />
     <result column="room_selection_date" jdbcType="TIMESTAMP" property="roomSelectionDate" />
     <result column="status" jdbcType="INTEGER" property="status" />
-    <result column="house_id" jdbcType="INTEGER" property="houseId" />
+    <result column="house_id" jdbcType="VARCHAR" property="houseId" />
     <result column="house_name" jdbcType="VARCHAR" property="houseName" />
+    <result column="buyer_name" jdbcType="VARCHAR" property="buyerName" />
     <result column="created_id" jdbcType="VARCHAR" property="createdId" />
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
     <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
@@ -81,7 +82,8 @@
   </sql>
   <sql id="Base_Column_List">
     id, group_id, disc_id, batch_number, room_selection_number, room_selection_date, 
-    status, house_id, house_name, created_id, created_at, updated_at, updated_id, abandonment_date
+    status, house_id, house_name, buyer_name, created_id, created_at, updated_at, updated_id, 
+    abandonment_date
   </sql>
   <sql id="Blob_Column_List">
     abandonment_remark, abandonment_file_list
@@ -138,15 +140,17 @@
     insert into customer_management (id, group_id, disc_id, 
       batch_number, room_selection_number, room_selection_date, 
       status, house_id, house_name, 
-      created_id, created_at, updated_at, 
-      updated_id, abandonment_date, abandonment_remark, 
-      abandonment_file_list)
+      buyer_name, created_id, created_at, 
+      updated_at, updated_id, abandonment_date, 
+      abandonment_remark, abandonment_file_list
+      )
     values (#{id,jdbcType=VARCHAR}, #{groupId,jdbcType=VARCHAR}, #{discId,jdbcType=VARCHAR}, 
       #{batchNumber,jdbcType=VARCHAR}, #{roomSelectionNumber,jdbcType=VARCHAR}, #{roomSelectionDate,jdbcType=TIMESTAMP}, 
-      #{status,jdbcType=INTEGER}, #{houseId,jdbcType=INTEGER}, #{houseName,jdbcType=VARCHAR}, 
-      #{createdId,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, 
-      #{updatedId,jdbcType=VARCHAR}, #{abandonmentDate,jdbcType=TIMESTAMP}, #{abandonmentRemark,jdbcType=LONGVARCHAR}, 
-      #{abandonmentFileList,jdbcType=LONGVARCHAR})
+      #{status,jdbcType=INTEGER}, #{houseId,jdbcType=VARCHAR}, #{houseName,jdbcType=VARCHAR}, 
+      #{buyerName,jdbcType=VARCHAR}, #{createdId,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, 
+      #{updatedAt,jdbcType=TIMESTAMP}, #{updatedId,jdbcType=VARCHAR}, #{abandonmentDate,jdbcType=TIMESTAMP}, 
+      #{abandonmentRemark,jdbcType=LONGVARCHAR}, #{abandonmentFileList,jdbcType=LONGVARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.idea.customerManagement.model.CustomerManagement">
     insert into customer_management
@@ -178,6 +182,9 @@
       <if test="houseName != null">
         house_name,
       </if>
+      <if test="buyerName != null">
+        buyer_name,
+      </if>
       <if test="createdId != null">
         created_id,
       </if>
@@ -223,11 +230,14 @@
         #{status,jdbcType=INTEGER},
       </if>
       <if test="houseId != null">
-        #{houseId,jdbcType=INTEGER},
+        #{houseId,jdbcType=VARCHAR},
       </if>
       <if test="houseName != null">
         #{houseName,jdbcType=VARCHAR},
       </if>
+      <if test="buyerName != null">
+        #{buyerName,jdbcType=VARCHAR},
+      </if>
       <if test="createdId != null">
         #{createdId,jdbcType=VARCHAR},
       </if>
@@ -282,11 +292,14 @@
         status = #{record.status,jdbcType=INTEGER},
       </if>
       <if test="record.houseId != null">
-        house_id = #{record.houseId,jdbcType=INTEGER},
+        house_id = #{record.houseId,jdbcType=VARCHAR},
       </if>
       <if test="record.houseName != null">
         house_name = #{record.houseName,jdbcType=VARCHAR},
       </if>
+      <if test="record.buyerName != null">
+        buyer_name = #{record.buyerName,jdbcType=VARCHAR},
+      </if>
       <if test="record.createdId != null">
         created_id = #{record.createdId,jdbcType=VARCHAR},
       </if>
@@ -322,8 +335,9 @@
       room_selection_number = #{record.roomSelectionNumber,jdbcType=VARCHAR},
       room_selection_date = #{record.roomSelectionDate,jdbcType=TIMESTAMP},
       status = #{record.status,jdbcType=INTEGER},
-      house_id = #{record.houseId,jdbcType=INTEGER},
+      house_id = #{record.houseId,jdbcType=VARCHAR},
       house_name = #{record.houseName,jdbcType=VARCHAR},
+      buyer_name = #{record.buyerName,jdbcType=VARCHAR},
       created_id = #{record.createdId,jdbcType=VARCHAR},
       created_at = #{record.createdAt,jdbcType=TIMESTAMP},
       updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
@@ -344,8 +358,9 @@
       room_selection_number = #{record.roomSelectionNumber,jdbcType=VARCHAR},
       room_selection_date = #{record.roomSelectionDate,jdbcType=TIMESTAMP},
       status = #{record.status,jdbcType=INTEGER},
-      house_id = #{record.houseId,jdbcType=INTEGER},
+      house_id = #{record.houseId,jdbcType=VARCHAR},
       house_name = #{record.houseName,jdbcType=VARCHAR},
+      buyer_name = #{record.buyerName,jdbcType=VARCHAR},
       created_id = #{record.createdId,jdbcType=VARCHAR},
       created_at = #{record.createdAt,jdbcType=TIMESTAMP},
       updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
@@ -377,11 +392,14 @@
         status = #{status,jdbcType=INTEGER},
       </if>
       <if test="houseId != null">
-        house_id = #{houseId,jdbcType=INTEGER},
+        house_id = #{houseId,jdbcType=VARCHAR},
       </if>
       <if test="houseName != null">
         house_name = #{houseName,jdbcType=VARCHAR},
       </if>
+      <if test="buyerName != null">
+        buyer_name = #{buyerName,jdbcType=VARCHAR},
+      </if>
       <if test="createdId != null">
         created_id = #{createdId,jdbcType=VARCHAR},
       </if>
@@ -414,8 +432,9 @@
       room_selection_number = #{roomSelectionNumber,jdbcType=VARCHAR},
       room_selection_date = #{roomSelectionDate,jdbcType=TIMESTAMP},
       status = #{status,jdbcType=INTEGER},
-      house_id = #{houseId,jdbcType=INTEGER},
+      house_id = #{houseId,jdbcType=VARCHAR},
       house_name = #{houseName,jdbcType=VARCHAR},
+      buyer_name = #{buyerName,jdbcType=VARCHAR},
       created_id = #{createdId,jdbcType=VARCHAR},
       created_at = #{createdAt,jdbcType=TIMESTAMP},
       updated_at = #{updatedAt,jdbcType=TIMESTAMP},
@@ -433,8 +452,9 @@
       room_selection_number = #{roomSelectionNumber,jdbcType=VARCHAR},
       room_selection_date = #{roomSelectionDate,jdbcType=TIMESTAMP},
       status = #{status,jdbcType=INTEGER},
-      house_id = #{houseId,jdbcType=INTEGER},
+      house_id = #{houseId,jdbcType=VARCHAR},
       house_name = #{houseName,jdbcType=VARCHAR},
+      buyer_name = #{buyerName,jdbcType=VARCHAR},
       created_id = #{createdId,jdbcType=VARCHAR},
       created_at = #{createdAt,jdbcType=TIMESTAMP},
       updated_at = #{updatedAt,jdbcType=TIMESTAMP},

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

@@ -0,0 +1,409 @@
+<?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.IntentionalDepositMapper">
+  <resultMap id="BaseResultMap" type="com.idea.customerManagement.model.IntentionalDeposit">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <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="number" jdbcType="VARCHAR" property="number" />
+    <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" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.idea.customerManagement.model.IntentionalDeposit">
+    <result column="remark" jdbcType="LONGVARCHAR" property="remark" />
+    <result column="file_list" jdbcType="LONGVARCHAR" property="fileList" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, customer_management_id, receivable_money, received_amount, payment_method, serial_number, 
+    number, collection_time, created_id, created_at, updated_at, updated_id
+  </sql>
+  <sql id="Blob_Column_List">
+    remark, file_list
+  </sql>
+  <select id="selectByExampleWithBLOBs" parameterType="com.idea.customerManagement.model.IntentionalDepositExample" resultMap="ResultMapWithBLOBs">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from intentional_deposit
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByExample" parameterType="com.idea.customerManagement.model.IntentionalDepositExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from intentional_deposit
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
+    select 
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from intentional_deposit
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from intentional_deposit
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.idea.customerManagement.model.IntentionalDepositExample">
+    delete from intentional_deposit
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.idea.customerManagement.model.IntentionalDeposit">
+    insert into intentional_deposit (id, customer_management_id, receivable_money, 
+      received_amount, payment_method, serial_number, 
+      number, collection_time, created_id, 
+      created_at, updated_at, updated_id, 
+      remark, file_list)
+    values (#{id,jdbcType=VARCHAR}, #{customerManagementId,jdbcType=VARCHAR}, #{receivableMoney,jdbcType=DECIMAL}, 
+      #{receivedAmount,jdbcType=DECIMAL}, #{paymentMethod,jdbcType=INTEGER}, #{serialNumber,jdbcType=VARCHAR}, 
+      #{number,jdbcType=VARCHAR}, #{collectionTime,jdbcType=TIMESTAMP}, #{createdId,jdbcType=VARCHAR}, 
+      #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{updatedId,jdbcType=VARCHAR}, 
+      #{remark,jdbcType=LONGVARCHAR}, #{fileList,jdbcType=LONGVARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.idea.customerManagement.model.IntentionalDeposit">
+    insert into intentional_deposit
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="customerManagementId != null">
+        customer_management_id,
+      </if>
+      <if test="receivableMoney != null">
+        receivable_money,
+      </if>
+      <if test="receivedAmount != null">
+        received_amount,
+      </if>
+      <if test="paymentMethod != null">
+        payment_method,
+      </if>
+      <if test="serialNumber != null">
+        serial_number,
+      </if>
+      <if test="number != null">
+        number,
+      </if>
+      <if test="collectionTime != null">
+        collection_time,
+      </if>
+      <if test="createdId != null">
+        created_id,
+      </if>
+      <if test="createdAt != null">
+        created_at,
+      </if>
+      <if test="updatedAt != null">
+        updated_at,
+      </if>
+      <if test="updatedId != null">
+        updated_id,
+      </if>
+      <if test="remark != null">
+        remark,
+      </if>
+      <if test="fileList != null">
+        file_list,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="customerManagementId != null">
+        #{customerManagementId,jdbcType=VARCHAR},
+      </if>
+      <if test="receivableMoney != null">
+        #{receivableMoney,jdbcType=DECIMAL},
+      </if>
+      <if test="receivedAmount != null">
+        #{receivedAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="paymentMethod != null">
+        #{paymentMethod,jdbcType=INTEGER},
+      </if>
+      <if test="serialNumber != null">
+        #{serialNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="number != null">
+        #{number,jdbcType=VARCHAR},
+      </if>
+      <if test="collectionTime != null">
+        #{collectionTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createdId != null">
+        #{createdId,jdbcType=VARCHAR},
+      </if>
+      <if test="createdAt != null">
+        #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedId != null">
+        #{updatedId,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="fileList != null">
+        #{fileList,jdbcType=LONGVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.idea.customerManagement.model.IntentionalDepositExample" resultType="java.lang.Long">
+    select count(*) from intentional_deposit
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update intentional_deposit
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.customerManagementId != null">
+        customer_management_id = #{record.customerManagementId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.receivableMoney != null">
+        receivable_money = #{record.receivableMoney,jdbcType=DECIMAL},
+      </if>
+      <if test="record.receivedAmount != null">
+        received_amount = #{record.receivedAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.paymentMethod != null">
+        payment_method = #{record.paymentMethod,jdbcType=INTEGER},
+      </if>
+      <if test="record.serialNumber != null">
+        serial_number = #{record.serialNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="record.number != null">
+        number = #{record.number,jdbcType=VARCHAR},
+      </if>
+      <if test="record.collectionTime != null">
+        collection_time = #{record.collectionTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.createdId != null">
+        created_id = #{record.createdId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createdAt != null">
+        created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatedAt != null">
+        updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatedId != null">
+        updated_id = #{record.updatedId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.remark != null">
+        remark = #{record.remark,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="record.fileList != null">
+        file_list = #{record.fileList,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExampleWithBLOBs" parameterType="map">
+    update intentional_deposit
+    set id = #{record.id,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},
+      number = #{record.number,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}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update intentional_deposit
+    set id = #{record.id,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},
+      number = #{record.number,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}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.idea.customerManagement.model.IntentionalDeposit">
+    update intentional_deposit
+    <set>
+      <if test="customerManagementId != null">
+        customer_management_id = #{customerManagementId,jdbcType=VARCHAR},
+      </if>
+      <if test="receivableMoney != null">
+        receivable_money = #{receivableMoney,jdbcType=DECIMAL},
+      </if>
+      <if test="receivedAmount != null">
+        received_amount = #{receivedAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="paymentMethod != null">
+        payment_method = #{paymentMethod,jdbcType=INTEGER},
+      </if>
+      <if test="serialNumber != null">
+        serial_number = #{serialNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="number != null">
+        number = #{number,jdbcType=VARCHAR},
+      </if>
+      <if test="collectionTime != null">
+        collection_time = #{collectionTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createdId != null">
+        created_id = #{createdId,jdbcType=VARCHAR},
+      </if>
+      <if test="createdAt != null">
+        created_at = #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedId != null">
+        updated_id = #{updatedId,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="fileList != null">
+        file_list = #{fileList,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.idea.customerManagement.model.IntentionalDeposit">
+    update intentional_deposit
+    set 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},
+      number = #{number,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}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.idea.customerManagement.model.IntentionalDeposit">
+    update intentional_deposit
+    set 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},
+      number = #{number,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}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

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

@@ -0,0 +1,12 @@
+<?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.RoomSelectionInfoExtendMapper">
+
+  <select id="selectHouseListByCustomerId" resultType="com.idea.customerManagement.dto.RoomSelectionInfoDto">
+    select room_selection_info.*,mnp_building.build_num,park_room.room_no,park_room.actual_internal_area,
+           park_room.actual_build_area,park_room.decoration_situation
+           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
+  </select>
+</mapper>

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

@@ -0,0 +1,482 @@
+<?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.RoomSelectionInfoMapper">
+  <resultMap id="BaseResultMap" type="com.idea.customerManagement.model.RoomSelectionInfo">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="customer_management_id" jdbcType="VARCHAR" property="customerManagementId" />
+    <result column="group_id" jdbcType="VARCHAR" property="groupId" />
+    <result column="disc_id" jdbcType="VARCHAR" property="discId" />
+    <result column="build_id" jdbcType="VARCHAR" property="buildId" />
+    <result column="house_id" jdbcType="VARCHAR" property="houseId" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <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="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" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.idea.customerManagement.model.RoomSelectionInfo">
+    <result column="remark" jdbcType="LONGVARCHAR" property="remark" />
+    <result column="file_list" jdbcType="LONGVARCHAR" property="fileList" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, customer_management_id, group_id, disc_id, build_id, house_id, status, receivable_money, 
+    received_amount, payment_method, serial_number, collection_time, created_id, created_at, 
+    updated_at, updated_id
+  </sql>
+  <sql id="Blob_Column_List">
+    remark, file_list
+  </sql>
+  <select id="selectByExampleWithBLOBs" parameterType="com.idea.customerManagement.model.RoomSelectionInfoExample" resultMap="ResultMapWithBLOBs">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from room_selection_info
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByExample" parameterType="com.idea.customerManagement.model.RoomSelectionInfoExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from room_selection_info
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
+    select 
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from room_selection_info
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from room_selection_info
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.idea.customerManagement.model.RoomSelectionInfoExample">
+    delete from room_selection_info
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.idea.customerManagement.model.RoomSelectionInfo">
+    insert into room_selection_info (id, customer_management_id, group_id, 
+      disc_id, build_id, house_id, 
+      status, 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}, #{customerManagementId,jdbcType=VARCHAR}, #{groupId,jdbcType=VARCHAR}, 
+      #{discId,jdbcType=VARCHAR}, #{buildId,jdbcType=VARCHAR}, #{houseId,jdbcType=VARCHAR}, 
+      #{status,jdbcType=INTEGER}, #{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>
+  <insert id="insertSelective" parameterType="com.idea.customerManagement.model.RoomSelectionInfo">
+    insert into room_selection_info
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="customerManagementId != null">
+        customer_management_id,
+      </if>
+      <if test="groupId != null">
+        group_id,
+      </if>
+      <if test="discId != null">
+        disc_id,
+      </if>
+      <if test="buildId != null">
+        build_id,
+      </if>
+      <if test="houseId != null">
+        house_id,
+      </if>
+      <if test="status != null">
+        status,
+      </if>
+      <if test="receivableMoney != null">
+        receivable_money,
+      </if>
+      <if test="receivedAmount != null">
+        received_amount,
+      </if>
+      <if test="paymentMethod != null">
+        payment_method,
+      </if>
+      <if test="serialNumber != null">
+        serial_number,
+      </if>
+      <if test="collectionTime != null">
+        collection_time,
+      </if>
+      <if test="createdId != null">
+        created_id,
+      </if>
+      <if test="createdAt != null">
+        created_at,
+      </if>
+      <if test="updatedAt != null">
+        updated_at,
+      </if>
+      <if test="updatedId != null">
+        updated_id,
+      </if>
+      <if test="remark != null">
+        remark,
+      </if>
+      <if test="fileList != null">
+        file_list,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="customerManagementId != null">
+        #{customerManagementId,jdbcType=VARCHAR},
+      </if>
+      <if test="groupId != null">
+        #{groupId,jdbcType=VARCHAR},
+      </if>
+      <if test="discId != null">
+        #{discId,jdbcType=VARCHAR},
+      </if>
+      <if test="buildId != null">
+        #{buildId,jdbcType=VARCHAR},
+      </if>
+      <if test="houseId != null">
+        #{houseId,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="receivableMoney != null">
+        #{receivableMoney,jdbcType=DECIMAL},
+      </if>
+      <if test="receivedAmount != null">
+        #{receivedAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="paymentMethod != null">
+        #{paymentMethod,jdbcType=INTEGER},
+      </if>
+      <if test="serialNumber != null">
+        #{serialNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="collectionTime != null">
+        #{collectionTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createdId != null">
+        #{createdId,jdbcType=VARCHAR},
+      </if>
+      <if test="createdAt != null">
+        #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedId != null">
+        #{updatedId,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="fileList != null">
+        #{fileList,jdbcType=LONGVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.idea.customerManagement.model.RoomSelectionInfoExample" resultType="java.lang.Long">
+    select count(*) from room_selection_info
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update room_selection_info
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.customerManagementId != null">
+        customer_management_id = #{record.customerManagementId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.groupId != null">
+        group_id = #{record.groupId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.discId != null">
+        disc_id = #{record.discId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.buildId != null">
+        build_id = #{record.buildId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.houseId != null">
+        house_id = #{record.houseId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.status != null">
+        status = #{record.status,jdbcType=INTEGER},
+      </if>
+      <if test="record.receivableMoney != null">
+        receivable_money = #{record.receivableMoney,jdbcType=DECIMAL},
+      </if>
+      <if test="record.receivedAmount != null">
+        received_amount = #{record.receivedAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.paymentMethod != null">
+        payment_method = #{record.paymentMethod,jdbcType=INTEGER},
+      </if>
+      <if test="record.serialNumber != null">
+        serial_number = #{record.serialNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="record.collectionTime != null">
+        collection_time = #{record.collectionTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.createdId != null">
+        created_id = #{record.createdId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createdAt != null">
+        created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatedAt != null">
+        updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatedId != null">
+        updated_id = #{record.updatedId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.remark != null">
+        remark = #{record.remark,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="record.fileList != null">
+        file_list = #{record.fileList,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExampleWithBLOBs" parameterType="map">
+    update room_selection_info
+    set id = #{record.id,jdbcType=VARCHAR},
+      customer_management_id = #{record.customerManagementId,jdbcType=VARCHAR},
+      group_id = #{record.groupId,jdbcType=VARCHAR},
+      disc_id = #{record.discId,jdbcType=VARCHAR},
+      build_id = #{record.buildId,jdbcType=VARCHAR},
+      house_id = #{record.houseId,jdbcType=VARCHAR},
+      status = #{record.status,jdbcType=INTEGER},
+      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}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update room_selection_info
+    set id = #{record.id,jdbcType=VARCHAR},
+      customer_management_id = #{record.customerManagementId,jdbcType=VARCHAR},
+      group_id = #{record.groupId,jdbcType=VARCHAR},
+      disc_id = #{record.discId,jdbcType=VARCHAR},
+      build_id = #{record.buildId,jdbcType=VARCHAR},
+      house_id = #{record.houseId,jdbcType=VARCHAR},
+      status = #{record.status,jdbcType=INTEGER},
+      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}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.idea.customerManagement.model.RoomSelectionInfo">
+    update room_selection_info
+    <set>
+      <if test="customerManagementId != null">
+        customer_management_id = #{customerManagementId,jdbcType=VARCHAR},
+      </if>
+      <if test="groupId != null">
+        group_id = #{groupId,jdbcType=VARCHAR},
+      </if>
+      <if test="discId != null">
+        disc_id = #{discId,jdbcType=VARCHAR},
+      </if>
+      <if test="buildId != null">
+        build_id = #{buildId,jdbcType=VARCHAR},
+      </if>
+      <if test="houseId != null">
+        house_id = #{houseId,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        status = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="receivableMoney != null">
+        receivable_money = #{receivableMoney,jdbcType=DECIMAL},
+      </if>
+      <if test="receivedAmount != null">
+        received_amount = #{receivedAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="paymentMethod != null">
+        payment_method = #{paymentMethod,jdbcType=INTEGER},
+      </if>
+      <if test="serialNumber != null">
+        serial_number = #{serialNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="collectionTime != null">
+        collection_time = #{collectionTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createdId != null">
+        created_id = #{createdId,jdbcType=VARCHAR},
+      </if>
+      <if test="createdAt != null">
+        created_at = #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedId != null">
+        updated_id = #{updatedId,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="fileList != null">
+        file_list = #{fileList,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.idea.customerManagement.model.RoomSelectionInfo">
+    update room_selection_info
+    set customer_management_id = #{customerManagementId,jdbcType=VARCHAR},
+      group_id = #{groupId,jdbcType=VARCHAR},
+      disc_id = #{discId,jdbcType=VARCHAR},
+      build_id = #{buildId,jdbcType=VARCHAR},
+      house_id = #{houseId,jdbcType=VARCHAR},
+      status = #{status,jdbcType=INTEGER},
+      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}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.idea.customerManagement.model.RoomSelectionInfo">
+    update room_selection_info
+    set customer_management_id = #{customerManagementId,jdbcType=VARCHAR},
+      group_id = #{groupId,jdbcType=VARCHAR},
+      disc_id = #{discId,jdbcType=VARCHAR},
+      build_id = #{buildId,jdbcType=VARCHAR},
+      house_id = #{houseId,jdbcType=VARCHAR},
+      status = #{status,jdbcType=INTEGER},
+      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}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>