选房 认购

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

@@ -69,13 +69,13 @@ public class CustomerManagementController extends BaseController {
 
     /**
      * 删除轮号客户
-     * @param id
+     * @param ids
      * @return
      */
     @PostMapping(value = "delete",produces = {"application/json;charset=UTF-8"})
     @ResponseBody
-    public AjaxResult delete(String id){
-        int result = modelService.delete(id);
+    public AjaxResult delete(String ids){
+        int result = modelService.delete(ids);
         return result(result);
     }
 

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

@@ -10,4 +10,8 @@ public class CustomerManagementDto extends CustomerManagement {
 
     private String groupDiscName;
 
+    private String groupIds;
+
+    private String discIds;
+
 }

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

@@ -14,7 +14,7 @@ public class RoomSelectionInfoDto extends RoomSelectionInfo {
     /**
      * 单元/楼栋号
      */
-    private String buildNum;
+    private String buildName;
 
     /**
      * 户室号

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

@@ -1,7 +1,9 @@
 package com.idea.customerManagement.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -32,10 +34,16 @@ public class RoomSelectionInfo implements Serializable {
 
     private String serialNumber;
 
+    private String collectionId;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date collectionTime;
 
     private String createdId;
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date createdAt;
 
     private Date updatedAt;

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

@@ -526,6 +526,76 @@ public class RoomSelectionInfoExample {
             return (Criteria) this;
         }
 
+        public Criteria andDepositNumberIsNull() {
+            addCriterion("deposit_number is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepositNumberIsNotNull() {
+            addCriterion("deposit_number is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepositNumberEqualTo(String value) {
+            addCriterion("deposit_number =", value, "depositNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepositNumberNotEqualTo(String value) {
+            addCriterion("deposit_number <>", value, "depositNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepositNumberGreaterThan(String value) {
+            addCriterion("deposit_number >", value, "depositNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepositNumberGreaterThanOrEqualTo(String value) {
+            addCriterion("deposit_number >=", value, "depositNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepositNumberLessThan(String value) {
+            addCriterion("deposit_number <", value, "depositNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepositNumberLessThanOrEqualTo(String value) {
+            addCriterion("deposit_number <=", value, "depositNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepositNumberLike(String value) {
+            addCriterion("deposit_number like", value, "depositNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepositNumberNotLike(String value) {
+            addCriterion("deposit_number not like", value, "depositNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepositNumberIn(List<String> values) {
+            addCriterion("deposit_number in", values, "depositNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepositNumberNotIn(List<String> values) {
+            addCriterion("deposit_number not in", values, "depositNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepositNumberBetween(String value1, String value2) {
+            addCriterion("deposit_number between", value1, value2, "depositNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepositNumberNotBetween(String value1, String value2) {
+            addCriterion("deposit_number not between", value1, value2, "depositNumber");
+            return (Criteria) this;
+        }
+
         public Criteria andStatusIsNull() {
             addCriterion("status is null");
             return (Criteria) this;
@@ -836,6 +906,76 @@ public class RoomSelectionInfoExample {
             return (Criteria) this;
         }
 
+        public Criteria andCollectionIdIsNull() {
+            addCriterion("collection_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCollectionIdIsNotNull() {
+            addCriterion("collection_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCollectionIdEqualTo(String value) {
+            addCriterion("collection_id =", value, "collectionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCollectionIdNotEqualTo(String value) {
+            addCriterion("collection_id <>", value, "collectionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCollectionIdGreaterThan(String value) {
+            addCriterion("collection_id >", value, "collectionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCollectionIdGreaterThanOrEqualTo(String value) {
+            addCriterion("collection_id >=", value, "collectionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCollectionIdLessThan(String value) {
+            addCriterion("collection_id <", value, "collectionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCollectionIdLessThanOrEqualTo(String value) {
+            addCriterion("collection_id <=", value, "collectionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCollectionIdLike(String value) {
+            addCriterion("collection_id like", value, "collectionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCollectionIdNotLike(String value) {
+            addCriterion("collection_id not like", value, "collectionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCollectionIdIn(List<String> values) {
+            addCriterion("collection_id in", values, "collectionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCollectionIdNotIn(List<String> values) {
+            addCriterion("collection_id not in", values, "collectionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCollectionIdBetween(String value1, String value2) {
+            addCriterion("collection_id between", value1, value2, "collectionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCollectionIdNotBetween(String value1, String value2) {
+            addCriterion("collection_id not between", value1, value2, "collectionId");
+            return (Criteria) this;
+        }
+
         public Criteria andCollectionTimeIsNull() {
             addCriterion("collection_time is null");
             return (Criteria) this;

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

@@ -186,17 +186,22 @@ public class CustomerManagementService implements BaseService<CustomerManagement
 
     /**
      * 删除
-     * @param id
+     * @param ids
      * @return
      */
-    public int delete(String id){
-
-        CustomerManagement customerManagement = selectByPrimaryKey(id);
-        String houseId = customerManagement.getHouseId();
-        if(StringUtils.isNotEmpty(houseId)){
-            throw new RuntimeException("该数据已在别的业务中引用，无法删除!!!");
+    public int delete(String ids){
+        String[] idLsit = ids.split(",");
+        for(String id : idLsit){
+            CustomerManagement customerManagement = selectByPrimaryKey(id);
+            String houseId = customerManagement.getHouseId();
+            if(StringUtils.isNotEmpty(houseId)){
+                throw new RuntimeException("该数据已在别的业务中引用，无法删除!!!");
+            }
+        }
+        for(String id : idLsit){
+             deleteByPrimaryKey(id);
         }
-        return deleteByPrimaryKey(id);
+        return 1;
     }
 
     /**

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

@@ -136,8 +136,9 @@ public class RoomSelectionInfoService implements BaseService<RoomSelectionInfo,
             roomSelectionInfo.setDiscId(response.getDiscId());
             roomSelectionInfo.setGroupId(response.getGroupId());
             roomSelectionInfo.setCreatedAt(new Date());
-            roomSelectionInfo.setId(ShiroUtils.getUserId());
+            roomSelectionInfo.setCreatedId(ShiroUtils.getUserId());
             roomSelectionInfo.setReceivableMoney(response.getSubscriptionFunds());
+            roomSelectionInfo.setStatus(1);
             insertSelective(roomSelectionInfo);
         }
         if (builder.length() > 0) {

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

@@ -16,11 +16,11 @@
       <if test="status != null and status != ''">
         and status = #{status}
       </if>
-      <if test="groupId != null and groupId != ''">
-        and group_id = #{groupId}
+      <if test="groupIds != null and groupIds != ''">
+        and customer_management.group_id in (${groupIds})
       </if>
-      <if test="discId != null and discId != ''">
-        and disc_id = #{discId}
+      <if test="discIds != null and discIds != ''">
+        and disc_id in (${discIds})
       </if>
     </where>
     order by batch_number desc,room_selection_number asc

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

@@ -3,8 +3,12 @@
 <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
+    select room_selection_info.*,
+           mnp_building.build_num buildName,
+           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

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

@@ -8,11 +8,13 @@
     <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="deposit_number" jdbcType="VARCHAR" property="depositNumber" />
     <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_id" jdbcType="VARCHAR" property="collectionId" />
     <result column="collection_time" jdbcType="TIMESTAMP" property="collectionTime" />
     <result column="created_id" jdbcType="VARCHAR" property="createdId" />
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
@@ -82,9 +84,9 @@
     </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
+    id, customer_management_id, group_id, disc_id, build_id, house_id, deposit_number,
+    status, receivable_money, received_amount, payment_method, serial_number, collection_id,
+    collection_time, created_id, created_at, updated_at, updated_id
   </sql>
   <sql id="Blob_Column_List">
     remark, file_list
@@ -120,7 +122,7 @@
     </if>
   </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
-    select 
+    select
     <include refid="Base_Column_List" />
     ,
     <include refid="Blob_Column_List" />
@@ -138,20 +140,20 @@
     </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 into room_selection_info (id, customer_management_id, group_id,
+                                     disc_id, build_id, house_id,
+                                     deposit_number, status, receivable_money,
+                                     received_amount, payment_method, serial_number,
+                                     collection_id, 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},
+            #{depositNumber,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{receivableMoney,jdbcType=DECIMAL},
+            #{receivedAmount,jdbcType=DECIMAL}, #{paymentMethod,jdbcType=INTEGER}, #{serialNumber,jdbcType=VARCHAR},
+            #{collectionId,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
@@ -174,6 +176,9 @@
       <if test="houseId != null">
         house_id,
       </if>
+      <if test="depositNumber != null">
+        deposit_number,
+      </if>
       <if test="status != null">
         status,
       </if>
@@ -189,6 +194,9 @@
       <if test="serialNumber != null">
         serial_number,
       </if>
+      <if test="collectionId != null">
+        collection_id,
+      </if>
       <if test="collectionTime != null">
         collection_time,
       </if>
@@ -230,6 +238,9 @@
       <if test="houseId != null">
         #{houseId,jdbcType=VARCHAR},
       </if>
+      <if test="depositNumber != null">
+        #{depositNumber,jdbcType=VARCHAR},
+      </if>
       <if test="status != null">
         #{status,jdbcType=INTEGER},
       </if>
@@ -245,6 +256,9 @@
       <if test="serialNumber != null">
         #{serialNumber,jdbcType=VARCHAR},
       </if>
+      <if test="collectionId != null">
+        #{collectionId,jdbcType=VARCHAR},
+      </if>
       <if test="collectionTime != null">
         #{collectionTime,jdbcType=TIMESTAMP},
       </if>
@@ -295,6 +309,9 @@
       <if test="record.houseId != null">
         house_id = #{record.houseId,jdbcType=VARCHAR},
       </if>
+      <if test="record.depositNumber != null">
+        deposit_number = #{record.depositNumber,jdbcType=VARCHAR},
+      </if>
       <if test="record.status != null">
         status = #{record.status,jdbcType=INTEGER},
       </if>
@@ -310,6 +327,9 @@
       <if test="record.serialNumber != null">
         serial_number = #{record.serialNumber,jdbcType=VARCHAR},
       </if>
+      <if test="record.collectionId != null">
+        collection_id = #{record.collectionId,jdbcType=VARCHAR},
+      </if>
       <if test="record.collectionTime != null">
         collection_time = #{record.collectionTime,jdbcType=TIMESTAMP},
       </if>
@@ -339,23 +359,25 @@
   <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}
+    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},
+    deposit_number = #{record.depositNumber,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_id = #{record.collectionId,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>
@@ -363,21 +385,23 @@
   <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}
+    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},
+    deposit_number = #{record.depositNumber,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_id = #{record.collectionId,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>
@@ -400,6 +424,9 @@
       <if test="houseId != null">
         house_id = #{houseId,jdbcType=VARCHAR},
       </if>
+      <if test="depositNumber != null">
+        deposit_number = #{depositNumber,jdbcType=VARCHAR},
+      </if>
       <if test="status != null">
         status = #{status,jdbcType=INTEGER},
       </if>
@@ -415,6 +442,9 @@
       <if test="serialNumber != null">
         serial_number = #{serialNumber,jdbcType=VARCHAR},
       </if>
+      <if test="collectionId != null">
+        collection_id = #{collectionId,jdbcType=VARCHAR},
+      </if>
       <if test="collectionTime != null">
         collection_time = #{collectionTime,jdbcType=TIMESTAMP},
       </if>
@@ -442,41 +472,45 @@
   <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}
+        group_id = #{groupId,jdbcType=VARCHAR},
+        disc_id = #{discId,jdbcType=VARCHAR},
+        build_id = #{buildId,jdbcType=VARCHAR},
+        house_id = #{houseId,jdbcType=VARCHAR},
+        deposit_number = #{depositNumber,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_id = #{collectionId,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}
+        group_id = #{groupId,jdbcType=VARCHAR},
+        disc_id = #{discId,jdbcType=VARCHAR},
+        build_id = #{buildId,jdbcType=VARCHAR},
+        house_id = #{houseId,jdbcType=VARCHAR},
+        deposit_number = #{depositNumber,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_id = #{collectionId,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>