已认证居民修改

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

@@ -155,4 +155,19 @@ public class UserController {
         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

@@ -189,4 +189,14 @@ public interface UserDao extends BaseDao<UserEntity> {
      */
     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

@@ -319,4 +319,14 @@ public interface UserService extends BaseService<UserEntity> {
      */
     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

@@ -1180,4 +1180,18 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         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/UserDao.xml

@@ -410,4 +410,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 (u.grid_id = #{gridId}
+            OR find_in_set(#{gridId},u.ALL_DEPT_IDS))
+        </if>
+        ORDER BY
+        u.register_time desc
+    </select>
 </mapper>