|
|
|
@@ -234,7 +234,7 @@ |
|
|
|
|
|
|
|
<select id="findVoList" parameterType="com.iformall.domain.vo.WxMerchantSubsidyVo" resultMap="VoBaseResultMap"> |
|
|
|
select ms.id,ms.order_id,m.name,ms.source,ms.type, |
|
|
|
ms.create_date,ms.subsidy,ms.real_subsidy,ms.status,ms.freeze |
|
|
|
ms.create_date create_date,ms.subsidy subsidy,ms.real_subsidy,ms.status,ms.freeze |
|
|
|
from wx_merchant_subsidy ms left join wx_merchant m on ms.merchant_id=m.id |
|
|
|
where 1=1 |
|
|
|
<if test=" null != tenantId "> |
|
|
|
@@ -268,6 +268,8 @@ |
|
|
|
<if test=" null != startdate and null!=enddate"> |
|
|
|
and ms.`create_date` between #{startdate} and #{enddate} |
|
|
|
</if> |
|
|
|
<if test=" null != sortColumns">order by ${sortColumns}</if> |
|
|
|
|
|
|
|
</select> |
|
|
|
|
|
|
|
<select id="sumVoList" parameterType="com.iformall.domain.vo.WxMerchantSubsidyVo" resultType="hashmap"> |
|
|
|
|