diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml
index fa7ef629d..97bf9facb 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml
@@ -108,82 +108,71 @@
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 42c1c4d9d..66c368e58 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
@@ -112,24 +112,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 params, HttpServletResponse response) throws Exception {
List 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 params, HttpServletResponse response) throws Exception {
+ List list = userService.list(params);
+ ExcelUtils.exportExcelToTarget(response, "未认证居民", list, UserExcel.class);
+ }
/***
* 批量导入
@@ -139,7 +153,35 @@ public class UserController {
* @date 2019/10/24 14:55
*/
@PostMapping("importExcel")
- public Result importExcel(@RequestParam("file") MultipartFile file,@RequestParam Map params) {
- return userService.insertUserList(file,params);
+ public Result importExcel(@RequestParam("file") MultipartFile file, @RequestParam Map params) {
+ return userService.insertUserList(file, params);
+ }
+
+ /***
+ * 展示所有的
+ * @param params
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @author qushutong
+ * @date 2020/3/16 10:51
+ */
+ @GetMapping("alluserpage")
+ public Result> alluserpage(@RequestParam Map params) {
+ PageData page = userService.allUserPage(params);
+ return new Result>().ok(page);
+ }
+
+
+ /***
+ * 已认证居民
+ * @param params
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @author qushutong
+ * @date 2020/3/16 16:54
+ */
+ @GetMapping("authenticatedpage")
+ @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 e53bb438b..1dc4fa5f1 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
@@ -188,4 +188,15 @@ public interface UserDao extends BaseDao {
* @since 2020/3/7 15:31
*/
List selectListOfOrganizationInfo(String deptId);
+
+
+ /***
+ * 用户不关联网格关系表
+ * @param params
+ * @return java.util.List
+ * @author qushutong
+ * @date 2020/3/16 16:18
+ */
+ List selectAuthenticatedListUserDto(Map params);
+
}
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java
index 30c7e0227..533035a03 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java
@@ -308,4 +308,25 @@ public interface UserService extends BaseService {
* @since 2020/3/7 1:23
*/
void modifyOrganizationInfo(OrganizationModifyDTO dto);
+
+
+ /***
+ * 所有用户 用来锁定已注册在别的微信里面的信息
+ * @param params
+ * @return com.elink.esua.epdc.commons.tools.page.PageData
+ * @author qushutong
+ * @date 2020/3/16 10:53
+ */
+ PageData allUserPage(Map params);
+
+
+ /***
+ * 已认证列表
+ * @param params
+ * @return com.elink.esua.epdc.commons.tools.page.PageData
+ * @author qushutong
+ * @date 2020/3/16 16:16
+ */
+ PageData authenticatedpage(Map params);
+
}
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 1f2b7c0cc..66b43edac 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
@@ -129,7 +129,12 @@ public class UserServiceImpl extends BaseServiceImpl implem
@Override
public List list(Map params) {
this.verifyParams(params);
- return this.baseDao.selectListUserDto(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 verifyParams(Map params) {
@@ -595,9 +600,8 @@ public class UserServiceImpl extends BaseServiceImpl implem
EpdcCompleteAppUserDTO completeAppUser = formDto.getCompleteAppUser();
UserDTO userDto = ConvertUtils.sourceToTarget(completeAppUser, UserDTO.class);
- if (StringUtils.isBlank(userDto.getWxUnionId())) {
- userDto.setWxUnionId(null);
- }
+ userDto.setWxUnionId(StringUtils.isBlank(userDto.getWxUnionId()) ? null : userDto.getWxUnionId());
+ userDto.setFaceImg(StringUtils.isBlank(userDto.getFaceImg()) ? null : userDto.getFaceImg());
UserGridRelationDTO userGridRelation = formDto.getUserGridRelation();
String userId = userDto.getId();
@@ -620,7 +624,7 @@ public class UserServiceImpl extends BaseServiceImpl implem
partyMembersEntity.setGridName(userGridRelation.getGrid());
partyMembersEntity.setRegistFlag(PartyMemberRegFlagEnum.AUTO.getValue());
partyMembersEntity.setMobile(userDto.getMobile());
- partyMembersEntity.setRegistTime(oldEntity.getRegisterTime());
+ partyMembersEntity.setRegistTime(new Date());
QueryWrapper partyWrapper = new QueryWrapper<>();
partyWrapper.eq(UserFieldConsant.IDENTITY_NO, identityNo)
.eq(UserFieldConsant.REAL_NAME, userDto.getRealName());
@@ -636,7 +640,7 @@ public class UserServiceImpl extends BaseServiceImpl implem
authenticationFailedEntity.setRealName(userDto.getRealName());
authenticationFailedEntity.setMobile(userDto.getMobile());
authenticationFailedEntity.setIdentityNo(identityNo);
- authenticationFailedEntity.setRegistTime(oldEntity.getRegisterTime());
+ authenticationFailedEntity.setRegistTime(new Date());
partyAuthenticationFailedDao.insert(authenticationFailedEntity);
userDto.setState(AppUserStatesEnum.STATE_COMPLETED_INFORMATION_PENDING_REVIEW.value());
@@ -692,7 +696,7 @@ public class UserServiceImpl extends BaseServiceImpl implem
UserGridRelationDTO relationInfo = userGridRelationService.getUserRelationInfo(userEntity.getId(), userGridRelation.getGridId());
userDto.setLeaderFlag(relationInfo.getLeaderFlag());
- userDto.setFaceImg(oldEntity.getFaceImg());
+ userDto.setFaceImg(StringUtils.isBlank(userDto.getFaceImg()) ? oldEntity.getFaceImg() : userDto.getFaceImg());
return result.ok(userDto);
}
@@ -863,7 +867,7 @@ public class UserServiceImpl extends BaseServiceImpl implem
/**
* @param gridIdList
- * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
* @Author yinzuomei
* @Description 根据网格id查询网格下所有的用户
* @Date 2019/12/19 15:03
@@ -1124,18 +1128,18 @@ public class UserServiceImpl extends BaseServiceImpl implem
}
}
+
/**
- *
* 组织机构信息处理
*
- * @params [dto, userList]
* @return java.util.List
+ * @params [dto, userList]
* @author liuchuang
* @since 2020/3/7 15:22
*/
private List handleOrganizationInfo(OrganizationModifyDTO dto, List userList) {
List entities = new ArrayList<>();
- for (UserDTO user: userList) {
+ for (UserDTO user : userList) {
UserEntity entity = new UserEntity();
if (StringUtils.isNotEmpty(user.getParentDeptIds()) && StringUtils.isNotEmpty(user.getParentDeptNames())) {
List parentDeptIds = Arrays.asList(user.getParentDeptIds().split(","));
@@ -1164,4 +1168,34 @@ public class UserServiceImpl extends BaseServiceImpl implem
return entities;
}
+
+ @Override
+ @DataSource(value = DataSourceNames.FIRST)
+ public PageData allUserPage(Map params) {
+ String[] paramKeys = new String[]{"nickname", "identityNo", "realName", "identityNo", "mobile", "startTime", "endTime"};
+ if (AppUserUtils.isDefaultQuery(params, paramKeys)) {
+ List userDtoList = Lists.newArrayList();
+ return new PageData<>(userDtoList, NumConstant.ZERO);
+ }
+ this.verifyParams(params);
+ // 查询当前用户所具有的的数据权限
+ IPage iPage = this.getPage(params);
+ List userDtoList = this.baseDao.selectListUserDto(params);
+ return new PageData<>(userDtoList, iPage.getTotal());
+ }
+
+ @Override
+ public PageData authenticatedpage(Map params) {
+ String[] paramKeys = new String[]{"streetId", "communityId", "gridId", "realName", "identityNo", "startTime", "endTime", "nickname", "mobile"};
+ if (AppUserUtils.isDefaultQuery(params, paramKeys)) {
+ List userDtoList = Lists.newArrayList();
+ return new PageData<>(userDtoList, NumConstant.ZERO);
+ }
+ this.verifyParams(params);
+ // 查询当前用户所具有的的数据权限
+ IPage iPage = this.getPage(params);
+ List userDtoList = this.baseDao.selectAuthenticatedListUserDto(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 535ddb8da..71e9f1e0a 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
@@ -89,9 +89,9 @@
-
-