|
@@ -197,6 +197,8 @@
|
|
|
t6.nick_name AS applierName,
|
|
|
t2.task_type_id,
|
|
|
t7.name as typeName,
|
|
|
+ t8.nick_name AS verifyName,
|
|
|
+ t1.actually_date,
|
|
|
date_format( t1.arrive_date, '%Y-%m-%d') as receiptDate
|
|
|
FROM
|
|
|
biz_collection t1 right join biz_collection_detail t2 ON t1.id = t2.collection_id
|
|
@@ -205,11 +207,11 @@
|
|
|
LEFT JOIN biz_archive_input t5 ON t5.id = t1.contract_id
|
|
|
LEFT JOIN sys_user t6 ON t6.user_id = t1.applier_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
|
|
|
WHERE
|
|
|
t1.contract_id = #{conditions.contractId}
|
|
|
AND
|
|
|
t2.task_type_id = #{conditions.taskTypeIds[0]}
|
|
|
-
|
|
|
<if test="conditions.receiptDateFilter != null and conditions.receiptDateFilter.size() > 0 ">
|
|
|
AND (
|
|
|
DATE_FORMAT(c.arrive_date,'%Y-%m-%d') >= #{conditions.receiptDateFilter[0]}
|