【居民端】-【廉政市北修改】-李鹏飞-20200520

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/YesOrNoEnum.java

@@ -22,7 +22,13 @@ public enum YesOrNoEnum {
     /**
      * 否
      */
-    NO("0");
+    NO("0"),
+    /**
+     * 待审核
+     */
+    WAIT("2");
+
+
 
     private String value;
 

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java

@@ -1,6 +1,7 @@
 package com.elink.esua.epdc.controller;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.CompleteDeptDTO;
 import com.elink.esua.epdc.service.AdminService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -33,4 +34,8 @@ public class ApiAdminController {
     public Result<String> getCompleteDeptName(Long gridId) {
         return adminService.getCompleteDeptName(gridId);
     }
+    @GetMapping("/dept/getComplete")
+    public Result<CompleteDeptDTO> getComplete(Long gridId) {
+        return adminService.getComplete(gridId);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java

@@ -1,6 +1,7 @@
 package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.CompleteDeptDTO;
 
 /**
  * 管理端相关接口
@@ -20,4 +21,13 @@ public interface AdminService {
      * @date 2019/9/11 09:46
      */
     Result<String> getCompleteDeptName(Long gridId);
+    /**
+     * 获取完整机构名称（市区/街道/社区/网格）
+     *
+     * @param gridId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
+     * @author yujintao
+     * @date 2019/9/11 09:46
+     */
+    Result<CompleteDeptDTO>  getComplete(Long gridId);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java

@@ -33,4 +33,11 @@ public class AdminServiceImpl implements AdminService {
                 .concat(completeDept.getGrid());
         return new Result().ok(deptName);
     }
+    @Override
+    public Result<CompleteDeptDTO> getComplete(Long gridId) {
+        Result<CompleteDeptDTO> adminResult = adminFeignClient.getCompleteDept(gridId);
+
+        CompleteDeptDTO completeDept = adminResult.getData();
+        return adminResult;
+    }
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -832,6 +832,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         if (!updateById(userEntity)) {
             throw new RenException("用户认证修改居民信息时失败！");
         }
+        generateUserAuthenticateHistory(completeAppUser, UserAuthTypeEnum.RESIDENT_AUTH, YesOrNoEnum.WAIT, null);
         UserDTO userDto = ConvertUtils.sourceToTarget(userEntity, UserDTO.class);
         userDto.setLeaderFlag(relationInfo.getLeaderFlag());
         userDto.setFaceImg(StringUtils.isBlank(userDto.getFaceImg()) ? findUser.getFaceImg() : userDto.getFaceImg());