From a0971b262ab506aadca0879906006b1a964d09e8 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 22 May 2020 17:12:19 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=B1=85=E6=B0=91=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=85=9A=E5=91=98=E7=AE=A1=E7=90=86=E3=80=91=E3=80=90=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E6=95=B0=E9=87=8F=E7=A1=AE=E4=BF=9D=E4=B8=80=E7=9B=B4?= =?UTF-8?q?=E3=80=91-=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-05-22?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/user/result/GridOpeningResultDTO.java | 2 +- .../user/result/UserDataRankResultDTO.java | 2 +- .../modules/user/dao/UserAnalysisDao.java | 21 +- .../service/impl/UserAnalysisServiceImpl.java | 35 +- .../resources/mapper/user/UserAnalysisDao.xml | 293 +++++++++++- .../esua/epdc/modules/item/dao/ItemDao.java | 2 +- .../controller/PartyMembersController.java | 2 +- .../esua/epdc/controller/UserController.java | 6 +- .../java/com/elink/esua/epdc/dao/UserDao.java | 32 +- .../PartyAuthenticationFailedServiceImpl.java | 2 + .../service/impl/PartyMembersServiceImpl.java | 4 +- .../epdc/service/impl/UserServiceImpl.java | 15 +- .../main/resources/mapper/PartyMembersDao.xml | 26 +- .../src/main/resources/mapper/UserDao.xml | 418 ++++++++++++++++-- 14 files changed, 779 insertions(+), 81 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridOpeningResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridOpeningResultDTO.java index 42d92ff83..3a9fdae96 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridOpeningResultDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridOpeningResultDTO.java @@ -26,7 +26,7 @@ public class GridOpeningResultDTO implements Serializable { */ private int registerCount = 0; /** - * 居民数（包括认证成功和认证失败的居民） + * 居民数（包括认证成功和党员认证失败的居民） */ private int residentCount = 0; diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserDataRankResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserDataRankResultDTO.java index f215ae909..a725e5cfc 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserDataRankResultDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserDataRankResultDTO.java @@ -38,7 +38,7 @@ public class UserDataRankResultDTO { */ private Integer unknownSexCount; /** - * 居民数（包括认证成功和认证失败的居民） + * 居民数（包括认证成功和党员认证居民失败的居民） */ private Integer residentCount; /** diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java index 5b7b63619..ec47adbc1 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java @@ -7,7 +7,6 @@ import com.elink.esua.epdc.dto.user.form.UserCountDTO; import com.elink.esua.epdc.dto.user.form.UserSortRankFormDTO; import com.elink.esua.epdc.dto.user.result.*; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -242,5 +241,25 @@ public interface UserAnalysisDao extends BaseMapper { */ List selectExportEnterpriseCount(ExportOperationFormDTO exportOperationFormDTO); + /** + * 查询党员数据排行 + * + * @param params + * @return java.util.List + * @author wanggongfeng + * @date 2020/5/20 14:48 + */ + List selectListUserDataRankByParty(Map params); + + /** + * 查询居民数据排行 + * + * @param params + * @return java.util.List + * @author wanggongfeng + * @date 2020/5/20 14:48 + */ + List selectListUserDataRankByUser(Map params); + } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java index 274e26ca7..ee9d26ec4 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java @@ -82,7 +82,7 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl registerDataList = baseDao.selectListReigistData(params); // 未认证用户数 - List unAuthCountList = baseDao.selectListUnAuthorizedCountByGridId(params); + //List unAuthCountList = baseDao.selectListUnAuthorizedCountByGridId(params); // 新闻数 通知数 议题数 List nneCountList = baseDao.selectListNewsNoticeEventCount(params); // 项目数，项目结案数，项目好评数 @@ -93,8 +93,14 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl getListUserDataRankResultDro(Map params) { - List list = baseDao.selectListUserDataRank(params); + /*List list = baseDao.selectListUserDataRank(params); if (CollUtil.isNotEmpty(list)) { List streetIdList = Lists.newArrayList(); @@ -179,6 +185,19 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl list = new ArrayList(); + // 党员排行列表 + if (StringUtils.isNotBlank(partyFlag) && YesOrNoEnum.YES.value().equals(partyFlag)) { + list = baseDao.selectListUserDataRankByParty(params); + } else { + list = baseDao.selectListUserDataRankByUser(params); + } return list; } @@ -295,7 +314,7 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl exportOperationDataResultDTOS = baseDao.selectExportUserCount(exportOperationFormDTO); // 未认证用户 - List unAuthorizedResultDTOS = baseDao.selectExportunAuthorizedCount(exportOperationFormDTO); + //List unAuthorizedResultDTOS = baseDao.selectExportunAuthorizedCount(exportOperationFormDTO); List newsResultDTOS = baseDao.selectExportNewsCount(exportOperationFormDTO); // 议题 @@ -313,13 +332,13 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl enterpriseDataResultDTOS = baseDao.selectExportEnterpriseCount(exportOperationFormDTO); //居民数 for (int i = 0; i < exportOperationDataResultDTOS.size(); i++) { - for (ExportOperationDataResultDTO item : unAuthorizedResultDTOS) { + /*for (ExportOperationDataResultDTO item : unAuthorizedResultDTOS) { if (exportOperationDataResultDTOS.get(i).getStreetName().equals(item.getStreetName())) { exportOperationDataResultDTOS.get(i).setRegisterCount(exportOperationDataResultDTOS.get(i).getRegisterCount() + item.getUnAuthorizedCount()); } else { exportOperationDataResultDTOS.get(i).setRegisterCount(exportOperationDataResultDTOS.get(i).getRegisterCount()); } - } + }*/ exportOperationDataResultDTOS.get(i).setNewsCount(newsResultDTOS.get(i).getNewsCount()); exportOperationDataResultDTOS.get(i).setItemCount(itemDataResultDTOS.get(i).getItemCount()); exportOperationDataResultDTOS.get(i).setItemCloseCount(itemDataResultDTOS.get(i).getItemCloseCount()); diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml index de646727f..d34158a72 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml @@ -60,6 +60,7 @@ order by residentCount desc order by t1.streetId asc + @@ -434,34 +483,70 @@ + SELECT + t1.*, + t1.oldCount / t1.partyMemberCount oldPercent, + t1.youngCount / t1.partyMemberCount youngPercent + FROM ( + SELECT + t.streetName, t.streetId, + count( (t.AUTHENTICATED_TYPE='1' and t.AUTHENTICATED_FLAG = '1' and t.SEX = '1') OR NULL ) maleCount, + count( (t.AUTHENTICATED_TYPE='1' and t.AUTHENTICATED_FLAG = '1' and t.SEX = '0') OR NULL ) femaleCount, + count( (t.AUTHENTICATED_TYPE='1' and t.AUTHENTICATED_FLAG = '1' and t.SEX = '2') OR NULL ) unknownSexCount, + COUNT( (t.AUTHENTICATED_TYPE='1' and t.AUTHENTICATED_FLAG = '1') OR NULL ) partyMemberCount, + count((t.AUTHENTICATED_TYPE='1' and t.AUTHENTICATED_FLAG = '0' ) or null ) partyAuthFailureCount, + COUNT( (t.AUTHENTICATED_TYPE='1' and t.AUTHENTICATED_FLAG = '1' and t.age > 50) OR NULL ) oldCount, + COUNT( (t.AUTHENTICATED_TYPE='1' and t.AUTHENTICATED_FLAG = '1' and t.age <= 50 AND t.age > 0 ) OR NULL ) youngCount + FROM ( + + SELECT + uu.ID AS userId, + CASE WHEN uu.SEX is null or uu.SEX != '0' AND uu.SEX != '1' THEN '2' ELSE uu.SEX END AS SEX, + uu.STATE, uu.PARTY_FLAG, uu.DEPT_ID, + IFNULL( TIMESTAMPDIFF( YEAR, uu.BIRTHDAY, CURDATE()), 0 ) age, + ad2.`name` streetName, ad2.id streetId, + HISTORY.AUTHENTICATED_TYPE, + HISTORY.AUTHENTICATED_FLAG + FROM + esua_epdc_user.epdc_user uu + LEFT JOIN (SELECT MIN( CREATED_TIME ) AS CREATED_TIME, USER_ID FROM esua_epdc_user.epdc_user_grid_relation WHERE DEL_FLAG = '0' GROUP BY USER_ID ) MINRELA ON MINRELA.USER_ID = uu.ID + LEFT JOIN esua_epdc_user.epdc_user_grid_relation RELATION ON RELATION.USER_ID = MINRELA.USER_ID AND RELATION.DEL_FLAG = '0' AND MINRELA.CREATED_TIME = RELATION.CREATED_TIME + LEFT JOIN esua_epdc_admin.sys_dept ad ON IFNULL(uu.DEPT_ID,RELATION.GRID_ID) = ad.ID AND ad.type_key = 'grid_party' + + + LEFT JOIN ( + SELECT MAX( CREATED_TIME ) AS CREATED_TIME, USER_ID + FROM esua_epdc_user.epdc_user_authenticate_history + WHERE DEL_FLAG = '0' AND AUTHENTICATED_TYPE IN ( '0', '1' ) + + and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') <= #{endTime} + + GROUP BY USER_ID + ) MAXHIS ON MAXHIS.USER_ID = uu.ID + + LEFT JOIN esua_epdc_user.epdc_user_authenticate_history HISTORY ON HISTORY.USER_ID = MAXHIS.USER_ID AND HISTORY.CREATED_TIME = MAXHIS.CREATED_TIME AND HISTORY.DEL_FLAG = '0' + + + WHERE uu.DEL_FLAG = '0' + + AND ad2.ID = #{gridId} + + + AND ad2.ID in + #{deptId} + + + + + AND DATE_FORMAT(uu.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime} + + AND ad2.id is NOT NULL + AND ad.id IS NOT NULL + + + ) t GROUP BY t.streetId + ) t1 + + order by t1.oldCount desc + order by t1.youngCount desc + order by t1.oldCount asc + order by t1.youngCount asc + order by t1.userCount desc + order by t1.userCount asc + order by t1.userCount desc + order by t1.partyMemberCount desc + order by residentCount desc + order by t1.streetId asc + + + + + diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java index e98b97c67..897391324 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java @@ -187,7 +187,7 @@ public interface ItemDao extends BaseDao { * @author liuchuang * @since 2019/10/30 13:28 */ - int selectCountOfItemDeptNotice(Long deptId, int state); + int selectCountOfItemDeptNotice(@Param("deptId") Long deptId, @Param("state") int state); /** * 根据吹哨部门ID统计吹哨部门待处理项目数量 diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java index c01b05db2..906fc241f 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java @@ -171,7 +171,7 @@ public class PartyMembersController { * @date 2020/3/19 13:34 */ @GetMapping("optimizeHasAuthenticationPartyPage") - @DataFilter(tableAlias = "eu", prefix = "AND", isPendingCreator = false) +// @DataFilter(tableAlias = "eu", prefix = "AND", isPendingCreator = false) public Result> optimizeHasAuthenticationPartyPage(@RequestParam Map params) { return partyMembersService.optimizeHasAuthenticationPartyPage(params); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java index 1b1b69596..93a950381 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java @@ -56,7 +56,7 @@ public class UserController { private UserService userService; @GetMapping("page") - @DataFilter(tableAlias = "ug", isPendingCreator = false, deptId = "GRID_ID", prefix = "AND") +// @DataFilter(tableAlias = "ug", isPendingCreator = false, deptId = "GRID_ID", prefix = "AND") public Result> page(@RequestParam Map params) { PageData page = userService.page(params); return new Result>().ok(page); @@ -72,7 +72,7 @@ public class UserController { * @since 2020/3/24 15:47 */ @GetMapping("waitPartyPage") - @DataFilter(tableAlias = "u", isPendingCreator = false, deptId = "DEPT_ID", prefix = "AND") +// @DataFilter(tableAlias = "u", isPendingCreator = false, deptId = "DEPT_ID", prefix = "AND") public Result> waitPartyPage(@RequestParam Map params) { PageData page = userService.waitPartyPage(params); return new Result>().ok(page); @@ -278,7 +278,7 @@ public class UserController { * @date 2020/3/16 16:54 */ @GetMapping("authenticatedpage") - @DataFilter(tableAlias = "u", isPendingCreator = false, deptId = "DEPT_ID", prefix = "AND") +// @DataFilter(tableAlias = "u", isPendingCreator = false, deptId = "DEPT_ID", prefix = "AND") public Result> authenticatedpage(@RequestParam Map params) { PageData page = userService.authenticatedpage(params); return new Result>().ok(page); diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java index 5a53924d3..d9c83f770 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java @@ -20,7 +20,6 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.CachingUserInfoDTO; import com.elink.esua.epdc.dto.UserDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcAppQueryUserInfoFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUnauthorizedAmountFromDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcWorkUserFromDTO; @@ -241,4 +240,35 @@ public interface UserDao extends BaseDao { */ List selectWaitAuthenticatedListUserDto(Map params); + /*** + * 已认证居民 + * @param params + * @return java.util.List + * @author wanggongfeng + * @date 2020/5/22 13:18 + */ + List selectAuthenticatedListUserDtoByList(Map params); + + /*** + * 未认证居民 + * @param params + * @return java.util.List + * @author wanggongfeng + * @date 2020/5/22 13:18 + */ + List selectListUserDtoByList(Map params); + + /** + * + * 认证失败居民 + * + * @params [params] + * @param params + * @return java.util.List + * @author wanggongfeng + * @date 2020/5/22 13:18 + */ + List selectFaildAuthenticatedListUserDto(Map params); + + } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyAuthenticationFailedServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyAuthenticationFailedServiceImpl.java index f1614a0f7..254bf7bd7 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyAuthenticationFailedServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyAuthenticationFailedServiceImpl.java @@ -22,6 +22,7 @@ import com.elink.esua.epdc.commons.dynamic.datasource.annotation.DataSource; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.dao.PartyAuthenticationFailedDao; import com.elink.esua.epdc.datasources.DataSourceNames; @@ -63,6 +64,7 @@ public class PartyAuthenticationFailedServiceImpl extends BaseServiceImpl page = this.getPage(params); List list = baseDao.selectListDto(params); return new PageData<>(list, page.getTotal()); diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java index 0eff4f157..e031abbff 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java @@ -24,14 +24,13 @@ import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.dynamic.datasource.annotation.DataSource; -import com.elink.esua.epdc.async.PartyTask; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; -import com.elink.esua.epdc.commons.tools.constant.Constant; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; @@ -509,6 +508,7 @@ public class PartyMembersServiceImpl extends BaseServiceImpl> optimizeHasAuthenticationPartyPage(Map params) { + params.put("deptIdList", SecurityUser.getUser().getDeptIdList()); IPage page = getPage(params); List userIds = baseDao.optimizeHasAuthenticationPartyPage(params); if (userIds.size() > 0) { diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index abbc20ef6..b798f9992 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -145,14 +145,16 @@ public class UserServiceImpl extends BaseServiceImpl implem } this.verifyParams(params); // 查询当前用户所具有的的数据权限 + params.put("deptIdList",SecurityUser.getUser().getDeptIdList()); IPage iPage = this.getPage(params); - List userDtoList = this.baseDao.selectListUserDto(params); + List userDtoList = this.baseDao.selectListUserDtoByList(params); return new PageData<>(userDtoList, iPage.getTotal()); } @Override public PageData waitPartyPage(Map params) { this.verifyParams(params); + params.put("deptIdList",SecurityUser.getUser().getDeptIdList()); IPage iPage = this.getPage(params); List userDtoList = this.baseDao.selectListOfWaitPartyUserDto(params); return new PageData<>(userDtoList, iPage.getTotal()); @@ -1551,14 +1553,23 @@ public class UserServiceImpl extends BaseServiceImpl implem } this.verifyParams(params); // 查询当前用户所具有的的数据权限 + params.put("deptIdList",SecurityUser.getUser().getDeptIdList()); if (NumConstant.ONE_STR.equals(params.get("state").toString())) { + // 待认证 IPage iPage = this.getPage(params); List userDtoList = this.baseDao.selectWaitAuthenticatedListUserDto(params); return new PageData<>(userDtoList, iPage.getTotal()); + } else if (NumConstant.THREE_STR.equals(params.get("state").toString())){ + // 已认证 + IPage iPage = this.getPage(params); + List userDtoList = this.baseDao.selectAuthenticatedListUserDtoByList(params); + return new PageData<>(userDtoList, iPage.getTotal()); } else { + // 认证失败 IPage iPage = this.getPage(params); - List userDtoList = this.baseDao.selectAuthenticatedListUserDto(params); + List userDtoList = this.baseDao.selectFaildAuthenticatedListUserDto(params); return new PageData<>(userDtoList, iPage.getTotal()); + } } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml index 107800d01..8b4aaec59 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml @@ -160,14 +160,29 @@ eu.ID FROM epdc_user eu + LEFT JOIN ( + SELECT + MAX( CREATED_TIME ) AS CREATED_TIME, + USER_ID + FROM + epdc_user_authenticate_history + WHERE + DEL_FLAG = '0' + AND AUTHENTICATED_TYPE IN ( '0', '1' ) + + and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') <= #{endTime} + + GROUP BY USER_ID + ) MAXHIS ON MAXHIS.USER_ID = eu.ID + LEFT JOIN epdc_user_authenticate_history HISTORY ON HISTORY.USER_ID = MAXHIS.USER_ID AND HISTORY.CREATED_TIME = MAXHIS.CREATED_TIME AND HISTORY.DEL_FLAG = '0' WHERE - eu.PARTY_FLAG = '1' and eu.DEL_FLAG = '0' + eu.DEL_FLAG = '0' and eu.REAL_NAME = #{realName} and eu.MOBILE = #{mobile} and eu.IDENTITY_NO = #{identityNo} and eu.REGIST_FLAG = #{registFlag} - and eu.CREATED_TIME >= #{startTime} - #{endTime} + and DATE_FORMAT(eu.CREATED_TIME,'%Y-%m-%d') >= #{startTime} + #{endTime} AND (find_in_set(#{streetId},eu.PARENT_DEPT_IDS) OR find_in_set(#{streetId},eu.ALL_DEPT_IDS)) @@ -177,6 +192,11 @@ and (eu.dept_id = #{gridId} OR find_in_set(#{gridId},eu.ALL_DEPT_IDS)) + AND eu.DEPT_ID IN + + #{deptId} + + and (HISTORY.AUTHENTICATED_TYPE='1' and HISTORY.AUTHENTICATED_FLAG = '1') ORDER BY eu.REGISTER_TIME DESC diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml index 7a9355a2b..d80feaae5 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml @@ -102,44 +102,7 @@ u.ID ORDER BY u.register_time desc - - + + + + + +