1

pro-base/src/main/java/com/idea/saleManage/model/PropertyRegistrationMore.java

@@ -13,4 +13,7 @@ public class PropertyRegistrationMore extends PropertyRegistration {
     private String operater;
     //合同id
     private String  contractManageId2;
+
+    private String customerManagementId;
+
 }

pro-base/src/main/resources/mybatis/paymentManagement/MaintenanceFundsManagementExtendMapper.xml

@@ -10,7 +10,7 @@
            from contract_manage
            left join maintenance_funds_management on contract_manage.id = maintenance_funds_management.contract_id
     <where>
-        and contract_manage.contract_status = '2'
+        and contract_manage.contract_status in (2,3)
       <if test="houseName != null and houseName != ''">
         and contract_manage.house_name like concat('%',#{houseName},'%')
       </if>

pro-base/src/main/resources/mybatis/saleManage/CheckInMapper.xml

@@ -262,10 +262,9 @@
         LEFT JOIN check_in ON check_in.contract_manage_id = contract_manage.id
         left join frame_user on frame_user.id=check_in.operater_id
         WHERE
-        fund_collection_status =2
+        fund_collection_status =2 and contract_manage.contract_status != 3
         <if test="record.buyerName != null and record.buyerName != ''">
             and contract_manage.buyer_Name like concat('%',#{record.buyerName},'%')
-
         </if>
         <if test="record.houseName != null and record.houseName != ''">
             and contract_manage.house_Name like concat('%',#{record.houseName},'%')

pro-base/src/main/resources/mybatis/saleManage/PropertyRegistrationMapper.xml

@@ -251,13 +251,15 @@
     contract_manage.contract_Number,
     contract_manage.house_Name,
     frame_user.username as operater,
-    property_registration.*
+    property_registration.*,
+    customer_management.id as customer_management_id
     FROM
     contract_manage
+    left join customer_management on customer_management.id = contract_manage.customer_management_id
     LEFT JOIN property_registration ON property_registration.contract_manage_id = contract_manage.id
     left join frame_user on frame_user.id=property_registration.operater_id
     WHERE
-    fund_collection_status =2
+    fund_collection_status =2 and contract_manage.contract_status != 3
     <if test="record.buyerName != null and record.buyerName != ''">
       and contract_manage.buyer_Name like concat('%',#{record.buyerName},'%')
 

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

@@ -63,6 +63,7 @@
             r.house_id,
             r.buyer_name,
             r.bank_number,
+            r.house_name,
             u.truename createdName,
             d.nc_submit_status,
             d.nc_submit_date,