|
|
|
@@ -198,7 +198,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> |
|
|
|
|
|
|
|
@@ -532,7 +532,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 |
|
|
|
@@ -549,7 +548,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} |
|
|
|
|