|
@@ -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() > 0 ">
|
|
|
AND (
|
|
|
DATE_FORMAT(t1.verify_date,'%Y-%m-%d') >= #{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() > 0 ">
|
|
|
AND (
|
|
|
DATE_FORMAT(t1.verify_date,'%Y-%m-%d') >= #{conditions.examineTimeFilter[0]}
|