|
@@ -222,7 +222,7 @@
|
|
LEFT JOIN biz_task_type t7 on t7.id = t2.task_type_id
|
|
LEFT JOIN biz_task_type t7 on t7.id = t2.task_type_id
|
|
left join sys_user t8 on t8.user_id = t1.verify_id
|
|
left join sys_user t8 on t8.user_id = t1.verify_id
|
|
WHERE
|
|
WHERE
|
|
- t1.deleted = 0 and
|
|
|
|
|
|
+ t1.deleted = 0 and t1.status = 1 and
|
|
t1.contract_id = #{conditions.contractId}
|
|
t1.contract_id = #{conditions.contractId}
|
|
AND
|
|
AND
|
|
t2.task_type_id = #{conditions.taskTypeIds[0]}
|
|
t2.task_type_id = #{conditions.taskTypeIds[0]}
|
|
@@ -284,7 +284,7 @@
|
|
sum(de.payment_amount) as zongjine
|
|
sum(de.payment_amount) as zongjine
|
|
FROM biz_payment p
|
|
FROM biz_payment p
|
|
right join biz_payment_detail de ON p.id = de.payment_id
|
|
right join biz_payment_detail de ON p.id = de.payment_id
|
|
- WHERE p.verify_status != 4 and p.verify_status != 2
|
|
|
|
|
|
+ WHERE p.verify_status = 3
|
|
<if test="conditions.examineTimeFilter != null and conditions.examineTimeFilter.size() > 0 ">
|
|
<if test="conditions.examineTimeFilter != null and conditions.examineTimeFilter.size() > 0 ">
|
|
AND (
|
|
AND (
|
|
DATE_FORMAT(t1.verify_date,'%Y-%m-%d') >= #{conditions.examineTimeFilter[0]}
|
|
DATE_FORMAT(t1.verify_date,'%Y-%m-%d') >= #{conditions.examineTimeFilter[0]}
|