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

党员详情

dev
qushutong 6 years ago
parent
7d69c6d444
commit
fd897e34f4
3 changed files with 41 additions and 41 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      esua-epdc/epdc-gateway/pom.xml
  2. 2
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java
  3. 72
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml

8
esua-epdc/epdc-gateway/pom.xml
View File

@ -92,12 +92,12 @@
<!-- gateway routes -->
<gateway.routes.epdc-auth-server.uri>lb://epdc-auth-server</gateway.routes.epdc-auth-server.uri>
<gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>
<!--<gateway.routes.epdc-admin-server.uri>http://127.0.0.1:9092</gateway.routes.epdc-admin-server.uri>-->
<!-- <gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>-->
<gateway.routes.epdc-admin-server.uri>http://127.0.0.1:9092</gateway.routes.epdc-admin-server.uri>
<gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server
</gateway.routes.epdc-activiti-server.uri>
<!--<gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>-->
<gateway.routes.epdc-api-server.uri>http://127.0.0.1:9040</gateway.routes.epdc-api-server.uri>
<gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>
<!-- <gateway.routes.epdc-api-server.uri>http://127.0.0.1:9040</gateway.routes.epdc-api-server.uri>-->
<gateway.routes.epdc-app-server.uri>lb://epdc-app-server</gateway.routes.epdc-app-server.uri>
<!-- <gateway.routes.epdc-app-server.uri>http://127.0.0.1:9058</gateway.routes.epdc-app-server.uri>-->
<gateway.routes.epdc-heart-server.uri>lb://epdc-heart-server</gateway.routes.epdc-heart-server.uri>

2
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java
View File

@ -22,7 +22,7 @@ import java.util.List;
* @email yujintao@elink-cn.com
* @date 2019/9/7 9:27
*/
@FeignClient(name = ServiceConstant.EPDC_USER_SERVER, fallback = UserFeignClientFallback.class,url = "http://localhost:9068")
@FeignClient(name = ServiceConstant.EPDC_USER_SERVER, fallback = UserFeignClientFallback.class)
public interface UserFeignClient {
/**

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

@ -203,8 +203,8 @@
eu.VILLAGE_NAME AS villageName,
eu.DWELLING_PLACE as dwellingPlace,
'1' as authenticatedFlag,
SUBSTRING_INDEX(epm.ALL_DEPT_NAMES,'-',-3) as streetName,
SUBSTRING_INDEX(epm.ALL_DEPT_NAMES,'-',-2)as communityName,
SUBSTRING_INDEX(SUBSTRING_INDEX(epm.ALL_DEPT_NAMES,'-',-3),'-',1) as streetName,
SUBSTRING_INDEX(SUBSTRING_INDEX(epm.ALL_DEPT_NAMES,'-',-2),'-',1)as communityName,
SUBSTRING_INDEX(epm.ALL_DEPT_NAMES,'-',-1) as gridName,
eu.PARTY_FLAG as partyFlag,
epm.CADRE_FLAG as cadreFlag,
@ -233,8 +233,8 @@
eu.VILLAGE_NAME AS villageName,
eu.DWELLING_PLACE AS dwellingPlace,
'0' AS authenticatedFlag,
SUBSTRING_INDEX(epaf.ALL_DEPT_NAMES,'-',-3) as streetName,
SUBSTRING_INDEX(epaf.ALL_DEPT_NAMES,'-',-2)as communityName,
SUBSTRING_INDEX(SUBSTRING_INDEX(epaf.ALL_DEPT_NAMES,'-',-3),'-',1) as streetName,
SUBSTRING_INDEX(SUBSTRING_INDEX(epaf.ALL_DEPT_NAMES,'-',-2),'-',1)as communityName,
SUBSTRING_INDEX(epaf.ALL_DEPT_NAMES,'-',-1) as gridName,
eu.PARTY_FLAG AS partyFlag,
epaf.CADRE_FLAG AS cadreFlag,
@ -269,29 +269,29 @@
<!--获取用户列表-->
<select id="selectWorkUserList" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO">
SELECT
u.ID as userId,
u.NICKNAME as nickname,
u.REGISTER_TIME as registerTime,
u.FACE_IMG as faceImg
u.ID as userId,
u.NICKNAME as nickname,
u.REGISTER_TIME as registerTime,
u.FACE_IMG as faceImg
FROM
epdc_user_grid_relation ug
LEFT JOIN epdc_user u ON ug.USER_ID = u.ID
epdc_user_grid_relation ug
LEFT JOIN epdc_user u ON ug.USER_ID = u.ID
WHERE
u.PARTY_FLAG = #{partyFlag}
AND u.STATE = #{authenticatedFlag}
AND u.DEL_FLAG = '0'
AND ug.DEL_FLAG = '0'
<choose>
<when test="gridId != null and gridId > 0">AND ug.GRID_ID = #{gridId}</when>
<otherwise>
AND ug.GRID_ID in
<foreach collection="gridIdList" item="item" open="(" separator="," close=")" >
#{item}
</foreach>
</otherwise>
</choose>
u.PARTY_FLAG = #{partyFlag}
AND u.STATE = #{authenticatedFlag}
AND u.DEL_FLAG = '0'
AND ug.DEL_FLAG = '0'
<choose>
<when test="gridId != null and gridId > 0">AND ug.GRID_ID = #{gridId}</when>
<otherwise>
AND ug.GRID_ID in
<foreach collection="gridIdList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</otherwise>
</choose>
GROUP BY
u.ID
u.ID
ORDER BY u.CREATED_TIME DESC
LIMIT #{pageIndex},#{pageSize}
</select>
@ -299,20 +299,20 @@
<!--查询待认证用户数量-->
<select id="selectCountUnauthorizedAmount" resultType="Integer">
SELECT
COUNT(DISTINCT(u.ID))
COUNT(DISTINCT(u.ID))
FROM
epdc_user_grid_relation ug
LEFT JOIN epdc_user u ON u.ID = ug.USER_ID
epdc_user_grid_relation ug
LEFT JOIN epdc_user u ON u.ID = ug.USER_ID
WHERE u.DEL_FLAG = '0' AND ug.DEL_FLAG = '0' AND u.STATE = '1'
<choose>
<when test="gridId != null and gridId > 0">AND ug.GRID_ID = #{gridId}</when>
<otherwise>
AND ug.GRID_ID in
<foreach collection="gridIdList" item="item" open="(" separator="," close=")" >
#{item}
</foreach>
</otherwise>
</choose>
<choose>
<when test="gridId != null and gridId > 0">AND ug.GRID_ID = #{gridId}</when>
<otherwise>
AND ug.GRID_ID in
<foreach collection="gridIdList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</otherwise>
</choose>
</select>

Write Preview
Loading…
Cancel
Save