From ade34a1bea02f6233a5bbcd611d9bc83b27d9043 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Wed, 25 Mar 2020 15:56:45 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=85=9A=E5=91=98?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/dto/PartyMemberModifyFormDTO.java | 57 ++++++ .../esua/epdc/controller/UserController.java | 85 ++++++++ .../java/com/elink/esua/epdc/dao/UserDao.java | 11 + .../elink/esua/epdc/service/UserService.java | 57 ++++++ .../epdc/service/impl/UserServiceImpl.java | 192 +++++++++++++++++- .../src/main/resources/mapper/UserDao.xml | 43 ++++ 6 files changed, 442 insertions(+), 3 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyMemberModifyFormDTO.java diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyMemberModifyFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyMemberModifyFormDTO.java new file mode 100644 index 000000000..1feaf4d4c --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyMemberModifyFormDTO.java @@ -0,0 +1,57 @@ +package com.elink.esua.epdc.dto; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Author：liuchuang + * @Date：2020/3/24 19:39 + */ +@Data +public class PartyMemberModifyFormDTO implements Serializable { + + /** + * 用户ID + */ + @NotBlank(message = "用户ID不能为空") + private String userId; + + /** + * 用户状态 + */ + private String state; + + /** + * 党员标识 + */ + private String partyFlag; + + /** + * 备注 + */ + private String remark; + + /** + * 真实姓名 + */ + @NotBlank(message = "姓名不能为空") + private String realName; + + /** + * 手机号 + */ + private String mobile; + + /** + * 身份证号 + */ + @NotBlank(message = "身份证号不能为空") + private String identityNo; + + /** + * 党员ID + */ + private String partyMemberId; +} 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 66c368e58..200ac3184 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 @@ -26,10 +26,12 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; +import com.elink.esua.epdc.dto.PartyMemberModifyFormDTO; import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.enums.AppUserStatesEnum; import com.elink.esua.epdc.excel.UserExcel; import com.elink.esua.epdc.service.UserService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -58,6 +60,22 @@ public class UserController { return new Result>().ok(page); } + /** + * + * 待认证党员列表 + * + * @params [params] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author liuchuang + * @since 2020/3/24 15:47 + */ + @GetMapping("waitPartyPage") + @DataFilter(tableAlias = "ug", isPendingCreator = false, deptId = "GRID_ID", prefix = "AND") + public Result> waitPartyPage(@RequestParam Map params) { + PageData page = userService.waitPartyPage(params); + return new Result>().ok(page); + } + @GetMapping("{id}") public Result get(@PathVariable("id") String id) { UserDTO data = userService.get(id); @@ -101,6 +119,57 @@ public class UserController { return new Result(); } + /** + * + * 党员认证 + * + * @params [dto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2020/3/24 15:58 + */ + @PostMapping("partyReview") + public Result partyReview(@RequestBody UserDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + return userService.partyReview(dto); + } + + /** + * + * 党员认证通过并更新党员库信息 + * + * @params [dto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2020/3/24 19:38 + */ + @PostMapping("updatePartyInfo") + public Result updatePartyInfo(@RequestBody PartyMemberModifyFormDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + if (StringUtils.isEmpty(dto.getPartyMemberId())) { + return new Result().error("党员ID不能为空"); + } + return userService.modifyPartyInfo(dto); + } + + /** + * + * 新增党员信息并认证通过 + * + * @params [dto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2020/3/25 14:31 + */ + @PostMapping("insertPartyInfo") + public Result insertPartyInfo(@RequestBody PartyMemberModifyFormDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + return userService.addPartyInfo(dto); + } + @DeleteMapping public Result delete(@RequestBody String[] ids) { //效验数据 @@ -130,6 +199,22 @@ public class UserController { ExcelUtils.exportExcelToTarget(response, fileName, list, UserExcel.class); } + /** + * + * 待认证党员导出 + * + * @params [params, response] + * @return void + * @author liuchuang + * @since 2020/3/24 16:00 + */ + @GetMapping("exportWaitParty") + @DataFilter(tableAlias = "ug", isPendingCreator = false, deptId = "GRID_ID", prefix = "AND") + public void exportWaitParty(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = userService.listOfWaitParty(params); + ExcelUtils.exportExcelToTarget(response, "待认证党员", list, UserExcel.class); + } + /*** * 未认证导出 * @param params 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 1dc4fa5f1..7827dccb7 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 @@ -99,6 +99,17 @@ public interface UserDao extends BaseDao { */ List selectListUserDto(Map params); + /** + * + * 待认证党员 + * + * @params [params] + * @return java.util.List + * @author liuchuang + * @since 2020/3/23 15:59 + */ + List selectListOfWaitPartyUserDto(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 533035a03..bb3b85610 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 @@ -20,6 +20,8 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.PartyMemberModifyFormDTO; +import com.elink.esua.epdc.dto.PartyMembersDTO; import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserRegistFormDTO; @@ -48,8 +50,30 @@ public interface UserService extends BaseService { PageData page(Map params); + /** + * + * 待认证党员列表 + * + * @params [params] + * @return com.elink.esua.epdc.commons.tools.page.PageData + * @author liuchuang + * @since 2020/3/23 15:57 + */ + PageData waitPartyPage(Map params); + List list(Map params); + /** + * + * 待认证党员导出 + * + * @params [params] + * @return java.util.List + * @author liuchuang + * @since 2020/3/23 16:25 + */ + List listOfWaitParty(Map params); + UserDTO get(String id); void save(UserDTO dto); @@ -60,6 +84,39 @@ public interface UserService extends BaseService { void audit(UserDTO dto); + /** + * + * 党员认证 + * + * @params [dto] + * @return void + * @author liuchuang + * @since 2020/3/23 17:56 + */ + Result> partyReview(UserDTO dto); + + /** + * + * 党员认证通过并更新党员库信息 + * + * @params [dto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2020/3/24 19:46 + */ + Result modifyPartyInfo(PartyMemberModifyFormDTO dto); + + /** + * + * 新增党员信息并认证通过 + * + * @params [dto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2020/3/25 14:33 + */ + Result addPartyInfo(PartyMemberModifyFormDTO dto); + /** * 根据用户微信openId获取用户信息 * 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 66b43edac..c1f2e4de3 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 @@ -42,13 +42,11 @@ import com.elink.esua.epdc.dao.PartyMembersDao; import com.elink.esua.epdc.dao.UserAuthenticateHistoryDao; import com.elink.esua.epdc.dao.UserDao; import com.elink.esua.epdc.datasources.DataSourceNames; -import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; -import com.elink.esua.epdc.dto.UserDTO; +import com.elink.esua.epdc.dto.*; import com.elink.esua.epdc.dto.epdc.UserCarInfoDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserRegistFormDTO; import com.elink.esua.epdc.dto.epdc.result.*; -import com.elink.esua.epdc.dto.UserGridRelationDTO; import com.elink.esua.epdc.dto.epdc.EpdcCompleteAppUserDTO; import com.elink.esua.epdc.dto.epdc.EpdcGridLeaderRegisterDTO; import com.elink.esua.epdc.dto.epdc.form.*; @@ -126,6 +124,14 @@ public class UserServiceImpl extends BaseServiceImpl implem return new PageData<>(userDtoList, iPage.getTotal()); } + @Override + public PageData waitPartyPage(Map params) { + this.verifyParams(params); + IPage iPage = this.getPage(params); + List userDtoList = this.baseDao.selectListOfWaitPartyUserDto(params); + return new PageData<>(userDtoList, iPage.getTotal()); + } + @Override public List list(Map params) { this.verifyParams(params); @@ -137,6 +143,12 @@ public class UserServiceImpl extends BaseServiceImpl implem } } + @Override + public List listOfWaitParty(Map params) { + this.verifyParams(params); + return this.baseDao.selectListOfWaitPartyUserDto(params); + } + private Map verifyParams(Map params) { String[] paramKeys = new String[]{"realName", "identityNo", "nickname", FieldConstant.MOBILE_HUMP}; @@ -203,6 +215,81 @@ public class UserServiceImpl extends BaseServiceImpl implem } } + @Override + @Transactional(rollbackFor = Exception.class) + public Result> partyReview(UserDTO dto) { + this.verifyUserInfo(dto); + UserEntity findUser = this.baseDao.selectById(dto.getId()); + dto.setState(NumConstant.THREE_STR); + // 手动认证为党员 + if (YesOrNoEnum.YES.value().equals(dto.getPartyFlag())) { + // 校验是党员库是否存在相同的身份证号或者姓名 + boolean isParty = getPartyMemberByRealNameAndIdentityNo(dto.getRealName(), dto.getIdentityNo()); + if (!isParty) { + Result> result = getPartyMemberByRealNameOrIdentityNo(dto.getRealName(), dto.getIdentityNo()); + if (result.getCode() != 0) { + return result; + } else { + // 插入党员库 + insertPartyMember(dto); + } + } + } + // createdTime作为提交注册时间，registerTime作为注册审核时间（即注册时间） + dto.setRegisterTime(new Date()); + //先删除以前审核未通过的那条数据 + UserEntity entity = ConvertUtils.sourceToTarget(dto, UserEntity.class); + updateById(entity); + // 组装数据并插入用户认证历史表 + findUser.setMobile(dto.getMobile()); + findUser.setRealName(dto.getRealName()); + saveUserAuthenticateHistory(findUser, dto.getPartyFlag(), dto.getRemark(), dto.getState()); + // 修改党员库信息 + if (YesOrNoEnum.YES.value().equals(dto.getPartyFlag())) { + updatePartyMember(findUser, dto.getRegisterTime()); + } + + return new Result<>(); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Result modifyPartyInfo(PartyMemberModifyFormDTO dto) { + // 更新党员库信息 + PartyMembersEntity entity = new PartyMembersEntity(); + entity.setId(dto.getPartyMemberId()); + entity.setRealName(dto.getRealName()); + entity.setIdentityNo(dto.getIdentityNo()); + partyMembersDao.updateById(entity); + + // 用户认证党员信息通过 + UserDTO userDTO = ConvertUtils.sourceToTarget(dto, UserDTO.class); + userDTO.setId(dto.getUserId()); + userDTO.setPartyFlag(YesOrNoEnum.YES.value()); + this.partyReview(userDTO); + + return new Result(); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Result addPartyInfo(PartyMemberModifyFormDTO dto) { + // 新增党员库信息 + PartyMembersEntity entity = new PartyMembersEntity(); + entity.setRealName(dto.getRealName()); + entity.setIdentityNo(dto.getIdentityNo()); + entity.setRegistFlag(PartyMemberRegFlagEnum.NO.getValue()); + partyMembersDao.insert(entity); + + // 用户认证党员信息通过 + UserDTO userDTO = ConvertUtils.sourceToTarget(dto, UserDTO.class); + userDTO.setId(dto.getUserId()); + userDTO.setPartyFlag(YesOrNoEnum.YES.value()); + this.partyReview(userDTO); + + return new Result(); + } + /** * 更新党员库信息 * @@ -1198,4 +1285,103 @@ public class UserServiceImpl extends BaseServiceImpl implem return new PageData<>(userDtoList, iPage.getTotal()); } + /** + * + * 用户信息校验 + * + * @params [dto] + * @return com.elink.esua.epdc.dto.UserDTO + * @author liuchuang + * @since 2020/3/23 18:23 + */ + private UserDTO verifyUserInfo(UserDTO dto) { + if (StringUtils.isBlank(dto.getRealName()) && StringUtils.isBlank(dto.getRealName().trim())) { + throw new RenException("用户姓名不能为空"); + } + if (StringUtils.isBlank(dto.getMobile()) && StringUtils.isBlank(dto.getMobile().trim())) { + throw new RenException("手机号不能为空"); + } + if (StringUtils.isBlank(dto.getIdentityNo()) && StringUtils.isBlank(dto.getIdentityNo().trim())) { + throw new RenException("身份证号不能为空"); + } + dto.setRealName(dto.getRealName().trim()); + dto.setMobile(dto.getMobile().trim()); + dto.setIdentityNo(dto.getIdentityNo().trim()); + + return dto; + } + + /** + * + * 获取党员信息 + * + * @params [realName, identityNo] + * @return boolean + * @author liuchuang + * @since 2020/3/23 18:30 + */ + private boolean getPartyMemberByRealNameAndIdentityNo(String realName, String identityNo) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(UserFieldConsant.IDENTITY_NO, identityNo) + .eq(UserFieldConsant.REAL_NAME, realName); + Integer count = this.partyMembersDao.selectCount(wrapper); + return count != NumConstant.ZERO; + } + + /** + * + * 获取党员信息 + * + * @params [realName, identityNo] + * @return java.util.List + * @author liuchuang + * @since 2020/3/23 18:35 + */ + private Result> getPartyMemberByRealNameOrIdentityNo(String realName, String identityNo) { + List partyMembersEntities = null; + List data = null; + Result> result = new Result<>(); + + // 根据身份证号查询党员库 + QueryWrapper identityNoWrapper = new QueryWrapper<>(); + identityNoWrapper.eq(UserFieldConsant.IDENTITY_NO, identityNo); + partyMembersEntities = this.partyMembersDao.selectList(identityNoWrapper); + if (null != partyMembersEntities && partyMembersEntities.size() > 0) { + data = ConvertUtils.sourceToTarget(partyMembersEntities, PartyMembersDTO.class); + result.setCode(NumConstant.ONE); + result.setData(data); + return result; + } + // 根据姓名查询党员库 + QueryWrapper realNameWrapper = new QueryWrapper<>(); + realNameWrapper.eq(UserFieldConsant.REAL_NAME, realName); + partyMembersEntities = this.partyMembersDao.selectList(realNameWrapper); + if (null != partyMembersEntities && partyMembersEntities.size() > 0) { + data = ConvertUtils.sourceToTarget(partyMembersEntities, PartyMembersDTO.class); + result.setCode(NumConstant.TWO); + result.setData(data); + return result; + } + + return new Result<>(); + } + + /** + * + * 新增党员信息 + * + * @params [dto, findUser] + * @return void + * @author liuchuang + * @since 2020/3/23 19:35 + */ + private void insertPartyMember(UserDTO dto) { + PartyMembersEntity entity = new PartyMembersEntity(); + entity.setRealName(dto.getRealName()); + entity.setIdentityNo(dto.getIdentityNo()); + entity.setRegistFlag(PartyMemberRegFlagEnum.MANUAL.getValue()); + + partyMembersDao.insert(entity); + } + } 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 f3a342d51..201ead04e 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 @@ -66,6 +66,7 @@ u.MOBILE, u.REGISTER_TIME, u.CREATED_TIME, + u.UPDATED_TIME, IDENTITY_NO, ADDRESS, STATE, @@ -77,6 +78,7 @@ LEFT JOIN epdc_user_grid_relation ug ON u.ID = ug.USER_ID where u.del_flag = '0' + and (u.IDENTITY_NO is null or u.IDENTITY_NO = '') and u.CREATED_TIME between #{startTime} and #{endTime} and u.state = #{state} and u.real_name like '%${realName}%' @@ -101,6 +103,47 @@ ORDER BY u.register_time desc + From 831b595cb49dc8c0077c5874ef4a94a8d288944e Mon Sep 17 00:00:00 2001 From: liuchuang Date: Mon, 30 Mar 2020 15:22:20 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=9A=E5=91=98?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=97=B6=E9=97=B4=E4=B8=8D=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc-user-server/src/main/resources/mapper/UserDao.xml | 1 + 1 file changed, 1 insertion(+) 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 201ead04e..fe3722702 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 @@ -111,6 +111,7 @@ u.MOBILE, u.REGISTER_TIME, u.CREATED_TIME, + u.UPDATED_TIME, u.IDENTITY_NO, u.ADDRESS, u.STATE, From b7a02f41a33158a7027cec12e40c67feba1063fd Mon Sep 17 00:00:00 2001 From: liuchuang Date: Mon, 30 Mar 2020 19:21:21 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E5=85=9A=E5=91=98=E5=88=97=E8=A1=A8=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/controller/PartyMembersController.java | 2 +- .../elink/esua/epdc/service/impl/PartyMembersServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 02b900a23..b26ec61f4 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 @@ -82,7 +82,7 @@ public class PartyMembersController { @GetMapping("{id}") public Result get(@PathVariable("id") String id) { PartyMembersDTO data = partyMembersService.get(id); - if (data.getTagIds() != null) { + if (null != data && data.getTagIds() != null) { data.setTagIdsNew(data.getTagIds().split(",")); } return new Result().ok(data); 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 9d2d4a082..e97b82714 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 @@ -169,7 +169,7 @@ public class PartyMembersServiceImpl extends BaseServiceImpl Date: Wed, 1 Apr 2020 11:27:08 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=85=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E5=B1=85=E6=B0=91=E5=88=97=E8=A1=A8=E4=BC=9A=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=9C=89=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7=E5=B1=85?= =?UTF-8?q?=E6=B0=91=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/UserDao.xml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) 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 fe3722702..129ecfcd5 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 @@ -119,7 +119,6 @@ u.ALL_DEPT_NAMES FROM epdc_user u - LEFT JOIN epdc_user_grid_relation ug ON u.ID = ug.USER_ID where u.del_flag = '0' and u.IDENTITY_NO is not null @@ -129,19 +128,16 @@ and u.real_name like '%${realName}%' and u.mobile like '%${mobile}%' - AND (find_in_set(#{streetId},ug.PARENT_DEPT_IDS) - OR find_in_set(#{streetId},ug.ALL_DEPT_IDS)) + AND (find_in_set(#{streetId},u.PARENT_DEPT_IDS) + OR find_in_set(#{streetId},u.ALL_DEPT_IDS)) - AND (find_in_set(#{communityId},ug.PARENT_DEPT_IDS) - OR find_in_set(#{communityId},ug.ALL_DEPT_IDS)) + AND (find_in_set(#{communityId},u.PARENT_DEPT_IDS) + OR find_in_set(#{communityId},u.ALL_DEPT_IDS)) - and (ug.grid_id = #{gridId} - OR find_in_set(#{gridId},ug.ALL_DEPT_IDS)) + and find_in_set(#{gridId},u.ALL_DEPT_IDS) - GROUP BY - u.ID ORDER BY u.register_time desc @@ -475,6 +471,7 @@ epdc_user u where u.del_flag = '0' + and (u.IDENTITY_NO is null or u.IDENTITY_NO = '') and u.CREATED_TIME between #{startTime} and #{endTime} and u.state = #{state} and u.real_name like '%${realName}%' From 18654c57032acea99894b219c7f025916920bebb Mon Sep 17 00:00:00 2001 From: liuchuang Date: Wed, 1 Apr 2020 14:02:52 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=85=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E5=85=9A=E5=91=98=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/elink/esua/epdc/controller/UserController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 200ac3184..7093d38c7 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 @@ -70,7 +70,7 @@ public class UserController { * @since 2020/3/24 15:47 */ @GetMapping("waitPartyPage") - @DataFilter(tableAlias = "ug", isPendingCreator = false, deptId = "GRID_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); From e1aea434241b467f8db1f0bacbab6744d7b79d18 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Wed, 1 Apr 2020 18:32:45 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=85=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E5=85=9A=E5=91=98=E5=AF=BC=E5=87=BA=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/controller/UserController.java | 2 +- .../java/com/elink/esua/epdc/dao/UserDao.java | 11 +++++ .../epdc/service/impl/UserServiceImpl.java | 12 ++++-- .../src/main/resources/mapper/UserDao.xml | 41 +++++++++++++++++++ 4 files changed, 62 insertions(+), 4 deletions(-) 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 7093d38c7..6ffc2d6dd 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 @@ -209,7 +209,7 @@ public class UserController { * @since 2020/3/24 16:00 */ @GetMapping("exportWaitParty") - @DataFilter(tableAlias = "ug", isPendingCreator = false, deptId = "GRID_ID", prefix = "AND") + @DataFilter(tableAlias = "u", isPendingCreator = false, deptId = "DEPT_ID", prefix = "AND") public void exportWaitParty(@RequestParam Map params, HttpServletResponse response) throws Exception { List list = userService.listOfWaitParty(params); ExcelUtils.exportExcelToTarget(response, "待认证党员", list, UserExcel.class); 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 7827dccb7..aa108f1d7 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 @@ -210,4 +210,15 @@ public interface UserDao extends BaseDao { */ List selectAuthenticatedListUserDto(Map params); + /** + * + * 待认证居民 + * + * @params [params] + * @return java.util.List + * @author liuchuang + * @since 2020/4/1 18:26 + */ + List selectWaitAuthenticatedListUserDto(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 5ca3910c7..39ea19168 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 @@ -1281,9 +1281,15 @@ public class UserServiceImpl extends BaseServiceImpl implem } this.verifyParams(params); // 查询当前用户所具有的的数据权限 - IPage iPage = this.getPage(params); - List userDtoList = this.baseDao.selectAuthenticatedListUserDto(params); - return new PageData<>(userDtoList, iPage.getTotal()); + 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 { + 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/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml index 129ecfcd5..5c8630129 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 @@ -454,6 +454,47 @@ + +