合并master分支到heart&tag分支

esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml

@@ -67,10 +67,10 @@
             <version>1.0.0</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
+        </dependency>-->
         <!--版本控制-->
         <dependency>
             <groupId>com.esua.epdc</groupId>

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml

@@ -108,25 +108,26 @@
 
     <select id="selectListGroupsOfMine" resultType="com.elink.esua.epdc.dto.group.result.GroupsOfMineResultDTO">
         SELECT
-	tmp.ID,
-	tmp.GROUP_NAME,
-	tmp.GROUP_AVATAR,
-	tmp.GROUP_CATEGORY,
-	tmp.STATE,
-	tmp.totalNum,
-	tmp.partyMemberNum,
-	tmp.unreadTopicNum,
-	tmp.latestTopicTime,
+	t.ID,
+	t.GROUP_NAME,
+	t.GROUP_AVATAR,
+	t.GROUP_CATEGORY,
+	t.STATE,
+	t.totalNum,
+	t.partyMemberNum,
+	COUNT( DISTINCT ugpr.ID ) AS unreadTopicNum,
+	MAX( tp.CREATED_TIME ) AS latestTopicTime,
 CASE
-			WHEN tmp.STATE = 0 THEN
+
+		WHEN t.STATE = 0 THEN
 		'网格长会尽快审核您创建的社群，请耐心等待'
-			WHEN tmp.STATE = 5 THEN
-			tmp.PROCESSING_OPINIONS
+		WHEN t.STATE = 5 THEN
+		t.PROCESSING_OPINIONS
 		WHEN (
-				tmp.STATE = 10
-				AND totalNum <![CDATA[ <= ]]> 1
-				AND tmp.GROUP_CATEGORY = '1'
-				AND tmp.topicNum = 0
+			t.STATE = 10
+			AND t.totalNum <![CDATA[ <= ]]> 1
+			AND t.GROUP_CATEGORY = '1'
+			AND COUNT( DISTINCT tp.ID ) = 0
 			) THEN
 			'您的社群审核已通过，快加好友进来吧' ELSE ''
 		END AS description
@@ -139,51 +140,39 @@ FROM
 			gp.GROUP_CATEGORY,
 			gp.STATE,
 			gp.PROCESSING_OPINIONS,
-		(
-		SELECT
-			COUNT( t.ID )
+			SUM( ugp.STATE = 10 ) AS totalNum,
+			SUM( ugp.PARTY_MEMBER = '1' ) AS partyMemberNum
 		FROM
-			epdc_user_group t
+			epdc_group gp
+			LEFT JOIN epdc_user_group ugp ON ugp.GROUP_ID = gp.ID
+			AND ugp.DEL_FLAG = '0'
+			AND ugp.STATE = 10
 		WHERE
-			t.GROUP_ID = gp.ID
-			AND t.DEL_FLAG = '0'
-			AND t.STATE = 10
-		) AS totalNum,
-		(
+			gp.ID IN (
 			SELECT
-			COUNT( t1.ID )
-		FROM
-			epdc_user_group t1
-		WHERE
-			t1.GROUP_ID = gp.ID
-			AND t1.DEL_FLAG = '0'
-			AND t1.STATE = 10
-			AND t1.PARTY_MEMBER = '1'
-		) AS partyMemberNum,
-		COUNT( DISTINCT ugpr.ID ) AS unreadTopicNum,
-		MAX( tp.CREATED_TIME ) AS latestTopicTime,
-		COUNT( DISTINCT tp.ID ) AS topicNum
+				gp.ID
 			FROM
 				epdc_group gp
 				RIGHT JOIN epdc_user_group ugp ON gp.ID = ugp.GROUP_ID
 				AND ugp.DEL_FLAG = '0'
-			AND ugp.USER_ID = #{userId}
 				AND ugp.STATE = 10
-			LEFT JOIN epdc_group_topic_user_read ugpr ON gp.ID = ugpr.GROUP_ID
-			AND ugpr.DEL_FLAG = '0'
-			AND ugpr.USER_ID = #{userId}
-			AND ugpr.READ_FLAG = '0'
-			LEFT JOIN epdc_topic tp ON gp.ID = tp.GROUP_ID
-			AND tp.DEL_FLAG = '0'
+				AND ugp.USER_ID = #{userId}
 			WHERE
 				gp.DEL_FLAG = '0'
+				AND gp.STATE <![CDATA[ AND gp.STATE <> ]]> 20
 				AND gp.GRID_ID = #{gridId}
-			<![CDATA[ AND gp.STATE <> ]]> 20
+			)
 		GROUP BY
 			gp.ID
