|
|
|
@@ -301,13 +301,13 @@ |
|
|
|
<select id="findCountHistory" parameterType="com.iformall.domain.dto.WxCUserBasicInfoDto" resultType="com.iformall.domain.vo.UserCountVo"> |
|
|
|
select count(cub.id) as incCount, |
|
|
|
<if test="1 == reportType "> |
|
|
|
date_format(create_date, '%Y-%m-%d') as reportTime, |
|
|
|
date_format(cub.create_date, '%Y-%m-%d') as reportTime, |
|
|
|
</if> |
|
|
|
<if test="2 == reportType "> |
|
|
|
date_format(create_date, '%Y-%m') as reportTime, |
|
|
|
date_format(cub.create_date, '%Y-%m') as reportTime, |
|
|
|
</if> |
|
|
|
<if test="3 == reportType "> |
|
|
|
date_format(create_date, '%Y') as reportTime, |
|
|
|
date_format(cub.create_date, '%Y') as reportTime, |
|
|
|
</if> |
|
|
|
|
|
|
|
<if test="1 == reportType or 2 == reportType or 3 == reportType"> |
|
|
|
@@ -315,13 +315,13 @@ |
|
|
|
inner join wx_c_user cu1 on cu1.id = cubi.id |
|
|
|
where 1=1 |
|
|
|
<if test="1 == reportType "> |
|
|
|
and cubi.date_format(cubi.create_date, '%Y-%m-%d') <= cubi.reportTime |
|
|
|
and date_format(cubi.create_date, '%Y-%m-%d') <= reportTime |
|
|
|
</if> |
|
|
|
<if test="2 == reportType "> |
|
|
|
and cubi.date_format(cubi.create_date, '%Y-%m') <= cubi.reportTime |
|
|
|
and date_format(cubi.create_date, '%Y-%m') <= reportTime |
|
|
|
</if> |
|
|
|
<if test="3 == reportType "> |
|
|
|
and cubi.date_format(cubi.create_date, '%Y') <= cubi.reportTime |
|
|
|
and date_format(cubi.create_date, '%Y') <= reportTime |
|
|
|
</if> |
|
|
|
<if test=" null != tenantId and '' != tenantId"> |
|
|
|
and cubi.`tenant_id` = #{tenantId} |
|
|
|
@@ -348,7 +348,7 @@ |
|
|
|
and cub.create_date < #{endTime} |
|
|
|
</if> |
|
|
|
<if test="1 == reportType or 2 == reportType or 3 == reportType"> |
|
|
|
group by cub.reportTime |
|
|
|
group by reportTime |
|
|
|
</if> |
|
|
|
</select> |
|
|
|
|
|
|
|
|