|
|
|
@@ -72,9 +72,25 @@ |
|
|
|
and id != #{ignoreId} |
|
|
|
</if> |
|
|
|
|
|
|
|
<if test=" dateType == 1 "> |
|
|
|
and date_type = 1 |
|
|
|
<if test=" null != startTime and null != endTime"> |
|
|
|
and report_date >= date_format(#{startTime},'%Y-%m-%d') |
|
|
|
and report_date <= date_format(#{endTime},'%Y-%m-%d') |
|
|
|
</if > |
|
|
|
</if> |
|
|
|
|
|
|
|
<if test=" dateType == 2 "> |
|
|
|
and date_type = 2 |
|
|
|
<if test=" null != startTime and null != endTime"> |
|
|
|
and report_date >= date_format(#{startTime},'%Y-%m') |
|
|
|
and report_date <= date_format(#{endTime},'%Y-%m') |
|
|
|
</if > |
|
|
|
</if> |
|
|
|
|
|
|
|
<if test=" null != startTime and null != endTime"> |
|
|
|
and mtd.report_date >= date_format(#{startTime},'%Y-%m-%d') |
|
|
|
and mtd.report_date <= date_format(#{endTime},'%Y-%m-%d') |
|
|
|
and report_date >= date_format(#{startTime},'%Y-%m-%d') |
|
|
|
and report_date <= date_format(#{endTime},'%Y-%m-%d') |
|
|
|
</if> |
|
|
|
|
|
|
|
<if test=" null != merchantIdList "> |
|
|
|
@@ -99,7 +115,7 @@ |
|
|
|
<select id="findList" parameterType="com.iformall.domain.po.WxMerchantTradeDaily" resultMap="BaseResultMap"> |
|
|
|
select |
|
|
|
<include refid="allColumns"/> |
|
|
|
from wx_merchant_trade_daily |
|
|
|
from wx_merchant_trade_daily |
|
|
|
<include refid="dynamicWhereConditions" /> |
|
|
|
</select> |
|
|
|
|
|
|
|
|