|
|
|
@@ -146,10 +146,10 @@ |
|
|
|
</if> |
|
|
|
|
|
|
|
<if test=" null != tenantInfo.tenantId and '' != tenantInfo.tenantId"> |
|
|
|
and wcu.`tenant_id` = #{tenantId} |
|
|
|
and wcu.`tenant_id` = #{tenantInfo.tenantId} |
|
|
|
</if> |
|
|
|
<if test=" null != tenantInfo.parentTenantId and '' != tenantInfo.parentTenantId"> |
|
|
|
and wcu.`parent_tenant_id` = #{parentTenantId} |
|
|
|
and wcu.`parent_tenant_id` = #{tenantInfo.parentTenantId} |
|
|
|
</if> |
|
|
|
|
|
|
|
<if test=" null != basicInfo.phone "> |
|
|
|
@@ -203,7 +203,7 @@ |
|
|
|
<if test=" null != basicInfo.name "> |
|
|
|
and wcubi.`name` like concat('%', #{basicInfo.name},'%') |
|
|
|
</if> |
|
|
|
<if test=" null != basicInfo.startTime and null! = basicInfo.endTime"> |
|
|
|
<if test=" null != basicInfo.startTime and null != basicInfo.endTime"> |
|
|
|
and wcubi.`create_date` between #{basicInfo.startTime} and #{basicInfo.endTime} |
|
|
|
</if> |
|
|
|
|
|
|
|
@@ -537,7 +537,6 @@ |
|
|
|
|
|
|
|
<if test="1 == reportType or 2 == reportType or 3 == reportType"> |
|
|
|
(select count(distinct wcubi.id) from wx_c_user_basic_info wcubi |
|
|
|
left join wx_c_user wcu on wcu.user_id = wcubi.id |
|
|
|
where 1=1 |
|
|
|
<if test="1 == reportType "> |
|
|
|
date_format(wcubi.create_date, '%Y-%m-%d') <= reportTime |
|
|
|
@@ -554,7 +553,6 @@ |
|
|
|
) as totalCount |
|
|
|
</if> |
|
|
|
from wx_c_user_basic_info wcubi |
|
|
|
left join wx_c_user wcu on wcu.user_id = wcubi.id |
|
|
|
where 1=1 |
|
|
|
<if test=" null != finalTenantId and '' != finalTenantId"> |
|
|
|
and wcubi.`final_tenant_id` = #{finalTenantId} |
|
|
|
@@ -613,10 +611,10 @@ |
|
|
|
and wcu.`parent_tenant_id` = #{tenantInfo.parentTenantId} |
|
|
|
</if> |
|
|
|
<if test=" null != basicInfo.startTime "> |
|
|
|
and wcubi.create_date >= #{startTime} |
|
|
|
and wcubi.create_date >= #{basicInfo.startTime} |
|
|
|
</if> |
|
|
|
<if test=" null != basicInfo.endTime"> |
|
|
|
and wcubi.create_date < #{endTime} |
|
|
|
and wcubi.create_date < #{basicInfo.endTime} |
|
|
|
</if> |
|
|
|
<if test="1 == basicInfo.reportType or 2 == basicInfo.reportType or 3 == basicInfo.reportType"> |
|
|
|
group by wcubi.reportTime |
|
|
|
|