-		ORDER BY
-			MAX( tp.CREATED_TIME ) DESC
-		) tmp
+		) t
+		LEFT JOIN epdc_group_topic_user_read ugpr ON t.ID = ugpr.GROUP_ID
+		AND ugpr.DEL_FLAG = '0'
+		AND ugpr.USER_ID = #{userId}
+		AND ugpr.READ_FLAG = '0'
+		LEFT JOIN epdc_topic tp ON t.ID = tp.GROUP_ID
+		AND tp.DEL_FLAG = '0'
+	GROUP BY
+		t.ID
 ORDER BY
 	latestTopicTime DESC
     </select>

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java

@@ -114,24 +114,38 @@ public class UserController {
     }
 
     @GetMapping("export")
-    @DataFilter(tableAlias = "ug", isPendingCreator = false, deptId = "GRID_ID", prefix = "AND")
+    @DataFilter(tableAlias = "u", isPendingCreator = false, deptId = "DEPT_ID", prefix = "AND")
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<UserDTO> list = userService.list(params);
         String auditState = (String) params.get("state");
         // 状态(0-未审核，1-审核通过，2-审核未通过)
         String fileName = null;
-        if (AppUserStatesEnum.STATE_COMPLETED_INFORMATION_PENDING_REVIEW.equals(auditState)) {
-            fileName = "未审核";
-        } else if (AppUserStatesEnum.STATE_INFORMATION_PASSED.equals(auditState)) {
-            fileName = "审核通过";
-        } else if (AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.equals(auditState)) {
-            fileName = "审核未通过";
-        } else if (AppUserStatesEnum.STATE_REGISTERED.equals(auditState)) {
-            fileName = "已注册";
+        if (AppUserStatesEnum.STATE_COMPLETED_INFORMATION_PENDING_REVIEW.value().equals(auditState)) {
+            fileName = "待认证居民";
+        } else if (AppUserStatesEnum.STATE_INFORMATION_PASSED.value().equals(auditState)) {
+            fileName = "已认证居民";
+        } else if (AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value().equals(auditState)) {
+            fileName = "居民认证失败";
+        } else if (AppUserStatesEnum.STATE_REGISTERED.value().equals(auditState)) {
+            fileName = "未认证居民";
         }
         ExcelUtils.exportExcelToTarget(response, fileName, list, UserExcel.class);
     }
 
+    /***
+     *  未认证导出
+     * @param params
+     * @param response
+     * @return void
+     * @author qushutong
+     * @date 2020/3/18 15:59
+     */
+    @GetMapping("unauthorizedexport")
+    @DataFilter(tableAlias = "ug", isPendingCreator = false, deptId = "GRID_ID", prefix = "AND")
+    public void unauthorizedExport(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<UserDTO> list = userService.list(params);
+        ExcelUtils.exportExcelToTarget(response, "未认证居民", list, UserExcel.class);
+    }
 
     /***
      * 批量导入
@@ -156,4 +170,32 @@ public class UserController {
     public Result<UserDTO> handleUserPoints(@RequestBody @Valid EpdcUserPointsFormDTO formDTO) {
         return userService.handleUserPoints(formDTO);
     }
+
+    /***
+     * 展示所有的
+     * @param params
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < com.elink.esua.epdc.dto.UserDTO>>
+     * @author qushutong
+     * @date 2020/3/16 10:51
+     */
+    @GetMapping("alluserpage")
+    public Result<PageData<UserDTO>> alluserpage(@RequestParam Map<String, Object> params) {
+        PageData<UserDTO> page = userService.allUserPage(params);
+        return new Result<PageData<UserDTO>>().ok(page);
+    }
+
+
+    /***
+     * 已认证居民
+     * @param params
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < com.elink.esua.epdc.dto.UserDTO>>
+     * @author qushutong
+     * @date 2020/3/16 16:54
+     */
+    @GetMapping("authenticatedpage")
+    @DataFilter(tableAlias = "u", isPendingCreator = false, deptId = "DEPT_ID", prefix = "AND")
+    public Result<PageData<UserDTO>> authenticatedpage(@RequestParam Map<String, Object> params) {
+        PageData<UserDTO> page = userService.authenticatedpage(params);
+        return new Result<PageData<UserDTO>>().ok(page);
+    }
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java

