用户完善信息接口修改、用户列表接口修改

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

@@ -148,5 +148,12 @@ public interface UserDao extends BaseDao<UserEntity> {
      */
     int selectCountUnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto);
 
-
+    /**
+     * @param workUserFromDto
+     * @return java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO>
+     * @Author yinzuomei
+     * @Description 获取用户列表：党员认证失败
+     * @Date 2019/12/7 11:23
+     **/
+    List<EpdcWorkUserResultDTO> selectPartyAuthenticationFailedList(EpdcWorkUserFromDTO workUserFromDto);
 }

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

@@ -90,6 +90,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     private UserDetailRedis userDetailRedis;
     @Autowired
     private AdminFeignClient adminFeignClient;
+    @Autowired
+    private PartyAuthenticationFailedDao partyAuthenticationFailedDao;
     @Override
     public PageData<UserDTO> page(Map<String, Object> params) {
         this.verifyParams(params);
@@ -488,9 +490,6 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         return new Result<String>().ok(userEntity.getState());
     }
 
-    @Autowired
-    private PartyAuthenticationFailedDao partyAuthenticationFailedDao;
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result<UserDTO> completeUserInfo(EpdcAppUserCompleteInfoFormDTO formDto) {
@@ -535,6 +534,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
                 partyAuthenticationFailedDao.insert(authenticationFailedEntity);
 
                 userDto.setState(AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value());
+                userDto.setPartyFlag(YesOrNoEnum.NO.value());//是否是党员(0-否，1-是)  认证失败：0
                 userAuthenticateHistoryEntity.setAuthenticatedFlag(YesOrNoEnum.NO.value());
             } else {
                 UpdateWrapper<PartyMembersEntity> partyUpdate = new UpdateWrapper<>();
@@ -543,6 +543,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
 
                 this.partyMembersDao.update(partyMembersEntity, partyUpdate);
                 userAuthenticateHistoryEntity.setAuthenticatedFlag(YesOrNoEnum.YES.value());
+                userDto.setPartyFlag(YesOrNoEnum.YES.value());//是否是党员(0-否，1-是)  认证失败：0
             }
             //插入用户认证历史表
             userAuthenticateHistoryEntity.setUserId(userId);
@@ -662,6 +663,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
 
     @Override
     public Result<List<EpdcWorkUserResultDTO>> getWorkUserList(EpdcWorkUserFromDTO workUserFromDto) {
+//        authenticatedFlag是否已认证 0否 1是
+//        partyFlag 是否党员，0否，1是
         int pageIndex = (workUserFromDto.getPageIndex() - NumConstant.ONE) * workUserFromDto.getPageSize();
         workUserFromDto.setPageIndex(pageIndex);
 
@@ -678,6 +681,10 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         // 查询认证失败的党员
         if (YesOrNoEnum.YES.value().equals(partyFlag) && YesOrNoEnum.NO.value().equals(authenticatedFlag)) {
             state = AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value();
+            workUserFromDto.setAuthenticatedFlag(state);
+            workUserFromDto.setPartyFlag(YesOrNoEnum.NO.value());
+            List<EpdcWorkUserResultDTO> epdcWorkUserResultDTOS = baseDao.selectPartyAuthenticationFailedList(workUserFromDto);
+            return new Result<List<EpdcWorkUserResultDTO>>().ok(epdcWorkUserResultDTOS);
         }
         workUserFromDto.setAuthenticatedFlag(state);
 

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

@@ -317,5 +317,39 @@
         </choose>
     </select>
 
+    <!--  获取用户列表：党员认证失败  -->
+    <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,
+        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
+        WHERE u.DEL_FLAG = '0'
+        AND ug.DEL_FLAG = '0'
+        <if test="partyFlag ='0' and authenticatedFlag ='2'">
+            and EXISTS(select m.USER_ID
+            from epdc_party_authentication_failed m
+            where m.USER_ID=u.id)
+        </if>
+        <choose>
+            <when test="gridId != null and gridId > 0">AND ug.GRID_ID = #{gridId}</when>
+            <otherwise>
+            <if test="gridIdList!=null and gridIdList.size()>0">
+                AND ug.GRID_ID in
+                <foreach collection="gridIdList" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            </otherwise>
+        </choose>
+        GROUP BY
+        u.ID
+        ORDER BY u.CREATED_TIME DESC
+        LIMIT #{pageIndex},#{pageSize}
+    </select>
 
 </mapper>