|
@@ -56,8 +56,6 @@
|
|
|
t.end_area as endArea,
|
|
|
t.end_detailed_address as endDetailedAddress,
|
|
|
t.receive_warehouse as receiveWarehouse,
|
|
|
- p.process_status_flag as processStatusFlag,
|
|
|
- p.process_status as processStatus,
|
|
|
t.status
|
|
|
FROM tran_task_info t
|
|
|
LEFT JOIN tran_process_info p ON t.id=p.info_id
|
|
@@ -88,6 +86,7 @@
|
|
|
AND (lower(t.contract_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
|
|
|
OR lower(t.task_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
|
|
|
</if>
|
|
|
+ group by p.info_id
|
|
|
ORDER BY t.status DESC , t.update_date DESC
|
|
|
<if test="currentPage != null and currentPage != ''">
|
|
|
LIMIT ${startRecord}, ${pageSize}
|