BUG

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

@@ -275,7 +275,7 @@ public class RoomSelectionInfoService implements BaseService<RoomSelectionInfo,
         payLog.setSerialNumber(model.getSerialNumber());
         payLog.setBankName(model.getBankName());
         payLog.setBankBranchName(model.getBankBranchName());
-        payLog.setBankNumber(model.getBankName());
+        payLog.setBankNumber(model.getBankNumber());
         payLogMapper.insertSelective(payLog);
 
         // 更新客户管理表 购房状态

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

@@ -174,6 +174,7 @@ public class MaintenanceFundsManagementService implements BaseService<Maintenanc
                 // 生成一条待推送的开票信息
                 InvoiceManage invoiceManage = invoiceManageService.getInfoByContract(model.getContractId(),
                         "*不动产*",2);
+                invoiceManage.setInvoiceAmount(payMoney);
                 // 正式发票
                 invoiceManage.setType("2");
                 // 专项维修资金

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

@@ -32,10 +32,10 @@
                 </foreach>
             </if>
             <if test="collectionDateFrom != null and collectionDateFrom != ''">
-                AND p.pay_time >= #{collectionDateFrom}
+                AND date_format(p.pay_time,'%Y-%m-%d') >= #{collectionDateFrom}
             </if>
             <if test="collectionDateTo != null and collectionDateTo != ''">
-                AND p.pay_time &lt;= #{collectionDateTo}
+                AND date_format(p.pay_time,'%Y-%m-%d') &lt;= #{collectionDateTo}
             </if>
             <if test="buyerName != null and buyerName != ''">
                 AND cm.buyer_name like concat('%',#{buyerName},'%')
@@ -74,10 +74,10 @@
                 </foreach>
             </if>
             <if test="collectionDateFrom != null and collectionDateFrom != ''">
-                AND d.created_at >= #{collectionDateFrom}
+                AND date_format(r.created_at,'%Y-%m-%d') >= #{collectionDateFrom}
             </if>
             <if test="collectionDateTo != null and collectionDateTo != ''">
-                AND d.created_at &lt;= #{collectionDateTo}
+                AND date_format(r.created_at,'%Y-%m-%d') &lt;= #{collectionDateTo}
             </if>
             <if test="buyerName != null and buyerName != ''">
                 AND r.buyer_name like concat('%',#{buyerName},'%')
@@ -160,10 +160,10 @@
                 </foreach>
             </if>
             <if test="collectionDateFrom !=null and collectionDateFrom != '' " >
-                and convert_date >= date_format(#{collectionDateFrom},'%Y-%m-%d')
+                and date_format(convert_date,'%Y-%m-%d') >= date_format(#{collectionDateFrom},'%Y-%m-%d')
             </if>
             <if test="collectionDateTo !=null and collectionDateTo != '' " >
-                and convert_date &lt;= date_format(#{collectionDateTo},'%Y-%m-%d')
+                and date_format(convert_date,'%Y-%m-%d') &lt;= date_format(#{collectionDateTo},'%Y-%m-%d')
             </if>
             <if test="convertType !=null and convertType != '' " >
                 and convert_type = #{convertType}