@@ -208,4 +208,15 @@ public interface UserDao extends BaseDao<UserEntity> {
      * @since 2020/3/7 15:31
      */
     List<UserDTO> selectListOfOrganizationInfo(String deptId);
+
+
+    /***
+     * 用户不关联网格关系表
+     * @param params
+     * @return java.util.List<com.elink.esua.epdc.dto.UserDTO>
+     * @author qushutong
+     * @date 2020/3/16 16:18
+     */
+    List<UserDTO> selectAuthenticatedListUserDto(Map<String, Object> params);
+
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java

@@ -329,4 +329,25 @@ public interface UserService extends BaseService<UserEntity> {
      * @since 2020/3/7 1:23
      */
     void modifyOrganizationInfo(OrganizationModifyDTO dto);
+
+
+    /***
+     * 所有用户 用来锁定已注册在别的微信里面的信息
+     * @param params
+     * @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.UserDTO>
+     * @author qushutong
+     * @date 2020/3/16 10:53
+     */
+    PageData<UserDTO> allUserPage(Map<String, Object> params);
+
+
+    /***
+     * 已认证列表
+     * @param params
+     * @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.UserDTO>
+     * @author qushutong
+     * @date 2020/3/16 16:16
+     */
+    PageData<UserDTO> authenticatedpage(Map<String, Object> params);
+
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -157,7 +157,12 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     @Override
     public List<UserDTO> list(Map<String, Object> params) {
         this.verifyParams(params);
+        String auditState = (String) params.get("state");
+        if (AppUserStatesEnum.STATE_REGISTERED.value().equals(auditState)) {
             return this.baseDao.selectListUserDto(params);
+        } else {
+            return this.baseDao.selectAuthenticatedListUserDto(params);
+        }
     }
 
     private Map<String, Object> verifyParams(Map<String, Object> params) {
@@ -653,9 +658,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         }
 
         UserEntity userEntity = ConvertUtils.sourceToTarget(completeAppUser, UserEntity.class);
-        if (StringUtils.isBlank(userEntity.getWxUnionId())) {
-            userEntity.setWxUnionId(null);
-        }
+        userEntity.setWxUnionId(StringUtils.isBlank(userEntity.getWxUnionId()) ? null : userEntity.getWxUnionId());
+        userEntity.setFaceImg(StringUtils.isBlank(userEntity.getFaceImg()) ? null : userEntity.getFaceImg());
         if (findUser.getState().equals(AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value())) {
             userEntity.setState(AppUserStatesEnum.STATE_COMPLETED_INFORMATION_PENDING_REVIEW.value());
         }
@@ -680,6 +684,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         }
         UserDTO userDto = ConvertUtils.sourceToTarget(userEntity, UserDTO.class);
         userDto.setLeaderFlag(relationInfo.getLeaderFlag());
+        userDto.setFaceImg(StringUtils.isBlank(userDto.getFaceImg()) ? findUser.getFaceImg() : userDto.getFaceImg());
         return userDto;
     }
 
@@ -1325,12 +1330,12 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         }
     }
 
+
     /**
-     *
      * 组织机构信息处理
      *
-     * @params [dto, userList]
      * @return java.util.List<com.elink.esua.epdc.entity.UserEntity>
+     * @params [dto, userList]
      * @author liuchuang
      * @since 2020/3/7 15:22
      */
@@ -1365,4 +1370,34 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
 
         return entities;
     }
+
+    @Override
+    @DataSource(value = DataSourceNames.FIRST)
+    public PageData<UserDTO> allUserPage(Map<String, Object> params) {
+        String[] paramKeys = new String[]{"nickname", "identityNo", "realName", "identityNo", "mobile", "startTime", "endTime"};
+        if (AppUserUtils.isDefaultQuery(params, paramKeys)) {
+            List<UserDTO> userDtoList = Lists.newArrayList();
+            return new PageData<>(userDtoList, NumConstant.ZERO);
+        }
+        this.verifyParams(params);
+        // 查询当前用户所具有的的数据权限
+        IPage<UserDTO> iPage = this.getPage(params);
+        List<UserDTO> userDtoList = this.baseDao.selectListUserDto(params);
+        return new PageData<>(userDtoList, iPage.getTotal());
+    }
+
+    @Override
+    public PageData<UserDTO> authenticatedpage(Map<String, Object> params) {
+        String[] paramKeys = new String[]{"streetId", "communityId", "gridId", "realName", "identityNo", "startTime", "endTime", "nickname", "mobile"};
+        if (AppUserUtils.isDefaultQuery(params, paramKeys)) {
+            List<UserDTO> userDtoList = Lists.newArrayList();
+            return new PageData<>(userDtoList, NumConstant.ZERO);
+        }
+        this.verifyParams(params);
+        // 查询当前用户所具有的的数据权限
+        IPage<UserDTO> iPage = this.getPage(params);
+        List<UserDTO> userDtoList = this.baseDao.selectAuthenticatedListUserDto(params);
+        return new PageData<>(userDtoList, iPage.getTotal());
+    }
+
 }

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

