|
|
|
@ -10,7 +10,7 @@ |
|
|
|
SELECT |
|
|
|
count(1) |
|
|
|
FROM |
|
|
|
js_esua_epdc_news.epdc_news |
|
|
|
esua_epdc_news.epdc_news |
|
|
|
WHERE |
|
|
|
DEL_FLAG = '0' |
|
|
|
<if test="startTime != null and endTime != null and endTime != ''"> |
|
|
|
@ -23,7 +23,7 @@ |
|
|
|
SELECT |
|
|
|
count(1) |
|
|
|
FROM |
|
|
|
js_esua_epdc_news.epdc_notice |
|
|
|
esua_epdc_news.epdc_notice |
|
|
|
WHERE |
|
|
|
DEL_FLAG = '0' |
|
|
|
<if test="startTime != null and endTime != null and endTime != ''"> |
|
|
|
@ -36,7 +36,7 @@ |
|
|
|
SELECT |
|
|
|
count(1) |
|
|
|
FROM |
|
|
|
js_esua_epdc_events.epdc_issue |
|
|
|
esua_epdc_events.epdc_issue |
|
|
|
WHERE |
|
|
|
DEL_FLAG = '0' |
|
|
|
<if test="startTime != null and endTime != null and endTime != ''"> |
|
|
|
@ -45,7 +45,7 @@ |
|
|
|
AND GRID_ID = dept.id |
|
|
|
) AS eventCount |
|
|
|
FROM |
|
|
|
js_esua_epdc_admin.sys_dept dept |
|
|
|
esua_epdc_admin.sys_dept dept |
|
|
|
WHERE |
|
|
|
dept.DEL_FLAG = '0' |
|
|
|
AND dept.type_key = 'grid_party' |
|
|
|
@ -69,8 +69,8 @@ |
|
|
|
(SELECT DISTINCT |
|
|
|
item.*,handle.STATE |
|
|
|
FROM |
|
|
|
js_esua_epdc_events.epdc_item item |
|
|
|
LEFT JOIN ( SELECT MAX( CREATED_TIME ) AS CREATED_TIME, ITEM_ID FROM js_esua_epdc_events.epdc_item_handle_process |
|
|
|
esua_epdc_events.epdc_item item |
|
|
|
LEFT JOIN ( SELECT MAX( CREATED_TIME ) AS CREATED_TIME, ITEM_ID FROM esua_epdc_events.epdc_item_handle_process |
|
|
|
WHERE |
|
|
|
DEL_FLAG = '0' and (state=0 or state=5 or state=10 ) |
|
|
|
<if test="endTime != null and endTime != ''"> |
|
|
|
@ -78,7 +78,7 @@ |
|
|
|
</if> |
|
|
|
GROUP BY ITEM_ID |
|
|
|
) maxitem ON maxitem.ITEM_ID = item.ID |
|
|
|
LEFT JOIN js_esua_epdc_events.epdc_item_handle_process handle ON maxitem.ITEM_ID = handle.ITEM_ID |
|
|
|
LEFT JOIN esua_epdc_events.epdc_item_handle_process handle ON maxitem.ITEM_ID = handle.ITEM_ID |
|
|
|
AND maxitem.CREATED_TIME = handle.CREATED_TIME)t |
|
|
|
WHERE |
|
|
|
DEL_FLAG = '0' |
|
|
|
@ -100,12 +100,12 @@ |
|
|
|
COUNT( DISTINCT ug.user_id ) communityMemberCount, |
|
|
|
COUNT( DISTINCT ut.ID ) communityTopicCount |
|
|
|
FROM |
|
|
|
js_esua_epdc_group.epdc_group epgr |
|
|
|
LEFT JOIN js_esua_epdc_group.epdc_user_group ug ON epgr.id = ug.group_id AND ug.DEL_FLAG = '0' |
|
|
|
esua_epdc_group.epdc_group epgr |
|
|
|
LEFT JOIN esua_epdc_group.epdc_user_group ug ON epgr.id = ug.group_id AND ug.DEL_FLAG = '0' |
|
|
|
<if test="startTime != null and endTime != null and endTime != ''"> |
|
|
|
AND DATE_FORMAT(ug.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime} |
|
|
|
</if> |
|
|
|
LEFT JOIN js_esua_epdc_group.epdc_topic ut ON epgr.id = ut.group_id AND ut.DEL_FLAG = '0' |
|
|
|
LEFT JOIN esua_epdc_group.epdc_topic ut ON epgr.id = ut.group_id AND ut.DEL_FLAG = '0' |
|
|
|
<if test="startTime != null and endTime != null and endTime != ''"> |
|
|
|
AND DATE_FORMAT(ut.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime} |
|
|
|
</if> |
|
|
|
@ -139,11 +139,11 @@ |
|
|
|
GROUP_CONCAT( DISTINCT u.real_name ) gridLeader |
|
|
|
FROM |
|
|
|
<include refid="fromGridCommunityStreet"></include> |
|
|
|
LEFT JOIN js_esua_epdc_admin.epdc_dept_ma_code ama ON ad.id = ama.GRID_ID AND ama.DEL_FLAG = '0' |
|
|
|
LEFT JOIN js_esua_epdc_admin.sys_role_data_scope ards ON ards.dept_id = ad.id |
|
|
|
LEFT JOIN js_esua_epdc_admin.sys_role r ON ards.role_id = r.id AND r.DEL_FLAG = 0 and r.type_key = 'gridLeader' |
|
|
|
LEFT JOIN js_esua_epdc_admin.sys_role_user ru ON r.id = ru.role_id |
|
|
|
LEFT JOIN js_esua_epdc_admin.sys_user u ON ru.user_id = u.id AND u.del_flag = 0 |
|
|
|
LEFT JOIN esua_epdc_admin.epdc_dept_ma_code ama ON ad.id = ama.GRID_ID AND ama.DEL_FLAG = '0' |
|
|
|
LEFT JOIN esua_epdc_admin.sys_role_data_scope ards ON ards.dept_id = ad.id |
|
|
|
LEFT JOIN esua_epdc_admin.sys_role r ON ards.role_id = r.id AND r.DEL_FLAG = 0 and r.type_key = 'gridLeader' |
|
|
|
LEFT JOIN esua_epdc_admin.sys_role_user ru ON r.id = ru.role_id |
|
|
|
LEFT JOIN esua_epdc_admin.sys_user u ON ru.user_id = u.id AND u.del_flag = 0 |
|
|
|
WHERE |
|
|
|
ad.type_key = 'grid_party' |
|
|
|
<if test="deptIdList != null and deptIdList.size() > 0"> |
|
|
|
@ -171,7 +171,7 @@ |
|
|
|
SELECT |
|
|
|
AUTHENTICATED_TYPE |
|
|
|
FROM |
|
|
|
js_esua_epdc_user.epdc_user_authenticate_history |
|
|
|
esua_epdc_user.epdc_user_authenticate_history |
|
|
|
WHERE |
|
|
|
DEL_FLAG = '0' |
|
|
|
AND AUTHENTICATED_TYPE IN ( '0', '1' ) |
|
|
|
@ -188,7 +188,7 @@ |
|
|
|
SELECT |
|
|
|
AUTHENTICATED_FLAG |
|
|
|
FROM |
|
|
|
js_esua_epdc_user.epdc_user_authenticate_history |
|
|
|
esua_epdc_user.epdc_user_authenticate_history |
|
|
|
WHERE |
|
|
|
DEL_FLAG = '0' |
|
|
|
AND AUTHENTICATED_TYPE IN ( '0', '1' ) |
|
|
|
@ -205,7 +205,7 @@ |
|
|
|
SELECT |
|
|
|
count( id ) AS HistoryCount |
|
|
|
FROM |
|
|
|
js_esua_epdc_user.epdc_user_authenticate_history |
|
|
|
esua_epdc_user.epdc_user_authenticate_history |
|
|
|
WHERE |
|
|
|
DEL_FLAG = '0' |
|
|
|
AND AUTHENTICATED_TYPE IN ( '0', '1' ) |
|
|
|
@ -216,7 +216,7 @@ |
|
|
|
AND USER_ID = uu.ID |
|
|
|
) AS HistoryCount, |
|
|
|
ifnull(if(uu.DEPT_ID = 0, NULL, uu.DEPT_ID), ( |
|
|
|
SELECT GRID_ID FROM js_esua_epdc_user.epdc_user_grid_relation |
|
|
|
SELECT GRID_ID FROM esua_epdc_user.epdc_user_grid_relation |
|
|
|
WHERE DEL_FLAG = '0' AND USER_ID = uu.ID |
|
|
|
ORDER BY |
|
|
|
CREATED_TIME, |
|
|
|
@ -224,7 +224,7 @@ |
|
|
|
LIMIT 1 |
|
|
|
)) AS DEPT_ID |
|
|
|
FROM |
|
|
|
js_esua_epdc_user.epdc_user uu ) newuu |
|
|
|
esua_epdc_user.epdc_user uu ) newuu |
|
|
|
where newuu.DEL_FLAG = '0' |
|
|
|
<if test="gridIdList != null and gridIdList.size() > 0"> |
|
|
|
AND newuu.DEPT_ID in <include refid="foreachGridIdList"></include> |
|
|
|
@ -245,7 +245,7 @@ |
|
|
|
IFNULL( ama.id, 'unwork' ) id |
|
|
|
FROM |
|
|
|
<include refid="fromGridCommunityStreet"></include> |
|
|
|
LEFT JOIN js_esua_epdc_admin.epdc_dept_ma_code ama ON ad.id = ama.GRID_ID AND ama.DEL_FLAG = '0' |
|
|
|
LEFT JOIN esua_epdc_admin.epdc_dept_ma_code ama ON ad.id = ama.GRID_ID AND ama.DEL_FLAG = '0' |
|
|
|
WHERE |
|
|
|
ad.type_key = 'grid_party' |
|
|
|
AND ad.del_flag = 0 |
|
|
|
@ -259,13 +259,13 @@ |
|
|
|
</select> |
|
|
|
|
|
|
|
<sql id="fromGridCommunityStreet"> |
|
|
|
js_esua_epdc_admin.sys_dept ad |
|
|
|
esua_epdc_admin.sys_dept ad |
|
|
|
<include refid="joinCommunityStreet"></include> |
|
|
|
</sql> |
|
|
|
|
|
|
|
<sql id="joinCommunityStreet"> |
|
|
|
LEFT JOIN js_esua_epdc_admin.sys_dept ad1 ON ad1.id = ad.pid |
|
|
|
LEFT JOIN js_esua_epdc_admin.sys_dept ad2 ON ad2.id = ad1.pid |
|
|
|
LEFT JOIN esua_epdc_admin.sys_dept ad1 ON ad1.id = ad.pid |
|
|
|
LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad2.id = ad1.pid |
|
|
|
</sql> |
|
|
|
<!--运营导出数据相关--> |
|
|
|
<select id="selectExportUserCount" resultType="com.elink.esua.epdc.dto.user.result.ExportOperationDataResultDTO" parameterType="com.elink.esua.epdc.dto.user.form.ExportOperationFormDTO"> |
|
|
|
@ -280,7 +280,7 @@ |
|
|
|
ad.`name`, |
|
|
|
ad.pid |
|
|
|
FROM |
|
|
|
js_esua_epdc_admin.sys_dept ad |
|
|
|
esua_epdc_admin.sys_dept ad |
|
|
|
WHERE |
|
|
|
ad.id IN <include refid="foreachAllDeptIdsShow"></include> |
|
|
|
AND ad.del_flag = 0 |
|
|
|
@ -298,7 +298,7 @@ |
|
|
|
SELECT |
|
|
|
AUTHENTICATED_TYPE |
|
|
|
FROM |
|
|
|
js_esua_epdc_user.epdc_user_authenticate_history |
|
|
|
esua_epdc_user.epdc_user_authenticate_history |
|
|
|
WHERE |
|
|
|
DEL_FLAG = '0' |
|
|
|
AND AUTHENTICATED_TYPE IN ( '0', '1' ) |
|
|
|
@ -318,7 +318,7 @@ |
|
|
|
SELECT |
|
|
|
AUTHENTICATED_FLAG |
|
|
|
FROM |
|
|
|
js_esua_epdc_user.epdc_user_authenticate_history |
|
|
|
esua_epdc_user.epdc_user_authenticate_history |
|
|
|
WHERE |
|
|
|
DEL_FLAG = '0' |
|
|
|
AND AUTHENTICATED_TYPE IN ( '0', '1' ) |
|
|
|
@ -335,7 +335,7 @@ |
|
|
|
LIMIT 1 |
|
|
|
) AS AUTHENTICATED_FLAG, |
|
|
|
ifnull(if(uu.DEPT_ID = 0, NULL, uu.DEPT_ID), ( |
|
|
|
SELECT GRID_ID FROM js_esua_epdc_user.epdc_user_grid_relation |
|
|
|
SELECT GRID_ID FROM esua_epdc_user.epdc_user_grid_relation |
|
|
|
WHERE DEL_FLAG = '0' AND USER_ID = uu.ID |
|
|
|
ORDER BY |
|
|
|
CREATED_TIME, |
|
|
|
@ -343,7 +343,7 @@ |
|
|
|
LIMIT 1 |
|
|
|
)) AS DEPT_ID, |
|
|
|
ifnull(if(uu.ALL_DEPT_IDS = '', NULL, uu.ALL_DEPT_IDS), ( |
|
|
|
SELECT ALL_DEPT_IDS FROM js_esua_epdc_user.epdc_user_grid_relation |
|
|
|
SELECT ALL_DEPT_IDS FROM esua_epdc_user.epdc_user_grid_relation |
|
|
|
WHERE DEL_FLAG = '0' AND USER_ID = uu.ID |
|
|
|
ORDER BY |
|
|
|
CREATED_TIME, |
|
|
|
@ -351,7 +351,7 @@ |
|
|
|
LIMIT 1 |
|
|
|
)) AS ALL_DEPT_IDS |
|
|
|
FROM |
|
|
|
js_esua_epdc_user.epdc_user uu |
|
|
|
esua_epdc_user.epdc_user uu |
|
|
|
where uu.DEL_FLAG = '0' |
|
|
|
<if test="operationStartTime != null and operationEndTime != null and operationEndTime != ''"> |
|
|
|
AND DATE_FORMAT(uu.CREATED_TIME,'%Y-%m-%d') BETWEEN #{operationStartTime} AND #{operationEndTime} |
|
|
|
@ -367,7 +367,7 @@ |
|
|
|
ad.`name`, |
|
|
|
ad.pid |
|
|
|
FROM |
|
|
|
js_esua_epdc_admin.sys_dept ad |
|
|
|
esua_epdc_admin.sys_dept ad |
|
|
|
WHERE |
|
|
|
ad.id IN <include refid="foreachAllDeptIdsShow"></include> |
|
|
|
AND ad.del_flag = 0 |
|
|
|
@ -392,12 +392,12 @@ |
|
|
|
ad.`name`, |
|
|
|
ad.pid |
|
|
|
FROM |
|
|
|
js_esua_epdc_admin.sys_dept ad |
|
|
|
esua_epdc_admin.sys_dept ad |
|
|
|
WHERE |
|
|
|
ad.id IN <include refid="foreachAllDeptIdsShow"></include> |
|
|
|
AND ad.del_flag = 0 |
|
|
|
) t0 |
|
|
|
LEFT JOIN js_esua_epdc_news.epdc_news un ON find_in_set(t0.id, un.ALL_DEPT_IDS) |
|
|
|
LEFT JOIN esua_epdc_news.epdc_news un ON find_in_set(t0.id, un.ALL_DEPT_IDS) |
|
|
|
AND un.DEL_FLAG = '0' |
|
|
|
<if test="operationStartTime != null and operationEndTime != null and operationEndTime != ''"> |
|
|
|
AND DATE_FORMAT(un.CREATED_TIME,'%Y-%m-%d') BETWEEN #{operationStartTime} AND #{operationEndTime} |
|
|
|
@ -424,14 +424,14 @@ |
|
|
|
ad.`name`, |
|
|
|
ad.pid |
|
|
|
FROM |
|
|
|
js_esua_epdc_admin.sys_dept ad |
|
|
|
esua_epdc_admin.sys_dept ad |
|
|
|
WHERE |
|
|
|
ad.id IN <include refid="foreachAllDeptIdsShow"></include> |
|
|
|
AND ad.del_flag = 0 |
|
|
|
) t0 |
|
|
|
LEFT JOIN ( |
|
|
|
select eie.ID,eie.ALL_DEPT_IDS,eie.DEL_FLAG,eie.CREATED_TIME from js_esua_epdc_events.epdc_issue eie |
|
|
|
left join js_esua_epdc_admin.sys_dept sd on eie.GRID_ID=sd.ID |
|
|
|
select eie.ID,eie.ALL_DEPT_IDS,eie.DEL_FLAG,eie.CREATED_TIME from esua_epdc_events.epdc_issue eie |
|
|
|
left join esua_epdc_admin.sys_dept sd on eie.GRID_ID=sd.ID |
|
|
|
where sd.del_flag='0' |
|
|
|
)epen ON find_in_set(t0.id, epen.ALL_DEPT_IDS) |
|
|
|
AND epen.DEL_FLAG = '0' |
|
|
|
@ -459,7 +459,7 @@ |
|
|
|
ad.`name`, |
|
|
|
ad.pid |
|
|
|
FROM |
|
|
|
js_esua_epdc_admin.sys_dept ad |
|
|
|
esua_epdc_admin.sys_dept ad |
|
|
|
WHERE |
|
|
|
ad.id IN <include refid="foreachAllDeptIdsShow"></include> |
|
|
|
AND ad.del_flag = 0 |
|
|
|
@ -469,10 +469,10 @@ |
|
|
|
item.*,handle.STATE |
|
|
|
FROM |
|
|
|
(select eie.* |
|
|
|
from js_esua_epdc_events.epdc_item eie |
|
|
|
left join js_esua_epdc_admin.sys_dept sd on eie.GRID_ID=sd.ID |
|
|
|
from esua_epdc_events.epdc_item eie |
|
|
|
left join esua_epdc_admin.sys_dept sd on eie.GRID_ID=sd.ID |
|
|
|
where sd.del_flag='0') item |
|
|
|
LEFT JOIN ( SELECT MAX( CREATED_TIME ) AS CREATED_TIME, ITEM_ID FROM js_esua_epdc_events.epdc_item_handle_process WHERE |
|
|
|
LEFT JOIN ( SELECT MAX( CREATED_TIME ) AS CREATED_TIME, ITEM_ID FROM esua_epdc_events.epdc_item_handle_process WHERE |
|
|
|
DEL_FLAG = '0' and (state=0 or state=5 or state=10 ) |
|
|
|
<if test="endTime != null and endTime != ''"> |
|
|
|
AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') <= #{endTime} |
|
|
|
@ -482,7 +482,7 @@ |
|
|
|
</if> |
|
|
|
GROUP BY ITEM_ID |
|
|
|
) maxitem ON maxitem.ITEM_ID = item.ID |
|
|
|
LEFT JOIN js_esua_epdc_events.epdc_item_handle_process handle ON maxitem.ITEM_ID = handle.ITEM_ID |
|
|
|
LEFT JOIN esua_epdc_events.epdc_item_handle_process handle ON maxitem.ITEM_ID = handle.ITEM_ID |
|
|
|
AND maxitem.CREATED_TIME = handle.CREATED_TIME)epen ON find_in_set(t0.id, epen.ALL_DEPT_IDS) |
|
|
|
AND epen.DEL_FLAG = '0' |
|
|
|
<if test="operationStartTime != null and operationEndTime != null and operationEndTime != ''"> |
|
|
|
@ -508,12 +508,12 @@ |
|
|
|
ad.`name`, |
|
|
|
ad.pid |
|
|
|
FROM |
|
|
|
js_esua_epdc_admin.sys_dept ad |
|
|
|
esua_epdc_admin.sys_dept ad |
|
|
|
WHERE |
|
|
|
ad.id IN <include refid="foreachAllDeptIdsShow"></include> |
|
|
|
AND ad.del_flag = 0 |
|
|
|
) t0 |
|
|
|
LEFT JOIN js_esua_epdc_group.epdc_group epgr ON find_in_set(t0.id, epgr.ALL_DEPT_IDS) |
|
|
|
LEFT JOIN esua_epdc_group.epdc_group epgr ON find_in_set(t0.id, epgr.ALL_DEPT_IDS) |
|
|
|
AND epgr.DEL_FLAG = '0' |
|
|
|
AND ( |
|
|
|
epgr.STATE = '10' |
|
|
|
@ -531,7 +531,7 @@ |
|
|
|
#{deptId} |
|
|
|
</foreach> |
|
|
|
</if> |
|
|
|
LEFT JOIN js_esua_epdc_group.epdc_user_group ugp ON ugp.GROUP_ID = epgr.ID |
|
|
|
LEFT JOIN esua_epdc_group.epdc_user_group ugp ON ugp.GROUP_ID = epgr.ID |
|
|
|
AND ugp.DEL_FLAG = '0' |
|
|
|
AND ugp.LORD_FLAG = '1' |
|
|
|
<if test="operationStartTime != null and operationEndTime != null and operationEndTime != ''"> |
|
|
|
@ -563,12 +563,12 @@ |
|
|
|
ad.`name`, |
|
|
|
ad.pid |
|
|
|
FROM |
|
|
|
js_esua_epdc_admin.sys_dept ad |
|
|
|
esua_epdc_admin.sys_dept ad |
|
|
|
WHERE |
|
|
|
ad.id IN<include refid="foreachAllDeptIdsShow"></include> |
|
|
|
AND ad.del_flag = 0 |
|
|
|
) t0 |
|
|
|
LEFT JOIN js_esua_epdc_group.epdc_group epgr ON FIND_IN_SET(t0.id,epgr.ALL_DEPT_IDS) |
|
|
|
LEFT JOIN esua_epdc_group.epdc_group epgr ON FIND_IN_SET(t0.id,epgr.ALL_DEPT_IDS) |
|
|
|
AND epgr.DEL_FLAG = '0' |
|
|
|
<if test="operationStartTime != null and operationEndTime != null and operationEndTime != ''"> |
|
|
|
AND DATE_FORMAT(epgr.CREATED_TIME,'%Y-%m-%d') BETWEEN #{operationStartTime} AND #{operationEndTime} |
|
|
|
@ -587,7 +587,7 @@ |
|
|
|
#{deptId} |
|
|
|
</foreach> |
|
|
|
</if> |
|
|
|
LEFT JOIN js_esua_epdc_group.epdc_user_group ug ON epgr.id = ug.group_id |
|
|
|
LEFT JOIN esua_epdc_group.epdc_user_group ug ON epgr.id = ug.group_id |
|
|
|
AND ug.DEL_FLAG = '0' |
|
|
|
<if test="operationStartTime != null and operationEndTime != null and operationEndTime != ''"> |
|
|
|
AND DATE_FORMAT(ug.CREATED_TIME,'%Y-%m-%d') BETWEEN #{operationStartTime} AND #{operationEndTime} |
|
|
|
@ -617,12 +617,12 @@ |
|
|
|
ad.`name`, |
|
|
|
ad.pid |
|
|
|
FROM |
|
|
|
js_esua_epdc_admin.sys_dept ad |
|
|
|
esua_epdc_admin.sys_dept ad |
|
|
|
WHERE |
|
|
|
ad.id IN <include refid="foreachAllDeptIdsShow"></include> |
|
|
|
AND ad.del_flag = 0 |
|
|
|
) t0 |
|
|
|
LEFT JOIN js_esua_epdc_group.epdc_group epgr ON find_in_set(t0.id, epgr.ALL_DEPT_IDS) |
|
|
|
LEFT JOIN esua_epdc_group.epdc_group epgr ON find_in_set(t0.id, epgr.ALL_DEPT_IDS) |
|
|
|
AND epgr.DEL_FLAG = '0' |
|
|
|
AND ( |
|
|
|
epgr.STATE = '10' |
|
|
|
@ -640,7 +640,7 @@ |
|
|
|
#{deptId} |
|
|
|
</foreach> |
|
|
|
</if> |
|
|
|
LEFT JOIN js_esua_epdc_group.epdc_topic ug ON epgr.id = ug.group_id |
|
|
|
LEFT JOIN esua_epdc_group.epdc_topic ug ON epgr.id = ug.group_id |
|
|
|
AND ug.DEL_FLAG = '0' |
|
|
|
<if test="operationStartTime != null and operationEndTime != null and operationEndTime != ''"> |
|
|
|
AND DATE_FORMAT(ug.CREATED_TIME,'%Y-%m-%d') BETWEEN #{operationStartTime} AND #{operationEndTime} |
|
|
|
@ -665,12 +665,12 @@ |
|
|
|
ad.`name`, |
|
|
|
ad.pid |
|
|
|
FROM |
|
|
|
js_esua_epdc_admin.sys_dept ad |
|
|
|
esua_epdc_admin.sys_dept ad |
|
|
|
WHERE |
|
|
|
ad.id IN <include refid="foreachAllDeptIdsShow"></include> |
|
|
|
AND ad.del_flag = 0 |
|
|
|
) t0 |
|
|
|
LEFT JOIN js_esua_epdc_custom.epdc_enterprise_info uu ON find_in_set(t0.id,uu.ALL_DEPT_IDS) |
|
|
|
LEFT JOIN esua_epdc_custom.epdc_enterprise_info uu ON find_in_set(t0.id,uu.ALL_DEPT_IDS) |
|
|
|
AND uu.DEL_FLAG = '0' |
|
|
|
<if test="operationStartTime != null and operationEndTime != null and operationEndTime != ''"> |
|
|
|
AND DATE_FORMAT(uu.CREATED_TIME,'%Y-%m-%d') BETWEEN #{operationStartTime} AND #{operationEndTime} |
|
|
|
@ -761,7 +761,7 @@ |
|
|
|
FROM |
|
|
|
epdc_user uu |
|
|
|
) newuu |
|
|
|
LEFT JOIN js_esua_epdc_admin.sys_dept ad ON newuu.DEPT_ID = ad.ID AND ad.type_key = 'grid_party' AND ad.DEL_FLAG = '0' |
|
|
|
LEFT JOIN esua_epdc_admin.sys_dept ad ON newuu.DEPT_ID = ad.ID AND ad.type_key = 'grid_party' AND ad.DEL_FLAG = '0' |
|
|
|
<include refid="joinCommunityStreet"></include> |
|
|
|
|
|
|
|
WHERE newuu.DEL_FLAG = '0' |
|
|
|
@ -897,7 +897,7 @@ |
|
|
|
FROM |
|
|
|
epdc_user uu |
|
|
|
) newuu |
|
|
|
LEFT JOIN js_esua_epdc_admin.sys_dept ad ON newuu.DEPT_ID = ad.ID AND ad.type_key = 'grid_party' AND ad.DEL_FLAG = '0' |
|
|
|
LEFT JOIN esua_epdc_admin.sys_dept ad ON newuu.DEPT_ID = ad.ID AND ad.type_key = 'grid_party' AND ad.DEL_FLAG = '0' |
|
|
|
<include refid="joinCommunityStreet"></include> |
|
|
|
where |
|
|
|
newuu.DEL_FLAG = '0' |
|
|
|
|