|
@@ -313,7 +313,7 @@
|
|
|
m.contract_type as contractType,
|
|
m.contract_type as contractType,
|
|
|
m.seller,
|
|
m.seller,
|
|
|
m.buyer,
|
|
m.buyer,
|
|
|
- m.signing_date,
|
|
|
|
|
|
|
+ m.signing_date as signingDate,
|
|
|
m.status,
|
|
m.status,
|
|
|
ci.inventory as inventory,
|
|
ci.inventory as inventory,
|
|
|
m.approve_status as approveStatus,
|
|
m.approve_status as approveStatus,
|
|
@@ -375,7 +375,7 @@
|
|
|
OR lower( m.buyer) like lower(CONCAT('%',#{searchKeyWord},'%'))
|
|
OR lower( m.buyer) like lower(CONCAT('%',#{searchKeyWord},'%'))
|
|
|
OR lower( m.seller) like lower(CONCAT('%',#{searchKeyWord},'%')))
|
|
OR lower( m.seller) like lower(CONCAT('%',#{searchKeyWord},'%')))
|
|
|
</if>
|
|
</if>
|
|
|
- ORDER BY m.signing_date DESC
|
|
|
|
|
|
|
+ ORDER BY m.signing_date
|
|
|
<if test="currentPage != null and currentPage != ''">
|
|
<if test="currentPage != null and currentPage != ''">
|
|
|
LIMIT ${startRecord}, ${pageSize}
|
|
LIMIT ${startRecord}, ${pageSize}
|
|
|
</if>
|
|
</if>
|
