Merge remote-tracking branch 'origin/release/partyAuthentication'

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;
+}

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<PartyMembersDTO> 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<PartyMembersDTO>().ok(data);

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<PageData<UserDTO>>().ok(page);
     }
 
+    /**
+     *
+     * 待认证党员列表
+     *
+     * @params [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 liuchuang
+     * @since 2020/3/24 15:47
+     */
+    @GetMapping("waitPartyPage")
+    @DataFilter(tableAlias = "ug", isPendingCreator = false, deptId = "GRID_ID", prefix = "AND")
+    public Result<PageData<UserDTO>> waitPartyPage(@RequestParam Map<String, Object> params) {
+        PageData<UserDTO> page = userService.waitPartyPage(params);
+        return new Result<PageData<UserDTO>>().ok(page);
+    }
+
     @GetMapping("{id}")
     public Result<UserDTO> 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<String, Object> params, HttpServletResponse response) throws Exception {
+        List<UserDTO> list = userService.listOfWaitParty(params);
+        ExcelUtils.exportExcelToTarget(response, "待认证党员", list, UserExcel.class);
+    }
+
     /***
      *  未认证导出
      * @param params

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<UserEntity> {
      */
     List<UserDTO> selectListUserDto(Map<String, Object> params);
 
+    /**
+     *
+     * 待认证党员
+     *
+     * @params [params]
+     * @return java.util.List<com.elink.esua.epdc.dto.UserDTO>
+     * @author liuchuang
+     * @since 2020/3/23 15:59
+     */
+    List<UserDTO> selectListOfWaitPartyUserDto(Map<String, Object> params);
+
     /**
      * 获取居民详情（已认证或待认证（提交信息待审核）的居民用户）
      *

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<UserEntity> {
 
     PageData<UserDTO> page(Map<String, Object> params);
 
+    /**
+     *
+     * 待认证党员列表
+     *
+     * @params [params]
+     * @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.UserDTO>
+     * @author liuchuang
+     * @since 2020/3/23 15:57
+     */
+    PageData<UserDTO> waitPartyPage(Map<String, Object> params);
+
     List<UserDTO> list(Map<String, Object> params);
 
+    /**
+     *
+     * 待认证党员导出
+     *
+     * @params [params]
+     * @return java.util.List<com.elink.esua.epdc.dto.UserDTO>
+     * @author liuchuang
+     * @since 2020/3/23 16:25
+     */
+    List<UserDTO> listOfWaitParty(Map<String, Object> params);
+
     UserDTO get(String id);
 
     void save(UserDTO dto);
@@ -60,6 +84,39 @@ public interface UserService extends BaseService<UserEntity> {
 
     void audit(UserDTO dto);
 
+    /**
+     *
+     * 党员认证
+     *
+     * @params [dto]
+     * @return void
+     * @author liuchuang
+     * @since 2020/3/23 17:56
+     */
+    Result<List<PartyMembersDTO>> 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获取用户信息
      *

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<PartyMembersDao, Pa
     @DataSource(value = DataSourceNames.FIRST)
     public PartyMembersDTO get(String id) {
         PartyMembersDTO partyMembersDTO = baseDao.selectByIdNew(id);
-        if (partyMembersDTO.getDeptStrIds() != null) {
+        if (null != partyMembersDTO && partyMembersDTO.getDeptStrIds() != null) {
             String depts[] = partyMembersDTO.getDeptStrIds().split(",");
             partyMembersDTO.setAllDeptIds(depts);
         }

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.*;
-import com.elink.esua.epdc.dto.UserDTO;
 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<UserDao, UserEntity> implem
         return new PageData<>(userDtoList, iPage.getTotal());
     }
 
+    @Override
+    public PageData<UserDTO> waitPartyPage(Map<String, Object> params) {
+        this.verifyParams(params);
+        IPage<UserDTO> iPage = this.getPage(params);
+        List<UserDTO> userDtoList = this.baseDao.selectListOfWaitPartyUserDto(params);
+        return new PageData<>(userDtoList, iPage.getTotal());
+    }
+
     @Override
     public List<UserDTO> list(Map<String, Object> params) {
         this.verifyParams(params);
@@ -137,6 +143,12 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         }
     }
 
+    @Override
+    public List<UserDTO> listOfWaitParty(Map<String, Object> params) {
+        this.verifyParams(params);
+        return this.baseDao.selectListOfWaitPartyUserDto(params);
+    }
+
     private Map<String, Object> verifyParams(Map<String, Object> params) {
 
         String[] paramKeys = new String[]{"realName", "identityNo", "nickname", FieldConstant.MOBILE_HUMP};
@@ -203,6 +215,81 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         }
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result<List<PartyMembersDTO>> 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<List<PartyMembersDTO>> 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();
+    }
+
     /**
      * 更新党员库信息
      *
@@ -1199,4 +1286,103 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> 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<PartyMembersEntity> 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<com.elink.esua.epdc.dto.UserDTO>
+     * @author liuchuang
+     * @since 2020/3/23 18:35
+     */
+    private Result<List<PartyMembersDTO>> getPartyMemberByRealNameOrIdentityNo(String realName, String identityNo) {
+        List<PartyMembersEntity> partyMembersEntities = null;
+        List<PartyMembersDTO> data = null;
+        Result<List<PartyMembersDTO>> result = new Result<>();
+
+        // 根据身份证号查询党员库
+        QueryWrapper<PartyMembersEntity> 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<PartyMembersEntity> 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);
+    }
+
 }

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 = '')
         <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>
@@ -101,6 +103,48 @@
         ORDER BY
         u.register_time desc
     </select>
+    <select id="selectListOfWaitPartyUserDto" resultType="com.elink.esua.epdc.dto.UserDTO">
+        SELECT
+        u.id,
+        u.REAL_NAME,
+        u.NICKNAME,
+        u.MOBILE,
+        u.REGISTER_TIME,
+        u.CREATED_TIME,
+        u.UPDATED_TIME,
+        u.IDENTITY_NO,
+        u.ADDRESS,
+        u.STATE,
+        u.PARTY_FLAG,
+        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
+        and u.state = '1'
+        <![CDATA[ AND u.IDENTITY_NO != '' ]]>
+        <if test="startTime != '' and endTime != ''">and u.CREATED_TIME between #{startTime} and #{endTime}</if>
+        <if test="realName != '' and realName != null">and u.real_name like '%${realName}%'</if>
+        <if test="mobile != '' and mobile != null">and u.mobile like '%${mobile}%'</if>
+        <if test="streetId != '' and streetId != null">
+            AND (find_in_set(#{streetId},ug.PARENT_DEPT_IDS)
+            OR find_in_set(#{streetId},ug.ALL_DEPT_IDS))
+        </if>
+        <if test="communityId != '' and communityId != null">
+            AND (find_in_set(#{communityId},ug.PARENT_DEPT_IDS)
+            OR find_in_set(#{communityId},ug.ALL_DEPT_IDS))
+        </if>
+        <if test="gridId != '' and gridId != null">
+            and (ug.grid_id = #{gridId}
+            OR find_in_set(#{gridId},ug.ALL_DEPT_IDS))
+        </if>
+        GROUP BY
+        u.ID
+        ORDER BY
+        u.register_time desc
+    </select>
     <!--  根据userId获取居民详情（已认证或待认证（提交信息待审核）的居民用户）  -->
     <resultMap id="EpdcResidentDetailResultDtoMap"
                type="com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO">