合同

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

@@ -14,4 +14,9 @@ public class CustomerManagementDto extends CustomerManagement {
 
     private String discIds;
 
+    /**
+     * 放弃资格操作人
+     */
+    private String abandonmentName;
+
 }

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

@@ -10,7 +10,7 @@ import java.util.List;
 
 public interface RoomSelectionInfoExtendMapper {
 
-    List<RoomSelectionInfoDto> selectHouseListByCustomerId(String CustomerManagementId);
+    List<RoomSelectionInfoDto> selectHouseListByCustomerId(@Param("customerManagementId") String customerManagementId);
 
 
 }

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

@@ -1,9 +1,12 @@
 package com.idea.customerManagement.model;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
+@Data
 public class ContractManage implements Serializable {
     private String id;
 
@@ -65,245 +68,8 @@ public class ContractManage implements Serializable {
 
     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;
-    }
+    private String downPaymentsProportion;
 
-    public void setBuyerMoney(BigDecimal buyerMoney) {
-        this.buyerMoney = buyerMoney;
-    }
-
-    public String getBuyerName() {
-        return buyerName;
-    }
-
-    public void setBuyerName(String buyerName) {
-        this.buyerName = buyerName == null ? null : buyerName.trim();
-    }
-
-    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 Integer getContractStatus() {
-        return contractStatus;
-    }
-
-    public void setContractStatus(Integer contractStatus) {
-        this.contractStatus = contractStatus;
-    }
-
-    public String getCustomerManagementId() {
-        return customerManagementId;
-    }
-
-    public void setCustomerManagementId(String customerManagementId) {
-        this.customerManagementId = customerManagementId == null ? null : customerManagementId.trim();
-    }
-
-    public BigDecimal getSubscriptionFunds() {
-        return subscriptionFunds;
-    }
-
-    public void setSubscriptionFunds(BigDecimal subscriptionFunds) {
-        this.subscriptionFunds = subscriptionFunds;
-    }
-
-    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 getContractOriginal() {
-        return contractOriginal;
-    }
-
-    public void setContractOriginal(String contractOriginal) {
-        this.contractOriginal = contractOriginal == null ? null : contractOriginal.trim();
-    }
-
-    public String getContractOther() {
-        return contractOther;
-    }
+    private static final long serialVersionUID = 1L;
 
-    public void setContractOther(String contractOther) {
-        this.contractOther = contractOther == null ? null : contractOther.trim();
-    }
 }

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

