1

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

@@ -86,4 +86,9 @@ public class ContractManage implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    private String bankName;
+
+    private String bankNumber;
+
+
 }

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

@@ -2025,6 +2025,146 @@ public class ContractManageExample {
             addCriterion("fund_collection_status not between", value1, value2, "fundCollectionStatus");
             return (Criteria) this;
         }
+
+        public Criteria andBankNameIsNull() {
+            addCriterion("bank_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameIsNotNull() {
+            addCriterion("bank_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameEqualTo(String value) {
+            addCriterion("bank_name =", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameNotEqualTo(String value) {
+            addCriterion("bank_name <>", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameGreaterThan(String value) {
+            addCriterion("bank_name >", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameGreaterThanOrEqualTo(String value) {
+            addCriterion("bank_name >=", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameLessThan(String value) {
+            addCriterion("bank_name <", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameLessThanOrEqualTo(String value) {
+            addCriterion("bank_name <=", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameLike(String value) {
+            addCriterion("bank_name like", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameNotLike(String value) {
+            addCriterion("bank_name not like", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameIn(List<String> values) {
+            addCriterion("bank_name in", values, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameNotIn(List<String> values) {
+            addCriterion("bank_name not in", values, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameBetween(String value1, String value2) {
+            addCriterion("bank_name between", value1, value2, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameNotBetween(String value1, String value2) {
+            addCriterion("bank_name not between", value1, value2, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberIsNull() {
+            addCriterion("bank_number is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberIsNotNull() {
+            addCriterion("bank_number is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberEqualTo(String value) {
+            addCriterion("bank_number =", value, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberNotEqualTo(String value) {
+            addCriterion("bank_number <>", value, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberGreaterThan(String value) {
+            addCriterion("bank_number >", value, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberGreaterThanOrEqualTo(String value) {
+            addCriterion("bank_number >=", value, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberLessThan(String value) {
+            addCriterion("bank_number <", value, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberLessThanOrEqualTo(String value) {
+            addCriterion("bank_number <=", value, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberLike(String value) {
+            addCriterion("bank_number like", value, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberNotLike(String value) {
+            addCriterion("bank_number not like", value, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberIn(List<String> values) {
+            addCriterion("bank_number in", values, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberNotIn(List<String> values) {
+            addCriterion("bank_number not in", values, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberBetween(String value1, String value2) {
+            addCriterion("bank_number between", value1, value2, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberNotBetween(String value1, String value2) {
+            addCriterion("bank_number not between", value1, value2, "bankNumber");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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

@@ -373,8 +373,8 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
         String customerManagementId = model.getCustomerManagementId();
 
         CustomerManagement customerManagement = customerManagementMapper.selectByPrimaryKey(customerManagementId);
-        // 购房状态 已选房
-        customerManagement.setStatus(2);
+        // 购房状态 已订房
+        customerManagement.setStatus(7);
         customerManagement.setHouseId(houseId);
         StringBuilder builder = new StringBuilder();
 

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

@@ -266,8 +266,13 @@ public class RoomSelectionInfoService implements BaseService<RoomSelectionInfo,
         payLog.setBankBranchName(model.getBankBranchName());
         payLog.setBankNumber(model.getBankName());
         payLogMapper.insertSelective(payLog);
-        // 票据管理 新增一条记录
+
+        // 更新客户管理表 购房状态
         CustomerManagement customerManagement = customerManagementMapper.selectByPrimaryKey(model.getCustomerManagementId());
+        customerManagement.setStatus(7);
+        customerManagementMapper.updateByPrimaryKeySelective(customerManagement);
+
+        // 票据管理 新增一条记录
         ReceiptManage receiptManage = new ReceiptManage();
         receiptManage.setBatchNumber(customerManagement.getBatchNumber());
         receiptManage.setRoomSelectionNumber(customerManagement.getRoomSelectionNumber());

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

@@ -76,10 +76,10 @@ public class FileZtController {
                 if (StringUtils.isNotEmpty(contentType) && contentType.indexOf("image/") == -1) {
                     FileUtils.downFile(response, frameData.getFileName(), frameData.getFilePath(), frameData.getFileContentType());
                 } else {
-                    readIMGToHtml(request, response, frameData.getFilePath());
+                    readIMGToHtml(request, response, frameData.getFilePath(),contentType);
                 }
             } else {
-                readIMGToHtml(request, response, "error");
+                readIMGToHtml(request, response, "error",null);
             }
         } catch (IOException var6) {
             var6.printStackTrace();
@@ -87,7 +87,7 @@ public class FileZtController {
 
     }
 
-    public static void readIMGToHtml(HttpServletRequest request, HttpServletResponse response, String fileUrl) throws IOException {
+    public static void readIMGToHtml(HttpServletRequest request, HttpServletResponse response, String fileUrl,String contentType) throws IOException {
         File desc = new File(fileUrl);
         InputStream inputStream = null;
         if (!desc.exists()) {
@@ -96,16 +96,16 @@ public class FileZtController {
             inputStream = new FileInputStream(fileUrl);
         }
 
-        readIMGToHtml(response, (InputStream)inputStream);
+        readIMGToHtml(response, (InputStream)inputStream,contentType);
     }
 
-    public static void readIMGToHtml(HttpServletResponse response, InputStream inputStream) throws IOException {
+    public static void readIMGToHtml(HttpServletResponse response, InputStream inputStream,String contentType) throws IOException {
         int i = inputStream.available();
         byte[] buff = new byte[i];
         inputStream.read(buff);
         inputStream.close();
         response.reset();
-        response.setContentType("image/jpg");
+        response.setContentType(contentType);
         OutputStream out = response.getOutputStream();
         out.write(buff);
         out.close();

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

@@ -32,6 +32,8 @@
     <result column="updated_id" jdbcType="VARCHAR" property="updatedId" />
     <result column="collection_status" jdbcType="INTEGER" property="collectionStatus" />
     <result column="fund_collection_status" jdbcType="INTEGER" property="fundCollectionStatus" />
+    <result column="bank_name" jdbcType="VARCHAR" property="bankName" />
+    <result column="bank_number" jdbcType="VARCHAR" property="bankNumber" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.idea.customerManagement.model.ContractManage">
     <result column="remark" jdbcType="LONGVARCHAR" property="remark" />
@@ -102,7 +104,7 @@
     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, collection_status,
-    fund_collection_status
+    fund_collection_status, bank_name, bank_number
   </sql>
   <sql id="Blob_Column_List">
     remark, contract_original, contract_other
@@ -166,8 +168,9 @@
                                  maintenance_total_price, contract_status,
                                  subscription_funds, created_id, created_at,
                                  updated_at, updated_id, collection_status,
-                                 fund_collection_status, remark, contract_original,
-                                 contract_other)
+                                 fund_collection_status, bank_name, bank_number,
+                                 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},
@@ -178,8 +181,9 @@
             #{maintenanceTotalPrice,jdbcType=DECIMAL}, #{contractStatus,jdbcType=INTEGER},
             #{subscriptionFunds,jdbcType=DECIMAL}, #{createdId,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP},
             #{updatedAt,jdbcType=TIMESTAMP}, #{updatedId,jdbcType=VARCHAR}, #{collectionStatus,jdbcType=INTEGER},
-            #{fundCollectionStatus,jdbcType=INTEGER}, #{remark,jdbcType=LONGVARCHAR}, #{contractOriginal,jdbcType=LONGVARCHAR},
-            #{contractOther,jdbcType=LONGVARCHAR})
+            #{fundCollectionStatus,jdbcType=INTEGER}, #{bankName,jdbcType=VARCHAR}, #{bankNumber,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
@@ -274,6 +278,12 @@
       <if test="fundCollectionStatus != null">
         fund_collection_status,
       </if>
+      <if test="bankName != null">
+        bank_name,
+      </if>
+      <if test="bankNumber != null">
+        bank_number,
+      </if>
       <if test="remark != null">
         remark,
       </if>
@@ -375,6 +385,12 @@
       <if test="fundCollectionStatus != null">
         #{fundCollectionStatus,jdbcType=INTEGER},
       </if>
+      <if test="bankName != null">
+        #{bankName,jdbcType=VARCHAR},
+      </if>
+      <if test="bankNumber != null">
+        #{bankNumber,jdbcType=VARCHAR},
+      </if>
       <if test="remark != null">
         #{remark,jdbcType=LONGVARCHAR},
       </if>
@@ -485,6 +501,12 @@
       <if test="record.fundCollectionStatus != null">
         fund_collection_status = #{record.fundCollectionStatus,jdbcType=INTEGER},
       </if>
+      <if test="record.bankName != null">
+        bank_name = #{record.bankName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.bankNumber != null">
+        bank_number = #{record.bankNumber,jdbcType=VARCHAR},
+      </if>
       <if test="record.remark != null">
         remark = #{record.remark,jdbcType=LONGVARCHAR},
       </if>
@@ -531,6 +553,8 @@
     updated_id = #{record.updatedId,jdbcType=VARCHAR},
     collection_status = #{record.collectionStatus,jdbcType=INTEGER},
     fund_collection_status = #{record.fundCollectionStatus,jdbcType=INTEGER},
+    bank_name = #{record.bankName,jdbcType=VARCHAR},
+    bank_number = #{record.bankNumber,jdbcType=VARCHAR},
     remark = #{record.remark,jdbcType=LONGVARCHAR},
     contract_original = #{record.contractOriginal,jdbcType=LONGVARCHAR},
     contract_other = #{record.contractOther,jdbcType=LONGVARCHAR}
@@ -569,7 +593,9 @@
     updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
     updated_id = #{record.updatedId,jdbcType=VARCHAR},
     collection_status = #{record.collectionStatus,jdbcType=INTEGER},
-    fund_collection_status = #{record.fundCollectionStatus,jdbcType=INTEGER}
+    fund_collection_status = #{record.fundCollectionStatus,jdbcType=INTEGER},
+    bank_name = #{record.bankName,jdbcType=VARCHAR},
+    bank_number = #{record.bankNumber,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -664,6 +690,12 @@
       <if test="fundCollectionStatus != null">
         fund_collection_status = #{fundCollectionStatus,jdbcType=INTEGER},
       </if>
+      <if test="bankName != null">
+        bank_name = #{bankName,jdbcType=VARCHAR},
+      </if>
+      <if test="bankNumber != null">
+        bank_number = #{bankNumber,jdbcType=VARCHAR},
+      </if>
       <if test="remark != null">
         remark = #{remark,jdbcType=LONGVARCHAR},
       </if>
@@ -707,6 +739,8 @@
         updated_id = #{updatedId,jdbcType=VARCHAR},
         collection_status = #{collectionStatus,jdbcType=INTEGER},
         fund_collection_status = #{fundCollectionStatus,jdbcType=INTEGER},
+        bank_name = #{bankName,jdbcType=VARCHAR},
+        bank_number = #{bankNumber,jdbcType=VARCHAR},
         remark = #{remark,jdbcType=LONGVARCHAR},
         contract_original = #{contractOriginal,jdbcType=LONGVARCHAR},
         contract_other = #{contractOther,jdbcType=LONGVARCHAR}
@@ -742,7 +776,9 @@
         updated_at = #{updatedAt,jdbcType=TIMESTAMP},
         updated_id = #{updatedId,jdbcType=VARCHAR},
         collection_status = #{collectionStatus,jdbcType=INTEGER},
-        fund_collection_status = #{fundCollectionStatus,jdbcType=INTEGER}
+        fund_collection_status = #{fundCollectionStatus,jdbcType=INTEGER},
+        bank_name = #{bankName,jdbcType=VARCHAR},
+        bank_number = #{bankNumber,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

pro-base/src/main/resources/mybatis/transactionRecord/TransactionRecord.xml

@@ -46,7 +46,7 @@
                 AND p.payment_method = #{paymentMethod}
             </if>
         </where>
-        order by cm.id,p.created_at desc
+        order by p.pay_time desc
     </select>
 
     <select id="listByDate" resultType="com.idea.paymentManagement.model.PayLog">
@@ -93,6 +93,7 @@
                 AND d.content_type = #{contentType}
             </if>
         </where>
+        order by d.created_at desc
     </select>
 
     <select id="refundListByDate" resultType="com.idea.paymentManagement.dto.RefundManageDto">
@@ -109,7 +110,7 @@
         customer_management.buyer_name,
         customer_management.house_name,
         frame_user.truename as createdName,
-        customer_management.house_id,
+        customer_management.house_id
         from intentional_deposit
         left join customer_management on customer_management.id = intentional_deposit.customer_management_id
         left join frame_user on frame_user.id = intentional_deposit.created_id