elink-star
/
esua-epdc-cloud
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'hotfix/selectDate' of http://121.42.41.42:7070/r/esua-epdc-cloud into hotfix/selectDate

feature/dangjian
wanggongfeng 5 years ago
parent
c6c7cf345f 81848fc70e
commit
bea7d5a8ee
2 changed files with 326 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 86
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml
  2. 247
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml

86
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml
View File

@ -156,7 +156,7 @@
<!--已认证党员分页--> <!--已认证党员分页-->
<select id="optimizeHasAuthenticationPartyPage" resultType="String"> <select id="optimizeHasAuthenticationPartyPage" resultType="String">
SELECT <!--SELECT
eu.ID eu.ID
FROM FROM
epdc_user eu epdc_user eu
@ -197,8 +197,88 @@
#{deptId} #{deptId}
</foreach> </foreach>
and (HISTORY.AUTHENTICATED_TYPE='1' and HISTORY.AUTHENTICATED_FLAG = '1') and (HISTORY.AUTHENTICATED_TYPE='1' and HISTORY.AUTHENTICATED_FLAG = '1')
ORDER BY eu.REGISTER_TIME DESC ORDER BY eu.REGISTER_TIME DESC -->
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' )
<if test="endTime != ''">
and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}
</if>
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' )
<if test="endTime != ''">
and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}
</if>
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'
<if test="endTime != ''">
and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}
</if>
AND USER_ID = uu.ID
) AS HistoryCount -- 统计
FROM
epdc_user uu
where uu.DEL_FLAG = '0'
<if test="realName != null and realName != '' ">and uu.REAL_NAME = #{realName}</if>
<if test="mobile != null and mobile != '' ">and uu.MOBILE = #{mobile}</if>
<if test="identityNo != null and identityNo != '' ">and uu.IDENTITY_NO = #{identityNo}</if>
<if test="registFlag != null and registFlag != '' ">and uu.REGIST_FLAG = #{registFlag}</if>
<if test="startTime != null and startTime != '' ">and DATE_FORMAT(uu.CREATED_TIME,'%Y-%m-%d') >= #{startTime}</if>
<if test="endTime != null and endTime != '' "> <![CDATA[ and DATE_FORMAT(uu.CREATED_TIME,'%Y-%m-%d') <= ]]> #{endTime}</if>
<if test="streetId != '' and streetId != null">
AND (find_in_set(#{streetId},uu.PARENT_DEPT_IDS) OR find_in_set(#{streetId},uu.ALL_DEPT_IDS))
</if>
<if test="communityId != '' and communityId != null">
AND (find_in_set(#{communityId},uu.PARENT_DEPT_IDS) OR find_in_set(#{communityId},uu.ALL_DEPT_IDS))
</if>
<if test="gridId != '' and gridId != null">
and (uu.dept_id = #{gridId} OR find_in_set(#{gridId},uu.ALL_DEPT_IDS))
</if>
AND uu.DEPT_ID IN
<foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
#{deptId}
</foreach>
) user
where
user.AUTHENTICATED_TYPE='1' and user.AUTHENTICATED_FLAG = '1'
ORDER BY user.REGISTER_TIME DESC
</select> </select>
<!--已认证党员填充数据--> <!--已认证党员填充数据-->

247
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
View File

@ -790,7 +790,7 @@
</select> </select>
<select id="selectFaildAuthenticatedListUserDto" resultType="com.elink.esua.epdc.dto.UserDTO"> <select id="selectFaildAuthenticatedListUserDto" resultType="com.elink.esua.epdc.dto.UserDTO">
SELECT <!-- SELECT
u.id, u.id,
u.REAL_NAME, u.REAL_NAME,
u.NICKNAME, u.NICKNAME,
@ -853,7 +853,124 @@
</if> </if>
and HISTORY.AUTHENTICATED_TYPE='0' and HISTORY.AUTHENTICATED_FLAG = '0' and HISTORY.AUTHENTICATED_TYPE='0' and HISTORY.AUTHENTICATED_FLAG = '0'
GROUP BY u.ID GROUP BY u.ID
ORDER BY u.register_time desc ORDER BY u.register_time desc -->
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' )
<if test="endTime != ''">
and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}
</if>
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' )
<if test="endTime != ''">
and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}
</if>
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'
<if test="endTime != ''">
and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}
</if>
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'
<if test="startTime != '' and endTime != ''">and DATE_FORMAT(uu.CREATED_TIME,'%Y-%m-%d') between #{startTime} and #{endTime}</if>
<if test="realName != '' and realName != null">and uu.real_name like '%${realName}%'</if>
<if test="nickname != '' and nickname != null">and uu.NICKNAME like '%${nickname}%'</if>
<if test="mobile != '' and mobile != null">and uu.mobile like '%${mobile}%'</if>
<if test="identityNo != '' and identityNo != null">and uu.identity_no like '%${identityNo}%'</if>
AND uu.dept_id IN
<foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
#{deptId}
</foreach>
) USER
where USER.del_flag = '0'
<if test="streetId != '' and streetId != null">
AND (find_in_set(#{streetId},USER.PARENT_DEPT_IDS)
OR find_in_set(#{streetId},USER.ALL_DEPT_IDS))
</if>
<if test="communityId != '' and communityId != null">
AND (find_in_set(#{communityId},USER.PARENT_DEPT_IDS)
OR find_in_set(#{communityId},USER.ALL_DEPT_IDS))
</if>
<if test="gridId != '' and gridId != null">
and (USER.DEPT_ID = #{gridId}
OR find_in_set(#{gridId},USER.ALL_DEPT_IDS))
</if>
and USER.AUTHENTICATED_TYPE='0' and USER.AUTHENTICATED_FLAG = '0'
GROUP BY USER.ID
ORDER BY USER.register_time desc
</select> </select>
<select id="selectListOfWaitPartyUserDto" resultType="com.elink.esua.epdc.dto.UserDTO"> <select id="selectListOfWaitPartyUserDto" resultType="com.elink.esua.epdc.dto.UserDTO">
@ -893,7 +1010,7 @@
</if> </if>
ORDER BY ORDER BY
u.register_time desc--> u.register_time desc-->
SELECT <!-- SELECT
u.id, u.id,
u.REAL_NAME, u.REAL_NAME,
u.NICKNAME, u.NICKNAME,
@ -956,6 +1073,128 @@
</if> </if>
and HISTORY.AUTHENTICATED_TYPE='1' and HISTORY.AUTHENTICATED_FLAG = '0' and HISTORY.AUTHENTICATED_TYPE='1' and HISTORY.AUTHENTICATED_FLAG = '0'
GROUP BY u.ID GROUP BY u.ID
ORDER BY u.register_time desc ORDER BY u.register_time desc -->
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' )
<if test="endTime != ''">
and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}
</if>
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' )
<if test="endTime != ''">
and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}
</if>
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'
<if test="endTime != ''">
and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}
</if>
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'
<if test="startTime != '' and endTime != ''">and DATE_FORMAT(uu.CREATED_TIME,'%Y-%m-%d') between #{startTime} and #{endTime}</if>
<if test="realName != '' and realName != null">and uu.real_name uu '%${realName}%'</if>
<if test="nickname != '' and nickname != null">and uu.NICKNAME like '%${nickname}%'</if>
<if test="mobile != '' and mobile != null">and uu.mobile like '%${mobile}%'</if>
<if test="identityNo != '' and identityNo != null">and uu.identity_no like '%${identityNo}%'</if>
) user
where user.DEL_FLAG = '0'
AND user.dept_id IN
<foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
#{deptId}
</foreach>
<if test="streetId != '' and streetId != null">
AND (find_in_set(#{streetId},user.PARENT_DEPT_IDS)
OR find_in_set(#{streetId},user.ALL_DEPT_IDS ))
</if>
<if test="communityId != '' and communityId != null">
AND (find_in_set(#{communityId},user.PARENT_DEPT_IDS)
OR find_in_set(#{communityId},user.ALL_DEPT_IDS))
</if>
<if test="gridId != '' and gridId != null">
and (user.DEPT_ID = #{gridId}
OR find_in_set(#{gridId},user.ALL_DEPT_IDS ))
</if>
and user.AUTHENTICATED_TYPE='1' and user.AUTHENTICATED_FLAG = '0'
GROUP BY user.ID
ORDER BY user.register_time desc
</select> </select>
</mapper> </mapper>

Write Preview
Loading…
Cancel
Save