@@ -89,9 +89,9 @@
     <select id="hasAuthenticationPartyPage" resultType="com.elink.esua.epdc.dto.PartyMembersDTO">
         SELECT
             pm.CADRE_FLAG, pm.CREATED_BY,eu.CREATED_TIME, pm.DEPT_ID,
-            pm.ID,pm.IDENTITY_NO,eu.MOBILE,pm.POST,
-            pm.POST_VALUE,pm.REAL_NAME,pm.REGIST_FLAG,eu.REGISTER_TIME as registTime,
-            GROUP_CONCAT( ut.TAG_NAME ) TAG_NAME, pm.ALL_DEPT_NAMES as allDeptNames
+            pm.ID,eu.IDENTITY_NO,eu.MOBILE,pm.POST,
+            pm.POST_VALUE,eu.REAL_NAME,pm.REGIST_FLAG,eu.REGISTER_TIME as registTime,
+            GROUP_CONCAT( ut.TAG_NAME ) TAG_NAME, eu.ALL_DEPT_NAMES as allDeptNames
         FROM
             epdc_user eu
             LEFT JOIN epdc_party_members pm on pm.IDENTITY_NO = eu.IDENTITY_NO and pm.REAL_NAME = eu.REAL_NAME

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

@@ -70,7 +70,8 @@
         ADDRESS,
         STATE,
         PARTY_FLAG,
-        ug.ALL_DEPT_NAMES AS myGridName
+        ug.ALL_DEPT_NAMES,
+        u.FACE_IMG
         FROM
         epdc_user u
         LEFT JOIN epdc_user_grid_relation ug ON u.ID = ug.USER_ID
@@ -320,7 +321,8 @@
     </select>
 
     <!--  获取用户列表：党员认证失败  -->
-    <select id="selectPartyAuthenticationFailedList" parameterType="com.elink.esua.epdc.dto.epdc.form.EpdcWorkUserFromDTO"
+    <select id="selectPartyAuthenticationFailedList"
+            parameterType="com.elink.esua.epdc.dto.epdc.form.EpdcWorkUserFromDTO"
             resultType="com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO">
         SELECT
         u.ID as userId,
@@ -356,7 +358,8 @@
     </select>
 
     <!-- 根据网格id查询网格下所有的用户 -->
-    <select id="selectListGridUserResultDTO" parameterType="map" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcGridUserResultDTO">
+    <select id="selectListGridUserResultDTO" parameterType="map"
+            resultType="com.elink.esua.epdc.dto.epdc.result.EpdcGridUserResultDTO">
         SELECT
         eu.id AS userId,
         eu.NICKNAME,
@@ -494,4 +497,45 @@
             FIND_IN_SET( #{deptId}, ALL_DEPT_IDS )
     </select>
 
+
+    <select id="selectAuthenticatedListUserDto" resultType="com.elink.esua.epdc.dto.UserDTO">
+        SELECT
+        u.id,
+        u.REAL_NAME,
+        u.NICKNAME,
+        u.MOBILE,
+        u.REGISTER_TIME,
+        u.CREATED_TIME,
+        IDENTITY_NO,
+        ADDRESS,
+        STATE,
+        PARTY_FLAG,
+        u.ALL_DEPT_NAMES,
+        u.FACE_IMG
+        FROM
+        epdc_user u
+        where
+        u.del_flag = '0'
+        <if test="startTime != '' and endTime != ''">and u.CREATED_TIME between #{startTime} and #{endTime}</if>
+        <if test="state != '' and state != null">and u.state = #{state}</if>
+        <if test="realName != '' and realName != null">and u.real_name like '%${realName}%'</if>
+        <if test="nickname != '' and nickname != null">and u.NICKNAME like '%${nickname}%'</if>
+        <if test="mobile != '' and mobile != null">and u.mobile like '%${mobile}%'</if>
+        <if test="identityNo != '' and identityNo != null">and u.identity_no like '%${identityNo}%'</if>
+        <if test="partyFlag != '' and partyFlag != null">and u.party_flag = #{partyFlag}</if>
+        <if test="streetId != '' and streetId != null">
+            AND (find_in_set(#{streetId},u.PARENT_DEPT_IDS)
+            OR find_in_set(#{streetId},u.ALL_DEPT_IDS))
+        </if>
+        <if test="communityId != '' and communityId != null">
+            AND (find_in_set(#{communityId},u.PARENT_DEPT_IDS)
+            OR find_in_set(#{communityId},u.ALL_DEPT_IDS))
+        </if>
+        <if test="gridId != '' and gridId != null">
+            AND
+            find_in_set(#{gridId},u.ALL_DEPT_IDS)
+        </if>
+        ORDER BY
+        u.register_time desc
+    </select>
 </mapper>