1

pro-base/src/main/resources/mybatis/buyingMore/BuyingMoreExtendMapper.xml

@@ -6,13 +6,14 @@
       select b.*,u.truename createdName from buying_more b
       left join frame_user u on u.id = b.created_id
       left join contract_manage c on c.id = b.contract_id
+      left join park_room on park_room.id = b.house_id
       <where>
           and b.del_flag = 0
           <if test="buyerName != null and buyerName != ''">
-              and buyer_name like concat('%',#{buyerName},'%')
+              and b.buyer_name like concat('%',#{buyerName},'%')
           </if>
           <if test="houseName != null and houseName != ''">
-              and house_name like concat('%',#{houseName},'%')
+              and b.house_name like concat('%',#{houseName},'%')
           </if>
           <if test="type != null and type != ''">
               and type = #{type}
@@ -27,7 +28,7 @@
           </if>
 
       </where>
-      order by b.created_at desc
+      order by park_room.group_name , park_room.disc_name , park_room.build_name , park_room.room_no + 0
   </select>
 
   <select id="getAllTransferProportion" resultType="java.lang.String">

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

@@ -3,7 +3,8 @@
 <mapper namespace="com.idea.customerManagement.mapper.ContractManageExtendMapper">
 
     <select id="listByModel" resultType="com.idea.customerManagement.dto.ContractManageDto">
-        select * from contract_manage
+        select contract_manage.* from contract_manage
+        left join park_room on park_room.id = contract_manage.id
         <where>
             <!-- <if test="buyerName != null and buyerName != ''">
                 and buyer_name like concat('%',#{buyerName},'%')
@@ -34,6 +35,6 @@
             </if>
 
         </where>
-        order by created_at desc,updated_at desc
+        order by park_room.group_name , park_room.disc_name , park_room.build_name , park_room.room_no + 0
     </select>
 </mapper>

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

@@ -9,12 +9,11 @@
            customer_management.house_name,
            frame_user.truename as createdName,
            customer_management.house_id,
-           concat(park_info.group_name,'-',park_floor_disc.name) groupDiscName
+           concat(park_room.group_name,'-',park_room.disc_name) groupDiscName
     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
-    left join park_info on park_info.id = intentional_deposit.group_id
-    left join park_floor_disc on park_floor_disc.id = intentional_deposit.disc_id
+    left join park_room on park_room.id = intentional_deposit.house_id
     <where>
         <if test="buyerName !=null and buyerName != '' " >
             and customer_management.buyer_name like concat('%',#{buyerName},'%')
@@ -30,7 +29,7 @@
         </if>
 
     </where>
-    order by created_at desc
+      order by park_room.group_name , park_room.disc_name , park_room.build_name , park_room.room_no + 0
   </select>
 
 </mapper>

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

@@ -75,6 +75,6 @@
                 and cm.batch_number like concat('%',#{batchNumber},'%')
             </if>
         </where>
-        order by created_at desc
+        order by park_room.group_name , park_room.disc_name , park_room.build_name , park_room.room_no + 0
     </select>
 </mapper>

pro-base/src/main/resources/mybatis/invoice/InvoiceManageExtendMapper.xml

@@ -11,6 +11,7 @@
              cm.collection_status,cm.fund_collection_status
       from invoice_manage i
       left join idea_settle_down.contract_manage cm on i.contract_id = cm.id
+      left join park_room on park_room.id = cm.house_id
       <where>
           <if test="type !=null and type !=''">
               and i.type = #{type}
@@ -49,7 +50,7 @@
               and cm.customer_management_id in (select id from customer_management where batch_number like concat('%',#{batchNumber},'%'))
           </if>
       </where>
-      order by i.create_time desc
+      order by park_room.group_name , park_room.disc_name , park_room.build_name , park_room.room_no + 0
   </select>
 
     <select id="selectNeedRefreshStatusList" resultType="com.idea.invoice.model.InvoiceManage">

pro-base/src/main/resources/mybatis/invoice/ReceiptManageExtendMapper.xml

@@ -9,6 +9,7 @@
         from receipt_manage
         left join customer_management on customer_management.id = receipt_manage.customer_management_id
         left join frame_user on frame_user.id = receipt_manage.created_id
+        left join park_room on park_room.id = customer_management.house_id
         <where>
             <if test="buyerName != null and buyerName != ''">
                 and receipt_manage.buyer_name like concat('%',#{buyerName},'%')
@@ -26,6 +27,6 @@
                 and receipt_manage.receipt_type in (${receiptType})
             </if>
         </where>
-        order by receipt_manage.created_at desc
+        order by park_room.group_name , park_room.disc_name , park_room.build_name , park_room.room_no + 0
     </select>
 </mapper>

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

@@ -9,6 +9,7 @@
       maintenance_funds_management.id maintenanceFundsId
       from contract_manage
       left join maintenance_funds_management on contract_manage.id = maintenance_funds_management.contract_id
+      left join park_room on park_room.id = contract_manage.house_id
       <where>
           and contract_manage.contract_status in (2,3)
           <if test="houseName != null and houseName != ''">
@@ -32,7 +33,7 @@
               and contract_manage.house_id = #{houseId}
           </if>
       </where>
-      order by contract_manage.created_at desc
+      order by park_room.group_name , park_room.disc_name , park_room.build_name , park_room.room_no + 0
   </select>
 
 

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

@@ -44,6 +44,7 @@
         from contract_manage
         left join pay_log on contract_manage.id = pay_log.contract_id
         and pay_log.pay_type = #{payType} and pay_log.content_type != 7 and pay_log.status = 0
+        left join park_room on park_room.id = contract_manage.house_id
         <where>
             and contract_status in (2,3)
             <if test="houseName != null and houseName != ''">
@@ -69,7 +70,7 @@
             </if>
         </where>
         group by contract_manage.id
-        ORDER BY contract_manage.created_at DESC
+        order by park_room.group_name , park_room.disc_name , park_room.build_name , park_room.room_no + 0
     </select>
 
     <select id="countByGroupId" resultType="java.lang.Integer">

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

@@ -12,6 +12,7 @@
            refund_manage.*
     from refund_manage
     left join contract_manage on contract_manage.id = refund_manage.contract_id
+    left join park_room on park_room.id = refund_manage.house_id
     <where>
       <if test="houseName != null and houseName != ''">
         and contract_manage.house_name like concat('%',#{houseName},'%')
@@ -38,5 +39,6 @@
         and refund_manage.customer_management_id in (select id from customer_management where batch_number like concat('%',#{batchNumber},'%'))
       </if>
     </where>
+    order by park_room.group_name , park_room.disc_name , park_room.build_name , park_room.room_no + 0
   </select>
 </mapper>

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

@@ -261,6 +261,7 @@
         contract_manage
         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
+        left join park_room on park_room.id = contract_manage.house_id
         WHERE
         fund_collection_status =2 and contract_manage.contract_status != 3
         <if test="record.buyerName != null and record.buyerName != ''">
@@ -286,5 +287,6 @@
         <if test="record.batchNumber != null and record.batchNumber != ''">
             and customer_management_id in (select id from customer_management where batch_number like concat('%',#{record.batchNumber},'%'))
         </if>
+        order by park_room.group_name , park_room.disc_name , park_room.build_name , park_room.room_no + 0
     </select>
 </mapper>

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

@@ -258,6 +258,7 @@
     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
+    left join park_room on park_room.id = contract_manage.house_id
     WHERE
     fund_collection_status =2 and contract_manage.contract_status != 3
     <if test="record.buyerName != null and record.buyerName != ''">
@@ -284,5 +285,6 @@
         and customer_management_id in (select id from customer_management where batch_number like concat('%',#{batchNumber},'%'))
       </if>
     </if>
+    order by park_room.group_name , park_room.disc_name , park_room.build_name , park_room.room_no + 0
   </select>
 </mapper>