diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
index fb46f4619..0ad3ad0e5 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
@@ -381,61 +381,82 @@
) t
GROUP BY t.DEPT_ID-->
SELECT
- t.DEPT_ID gridId, COUNT( t.ID ) registerCount,
- COUNT(((t.AUTHENTICATED_TYPE='0' and t.AUTHENTICATED_FLAG = '1') or (t.AUTHENTICATED_TYPE='1' and t.AUTHENTICATED_FLAG = '0' AND t.HistoryCount > 0)) OR NULL) residentCount,
- COUNT((t.AUTHENTICATED_TYPE='1' and t.AUTHENTICATED_FLAG = '1') OR NULL) partyCount
- FROM (
- SELECT
- uu.ID, ifnull(if(uu.DEPT_ID = 0,null,uu.DEPT_ID),RELATION.Grid_id) DEPT_ID, uu.STATE, uu.PARTY_FLAG,
- HISTORY.AUTHENTICATED_TYPE,HISTORY.AUTHENTICATED_FLAG,HISCOUNT.HistoryCount
+ user.DEPT_ID gridId,
+ COUNT(user.ID) AS registerCount,
+ COUNT((user.AUTHENTICATED_TYPE = '0' AND user.AUTHENTICATED_FLAG = '1') OR (user.AUTHENTICATED_TYPE = '1' AND user.AUTHENTICATED_FLAG = '0' AND user.HistoryCount > 0) OR NULL) AS residentCount ,
+ COUNT((user.AUTHENTICATED_TYPE = '1' AND user.AUTHENTICATED_FLAG = '1') OR NULL) AS partyCount
FROM
- esua_epdc_user.epdc_user uu
-
- LEFT JOIN (
- SELECT MAX( CREATED_TIME ) AS CREATED_TIME, USER_ID
- FROM esua_epdc_user.epdc_user_authenticate_history
- WHERE DEL_FLAG = '0' AND AUTHENTICATED_TYPE IN ( '0', '1' )
+ (
+ select newuu.ID,newuu.AUTHENTICATED_TYPE,newuu.AUTHENTICATED_FLAG,newuu.HistoryCount,newuu.DEPT_ID from (
+ SELECT
+ DISTINCT uu.ID,uu.DEL_FLAG,uu.CREATED_TIME,
+ (
+ SELECT
+ AUTHENTICATED_TYPE
+ FROM
+ esua_epdc_user.epdc_user_authenticate_history
+ WHERE
+ DEL_FLAG = '0'
+ AND AUTHENTICATED_TYPE IN ( '0', '1' )
and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') <= #{endTime}
- GROUP BY USER_ID
- ) MAXHIS ON MAXHIS.USER_ID = uu.ID
-
- LEFT JOIN esua_epdc_user.epdc_user_authenticate_history HISTORY ON HISTORY.USER_ID = MAXHIS.USER_ID AND HISTORY.CREATED_TIME = MAXHIS.CREATED_TIME AND HISTORY.DEL_FLAG = '0'
- LEFT JOIN (
+ AND USER_ID = uu.ID
+ ORDER BY
+ CREATED_TIME DESC,
+ id
+ LIMIT 1
+ ) AS AUTHENTICATED_TYPE,
+ (
SELECT
- count(id) AS HistoryCount,
- USER_ID
+ AUTHENTICATED_FLAG
FROM
esua_epdc_user.epdc_user_authenticate_history
WHERE
DEL_FLAG = '0'
AND AUTHENTICATED_TYPE IN ( '0', '1' )
- AND AUTHENTICATED_FLAG= '1'
and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') <= #{endTime}
- GROUP BY USER_ID
- ) HISCOUNT ON HISCOUNT.USER_ID = uu.ID
- LEFT JOIN (
- SELECT MIN( CREATED_TIME ) AS CREATED_TIME,
- USER_ID FROM esua_epdc_user.epdc_user_grid_relation
- WHERE
- DEL_FLAG = '0'
- GROUP BY
- USER_ID
- ) MINRELA ON MINRELA.USER_ID = uu.ID
- LEFT JOIN esua_epdc_user.epdc_user_grid_relation RELATION ON RELATION.USER_ID = MINRELA.USER_ID AND RELATION.DEL_FLAG = '0' AND MINRELA.CREATED_TIME = RELATION.CREATED_TIME
- WHERE
- uu.DEL_FLAG = '0'
+ AND USER_ID = uu.ID
+ ORDER BY
+ CREATED_TIME DESC ,
+ id
+ LIMIT 1
+ ) AS AUTHENTICATED_FLAG,
+ (
+ SELECT
+ count( id ) AS HistoryCount
+ FROM
+ esua_epdc_user.epdc_user_authenticate_history
+ WHERE
+ DEL_FLAG = '0'
+ AND AUTHENTICATED_TYPE IN ( '0', '1' )
+ AND AUTHENTICATED_FLAG = '1'
+
+ and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') <= #{endTime}
+
+ AND USER_ID = uu.ID
+ ) AS HistoryCount,
+ ifnull(if(uu.DEPT_ID = 0, NULL, uu.DEPT_ID), (
+ SELECT GRID_ID FROM esua_epdc_user.epdc_user_grid_relation
+ WHERE DEL_FLAG = '0' AND USER_ID = uu.ID
+ ORDER BY
+ CREATED_TIME,
+ id
+ LIMIT 1
+ )) AS DEPT_ID
+ FROM
+ esua_epdc_user.epdc_user uu ) newuu
+ where newuu.DEL_FLAG = '0'
- AND ifnull(if(uu.DEPT_ID = 0,null,uu.DEPT_ID),RELATION.Grid_id) in
- AND DATE_FORMAT(uu.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
+ AND DATE_FORMAT(newuu.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
- ) t
- GROUP BY t.DEPT_ID
+ ) user
+ GROUP BY user.DEPT_ID
- AND ad.del_flag = 0
- ) tt
- left join
- (
- SELECT
- t0.id,
- t0.`name` streetName,
- count(uu.id) userTotal,
- count((HISTORY.AUTHENTICATED_TYPE='1' and HISTORY.AUTHENTICATED_FLAG = '1') or null ) AS partyCount
- FROM
- esua_epdc_user.epdc_user uu
- LEFT JOIN (
- SELECT MIN( CREATED_TIME ) AS CREATED_TIME,
- USER_ID FROM esua_epdc_user.epdc_user_grid_relation
- WHERE
- DEL_FLAG = '0'
- GROUP BY
- USER_ID
- ) MINRELA
- ON MINRELA.USER_ID = uu.ID
- LEFT JOIN esua_epdc_user.epdc_user_grid_relation RELATION ON RELATION.USER_ID = MINRELA.USER_ID AND RELATION.DEL_FLAG = '0' AND MINRELA.CREATED_TIME = RELATION.CREATED_TIME
- inner JOIN
(
SELECT
ad.id,
@@ -567,40 +557,101 @@
WHERE
ad.id IN
- AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') <= #{operationEndTime}
-
-
- and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') <= #{endTime}
-
- GROUP BY USER_ID
- ) MAXHIS ON MAXHIS.USER_ID = uu.ID
-
- LEFT JOIN esua_epdc_user.epdc_user_authenticate_history HISTORY ON HISTORY.USER_ID = MAXHIS.USER_ID AND HISTORY.CREATED_TIME = MAXHIS.CREATED_TIME AND HISTORY.DEL_FLAG = '0'
- where uu.DEL_FLAG = '0'
- AND IFNULL(if(uu.dept_id=0,null,uu.dept_id),RELATION.GRID_ID) IN
-
- #{deptId}
-
-
- AND DATE_FORMAT(uu.CREATED_TIME,'%Y-%m-%d') BETWEEN #{operationStartTime} AND #{operationEndTime}
-
-
- and DATE_FORMAT(uu.CREATED_TIME,'%Y-%m-%d') <=#{endTime}
-
- GROUP BY
- t0.id
- ORDER BY
- t0.id ASC) tab
- on tt.id = tab.id
- ORDER BY
- tt.id ASC
+ ) tt
+ left join
+ (
+ SELECT
+ t0.ID as DEPT_ID,
+ COUNT(user.ID) AS userTotal,
+ COUNT((user.AUTHENTICATED_TYPE = '1' AND user.AUTHENTICATED_FLAG = '1') OR NULL) AS partyCount
+ FROM (
+ SELECT
+ DISTINCT uu.ID,
+ (
+ SELECT
+ AUTHENTICATED_TYPE
+ FROM
+ esua_epdc_user.epdc_user_authenticate_history
+ WHERE
+ DEL_FLAG = '0'
+ AND AUTHENTICATED_TYPE IN ( '0', '1' )
+
+ and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') <=#{operationEndTime}
+
+
+ and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') <=#{endTime}
+
+ AND USER_ID = uu.ID
+ ORDER BY
+ CREATED_TIME DESC,
+ id
+ LIMIT 1
+ ) AS AUTHENTICATED_TYPE,
+ (
+ SELECT
+ AUTHENTICATED_FLAG
+ FROM
+ esua_epdc_user.epdc_user_authenticate_history
+ WHERE
+ DEL_FLAG = '0'
+ AND AUTHENTICATED_TYPE IN ( '0', '1' )
+
+ and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') <=#{operationEndTime}
+
+
+ and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') <=#{endTime}
+
+ AND USER_ID = uu.ID
+ ORDER BY
+ CREATED_TIME DESC ,
+ id
+ LIMIT 1
+ ) AS AUTHENTICATED_FLAG,
+ ifnull(if(uu.DEPT_ID = 0, NULL, uu.DEPT_ID), (
+ SELECT GRID_ID FROM esua_epdc_user.epdc_user_grid_relation
+ WHERE DEL_FLAG = '0' AND USER_ID = uu.ID
+ ORDER BY
+ CREATED_TIME,
+ id
+ LIMIT 1
+ )) AS DEPT_ID,
+ ifnull(if(uu.ALL_DEPT_IDS = '', NULL, uu.ALL_DEPT_IDS), (
+ 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,
+ id
+ LIMIT 1
+ )) AS ALL_DEPT_IDS
+ FROM
+ esua_epdc_user.epdc_user uu
+ where uu.DEL_FLAG = '0'
+
+ AND DATE_FORMAT(uu.CREATED_TIME,'%Y-%m-%d') BETWEEN #{operationStartTime} AND #{operationEndTime}
+
+
+ and DATE_FORMAT(uu.CREATED_TIME,'%Y-%m-%d') <=#{endTime}
+
+ ) user
+ inner JOIN
+ (
+ SELECT
+ ad.id,
+ ad.`name`,
+ ad.pid
+ FROM
+ esua_epdc_admin.sys_dept ad
+ WHERE
+ ad.id IN
+ #{deptId}
+
+ GROUP BY t0.id
+ ) tab on tt.id = tab.DEPT_ID
+ ORDER BY tt.id ASC
@@ -954,64 +1005,91 @@
t1.*,
t1.oldCount / t1.partyMemberCount oldPercent,
t1.youngCount / t1.partyMemberCount youngPercent
- FROM (
- SELECT
- t.streetName, t.streetId,
- count( (t.AUTHENTICATED_TYPE='1' and t.AUTHENTICATED_FLAG = '1' and t.SEX = '1') OR NULL ) maleCount,
- count( (t.AUTHENTICATED_TYPE='1' and t.AUTHENTICATED_FLAG = '1' and t.SEX = '0') OR NULL ) femaleCount,
- count( (t.AUTHENTICATED_TYPE='1' and t.AUTHENTICATED_FLAG = '1' and t.SEX = '2') OR NULL ) unknownSexCount,
- COUNT( (t.AUTHENTICATED_TYPE='1' and t.AUTHENTICATED_FLAG = '1') OR NULL ) partyMemberCount,
- count((t.AUTHENTICATED_TYPE='1' and t.AUTHENTICATED_FLAG = '0' ) or null ) partyAuthFailureCount,
- COUNT( (t.AUTHENTICATED_TYPE='1' and t.AUTHENTICATED_FLAG = '1' and t.age > 50) OR NULL ) oldCount,
- COUNT( (t.AUTHENTICATED_TYPE='1' and t.AUTHENTICATED_FLAG = '1' and t.age <= 50 AND t.age > 0 ) OR NULL ) youngCount
- FROM (
-
- SELECT
- uu.ID AS userId,
- CASE WHEN uu.SEX is null or uu.SEX != '0' AND uu.SEX != '1' THEN '2' ELSE uu.SEX END AS SEX,
- uu.STATE, uu.PARTY_FLAG, uu.DEPT_ID,
- IFNULL( TIMESTAMPDIFF( YEAR, uu.BIRTHDAY, CURDATE()), 0 ) age,
- ad2.`name` streetName, ad2.id streetId,
- HISTORY.AUTHENTICATED_TYPE,
- HISTORY.AUTHENTICATED_FLAG
- FROM
- esua_epdc_user.epdc_user uu
- LEFT JOIN (SELECT MIN( CREATED_TIME ) AS CREATED_TIME, USER_ID FROM esua_epdc_user.epdc_user_grid_relation WHERE DEL_FLAG = '0' GROUP BY USER_ID ) MINRELA ON MINRELA.USER_ID = uu.ID
- LEFT JOIN esua_epdc_user.epdc_user_grid_relation RELATION ON RELATION.USER_ID = MINRELA.USER_ID AND RELATION.DEL_FLAG = '0' AND MINRELA.CREATED_TIME = RELATION.CREATED_TIME
- LEFT JOIN esua_epdc_admin.sys_dept ad ON IFNULL(if(uu.DEPT_ID = 0,null,uu.DEPT_ID),RELATION.GRID_ID) = ad.ID AND ad.type_key = 'grid_party'
-
- and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') <= #{endTime}
-
- GROUP BY USER_ID
- ) MAXHIS ON MAXHIS.USER_ID = uu.ID
-
- LEFT JOIN esua_epdc_user.epdc_user_authenticate_history HISTORY ON HISTORY.USER_ID = MAXHIS.USER_ID AND HISTORY.CREATED_TIME = MAXHIS.CREATED_TIME AND HISTORY.DEL_FLAG = '0'
+ FROM (
+ SELECT
+ t.streetName, t.streetId,
+ count( (t.AUTHENTICATED_TYPE='1' and t.AUTHENTICATED_FLAG = '1' and t.SEX = '1') OR NULL ) maleCount,
+ count( (t.AUTHENTICATED_TYPE='1' and t.AUTHENTICATED_FLAG = '1' and t.SEX = '0') OR NULL ) femaleCount,
+ count( (t.AUTHENTICATED_TYPE='1' and t.AUTHENTICATED_FLAG = '1' and t.SEX = '2') OR NULL ) unknownSexCount,
+ COUNT( (t.AUTHENTICATED_TYPE='1' and t.AUTHENTICATED_FLAG = '1') OR NULL ) partyMemberCount,
+ count((t.AUTHENTICATED_TYPE='1' and t.AUTHENTICATED_FLAG = '0' ) or null ) partyAuthFailureCount,
+ COUNT( (t.AUTHENTICATED_TYPE='1' and t.AUTHENTICATED_FLAG = '1' and t.age > 50) OR NULL ) oldCount,
+ COUNT( (t.AUTHENTICATED_TYPE='1' and t.AUTHENTICATED_FLAG = '1' and t.age <= 50 AND t.age > 0 ) OR NULL )
+ youngCount
+ FROM (
+ select newuu.userId,newuu.SEX,newuu.age,ad2.`name` streetName,
+ ad2.id streetId,newuu.AUTHENTICATED_TYPE,newuu.AUTHENTICATED_FLAG,newuu.DEPT_ID
+ from (
+ SELECT
+ DISTINCT uu.ID userId,uu.CREATED_TIME,uu.DEL_FLAG,
+ CASE WHEN uu.SEX is null or uu.SEX != '0' AND uu.SEX != '1' THEN '2' ELSE uu.SEX END AS SEX,
+ IFNULL( TIMESTAMPDIFF( YEAR, uu.BIRTHDAY, CURDATE()), 0 ) age,
+ (
+ SELECT
+ AUTHENTICATED_TYPE
+ FROM
+ epdc_user_authenticate_history
+ WHERE
+ DEL_FLAG = '0'
+ AND AUTHENTICATED_TYPE IN ( '0', '1' )
+
+ and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') <= #{endTime}
+
+ AND USER_ID = uu.ID
+ ORDER BY
+ CREATED_TIME DESC,
+ id
+ LIMIT 1
+ ) AS AUTHENTICATED_TYPE,
+ (
+ SELECT
+ AUTHENTICATED_FLAG
+ FROM
+ epdc_user_authenticate_history
+ WHERE
+ DEL_FLAG = '0'
+ AND AUTHENTICATED_TYPE IN ( '0', '1' )
+
+ and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') <= #{endTime}
+
+ AND USER_ID = uu.ID
+ ORDER BY
+ CREATED_TIME DESC ,
+ id
+ LIMIT 1
+ ) AS AUTHENTICATED_FLAG,
+ ifnull(if(uu.DEPT_ID = 0, NULL, uu.DEPT_ID), (
+ SELECT GRID_ID FROM epdc_user_grid_relation
+ WHERE DEL_FLAG = '0' AND USER_ID = uu.ID
+ ORDER BY
+ CREATED_TIME,
+ id
+ LIMIT 1
+ )) AS DEPT_ID
+ FROM
+ epdc_user uu
+ ) newuu
+ LEFT JOIN esua_epdc_admin.sys_dept ad ON newuu.DEPT_ID = ad.ID AND ad.type_key = 'grid_party'
+
- AND ad2.ID = #{gridId}
-
-
- AND ad2.ID in
- #{deptId}
-
-
-
-
- AND DATE_FORMAT(uu.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
+ WHERE newuu.DEL_FLAG = '0'
+
+ AND ad2.ID = #{gridId}
+
+
+ AND ad2.ID in
+ #{deptId}
- AND ad2.id is NOT NULL
- AND ad.id IS NOT NULL
-
+
+
+
+ AND DATE_FORMAT(newuu.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
+
+ AND ad2.id is NOT NULL
+ AND ad.id IS NOT NULL
- ) t GROUP BY t.streetId
+ ) t GROUP BY t.streetId
) t1
order by t1.oldCount desc
@@ -1047,49 +1125,92 @@
COUNT( (t.AUTHENTICATED_TYPE!='1' or t.AUTHENTICATED_FLAG != '1' and t.age <= 50 AND t.age > 0 ) OR NULL ) youngCount
FROM (
+ select
+ newuu.ID userId,
+ newuu.AUTHENTICATED_TYPE,
+ newuu.AUTHENTICATED_FLAG,
+ newuu.HistoryCount,
+ newuu.DEPT_ID,
+ newuu.SEX,
+ newuu.age,
+ ad2.`name` streetName,
+ ad2.id streetId
+ from
+ (
SELECT
- uu.ID AS userId,
- CASE WHEN uu.SEX is null or uu.SEX != '0' AND uu.SEX != '1' THEN '2' ELSE uu.SEX END AS SEX,
- uu.STATE, uu.PARTY_FLAG, uu.DEPT_ID,
- IFNULL( TIMESTAMPDIFF( YEAR, uu.BIRTHDAY, CURDATE()), 0 ) age,
- ad2.`name` streetName, ad2.id streetId,
- HISTORY.AUTHENTICATED_TYPE,
- HISTORY.AUTHENTICATED_FLAG,
- HISCOUNT.HistoryCount
- FROM
- esua_epdc_user.epdc_user uu
- LEFT JOIN (SELECT MIN( CREATED_TIME ) AS CREATED_TIME, USER_ID FROM esua_epdc_user.epdc_user_grid_relation WHERE DEL_FLAG = '0' GROUP BY USER_ID ) MINRELA ON MINRELA.USER_ID = uu.ID
- LEFT JOIN esua_epdc_user.epdc_user_grid_relation RELATION ON RELATION.USER_ID = MINRELA.USER_ID AND RELATION.DEL_FLAG = '0' AND MINRELA.CREATED_TIME = RELATION.CREATED_TIME
- LEFT JOIN esua_epdc_admin.sys_dept ad ON IFNULL(if(uu.DEPT_ID = 0,null,uu.DEPT_ID),RELATION.GRID_ID) = ad.ID AND ad.type_key = 'grid_party'
-
and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') <= #{endTime}
- GROUP BY USER_ID
- ) MAXHIS ON MAXHIS.USER_ID = uu.ID
-
- LEFT JOIN esua_epdc_user.epdc_user_authenticate_history HISTORY ON HISTORY.USER_ID = MAXHIS.USER_ID AND HISTORY.CREATED_TIME = MAXHIS.CREATED_TIME AND HISTORY.DEL_FLAG = '0'
- LEFT JOIN (
+ AND USER_ID = uu.ID
+ ORDER BY
+ CREATED_TIME DESC,
+ id
+ LIMIT 1
+ ) AS AUTHENTICATED_TYPE,
+ (
SELECT
- count(id) AS HistoryCount,
- USER_ID
+ AUTHENTICATED_FLAG
FROM
- esua_epdc_user.epdc_user_authenticate_history
+ epdc_user_authenticate_history
WHERE
DEL_FLAG = '0'
AND AUTHENTICATED_TYPE IN ( '0', '1' )
- AND AUTHENTICATED_FLAG= '1'
and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') <= #{endTime}
- GROUP BY USER_ID
- ) HISCOUNT ON HISCOUNT.USER_ID = uu.ID
- WHERE uu.DEL_FLAG = '0'
+ AND USER_ID = uu.ID
+ ORDER BY
+ CREATED_TIME DESC ,
+ id
+ LIMIT 1
+ ) AS AUTHENTICATED_FLAG,
+ (
+ SELECT
+ count( id ) AS HistoryCount
+ FROM
+ epdc_user_authenticate_history
+ WHERE
+ DEL_FLAG = '0'
+ AND AUTHENTICATED_TYPE IN ( '0', '1' )
+ AND AUTHENTICATED_FLAG = '1'
+
+ and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') <= #{endTime}
+
+ AND USER_ID = uu.ID
+ ) AS HistoryCount,
+ ifnull(if(uu.DEPT_ID = 0, NULL, uu.DEPT_ID), (
+ SELECT GRID_ID FROM epdc_user_grid_relation
+ WHERE DEL_FLAG = '0' AND USER_ID = uu.ID
+ ORDER BY
+ CREATED_TIME,
+ id
+ LIMIT 1
+ )) AS DEPT_ID
+ FROM
+ epdc_user uu
+ ) newuu
+ LEFT JOIN esua_epdc_admin.sys_dept ad ON newuu.DEPT_ID = ad.ID AND ad.type_key = 'grid_party'
+
+ AND DATE_FORMAT(newuu.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
+
+ AND ad2.id is NOT NULL
+ AND ad.id IS NOT NULL
AND ad2.ID = #{gridId}
@@ -1099,12 +1220,6 @@
-
- AND DATE_FORMAT(uu.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
-
- AND ad2.id is NOT NULL
- AND ad.id IS NOT NULL
-
) t GROUP BY t.streetId
) t1
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml
index 8b4aaec59..2de436e5b 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml
@@ -156,7 +156,7 @@
- SELECT
+
+ SELECT
+ user.ID
+ FROM
+ (
+ SELECT
+ DISTINCT uu.ID,
+ uu.REGISTER_TIME,
+ (
+ SELECT
+ AUTHENTICATED_TYPE
+ FROM
+ epdc_user_authenticate_history
+ WHERE
+ DEL_FLAG = '0'
+ AND AUTHENTICATED_TYPE IN ( '0', '1' )
+
+ and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') <= #{endTime}
+
+ AND USER_ID = uu.ID
+ ORDER BY
+ CREATED_TIME DESC,
+ id
+ LIMIT 1
+ ) AS AUTHENTICATED_TYPE, -- 认证类型
+ (
+ SELECT
+ AUTHENTICATED_FLAG
+ FROM
+ epdc_user_authenticate_history
+ WHERE
+ DEL_FLAG = '0'
+ AND AUTHENTICATED_TYPE IN ( '0', '1' )
+
+ and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') <= #{endTime}
+
+ AND USER_ID = uu.ID
+ ORDER BY
+ CREATED_TIME DESC ,
+ id
+ LIMIT 1
+ ) AS AUTHENTICATED_FLAG, -- 认证标识
+ (
+ SELECT
+ count( id ) AS HistoryCount
+ FROM
+ epdc_user_authenticate_history
+ WHERE
+ DEL_FLAG = '0'
+ AND AUTHENTICATED_TYPE IN ( '0', '1' )
+ AND AUTHENTICATED_FLAG = '1'
+
+ and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') <= #{endTime}
+
+ AND USER_ID = uu.ID
+ ) AS HistoryCount -- 统计
+ FROM
+ epdc_user uu
+ where uu.DEL_FLAG = '0'
+ and uu.REAL_NAME = #{realName}
+ and uu.MOBILE = #{mobile}
+ and uu.IDENTITY_NO = #{identityNo}
+ and uu.REGIST_FLAG = #{registFlag}
+ and DATE_FORMAT(uu.CREATED_TIME,'%Y-%m-%d') >= #{startTime}
+ #{endTime}
+
+ AND (find_in_set(#{streetId},uu.PARENT_DEPT_IDS) OR find_in_set(#{streetId},uu.ALL_DEPT_IDS))
+
+
+ AND (find_in_set(#{communityId},uu.PARENT_DEPT_IDS) OR find_in_set(#{communityId},uu.ALL_DEPT_IDS))
+
+
+ and (uu.dept_id = #{gridId} OR find_in_set(#{gridId},uu.ALL_DEPT_IDS))
+
+ AND uu.DEPT_ID IN
+
+ #{deptId}
+
+ ) user
+ where
+ user.AUTHENTICATED_TYPE='1' and user.AUTHENTICATED_FLAG = '1'
+ ORDER BY user.REGISTER_TIME DESC
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
index e778c15d7..c16f692ae 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
@@ -790,7 +790,7 @@
- SELECT
+
+
+ SELECT
+ USER.id,
+ USER.REAL_NAME,
+ USER.NICKNAME,
+ USER.MOBILE,
+ USER.REGISTER_TIME,
+ USER.CREATED_TIME,
+ USER.UPDATED_TIME,
+ USER.IDENTITY_NO,
+ USER.ADDRESS,
+ USER.STATE,
+ USER.PARTY_FLAG,
+ USER.ALL_DEPT_NAMES,
+ USER.FACE_IMG
+ FROM
+ (
+ SELECT DISTINCT
+ uu.ID,
+ uu.REAL_NAME,
+ uu.NICKNAME,
+ uu.MOBILE,
+ uu.REGISTER_TIME,
+ uu.CREATED_TIME,
+ uu.UPDATED_TIME,
+ uu.IDENTITY_NO,
+ uu.ADDRESS,
+ uu.STATE,
+ uu.PARTY_FLAG,
+ uu.ALL_DEPT_NAMES,
+ uu.PARENT_DEPT_IDS,
+ uu.ALL_DEPT_IDS,
+ uu.FACE_IMG,
+ uu.DEL_FLAG,
+ (
+ SELECT
+ AUTHENTICATED_TYPE
+ FROM
+ epdc_user_authenticate_history
+ WHERE
+ DEL_FLAG = '0'
+ AND AUTHENTICATED_TYPE IN ( '0', '1' )
+
+ and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') <= #{endTime}
+
+ AND USER_ID = uu.ID
+ ORDER BY
+ CREATED_TIME DESC,
+ id
+ LIMIT 1
+ ) AS AUTHENTICATED_TYPE,-- 认证类型
+ (
+ SELECT
+ AUTHENTICATED_FLAG
+ FROM
+ epdc_user_authenticate_history
+ WHERE
+ DEL_FLAG = '0'
+ AND AUTHENTICATED_TYPE IN ( '0', '1' )
+
+ and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') <= #{endTime}
+
+ AND USER_ID = uu.ID
+ ORDER BY
+ CREATED_TIME DESC,
+ id
+ LIMIT 1
+ ) AS AUTHENTICATED_FLAG,-- 认证标识
+ (
+ SELECT
+ count( id ) AS HistoryCount
+ FROM
+ epdc_user_authenticate_history
+ WHERE
+ DEL_FLAG = '0'
+ AND AUTHENTICATED_TYPE IN ( '0', '1' )
+ AND AUTHENTICATED_FLAG = '1'
+
+ and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') <= #{endTime}
+
+ AND USER_ID = uu.ID
+ ) AS HistoryCount,-- 统计
+ ifnull(
+ IF
+ ( uu.DEPT_ID = 0, NULL, uu.DEPT_ID ),
+ ( SELECT GRID_ID FROM epdc_user_grid_relation WHERE DEL_FLAG = '0' AND USER_ID = uu.ID ORDER BY CREATED_TIME, id LIMIT 1 )
+ ) AS DEPT_ID
+ FROM
+ epdc_user uu
+ WHERE
+ uu.DEL_FLAG = '0'
+ and DATE_FORMAT(uu.CREATED_TIME,'%Y-%m-%d') between #{startTime} and #{endTime}
+ and uu.real_name like '%${realName}%'
+ and uu.NICKNAME like '%${nickname}%'
+ and uu.mobile like '%${mobile}%'
+ and uu.identity_no like '%${identityNo}%'
+ AND uu.dept_id IN
+
+ #{deptId}
+
+ ) USER
+ where USER.del_flag = '0'
+
+ AND (find_in_set(#{streetId},USER.PARENT_DEPT_IDS)
+ OR find_in_set(#{streetId},USER.ALL_DEPT_IDS))
+
+
+ AND (find_in_set(#{communityId},USER.PARENT_DEPT_IDS)
+ OR find_in_set(#{communityId},USER.ALL_DEPT_IDS))
+
+
+ and (USER.DEPT_ID = #{gridId}
+ OR find_in_set(#{gridId},USER.ALL_DEPT_IDS))
+
+ and USER.AUTHENTICATED_TYPE='0' and USER.AUTHENTICATED_FLAG = '0'
+ GROUP BY USER.ID
+ ORDER BY USER.register_time desc
@@ -893,7 +1010,7 @@
ORDER BY
u.register_time desc-->
- SELECT
+
+ SELECT
+ user.DEPT_ID,
+ user.id,
+ user.REAL_NAME,
+ user.NICKNAME,
+ user.MOBILE,
+ user.REGISTER_TIME,
+ user.CREATED_TIME,
+ user.UPDATED_TIME,
+ user.IDENTITY_NO,
+ user.ADDRESS,
+ user.STATE,
+ user.PARTY_FLAG,
+ user.ALL_DEPT_IDS,
+ user.PARENT_DEPT_IDS,
+ user.ALL_DEPT_NAMES,
+ user.FACE_IMG
+ FROM (
+ SELECT
+ DISTINCT uu.ID,
+ uu.REAL_NAME,
+ uu.NICKNAME,
+ uu.MOBILE,
+ uu.REGISTER_TIME,
+ uu.CREATED_TIME,
+ uu.UPDATED_TIME,
+ uu.IDENTITY_NO,
+ uu.ADDRESS,
+ uu.STATE,
+ uu.PARTY_FLAG,
+ uu.ALL_DEPT_IDS,
+ uu.PARENT_DEPT_IDS,
+ IFNULL(uu.ALL_DEPT_NAMES,"") ALL_DEPT_NAMES,
+ uu.FACE_IMG,
+ uu.DEL_FLAG,
+ (
+ SELECT
+ AUTHENTICATED_TYPE
+ FROM
+ epdc_user_authenticate_history
+ WHERE
+ DEL_FLAG = '0'
+ AND AUTHENTICATED_TYPE IN ( '0', '1' )
+
+ and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') <= #{endTime}
+
+ AND USER_ID = uu.ID
+ ORDER BY
+ CREATED_TIME DESC,
+ id
+ LIMIT 1
+ ) AS AUTHENTICATED_TYPE, -- 认证类型
+ (
+ SELECT
+ AUTHENTICATED_FLAG
+ FROM
+ epdc_user_authenticate_history
+ WHERE
+ DEL_FLAG = '0'
+ AND AUTHENTICATED_TYPE IN ( '0', '1' )
+
+ and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') <= #{endTime}
+
+ AND USER_ID = uu.ID
+ ORDER BY
+ CREATED_TIME DESC ,
+ id
+ LIMIT 1
+ ) AS AUTHENTICATED_FLAG, -- 认证标识
+ (
+ SELECT
+ count( id ) AS HistoryCount
+ FROM
+ epdc_user_authenticate_history
+ WHERE
+ DEL_FLAG = '0'
+ AND AUTHENTICATED_TYPE IN ( '0', '1' )
+ AND AUTHENTICATED_FLAG = '1'
+
+ and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') <= #{endTime}
+
+ AND USER_ID = uu.ID
+ ) AS HistoryCount, -- 统计
+ ifnull(if(uu.DEPT_ID = 0, NULL, uu.DEPT_ID), (
+ SELECT GRID_ID FROM epdc_user_grid_relation
+ WHERE DEL_FLAG = '0' AND USER_ID = uu.ID
+ ORDER BY
+ CREATED_TIME,
+ id
+ LIMIT 1
+ )) AS DEPT_ID
+ FROM
+ epdc_user uu
+ where uu.DEL_FLAG = '0'
+ and DATE_FORMAT(uu.CREATED_TIME,'%Y-%m-%d') between #{startTime} and #{endTime}
+ and uu.real_name uu '%${realName}%'
+ and uu.NICKNAME like '%${nickname}%'
+ and uu.mobile like '%${mobile}%'
+ and uu.identity_no like '%${identityNo}%'
+ ) user
+ where user.DEL_FLAG = '0'
+ AND user.dept_id IN
+
+ #{deptId}
+
+
+
+ AND (find_in_set(#{streetId},user.PARENT_DEPT_IDS)
+ OR find_in_set(#{streetId},user.ALL_DEPT_IDS ))
+
+
+ AND (find_in_set(#{communityId},user.PARENT_DEPT_IDS)
+ OR find_in_set(#{communityId},user.ALL_DEPT_IDS))
+
+
+ and (user.DEPT_ID = #{gridId}
+ OR find_in_set(#{gridId},user.ALL_DEPT_IDS ))
+
+ and user.AUTHENTICATED_TYPE='1' and user.AUTHENTICATED_FLAG = '0'
+ GROUP BY user.ID
+ ORDER BY user.register_time desc
+