Pārlūkot izejas kodu

fix:收款统计表,收款,支出sql修改

ly 9 mēneši atpakaļ
vecāks
revīzija
309664f9d5

+ 2 - 1
src/main/resources/mybatis/business/BizCollectionMapper.xml

@@ -267,6 +267,7 @@
         LEFT JOIN biz_task_type t7 on t7.id = t2.task_type_id
         WHERE t1.contract_id = #{conditions.contractId}
         AND t2.task_type_id = #{conditions.taskTypeIds[0]}
+        and (t1.verify_status = 3 or t1.payment_status = 1)
         <if test="conditions.examineTimeFilter != null and conditions.examineTimeFilter.size() &gt; 0 ">
             AND (
             DATE_FORMAT(t1.verify_date,'%Y-%m-%d') &gt;= #{conditions.examineTimeFilter[0]}
@@ -284,7 +285,7 @@
         sum(de.payment_amount) as zongjine
         FROM biz_payment p
         right join biz_payment_detail de ON p.id = de.payment_id
-        WHERE p.verify_status = 3
+        WHERE  (p.verify_status = 3 or p.payment_status = 1)
         <if test="conditions.examineTimeFilter != null and conditions.examineTimeFilter.size() &gt; 0 ">
             AND (
             DATE_FORMAT(t1.verify_date,'%Y-%m-%d') &gt;= #{conditions.examineTimeFilter[0]}