@@ -176,6 +176,76 @@ public class ContractManageExample {
             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 andRecordNumberIsNull() {
             addCriterion("record_number is null");
             return (Criteria) this;
@@ -1206,6 +1276,76 @@ public class ContractManageExample {
             return (Criteria) this;
         }
 
+        public Criteria andDownPaymentsProportionIsNull() {
+            addCriterion("down_payments_proportion is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDownPaymentsProportionIsNotNull() {
+            addCriterion("down_payments_proportion is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDownPaymentsProportionEqualTo(String value) {
+            addCriterion("down_payments_proportion =", value, "downPaymentsProportion");
+            return (Criteria) this;
+        }
+
+        public Criteria andDownPaymentsProportionNotEqualTo(String value) {
+            addCriterion("down_payments_proportion <>", value, "downPaymentsProportion");
+            return (Criteria) this;
+        }
+
+        public Criteria andDownPaymentsProportionGreaterThan(String value) {
+            addCriterion("down_payments_proportion >", value, "downPaymentsProportion");
+            return (Criteria) this;
+        }
+
+        public Criteria andDownPaymentsProportionGreaterThanOrEqualTo(String value) {
+            addCriterion("down_payments_proportion >=", value, "downPaymentsProportion");
+            return (Criteria) this;
+        }
+
+        public Criteria andDownPaymentsProportionLessThan(String value) {
+            addCriterion("down_payments_proportion <", value, "downPaymentsProportion");
+            return (Criteria) this;
+        }
+
+        public Criteria andDownPaymentsProportionLessThanOrEqualTo(String value) {
+            addCriterion("down_payments_proportion <=", value, "downPaymentsProportion");
+            return (Criteria) this;
+        }
+
+        public Criteria andDownPaymentsProportionLike(String value) {
+            addCriterion("down_payments_proportion like", value, "downPaymentsProportion");
+            return (Criteria) this;
+        }
+
+        public Criteria andDownPaymentsProportionNotLike(String value) {
+            addCriterion("down_payments_proportion not like", value, "downPaymentsProportion");
+            return (Criteria) this;
+        }
+
+        public Criteria andDownPaymentsProportionIn(List<String> values) {
+            addCriterion("down_payments_proportion in", values, "downPaymentsProportion");
+            return (Criteria) this;
+        }
+
+        public Criteria andDownPaymentsProportionNotIn(List<String> values) {
+            addCriterion("down_payments_proportion not in", values, "downPaymentsProportion");
+            return (Criteria) this;
+        }
+
+        public Criteria andDownPaymentsProportionBetween(String value1, String value2) {
+            addCriterion("down_payments_proportion between", value1, value2, "downPaymentsProportion");
+            return (Criteria) this;
+        }
+
+        public Criteria andDownPaymentsProportionNotBetween(String value1, String value2) {
+            addCriterion("down_payments_proportion not between", value1, value2, "downPaymentsProportion");
+            return (Criteria) this;
+        }
+
         public Criteria andDeadlineIsNull() {
             addCriterion("deadline is null");
             return (Criteria) this;
@@ -1446,76 +1586,6 @@ public class ContractManageExample {
             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 andSubscriptionFundsIsNull() {
             addCriterion("subscription_funds is null");
             return (Criteria) this;

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

@@ -33,12 +33,18 @@ public class CustomerManagement implements Serializable {
 
     private String createdId;
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date createdAt;
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date updatedAt;
 
     private String updatedId;
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date abandonmentDate;
 
     private String abandonmentRemark;
@@ -47,6 +53,12 @@ public class CustomerManagement implements Serializable {
 
     private String buyerName;
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date abandonmentAt;
+
+    private String abandonmentId;
+
     private static final long serialVersionUID = 1L;
 
 }

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

@@ -1104,6 +1104,136 @@ public class CustomerManagementExample {
             addCriterion("abandonment_date not between", value1, value2, "abandonmentDate");
             return (Criteria) this;
         }
+
+        public Criteria andAbandonmentAtIsNull() {
+            addCriterion("abandonment_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbandonmentAtIsNotNull() {
+            addCriterion("abandonment_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbandonmentAtEqualTo(Date value) {
+            addCriterion("abandonment_at =", value, "abandonmentAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbandonmentAtNotEqualTo(Date value) {
+            addCriterion("abandonment_at <>", value, "abandonmentAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbandonmentAtGreaterThan(Date value) {
+            addCriterion("abandonment_at >", value, "abandonmentAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbandonmentAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("abandonment_at >=", value, "abandonmentAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbandonmentAtLessThan(Date value) {
+            addCriterion("abandonment_at <", value, "abandonmentAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbandonmentAtLessThanOrEqualTo(Date value) {
+            addCriterion("abandonment_at <=", value, "abandonmentAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbandonmentAtIn(List<Date> values) {
+            addCriterion("abandonment_at in", values, "abandonmentAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbandonmentAtNotIn(List<Date> values) {
+            addCriterion("abandonment_at not in", values, "abandonmentAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbandonmentAtBetween(Date value1, Date value2) {
+            addCriterion("abandonment_at between", value1, value2, "abandonmentAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbandonmentAtNotBetween(Date value1, Date value2) {
+            addCriterion("abandonment_at not between", value1, value2, "abandonmentAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbandonmentIdIsNull() {
+            addCriterion("abandonment_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbandonmentIdIsNotNull() {
+            addCriterion("abandonment_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbandonmentIdEqualTo(String value) {
+            addCriterion("abandonment_id =", value, "abandonmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbandonmentIdNotEqualTo(String value) {
+            addCriterion("abandonment_id <>", value, "abandonmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbandonmentIdGreaterThan(String value) {
+            addCriterion("abandonment_id >", value, "abandonmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbandonmentIdGreaterThanOrEqualTo(String value) {
+            addCriterion("abandonment_id >=", value, "abandonmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbandonmentIdLessThan(String value) {
+            addCriterion("abandonment_id <", value, "abandonmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbandonmentIdLessThanOrEqualTo(String value) {
+            addCriterion("abandonment_id <=", value, "abandonmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbandonmentIdLike(String value) {
+            addCriterion("abandonment_id like", value, "abandonmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbandonmentIdNotLike(String value) {
+            addCriterion("abandonment_id not like", value, "abandonmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbandonmentIdIn(List<String> values) {
+            addCriterion("abandonment_id in", values, "abandonmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbandonmentIdNotIn(List<String> values) {
+            addCriterion("abandonment_id not in", values, "abandonmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbandonmentIdBetween(String value1, String value2) {
+            addCriterion("abandonment_id between", value1, value2, "abandonmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbandonmentIdNotBetween(String value1, String value2) {
+            addCriterion("abandonment_id not between", value1, value2, "abandonmentId");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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

@@ -14,8 +14,10 @@ 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.FrameUser;
 import com.rockstar.frame.model.extend.DateTrans;
 import com.rockstar.frame.model.extend.Tablepar;
+import com.rockstar.frame.service.FrameUserService;
 import com.rockstar.shiro.util.ShiroUtils;
 import com.rockstar.system.service.SysDictService;
 import com.rockstar.util.StringUtils;
@@ -38,6 +40,8 @@ public class CustomerManagementService implements BaseService<CustomerManagement
     private BuyerService buyerService;
     @Autowired
     private SysDictService sysDictService;
+    @Autowired
+    private FrameUserService frameUserService;
 
     @Override
     public int deleteByPrimaryKey(String s) {
@@ -220,6 +224,12 @@ public class CustomerManagementService implements BaseService<CustomerManagement
             String json = JSON.toJSON(buyers).toString();
             result.setBuyerJson(json);
         }
+        if(StringUtils.isNotEmpty(customerManagement.getAbandonmentId())){
+            FrameUser frameUser = frameUserService.selectByPrimaryKey(customerManagement.getAbandonmentId());
+            String name = frameUser == null ? "" : frameUser.getTruename();
+            result.setAbandonmentName(name);
+        }
+
         return result;
     }
 
@@ -231,6 +241,8 @@ public class CustomerManagementService implements BaseService<CustomerManagement
     public int giveUp(CustomerManagement model){
 
         model.setStatus(6);
+        model.setAbandonmentAt(new Date());
+        model.setAbandonmentId(ShiroUtils.getUserId());
         return updateByPrimaryKeySelective(model);
     }
 

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

@@ -33,11 +33,9 @@ public class RoomSelectionInfoService implements BaseService<RoomSelectionInfo,
     @Autowired
     private CustomerManagementMapper customerManagementMapper;
     @Autowired
-    private MnpBuildingMapper buildingMapper;
-    @Autowired
-    private ParkRoomMapper roomMapper;
-    @Autowired
     private ParkRoomExtendMapper roomExtendMapper;
+    @Autowired
+    private ContractManageService contractManageService;
 
 
     @Override
@@ -93,11 +91,11 @@ public class RoomSelectionInfoService implements BaseService<RoomSelectionInfo,
     /**
      * 选房信息列表
      *
-     * @param CustomerManagementId
+     * @param customerManagementId
      * @return
      */
-    public List<RoomSelectionInfoDto> listAll(String CustomerManagementId) {
-        List<RoomSelectionInfoDto> result = extendMapper.selectHouseListByCustomerId(CustomerManagementId);
+    public List<RoomSelectionInfoDto> listAll(String customerManagementId) {
+        List<RoomSelectionInfoDto> result = extendMapper.selectHouseListByCustomerId(customerManagementId);
         return result;
     }
 
@@ -111,6 +109,7 @@ public class RoomSelectionInfoService implements BaseService<RoomSelectionInfo,
     public int submit(String houseIds, String customerManagementId) {
 
         CustomerManagement customerManagement = customerManagementMapper.selectByPrimaryKey(customerManagementId);
+        customerManagement.setStatus(2);
         customerManagement.setHouseId(houseIds);
         String[] split = houseIds.split(",");
         StringBuilder builder = new StringBuilder();
@@ -183,7 +182,10 @@ public class RoomSelectionInfoService implements BaseService<RoomSelectionInfo,
         model.setUpdatedId(ShiroUtils.getUserId());
         model.setStatus(2);
         model.setCollectionId(ShiroUtils.getUserId());
-        return updateByPrimaryKeySelective(model);
+        int result = updateByPrimaryKeySelective(model);
+        contractManageService.addContract(model);
+        // 生成合同
+        return result;
     }
 
     /**

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

@@ -5,6 +5,9 @@
     <select id="listByModel" resultType="com.idea.customerManagement.dto.ContractManageDto">
         select * from contract_manage
         <where>
+            <!-- <if test="buyerName != null and buyerName != ''">
+                and buyer_name like concat('%',#{buyerName},'%')
+            </if> -->
             <if test="houseName != null and houseName != ''">
                 and house_name like concat('%',#{houseName},'%')
             </if>

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

@@ -3,6 +3,7 @@
 <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="customer_management_id" jdbcType="VARCHAR" property="customerManagementId" />
     <result column="record_number" jdbcType="VARCHAR" property="recordNumber" />
     <result column="contract_number" jdbcType="VARCHAR" property="contractNumber" />
     <result column="seller" jdbcType="VARCHAR" property="seller" />
@@ -19,11 +20,11 @@
     <result column="buyer_money" jdbcType="DECIMAL" property="buyerMoney" />
     <result column="buyer_name" jdbcType="VARCHAR" property="buyerName" />
     <result column="payment_method" jdbcType="INTEGER" property="paymentMethod" />
+    <result column="down_payments_proportion" jdbcType="VARCHAR" property="downPaymentsProportion" />
     <result column="deadline" jdbcType="TIMESTAMP" property="deadline" />
     <result column="maintenance_funds" jdbcType="DECIMAL" property="maintenanceFunds" />
     <result column="maintenance_total_price" jdbcType="DECIMAL" property="maintenanceTotalPrice" />
     <result column="contract_status" jdbcType="INTEGER" property="contractStatus" />
-    <result column="customer_management_id" jdbcType="VARCHAR" property="customerManagementId" />
     <result column="subscription_funds" jdbcType="DECIMAL" property="subscriptionFunds" />
     <result column="created_id" jdbcType="VARCHAR" property="createdId" />
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
@@ -94,10 +95,10 @@
     </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, buyer_name, payment_method, deadline,
-    maintenance_funds, maintenance_total_price, contract_status, customer_management_id,
+    id, customer_management_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, buyer_name, payment_method,
+    down_payments_proportion, deadline, maintenance_funds, maintenance_total_price, contract_status,
     subscription_funds, created_id, created_at, updated_at, updated_id
   </sql>
   <sql id="Blob_Column_List">
@@ -152,28 +153,30 @@
     </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,
-                                 buyer_name, payment_method, deadline,
-                                 maintenance_funds, maintenance_total_price,
-                                 contract_status, customer_management_id, subscription_funds,
-                                 created_id, created_at, updated_at,
-                                 updated_id, 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},
-            #{buyerName,jdbcType=VARCHAR}, #{paymentMethod,jdbcType=INTEGER}, #{deadline,jdbcType=TIMESTAMP},
-            #{maintenanceFunds,jdbcType=DECIMAL}, #{maintenanceTotalPrice,jdbcType=DECIMAL},
-            #{contractStatus,jdbcType=INTEGER}, #{customerManagementId,jdbcType=VARCHAR}, #{subscriptionFunds,jdbcType=DECIMAL},
-            #{createdId,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP},
-            #{updatedId,jdbcType=VARCHAR}, #{remark,jdbcType=LONGVARCHAR}, #{contractOriginal,jdbcType=LONGVARCHAR},
-            #{contractOther,jdbcType=LONGVARCHAR})
+    insert into contract_manage (id, customer_management_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, buyer_name, payment_method,
+                                 down_payments_proportion, deadline, maintenance_funds,
+                                 maintenance_total_price, contract_status,
+                                 subscription_funds, created_id, created_at,
+                                 updated_at, updated_id, remark,
+                                 contract_original, contract_other
+    )
+    values (#{id,jdbcType=VARCHAR}, #{customerManagementId,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}, #{buyerName,jdbcType=VARCHAR}, #{paymentMethod,jdbcType=INTEGER},
+            #{downPaymentsProportion,jdbcType=VARCHAR}, #{deadline,jdbcType=TIMESTAMP}, #{maintenanceFunds,jdbcType=DECIMAL},
+            #{maintenanceTotalPrice,jdbcType=DECIMAL}, #{contractStatus,jdbcType=INTEGER},
+            #{subscriptionFunds,jdbcType=DECIMAL}, #{createdId,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP},
+            #{updatedAt,jdbcType=TIMESTAMP}, #{updatedId,jdbcType=VARCHAR}, #{remark,jdbcType=LONGVARCHAR},
+            #{contractOriginal,jdbcType=LONGVARCHAR}, #{contractOther,jdbcType=LONGVARCHAR}
+           )
   </insert>
   <insert id="insertSelective" parameterType="com.idea.customerManagement.model.ContractManage">
     insert into contract_manage
@@ -181,6 +184,9 @@
       <if test="id != null">
         id,
       </if>
+      <if test="customerManagementId != null">
+        customer_management_id,
+      </if>
       <if test="recordNumber != null">
         record_number,
       </if>
@@ -229,6 +235,9 @@
       <if test="paymentMethod != null">
         payment_method,
       </if>
+      <if test="downPaymentsProportion != null">
+        down_payments_proportion,
+      </if>
       <if test="deadline != null">
         deadline,
       </if>
@@ -241,9 +250,6 @@
       <if test="contractStatus != null">
         contract_status,
       </if>
-      <if test="customerManagementId != null">
-        customer_management_id,
-      </if>
       <if test="subscriptionFunds != null">
         subscription_funds,
       </if>
@@ -273,6 +279,9 @@
       <if test="id != null">
         #{id,jdbcType=VARCHAR},
       </if>
+      <if test="customerManagementId != null">
+        #{customerManagementId,jdbcType=VARCHAR},
+      </if>
       <if test="recordNumber != null">
         #{recordNumber,jdbcType=VARCHAR},
       </if>
@@ -321,6 +330,9 @@
       <if test="paymentMethod != null">
         #{paymentMethod,jdbcType=INTEGER},
       </if>
+      <if test="downPaymentsProportion != null">
+        #{downPaymentsProportion,jdbcType=VARCHAR},
+      </if>
       <if test="deadline != null">
         #{deadline,jdbcType=TIMESTAMP},
       </if>
@@ -333,9 +345,6 @@
       <if test="contractStatus != null">
         #{contractStatus,jdbcType=INTEGER},
       </if>
-      <if test="customerManagementId != null">
-        #{customerManagementId,jdbcType=VARCHAR},
-      </if>
       <if test="subscriptionFunds != null">
         #{subscriptionFunds,jdbcType=DECIMAL},
       </if>
@@ -374,6 +383,9 @@
       <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.recordNumber != null">
         record_number = #{record.recordNumber,jdbcType=VARCHAR},
       </if>
@@ -422,6 +434,9 @@
       <if test="record.paymentMethod != null">
         payment_method = #{record.paymentMethod,jdbcType=INTEGER},
       </if>
+      <if test="record.downPaymentsProportion != null">
+        down_payments_proportion = #{record.downPaymentsProportion,jdbcType=VARCHAR},
+      </if>
       <if test="record.deadline != null">
         deadline = #{record.deadline,jdbcType=TIMESTAMP},
       </if>
@@ -434,9 +449,6 @@
       <if test="record.contractStatus != null">
         contract_status = #{record.contractStatus,jdbcType=INTEGER},
       </if>
-      <if test="record.customerManagementId != null">
-        customer_management_id = #{record.customerManagementId,jdbcType=VARCHAR},
-      </if>
       <if test="record.subscriptionFunds != null">
         subscription_funds = #{record.subscriptionFunds,jdbcType=DECIMAL},
       </if>
@@ -469,6 +481,7 @@
   <update id="updateByExampleWithBLOBs" parameterType="map">
     update contract_manage
     set id = #{record.id,jdbcType=VARCHAR},
+    customer_management_id = #{record.customerManagementId,jdbcType=VARCHAR},
     record_number = #{record.recordNumber,jdbcType=VARCHAR},
     contract_number = #{record.contractNumber,jdbcType=VARCHAR},
     seller = #{record.seller,jdbcType=VARCHAR},
@@ -485,11 +498,11 @@
     buyer_money = #{record.buyerMoney,jdbcType=DECIMAL},
     buyer_name = #{record.buyerName,jdbcType=VARCHAR},
     payment_method = #{record.paymentMethod,jdbcType=INTEGER},
+    down_payments_proportion = #{record.downPaymentsProportion,jdbcType=VARCHAR},
     deadline = #{record.deadline,jdbcType=TIMESTAMP},
     maintenance_funds = #{record.maintenanceFunds,jdbcType=DECIMAL},
     maintenance_total_price = #{record.maintenanceTotalPrice,jdbcType=DECIMAL},
     contract_status = #{record.contractStatus,jdbcType=INTEGER},
-    customer_management_id = #{record.customerManagementId,jdbcType=VARCHAR},
     subscription_funds = #{record.subscriptionFunds,jdbcType=DECIMAL},
     created_id = #{record.createdId,jdbcType=VARCHAR},
     created_at = #{record.createdAt,jdbcType=TIMESTAMP},
@@ -505,6 +518,7 @@
   <update id="updateByExample" parameterType="map">
     update contract_manage
     set id = #{record.id,jdbcType=VARCHAR},
+    customer_management_id = #{record.customerManagementId,jdbcType=VARCHAR},
     record_number = #{record.recordNumber,jdbcType=VARCHAR},
     contract_number = #{record.contractNumber,jdbcType=VARCHAR},
     seller = #{record.seller,jdbcType=VARCHAR},
@@ -521,11 +535,11 @@
     buyer_money = #{record.buyerMoney,jdbcType=DECIMAL},
     buyer_name = #{record.buyerName,jdbcType=VARCHAR},
     payment_method = #{record.paymentMethod,jdbcType=INTEGER},
+    down_payments_proportion = #{record.downPaymentsProportion,jdbcType=VARCHAR},
     deadline = #{record.deadline,jdbcType=TIMESTAMP},
     maintenance_funds = #{record.maintenanceFunds,jdbcType=DECIMAL},
     maintenance_total_price = #{record.maintenanceTotalPrice,jdbcType=DECIMAL},
     contract_status = #{record.contractStatus,jdbcType=INTEGER},
-    customer_management_id = #{record.customerManagementId,jdbcType=VARCHAR},
     subscription_funds = #{record.subscriptionFunds,jdbcType=DECIMAL},
     created_id = #{record.createdId,jdbcType=VARCHAR},
     created_at = #{record.createdAt,jdbcType=TIMESTAMP},
@@ -538,6 +552,9 @@
   <update id="updateByPrimaryKeySelective" parameterType="com.idea.customerManagement.model.ContractManage">
     update contract_manage
     <set>
+      <if test="customerManagementId != null">
+        customer_management_id = #{customerManagementId,jdbcType=VARCHAR},
+      </if>
       <if test="recordNumber != null">
         record_number = #{recordNumber,jdbcType=VARCHAR},
       </if>
@@ -586,6 +603,9 @@
       <if test="paymentMethod != null">
         payment_method = #{paymentMethod,jdbcType=INTEGER},
       </if>
+      <if test="downPaymentsProportion != null">
+        down_payments_proportion = #{downPaymentsProportion,jdbcType=VARCHAR},
+      </if>
       <if test="deadline != null">
         deadline = #{deadline,jdbcType=TIMESTAMP},
       </if>
@@ -598,9 +618,6 @@
       <if test="contractStatus != null">
         contract_status = #{contractStatus,jdbcType=INTEGER},
       </if>
-      <if test="customerManagementId != null">
-        customer_management_id = #{customerManagementId,jdbcType=VARCHAR},
-      </if>
       <if test="subscriptionFunds != null">
         subscription_funds = #{subscriptionFunds,jdbcType=DECIMAL},
       </if>
@@ -630,7 +647,8 @@
   </update>
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.idea.customerManagement.model.ContractManage">
     update contract_manage
-    set record_number = #{recordNumber,jdbcType=VARCHAR},
+    set customer_management_id = #{customerManagementId,jdbcType=VARCHAR},
+        record_number = #{recordNumber,jdbcType=VARCHAR},
         contract_number = #{contractNumber,jdbcType=VARCHAR},
         seller = #{seller,jdbcType=VARCHAR},
         house_id = #{houseId,jdbcType=VARCHAR},
@@ -646,11 +664,11 @@
         buyer_money = #{buyerMoney,jdbcType=DECIMAL},
         buyer_name = #{buyerName,jdbcType=VARCHAR},
         payment_method = #{paymentMethod,jdbcType=INTEGER},
+        down_payments_proportion = #{downPaymentsProportion,jdbcType=VARCHAR},
         deadline = #{deadline,jdbcType=TIMESTAMP},
         maintenance_funds = #{maintenanceFunds,jdbcType=DECIMAL},
         maintenance_total_price = #{maintenanceTotalPrice,jdbcType=DECIMAL},
         contract_status = #{contractStatus,jdbcType=INTEGER},
-        customer_management_id = #{customerManagementId,jdbcType=VARCHAR},
         subscription_funds = #{subscriptionFunds,jdbcType=DECIMAL},
         created_id = #{createdId,jdbcType=VARCHAR},
         created_at = #{createdAt,jdbcType=TIMESTAMP},
@@ -663,7 +681,8 @@
   </update>
   <update id="updateByPrimaryKey" parameterType="com.idea.customerManagement.model.ContractManage">
     update contract_manage
-    set record_number = #{recordNumber,jdbcType=VARCHAR},
+    set customer_management_id = #{customerManagementId,jdbcType=VARCHAR},
+        record_number = #{recordNumber,jdbcType=VARCHAR},
         contract_number = #{contractNumber,jdbcType=VARCHAR},
         seller = #{seller,jdbcType=VARCHAR},
         house_id = #{houseId,jdbcType=VARCHAR},
@@ -679,11 +698,11 @@
         buyer_money = #{buyerMoney,jdbcType=DECIMAL},
         buyer_name = #{buyerName,jdbcType=VARCHAR},
         payment_method = #{paymentMethod,jdbcType=INTEGER},
+        down_payments_proportion = #{downPaymentsProportion,jdbcType=VARCHAR},
         deadline = #{deadline,jdbcType=TIMESTAMP},
         maintenance_funds = #{maintenanceFunds,jdbcType=DECIMAL},
         maintenance_total_price = #{maintenanceTotalPrice,jdbcType=DECIMAL},
         contract_status = #{contractStatus,jdbcType=INTEGER},
-        customer_management_id = #{customerManagementId,jdbcType=VARCHAR},
         subscription_funds = #{subscriptionFunds,jdbcType=DECIMAL},
         created_id = #{createdId,jdbcType=VARCHAR},
         created_at = #{createdAt,jdbcType=TIMESTAMP},

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

@@ -17,6 +17,8 @@
     <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
     <result column="updated_id" jdbcType="VARCHAR" property="updatedId" />
     <result column="abandonment_date" jdbcType="TIMESTAMP" property="abandonmentDate" />
+    <result column="abandonment_at" jdbcType="TIMESTAMP" property="abandonmentAt" />
+    <result column="abandonment_id" jdbcType="VARCHAR" property="abandonmentId" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.idea.customerManagement.model.CustomerManagement">
     <result column="abandonment_remark" jdbcType="LONGVARCHAR" property="abandonmentRemark" />
@@ -81,9 +83,9 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, group_id, disc_id, batch_number, room_selection_number, room_selection_date, 
-    status, house_id, house_name, buyer_name, created_id, created_at, updated_at, updated_id, 
-    abandonment_date
+    id, group_id, disc_id, batch_number, room_selection_number, room_selection_date,
+    status, house_id, house_name, buyer_name, created_id, created_at, updated_at, updated_id,
+    abandonment_date, abandonment_at, abandonment_id
   </sql>
   <sql id="Blob_Column_List">
     abandonment_remark, abandonment_file_list
@@ -119,7 +121,7 @@
     </if>
   </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
-    select 
+    select
     <include refid="Base_Column_List" />
     ,
     <include refid="Blob_Column_List" />
@@ -137,20 +139,20 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.idea.customerManagement.model.CustomerManagement">
-    insert into customer_management (id, group_id, disc_id, 
-      batch_number, room_selection_number, room_selection_date, 
-      status, house_id, house_name, 
-      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=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 into customer_management (id, group_id, disc_id,
+                                     batch_number, room_selection_number, room_selection_date,
+                                     status, house_id, house_name,
+                                     buyer_name, created_id, created_at,
+                                     updated_at, updated_id, abandonment_date,
+                                     abandonment_at, abandonment_id, 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=VARCHAR}, #{houseName,jdbcType=VARCHAR},
+            #{buyerName,jdbcType=VARCHAR}, #{createdId,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP},
+            #{updatedAt,jdbcType=TIMESTAMP}, #{updatedId,jdbcType=VARCHAR}, #{abandonmentDate,jdbcType=TIMESTAMP},
+            #{abandonmentAt,jdbcType=TIMESTAMP}, #{abandonmentId,jdbcType=VARCHAR}, #{abandonmentRemark,jdbcType=LONGVARCHAR},
+            #{abandonmentFileList,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.idea.customerManagement.model.CustomerManagement">
     insert into customer_management
@@ -200,6 +202,12 @@
       <if test="abandonmentDate != null">
         abandonment_date,
       </if>
+      <if test="abandonmentAt != null">
+        abandonment_at,
+      </if>
+      <if test="abandonmentId != null">
+        abandonment_id,
+      </if>
       <if test="abandonmentRemark != null">
         abandonment_remark,
       </if>
@@ -253,6 +261,12 @@
       <if test="abandonmentDate != null">
         #{abandonmentDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="abandonmentAt != null">
+        #{abandonmentAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="abandonmentId != null">
+        #{abandonmentId,jdbcType=VARCHAR},
+      </if>
       <if test="abandonmentRemark != null">
         #{abandonmentRemark,jdbcType=LONGVARCHAR},
       </if>
@@ -315,6 +329,12 @@
       <if test="record.abandonmentDate != null">
         abandonment_date = #{record.abandonmentDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.abandonmentAt != null">
+        abandonment_at = #{record.abandonmentAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.abandonmentId != null">
+        abandonment_id = #{record.abandonmentId,jdbcType=VARCHAR},
+      </if>
       <if test="record.abandonmentRemark != null">
         abandonment_remark = #{record.abandonmentRemark,jdbcType=LONGVARCHAR},
       </if>
@@ -329,22 +349,24 @@
   <update id="updateByExampleWithBLOBs" parameterType="map">
     update customer_management
     set id = #{record.id,jdbcType=VARCHAR},
-      group_id = #{record.groupId,jdbcType=VARCHAR},
-      disc_id = #{record.discId,jdbcType=VARCHAR},
-      batch_number = #{record.batchNumber,jdbcType=VARCHAR},
-      room_selection_number = #{record.roomSelectionNumber,jdbcType=VARCHAR},
-      room_selection_date = #{record.roomSelectionDate,jdbcType=TIMESTAMP},
-      status = #{record.status,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},
-      updated_id = #{record.updatedId,jdbcType=VARCHAR},
-      abandonment_date = #{record.abandonmentDate,jdbcType=TIMESTAMP},
-      abandonment_remark = #{record.abandonmentRemark,jdbcType=LONGVARCHAR},
-      abandonment_file_list = #{record.abandonmentFileList,jdbcType=LONGVARCHAR}
+    group_id = #{record.groupId,jdbcType=VARCHAR},
+    disc_id = #{record.discId,jdbcType=VARCHAR},
+    batch_number = #{record.batchNumber,jdbcType=VARCHAR},
+    room_selection_number = #{record.roomSelectionNumber,jdbcType=VARCHAR},
+    room_selection_date = #{record.roomSelectionDate,jdbcType=TIMESTAMP},
+    status = #{record.status,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},
+    updated_id = #{record.updatedId,jdbcType=VARCHAR},
+    abandonment_date = #{record.abandonmentDate,jdbcType=TIMESTAMP},
+    abandonment_at = #{record.abandonmentAt,jdbcType=TIMESTAMP},
+    abandonment_id = #{record.abandonmentId,jdbcType=VARCHAR},
+    abandonment_remark = #{record.abandonmentRemark,jdbcType=LONGVARCHAR},
+    abandonment_file_list = #{record.abandonmentFileList,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -352,20 +374,22 @@
   <update id="updateByExample" parameterType="map">
     update customer_management
     set id = #{record.id,jdbcType=VARCHAR},
-      group_id = #{record.groupId,jdbcType=VARCHAR},
-      disc_id = #{record.discId,jdbcType=VARCHAR},
-      batch_number = #{record.batchNumber,jdbcType=VARCHAR},
-      room_selection_number = #{record.roomSelectionNumber,jdbcType=VARCHAR},
-      room_selection_date = #{record.roomSelectionDate,jdbcType=TIMESTAMP},
-      status = #{record.status,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},
-      updated_id = #{record.updatedId,jdbcType=VARCHAR},
-      abandonment_date = #{record.abandonmentDate,jdbcType=TIMESTAMP}
+    group_id = #{record.groupId,jdbcType=VARCHAR},
+    disc_id = #{record.discId,jdbcType=VARCHAR},
+    batch_number = #{record.batchNumber,jdbcType=VARCHAR},
+    room_selection_number = #{record.roomSelectionNumber,jdbcType=VARCHAR},
+    room_selection_date = #{record.roomSelectionDate,jdbcType=TIMESTAMP},
+    status = #{record.status,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},
+    updated_id = #{record.updatedId,jdbcType=VARCHAR},
+    abandonment_date = #{record.abandonmentDate,jdbcType=TIMESTAMP},
+    abandonment_at = #{record.abandonmentAt,jdbcType=TIMESTAMP},
+    abandonment_id = #{record.abandonmentId,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -415,6 +439,12 @@
       <if test="abandonmentDate != null">
         abandonment_date = #{abandonmentDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="abandonmentAt != null">
+        abandonment_at = #{abandonmentAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="abandonmentId != null">
+        abandonment_id = #{abandonmentId,jdbcType=VARCHAR},
+      </if>
       <if test="abandonmentRemark != null">
         abandonment_remark = #{abandonmentRemark,jdbcType=LONGVARCHAR},
       </if>
@@ -427,39 +457,43 @@
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.idea.customerManagement.model.CustomerManagement">
     update customer_management
     set group_id = #{groupId,jdbcType=VARCHAR},
-      disc_id = #{discId,jdbcType=VARCHAR},
-      batch_number = #{batchNumber,jdbcType=VARCHAR},
-      room_selection_number = #{roomSelectionNumber,jdbcType=VARCHAR},
-      room_selection_date = #{roomSelectionDate,jdbcType=TIMESTAMP},
-      status = #{status,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},
-      updated_id = #{updatedId,jdbcType=VARCHAR},
-      abandonment_date = #{abandonmentDate,jdbcType=TIMESTAMP},
-      abandonment_remark = #{abandonmentRemark,jdbcType=LONGVARCHAR},
-      abandonment_file_list = #{abandonmentFileList,jdbcType=LONGVARCHAR}
+        disc_id = #{discId,jdbcType=VARCHAR},
+        batch_number = #{batchNumber,jdbcType=VARCHAR},
+        room_selection_number = #{roomSelectionNumber,jdbcType=VARCHAR},
+        room_selection_date = #{roomSelectionDate,jdbcType=TIMESTAMP},
+        status = #{status,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},
+        updated_id = #{updatedId,jdbcType=VARCHAR},
+        abandonment_date = #{abandonmentDate,jdbcType=TIMESTAMP},
+        abandonment_at = #{abandonmentAt,jdbcType=TIMESTAMP},
+        abandonment_id = #{abandonmentId,jdbcType=VARCHAR},
+        abandonment_remark = #{abandonmentRemark,jdbcType=LONGVARCHAR},
+        abandonment_file_list = #{abandonmentFileList,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.idea.customerManagement.model.CustomerManagement">
     update customer_management
     set group_id = #{groupId,jdbcType=VARCHAR},
-      disc_id = #{discId,jdbcType=VARCHAR},
-      batch_number = #{batchNumber,jdbcType=VARCHAR},
-      room_selection_number = #{roomSelectionNumber,jdbcType=VARCHAR},
-      room_selection_date = #{roomSelectionDate,jdbcType=TIMESTAMP},
-      status = #{status,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},
-      updated_id = #{updatedId,jdbcType=VARCHAR},
-      abandonment_date = #{abandonmentDate,jdbcType=TIMESTAMP}
+        disc_id = #{discId,jdbcType=VARCHAR},
+        batch_number = #{batchNumber,jdbcType=VARCHAR},
+        room_selection_number = #{roomSelectionNumber,jdbcType=VARCHAR},
+        room_selection_date = #{roomSelectionDate,jdbcType=TIMESTAMP},
+        status = #{status,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},
+        updated_id = #{updatedId,jdbcType=VARCHAR},
+        abandonment_date = #{abandonmentDate,jdbcType=TIMESTAMP},
+        abandonment_at = #{abandonmentAt,jdbcType=TIMESTAMP},
+        abandonment_id = #{abandonmentId,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

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

@@ -12,5 +12,10 @@
            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
+    <where>
+        <if test="customerManagementId !=null and customerManagementId != ''">
+            and room_selection_info.customer_management_id = #{customerManagementId}
+        </if>
+    </where>
   </select>
 </mapper>