1

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

@@ -8,6 +8,8 @@ import java.util.Date;
 
 @Data
 public class ParkInfo implements Serializable {
+
+
     private String id;
 
     private String groupId;
@@ -40,7 +42,7 @@ public class ParkInfo implements Serializable {
 
     private String landUsePermitNumber;
 
-    private Double volumeRatio;
+    private String volumeRatio;
 
     private String greenRatio;
 
@@ -56,12 +58,12 @@ public class ParkInfo implements Serializable {
 
     private String address;
 
-    private String introduction;
-
     private String orderNum;
 
     private String archiveCode;
 
+    private String introduction;
+
     private static final long serialVersionUID = 1L;
 
 

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

@@ -1196,52 +1196,62 @@ public class ParkInfoExample {
             return (Criteria) this;
         }
 
-        public Criteria andVolumeRatioEqualTo(Double value) {
+        public Criteria andVolumeRatioEqualTo(String value) {
             addCriterion("volume_ratio =", value, "volumeRatio");
             return (Criteria) this;
         }
 
-        public Criteria andVolumeRatioNotEqualTo(Double value) {
+        public Criteria andVolumeRatioNotEqualTo(String value) {
             addCriterion("volume_ratio <>", value, "volumeRatio");
             return (Criteria) this;
         }
 
-        public Criteria andVolumeRatioGreaterThan(Double value) {
+        public Criteria andVolumeRatioGreaterThan(String value) {
             addCriterion("volume_ratio >", value, "volumeRatio");
             return (Criteria) this;
         }
 
-        public Criteria andVolumeRatioGreaterThanOrEqualTo(Double value) {
+        public Criteria andVolumeRatioGreaterThanOrEqualTo(String value) {
             addCriterion("volume_ratio >=", value, "volumeRatio");
             return (Criteria) this;
         }
 
-        public Criteria andVolumeRatioLessThan(Double value) {
+        public Criteria andVolumeRatioLessThan(String value) {
             addCriterion("volume_ratio <", value, "volumeRatio");
             return (Criteria) this;
         }
 
-        public Criteria andVolumeRatioLessThanOrEqualTo(Double value) {
+        public Criteria andVolumeRatioLessThanOrEqualTo(String value) {
             addCriterion("volume_ratio <=", value, "volumeRatio");
             return (Criteria) this;
         }
 
-        public Criteria andVolumeRatioIn(List<Double> values) {
+        public Criteria andVolumeRatioLike(String value) {
+            addCriterion("volume_ratio like", value, "volumeRatio");
+            return (Criteria) this;
+        }
+
+        public Criteria andVolumeRatioNotLike(String value) {
+            addCriterion("volume_ratio not like", value, "volumeRatio");
+            return (Criteria) this;
+        }
+
+        public Criteria andVolumeRatioIn(List<String> values) {
             addCriterion("volume_ratio in", values, "volumeRatio");
             return (Criteria) this;
         }
 
-        public Criteria andVolumeRatioNotIn(List<Double> values) {
+        public Criteria andVolumeRatioNotIn(List<String> values) {
             addCriterion("volume_ratio not in", values, "volumeRatio");
             return (Criteria) this;
         }
 
-        public Criteria andVolumeRatioBetween(Double value1, Double value2) {
+        public Criteria andVolumeRatioBetween(String value1, String value2) {
             addCriterion("volume_ratio between", value1, value2, "volumeRatio");
             return (Criteria) this;
         }
 
-        public Criteria andVolumeRatioNotBetween(Double value1, Double value2) {
+        public Criteria andVolumeRatioNotBetween(String value1, String value2) {
             addCriterion("volume_ratio not between", value1, value2, "volumeRatio");
             return (Criteria) this;
         }

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

@@ -90,4 +90,6 @@ public class IntentionalDeposit implements Serializable {
 
     private String roomSelectionInfoId;
 
+    private String ncBankSerialId;
+
 }

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

@@ -1736,6 +1736,76 @@ public class IntentionalDepositExample {
             return (Criteria) this;
         }
 
+        public Criteria andNcBankSerialIdIsNull() {
+            addCriterion("nc_bank_serial_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcBankSerialIdIsNotNull() {
+            addCriterion("nc_bank_serial_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcBankSerialIdEqualTo(String value) {
+            addCriterion("nc_bank_serial_id =", value, "ncBankSerialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcBankSerialIdNotEqualTo(String value) {
+            addCriterion("nc_bank_serial_id <>", value, "ncBankSerialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcBankSerialIdGreaterThan(String value) {
+            addCriterion("nc_bank_serial_id >", value, "ncBankSerialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcBankSerialIdGreaterThanOrEqualTo(String value) {
+            addCriterion("nc_bank_serial_id >=", value, "ncBankSerialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcBankSerialIdLessThan(String value) {
+            addCriterion("nc_bank_serial_id <", value, "ncBankSerialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcBankSerialIdLessThanOrEqualTo(String value) {
+            addCriterion("nc_bank_serial_id <=", value, "ncBankSerialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcBankSerialIdLike(String value) {
+            addCriterion("nc_bank_serial_id like", value, "ncBankSerialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcBankSerialIdNotLike(String value) {
+            addCriterion("nc_bank_serial_id not like", value, "ncBankSerialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcBankSerialIdIn(List<String> values) {
+            addCriterion("nc_bank_serial_id in", values, "ncBankSerialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcBankSerialIdNotIn(List<String> values) {
+            addCriterion("nc_bank_serial_id not in", values, "ncBankSerialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcBankSerialIdBetween(String value1, String value2) {
+            addCriterion("nc_bank_serial_id between", value1, value2, "ncBankSerialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcBankSerialIdNotBetween(String value1, String value2) {
+            addCriterion("nc_bank_serial_id not between", value1, value2, "ncBankSerialId");
+            return (Criteria) this;
+        }
+
         public Criteria andBankNameIsNull() {
             addCriterion("bank_name is null");
             return (Criteria) this;

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

@@ -64,6 +64,8 @@ public class RoomSelectionInfo implements Serializable {
 
     private String bankNumber;
 
+    private String ncBankSerialId;
+
     private static final long serialVersionUID = 1L;
 
 }

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

@@ -1296,6 +1296,76 @@ public class RoomSelectionInfoExample {
             return (Criteria) this;
         }
 
+        public Criteria andNcBankSerialIdIsNull() {
+            addCriterion("nc_bank_serial_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcBankSerialIdIsNotNull() {
+            addCriterion("nc_bank_serial_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcBankSerialIdEqualTo(String value) {
+            addCriterion("nc_bank_serial_id =", value, "ncBankSerialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcBankSerialIdNotEqualTo(String value) {
+            addCriterion("nc_bank_serial_id <>", value, "ncBankSerialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcBankSerialIdGreaterThan(String value) {
+            addCriterion("nc_bank_serial_id >", value, "ncBankSerialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcBankSerialIdGreaterThanOrEqualTo(String value) {
+            addCriterion("nc_bank_serial_id >=", value, "ncBankSerialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcBankSerialIdLessThan(String value) {
+            addCriterion("nc_bank_serial_id <", value, "ncBankSerialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcBankSerialIdLessThanOrEqualTo(String value) {
+            addCriterion("nc_bank_serial_id <=", value, "ncBankSerialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcBankSerialIdLike(String value) {
+            addCriterion("nc_bank_serial_id like", value, "ncBankSerialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcBankSerialIdNotLike(String value) {
+            addCriterion("nc_bank_serial_id not like", value, "ncBankSerialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcBankSerialIdIn(List<String> values) {
+            addCriterion("nc_bank_serial_id in", values, "ncBankSerialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcBankSerialIdNotIn(List<String> values) {
+            addCriterion("nc_bank_serial_id not in", values, "ncBankSerialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcBankSerialIdBetween(String value1, String value2) {
+            addCriterion("nc_bank_serial_id between", value1, value2, "ncBankSerialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcBankSerialIdNotBetween(String value1, String value2) {
+            addCriterion("nc_bank_serial_id not between", value1, value2, "ncBankSerialId");
+            return (Criteria) this;
+        }
+
         public Criteria andBankNameIsNull() {
             addCriterion("bank_name is null");
             return (Criteria) this;

pro-base/src/main/java/com/idea/paymentManagement/service/PayLogService.java

@@ -538,7 +538,10 @@ public class PayLogService implements BaseService<PayLog, PayLogExample> {
         return AjaxResult.success();
     }
 
-
+//    public int convertType(String id,int type){
+//        PayLog payLog = selectByPrimaryKey(id);
+//        payLog.
+//    }
 
 
 

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

@@ -1,6 +1,7 @@
 package com.idea.util;
 
 import com.rockstar.common.domain.AjaxResult;
+import com.rockstar.common.file.FileUtils;
 import com.rockstar.frame.model.FrameData;
 import com.rockstar.frame.model.FrameDataExample;
 import com.rockstar.frame.service.FrameDataService;
@@ -8,13 +9,11 @@ import com.rockstar.util.StringUtils;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.*;
 import java.util.*;
 
 /**
@@ -66,4 +65,52 @@ public class FileZtController {
 
         return AjaxResult.success(list_map);
     }
+
+    @GetMapping({"/viewImg/{id}"})
+    public void viewIMG(@PathVariable("id") String id, HttpServletRequest request, HttpServletResponse response) {
+        FrameData frameData = this.frameDataService.selectByPrimaryKey(id);
+
+        try {
+            if (null != frameData) {
+                String contentType = frameData.getFileContentType();
+                if (StringUtils.isNotEmpty(contentType) && contentType.indexOf("image/") == -1) {
+                    FileUtils.downFile(response, frameData.getFileName(), frameData.getFilePath(), frameData.getFileContentType());
+                } else {
+                    readIMGToHtml(request, response, frameData.getFilePath());
+                }
+            } else {
+                readIMGToHtml(request, response, "error");
+            }
+        } catch (IOException var6) {
+            var6.printStackTrace();
+        }
+
+    }
+
+    public static void readIMGToHtml(HttpServletRequest request, HttpServletResponse response, String fileUrl) throws IOException {
+        File desc = new File(fileUrl);
+        InputStream inputStream = null;
+        if (!desc.exists()) {
+            inputStream = FileUtils.class.getResourceAsStream("/static/no_image.jpg");
+        } else {
+            inputStream = new FileInputStream(fileUrl);
+        }
+
+        readIMGToHtml(response, (InputStream)inputStream);
+    }
+
+    public static void readIMGToHtml(HttpServletResponse response, InputStream inputStream) throws IOException {
+        int i = inputStream.available();
+        byte[] buff = new byte[i];
+        inputStream.read(buff);
+        inputStream.close();
+        response.reset();
+        response.setContentType("image/jpg");
+        OutputStream out = response.getOutputStream();
+        out.write(buff);
+        out.close();
+    }
+
+
+
 }

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

@@ -18,7 +18,7 @@
     <result column="construction_permit" jdbcType="VARCHAR" property="constructionPermit" />
     <result column="land_certificate_number" jdbcType="VARCHAR" property="landCertificateNumber" />
     <result column="land_use_permit_number" jdbcType="VARCHAR" property="landUsePermitNumber" />
-    <result column="volume_ratio" jdbcType="DOUBLE" property="volumeRatio" />
+    <result column="volume_ratio" jdbcType="VARCHAR" property="volumeRatio" />
     <result column="green_ratio" jdbcType="VARCHAR" property="greenRatio" />
     <result column="price" jdbcType="DECIMAL" property="price" />
     <result column="exceeded_price" jdbcType="DECIMAL" property="exceededPrice" />
@@ -165,7 +165,7 @@
             #{buildArea,jdbcType=DOUBLE}, #{landArea,jdbcType=DOUBLE}, #{projectApprovalDocument,jdbcType=VARCHAR},
             #{engineeringPlanningPermit,jdbcType=VARCHAR}, #{constructionPermit,jdbcType=VARCHAR},
             #{landCertificateNumber,jdbcType=VARCHAR}, #{landUsePermitNumber,jdbcType=VARCHAR},
-            #{volumeRatio,jdbcType=DOUBLE}, #{greenRatio,jdbcType=VARCHAR}, #{price,jdbcType=DECIMAL},
+            #{volumeRatio,jdbcType=VARCHAR}, #{greenRatio,jdbcType=VARCHAR}, #{price,jdbcType=DECIMAL},
             #{exceededPrice,jdbcType=DECIMAL}, #{areaStatus,jdbcType=INTEGER}, #{saleStatus,jdbcType=INTEGER},
             #{regionalismCode,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, #{orderNum,jdbcType=VARCHAR},
             #{archiveCode,jdbcType=VARCHAR}, #{introduction,jdbcType=LONGVARCHAR})
@@ -305,7 +305,7 @@
         #{landUsePermitNumber,jdbcType=VARCHAR},
       </if>
       <if test="volumeRatio != null">
-        #{volumeRatio,jdbcType=DOUBLE},
+        #{volumeRatio,jdbcType=VARCHAR},
       </if>
       <if test="greenRatio != null">
         #{greenRatio,jdbcType=VARCHAR},
@@ -397,7 +397,7 @@
         land_use_permit_number = #{record.landUsePermitNumber,jdbcType=VARCHAR},
       </if>
       <if test="record.volumeRatio != null">
-        volume_ratio = #{record.volumeRatio,jdbcType=DOUBLE},
+        volume_ratio = #{record.volumeRatio,jdbcType=VARCHAR},
       </if>
       <if test="record.greenRatio != null">
         green_ratio = #{record.greenRatio,jdbcType=VARCHAR},
@@ -452,7 +452,7 @@
     construction_permit = #{record.constructionPermit,jdbcType=VARCHAR},
     land_certificate_number = #{record.landCertificateNumber,jdbcType=VARCHAR},
     land_use_permit_number = #{record.landUsePermitNumber,jdbcType=VARCHAR},
-    volume_ratio = #{record.volumeRatio,jdbcType=DOUBLE},
+    volume_ratio = #{record.volumeRatio,jdbcType=VARCHAR},
     green_ratio = #{record.greenRatio,jdbcType=VARCHAR},
     price = #{record.price,jdbcType=DECIMAL},
     exceeded_price = #{record.exceededPrice,jdbcType=DECIMAL},
@@ -485,7 +485,7 @@
     construction_permit = #{record.constructionPermit,jdbcType=VARCHAR},
     land_certificate_number = #{record.landCertificateNumber,jdbcType=VARCHAR},
     land_use_permit_number = #{record.landUsePermitNumber,jdbcType=VARCHAR},
-    volume_ratio = #{record.volumeRatio,jdbcType=DOUBLE},
+    volume_ratio = #{record.volumeRatio,jdbcType=VARCHAR},
     green_ratio = #{record.greenRatio,jdbcType=VARCHAR},
     price = #{record.price,jdbcType=DECIMAL},
     exceeded_price = #{record.exceededPrice,jdbcType=DECIMAL},
@@ -548,7 +548,7 @@
         land_use_permit_number = #{landUsePermitNumber,jdbcType=VARCHAR},
       </if>
       <if test="volumeRatio != null">
-        volume_ratio = #{volumeRatio,jdbcType=DOUBLE},
+        volume_ratio = #{volumeRatio,jdbcType=VARCHAR},
       </if>
       <if test="greenRatio != null">
         green_ratio = #{greenRatio,jdbcType=VARCHAR},
@@ -600,7 +600,7 @@
         construction_permit = #{constructionPermit,jdbcType=VARCHAR},
         land_certificate_number = #{landCertificateNumber,jdbcType=VARCHAR},
         land_use_permit_number = #{landUsePermitNumber,jdbcType=VARCHAR},
-        volume_ratio = #{volumeRatio,jdbcType=DOUBLE},
+        volume_ratio = #{volumeRatio,jdbcType=VARCHAR},
         green_ratio = #{greenRatio,jdbcType=VARCHAR},
         price = #{price,jdbcType=DECIMAL},
         exceeded_price = #{exceededPrice,jdbcType=DECIMAL},
@@ -630,7 +630,7 @@
         construction_permit = #{constructionPermit,jdbcType=VARCHAR},
         land_certificate_number = #{landCertificateNumber,jdbcType=VARCHAR},
         land_use_permit_number = #{landUsePermitNumber,jdbcType=VARCHAR},
-        volume_ratio = #{volumeRatio,jdbcType=DOUBLE},
+        volume_ratio = #{volumeRatio,jdbcType=VARCHAR},
         green_ratio = #{greenRatio,jdbcType=VARCHAR},
         price = #{price,jdbcType=DECIMAL},
         exceeded_price = #{exceededPrice,jdbcType=DECIMAL},

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

@@ -27,6 +27,7 @@
     <result column="nc_submit_status" jdbcType="INTEGER" property="ncSubmitStatus" />
     <result column="nc_submit_date" jdbcType="TIMESTAMP" property="ncSubmitDate" />
     <result column="nc_submit_name" jdbcType="VARCHAR" property="ncSubmitName" />
+    <result column="nc_bank_serial_id" jdbcType="VARCHAR" property="ncBankSerialId" />
     <result column="bank_name" jdbcType="VARCHAR" property="bankName" />
     <result column="bank_branch_name" jdbcType="VARCHAR" property="bankBranchName" />
     <result column="bank_number" jdbcType="CHAR" property="bankNumber" />
@@ -103,7 +104,7 @@
     payment_method, serial_number, deposit_serial_number, collection_time, created_id,
     created_at, updated_at, updated_id, handle_id, handle_date, refund_handle_id, refund_handle_date,
     status, refund_money, house_name, nc_submit_status, nc_submit_date, nc_submit_name,
-    bank_name, bank_branch_name, bank_number, room_selection_info_id
+    nc_bank_serial_id, bank_name, bank_branch_name, bank_number, room_selection_info_id
   </sql>
   <sql id="Blob_Column_List">
     remark, deposit_remark, refund_remark, file_list, paper_receipts, nc_json
@@ -165,11 +166,11 @@
                                      updated_id, handle_id, handle_date,
                                      refund_handle_id, refund_handle_date, status,
                                      refund_money, house_name, nc_submit_status,
-                                     nc_submit_date, nc_submit_name, bank_name,
-                                     bank_branch_name, bank_number, room_selection_info_id,
-                                     remark, deposit_remark, refund_remark,
-                                     file_list, paper_receipts, nc_json
-    )
+                                     nc_submit_date, nc_submit_name, nc_bank_serial_id,
+                                     bank_name, bank_branch_name, bank_number,
+                                     room_selection_info_id, remark, deposit_remark,
+                                     refund_remark, file_list, paper_receipts,
+                                     nc_json)
     values (#{id,jdbcType=VARCHAR}, #{groupId,jdbcType=VARCHAR}, #{discId,jdbcType=VARCHAR},
             #{houseId,jdbcType=VARCHAR}, #{customerManagementId,jdbcType=VARCHAR}, #{receivableMoney,jdbcType=DECIMAL},
             #{receivedAmount,jdbcType=DECIMAL}, #{paymentMethod,jdbcType=INTEGER}, #{serialNumber,jdbcType=VARCHAR},
@@ -178,11 +179,11 @@
             #{updatedId,jdbcType=VARCHAR}, #{handleId,jdbcType=VARCHAR}, #{handleDate,jdbcType=TIMESTAMP},
             #{refundHandleId,jdbcType=VARCHAR}, #{refundHandleDate,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER},
             #{refundMoney,jdbcType=DECIMAL}, #{houseName,jdbcType=VARCHAR}, #{ncSubmitStatus,jdbcType=INTEGER},
-            #{ncSubmitDate,jdbcType=TIMESTAMP}, #{ncSubmitName,jdbcType=VARCHAR}, #{bankName,jdbcType=VARCHAR},
-            #{bankBranchName,jdbcType=VARCHAR}, #{bankNumber,jdbcType=CHAR}, #{roomSelectionInfoId,jdbcType=VARCHAR},
-            #{remark,jdbcType=LONGVARCHAR}, #{depositRemark,jdbcType=LONGVARCHAR}, #{refundRemark,jdbcType=LONGVARCHAR},
-            #{fileList,jdbcType=LONGVARCHAR}, #{paperReceipts,jdbcType=LONGVARCHAR}, #{ncJson,jdbcType=LONGVARCHAR}
-           )
+            #{ncSubmitDate,jdbcType=TIMESTAMP}, #{ncSubmitName,jdbcType=VARCHAR}, #{ncBankSerialId,jdbcType=VARCHAR},
+            #{bankName,jdbcType=VARCHAR}, #{bankBranchName,jdbcType=VARCHAR}, #{bankNumber,jdbcType=CHAR},
+            #{roomSelectionInfoId,jdbcType=VARCHAR}, #{remark,jdbcType=LONGVARCHAR}, #{depositRemark,jdbcType=LONGVARCHAR},
+            #{refundRemark,jdbcType=LONGVARCHAR}, #{fileList,jdbcType=LONGVARCHAR}, #{paperReceipts,jdbcType=LONGVARCHAR},
+            #{ncJson,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.idea.customerManagement.model.IntentionalDeposit">
     insert into intentional_deposit
@@ -262,6 +263,9 @@
       <if test="ncSubmitName != null">
         nc_submit_name,
       </if>
+      <if test="ncBankSerialId != null">
+        nc_bank_serial_id,
+      </if>
       <if test="bankName != null">
         bank_name,
       </if>
@@ -369,6 +373,9 @@
       <if test="ncSubmitName != null">
         #{ncSubmitName,jdbcType=VARCHAR},
       </if>
+      <if test="ncBankSerialId != null">
+        #{ncBankSerialId,jdbcType=VARCHAR},
+      </if>
       <if test="bankName != null">
         #{bankName,jdbcType=VARCHAR},
       </if>
@@ -485,6 +492,9 @@
       <if test="record.ncSubmitName != null">
         nc_submit_name = #{record.ncSubmitName,jdbcType=VARCHAR},
       </if>
+      <if test="record.ncBankSerialId != null">
+        nc_bank_serial_id = #{record.ncBankSerialId,jdbcType=VARCHAR},
+      </if>
       <if test="record.bankName != null">
         bank_name = #{record.bankName,jdbcType=VARCHAR},
       </if>
@@ -547,6 +557,7 @@
     nc_submit_status = #{record.ncSubmitStatus,jdbcType=INTEGER},
     nc_submit_date = #{record.ncSubmitDate,jdbcType=TIMESTAMP},
     nc_submit_name = #{record.ncSubmitName,jdbcType=VARCHAR},
+    nc_bank_serial_id = #{record.ncBankSerialId,jdbcType=VARCHAR},
     bank_name = #{record.bankName,jdbcType=VARCHAR},
     bank_branch_name = #{record.bankBranchName,jdbcType=VARCHAR},
     bank_number = #{record.bankNumber,jdbcType=CHAR},
@@ -588,6 +599,7 @@
     nc_submit_status = #{record.ncSubmitStatus,jdbcType=INTEGER},
     nc_submit_date = #{record.ncSubmitDate,jdbcType=TIMESTAMP},
     nc_submit_name = #{record.ncSubmitName,jdbcType=VARCHAR},
+    nc_bank_serial_id = #{record.ncBankSerialId,jdbcType=VARCHAR},
     bank_name = #{record.bankName,jdbcType=VARCHAR},
     bank_branch_name = #{record.bankBranchName,jdbcType=VARCHAR},
     bank_number = #{record.bankNumber,jdbcType=CHAR},
@@ -671,6 +683,9 @@
       <if test="ncSubmitName != null">
         nc_submit_name = #{ncSubmitName,jdbcType=VARCHAR},
       </if>
+      <if test="ncBankSerialId != null">
+        nc_bank_serial_id = #{ncBankSerialId,jdbcType=VARCHAR},
+      </if>
       <if test="bankName != null">
         bank_name = #{bankName,jdbcType=VARCHAR},
       </if>
@@ -730,6 +745,7 @@
         nc_submit_status = #{ncSubmitStatus,jdbcType=INTEGER},
         nc_submit_date = #{ncSubmitDate,jdbcType=TIMESTAMP},
         nc_submit_name = #{ncSubmitName,jdbcType=VARCHAR},
+        nc_bank_serial_id = #{ncBankSerialId,jdbcType=VARCHAR},
         bank_name = #{bankName,jdbcType=VARCHAR},
         bank_branch_name = #{bankBranchName,jdbcType=VARCHAR},
         bank_number = #{bankNumber,jdbcType=CHAR},
@@ -768,6 +784,7 @@
         nc_submit_status = #{ncSubmitStatus,jdbcType=INTEGER},
         nc_submit_date = #{ncSubmitDate,jdbcType=TIMESTAMP},
         nc_submit_name = #{ncSubmitName,jdbcType=VARCHAR},
+        nc_bank_serial_id = #{ncBankSerialId,jdbcType=VARCHAR},
         bank_name = #{bankName,jdbcType=VARCHAR},
         bank_branch_name = #{bankBranchName,jdbcType=VARCHAR},
         bank_number = #{bankNumber,jdbcType=CHAR},

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

@@ -20,6 +20,7 @@
     <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
     <result column="updated_id" jdbcType="VARCHAR" property="updatedId" />
     <result column="nc_code" jdbcType="VARCHAR" property="ncCode" />
+    <result column="nc_bank_serial_id" jdbcType="VARCHAR" property="ncBankSerialId" />
     <result column="bank_name" jdbcType="VARCHAR" property="bankName" />
     <result column="bank_branch_name" jdbcType="VARCHAR" property="bankBranchName" />
     <result column="bank_number" jdbcType="CHAR" property="bankNumber" />
@@ -90,7 +91,8 @@
   <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_id, collection_time, created_id,
-    created_at, updated_at, updated_id, nc_code, bank_name, bank_branch_name, bank_number
+    created_at, updated_at, updated_id, nc_code, nc_bank_serial_id, bank_name, bank_branch_name,
+    bank_number
   </sql>
   <sql id="Blob_Column_List">
     remark, file_list, nc_json
@@ -150,18 +152,18 @@
                                      payment_method, serial_number, collection_id,
                                      collection_time, created_id, created_at,
                                      updated_at, updated_id, nc_code,
-                                     bank_name, bank_branch_name, bank_number,
-                                     remark, file_list, nc_json
-    )
+                                     nc_bank_serial_id, bank_name, bank_branch_name,
+                                     bank_number, remark, file_list,
+                                     nc_json)
     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}, #{collectionId,jdbcType=VARCHAR},
             #{collectionTime,jdbcType=TIMESTAMP}, #{createdId,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP},
             #{updatedAt,jdbcType=TIMESTAMP}, #{updatedId,jdbcType=VARCHAR}, #{ncCode,jdbcType=VARCHAR},
-            #{bankName,jdbcType=VARCHAR}, #{bankBranchName,jdbcType=VARCHAR}, #{bankNumber,jdbcType=CHAR},
-            #{remark,jdbcType=LONGVARCHAR}, #{fileList,jdbcType=LONGVARCHAR}, #{ncJson,jdbcType=LONGVARCHAR}
-           )
+            #{ncBankSerialId,jdbcType=VARCHAR}, #{bankName,jdbcType=VARCHAR}, #{bankBranchName,jdbcType=VARCHAR},
+            #{bankNumber,jdbcType=CHAR}, #{remark,jdbcType=LONGVARCHAR}, #{fileList,jdbcType=LONGVARCHAR},
+            #{ncJson,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.idea.customerManagement.model.RoomSelectionInfo">
     insert into room_selection_info
@@ -220,6 +222,9 @@
       <if test="ncCode != null">
         nc_code,
       </if>
+      <if test="ncBankSerialId != null">
+        nc_bank_serial_id,
+      </if>
       <if test="bankName != null">
         bank_name,
       </if>
@@ -294,6 +299,9 @@
       <if test="ncCode != null">
         #{ncCode,jdbcType=VARCHAR},
       </if>
+      <if test="ncBankSerialId != null">
+        #{ncBankSerialId,jdbcType=VARCHAR},
+      </if>
       <if test="bankName != null">
         #{bankName,jdbcType=VARCHAR},
       </if>
@@ -377,6 +385,9 @@
       <if test="record.ncCode != null">
         nc_code = #{record.ncCode,jdbcType=VARCHAR},
       </if>
+      <if test="record.ncBankSerialId != null">
+        nc_bank_serial_id = #{record.ncBankSerialId,jdbcType=VARCHAR},
+      </if>
       <if test="record.bankName != null">
         bank_name = #{record.bankName,jdbcType=VARCHAR},
       </if>
@@ -420,6 +431,7 @@
     updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
     updated_id = #{record.updatedId,jdbcType=VARCHAR},
     nc_code = #{record.ncCode,jdbcType=VARCHAR},
+    nc_bank_serial_id = #{record.ncBankSerialId,jdbcType=VARCHAR},
     bank_name = #{record.bankName,jdbcType=VARCHAR},
     bank_branch_name = #{record.bankBranchName,jdbcType=VARCHAR},
     bank_number = #{record.bankNumber,jdbcType=CHAR},
@@ -450,6 +462,7 @@
     updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
     updated_id = #{record.updatedId,jdbcType=VARCHAR},
     nc_code = #{record.ncCode,jdbcType=VARCHAR},
+    nc_bank_serial_id = #{record.ncBankSerialId,jdbcType=VARCHAR},
     bank_name = #{record.bankName,jdbcType=VARCHAR},
     bank_branch_name = #{record.bankBranchName,jdbcType=VARCHAR},
     bank_number = #{record.bankNumber,jdbcType=CHAR}
@@ -511,6 +524,9 @@
       <if test="ncCode != null">
         nc_code = #{ncCode,jdbcType=VARCHAR},
       </if>
+      <if test="ncBankSerialId != null">
+        nc_bank_serial_id = #{ncBankSerialId,jdbcType=VARCHAR},
+      </if>
       <if test="bankName != null">
         bank_name = #{bankName,jdbcType=VARCHAR},
       </if>
@@ -551,6 +567,7 @@
         updated_at = #{updatedAt,jdbcType=TIMESTAMP},
         updated_id = #{updatedId,jdbcType=VARCHAR},
         nc_code = #{ncCode,jdbcType=VARCHAR},
+        nc_bank_serial_id = #{ncBankSerialId,jdbcType=VARCHAR},
         bank_name = #{bankName,jdbcType=VARCHAR},
         bank_branch_name = #{bankBranchName,jdbcType=VARCHAR},
         bank_number = #{bankNumber,jdbcType=CHAR},
@@ -578,6 +595,7 @@
         updated_at = #{updatedAt,jdbcType=TIMESTAMP},
         updated_id = #{updatedId,jdbcType=VARCHAR},
         nc_code = #{ncCode,jdbcType=VARCHAR},
+        nc_bank_serial_id = #{ncBankSerialId,jdbcType=VARCHAR},
         bank_name = #{bankName,jdbcType=VARCHAR},
         bank_branch_name = #{bankBranchName,jdbcType=VARCHAR},
         bank_number = #{bankNumber,jdbcType=CHAR}