Merge branch 'dev_1118' of http://121.42.41.42:7070/r/esua-epdc-cloud into dev_1118

# Conflicts:
#	esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java
#	esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java
#	esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java
#	esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java
#	esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java
#	esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java
#	esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java
#	esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java
#	esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

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

@@ -0,0 +1,28 @@
+package com.elink.esua.epdc.controller;
+
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.issue.form.IssueStateStatisticsFormDTO;
+import com.elink.esua.epdc.dto.issue.result.IssueStateStatisticsResultDTO;
+import com.elink.esua.epdc.service.WorkIssueService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("work/event/issue/")
+public class ApiWorkIssueController {
+
+    @Autowired
+    private WorkIssueService workIssueService;
+
+
+    @GetMapping("statistics")
+    public Result<IssueStateStatisticsResultDTO> statistics(@RequestBody IssueStateStatisticsFormDTO formDto) {
+        return workIssueService.stateStatistics(formDto);
+
+    }
+
+}

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

@@ -2,12 +2,11 @@ package com.elink.esua.epdc.controller;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.epdc.result.EpdcPartyMemberDetailDto;
-import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDto;
+import com.elink.esua.epdc.dto.epdc.form.EpdcAppAuthenticateResidentFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO;
 import com.elink.esua.epdc.service.WorkUserService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 工作端，用户登录，用户管理相关接口
@@ -28,7 +27,7 @@ public class ApiWorkUserController {
      * @return
      */
     @GetMapping("residentDetail")
-    public Result<EpdcResidentDetailResultDto> residentDetail(String userId){
+    public Result<EpdcResidentDetailResultDTO> residentDetail(String userId){
         return workUserService.residentDetail(userId);
     }
 
@@ -41,4 +40,14 @@ public class ApiWorkUserController {
     public Result<EpdcPartyMemberDetailDto> partyMemberDetail(String userId) {
         return workUserService.partyMemberDetail(userId);
     }
+
+    /**
+     * 认证用户（用户信息审核）
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("authenticateResident")
+    public Result authenticateResident(@RequestBody EpdcAppAuthenticateResidentFormDTO formDTO){
+        return workUserService.authenticateResident(formDTO);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java

@@ -24,7 +24,7 @@ import java.util.List;
  * @email yujintao@elink-cn.com
  * @date 2019/9/7 9:27
  */
-@FeignClient(name = ServiceConstant.EPDC_USER_SERVER, fallback = UserFeignClientFallback.class, url="http://127.0.0.1:9068")
+@FeignClient(name = ServiceConstant.EPDC_USER_SERVER, fallback = UserFeignClientFallback.class)
 public interface UserFeignClient {
 
     /**
@@ -258,7 +258,15 @@ public interface UserFeignClient {
      * @return
      */
     @GetMapping("app-user/epdc-app/user/residentDetail/{userId}")
-    Result<EpdcResidentDetailResultDto> residentDetail(@PathVariable("userId") String userId);
+    Result<EpdcResidentDetailResultDTO> residentDetail(@PathVariable("userId") String userId);
+
+	/**
+	 * 认证用户（用户信息审核）
+	 * @param formDTO
+	 * @return
+	 */
+	@PostMapping("app-user/epdc-app/user/authenticateResident")
+	  Result authenticateResident(EpdcAppAuthenticateResidentFormDTO formDTO);
 
     /**
      * 获取党员详情（已认证或未认证的党员用户）

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkIssueFeignClient.java

@@ -0,0 +1,23 @@
+package com.elink.esua.epdc.feign;
+
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.issue.form.*;
+import com.elink.esua.epdc.dto.issue.result.*;
+import com.elink.esua.epdc.feign.fallback.IssueFeignClientFallback;
+import com.elink.esua.epdc.feign.fallback.WorkIssueFeignClientFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import java.util.List;
+
+
+@FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = WorkIssueFeignClientFallback.class)
+public interface WorkIssueFeignClient {
+
+    @GetMapping(value = "events/epdc-app/issue/stateStatistics", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<IssueStateStatisticsResultDTO> stateStatistics(IssueStateStatisticsFormDTO formDto);
+
+
+}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java

@@ -122,7 +122,7 @@ public class UserFeignClientFallback implements UserFeignClient {
     }
 
     @Override
-    public Result<EpdcResidentDetailResultDto> residentDetail(String userId) {
+    public Result<EpdcResidentDetailResultDTO> residentDetail(String userId) {
         return  ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "residentDetail", userId);
     }
 
@@ -130,4 +130,9 @@ public class UserFeignClientFallback implements UserFeignClient {
     public Result<EpdcPartyMemberDetailDto> partyMemberDetail(String userId) {
         return  ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "partyMemberDetail", userId);
     }
+
+    @Override
+    public Result authenticateResident(EpdcAppAuthenticateResidentFormDTO formDTO) {
+        return  ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "authenticateResident", formDTO);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkIssueFeignClientFallback.java

@@ -0,0 +1,27 @@
+package com.elink.esua.epdc.feign.fallback;
+
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO;
+import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
+import com.elink.esua.epdc.dto.issue.form.*;
+import com.elink.esua.epdc.dto.issue.result.*;
+import com.elink.esua.epdc.feign.IssueFeignClient;
+import com.elink.esua.epdc.feign.WorkIssueFeignClient;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Author LC
+ * @Date 2019/9/7 11:34
+ */
+@Component
+public class WorkIssueFeignClientFallback implements WorkIssueFeignClient {
+
+    @Override
+    public Result<IssueStateStatisticsResultDTO> stateStatistics(IssueStateStatisticsFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "stateStatistics", formDto);
+    }
+}

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

@@ -0,0 +1,30 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.service;
+
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.issue.form.IssueStateStatisticsFormDTO;
+import com.elink.esua.epdc.dto.issue.result.IssueStateStatisticsResultDTO;
+import org.springframework.web.bind.annotation.RequestBody;
+
+public interface WorkIssueService {
+
+    Result<IssueStateStatisticsResultDTO> stateStatistics(@RequestBody IssueStateStatisticsFormDTO formDto);
+
+}

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

@@ -1,8 +1,9 @@
 package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.epdc.form.EpdcAppAuthenticateResidentFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcPartyMemberDetailDto;
-import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDto;
 
 /**
  * 工作端，用户登录、用户管理 相关业务接口
@@ -16,7 +17,13 @@ public interface WorkUserService {
 	 * @param userId 用户Id
 	 * @return
 	 */
-	Result<EpdcResidentDetailResultDto> residentDetail(String userId);
+	Result<EpdcResidentDetailResultDTO> residentDetail(String userId);
+	/**
+	 * 认证用户（用户信息审核）
+	 * @param formDTO
+	 * @return
+	 */
+	Result authenticateResident(EpdcAppAuthenticateResidentFormDTO formDTO);
 
 	/**
 	 * 获取党员详情（已认证或未认证的党员用户）

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

@@ -0,0 +1,39 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.service.impl;
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.issue.form.IssueStateStatisticsFormDTO;
+import com.elink.esua.epdc.dto.issue.result.IssueStateStatisticsResultDTO;
+import com.elink.esua.epdc.feign.WorkIssueFeignClient;
+import com.elink.esua.epdc.service.WorkIssueService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+@Service
+public class WorkIssueServiceImpl implements WorkIssueService {
+
+    @Autowired
+    private WorkIssueFeignClient workIssueFeignClient;
+
+    @Override
+    public Result<IssueStateStatisticsResultDTO> stateStatistics(IssueStateStatisticsFormDTO formDto) {
+        return workIssueFeignClient.stateStatistics(formDto);
+    }
+}

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

@@ -1,8 +1,9 @@
 package com.elink.esua.epdc.service.impl;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.epdc.form.EpdcAppAuthenticateResidentFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcPartyMemberDetailDto;
-import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDto;
 import com.elink.esua.epdc.feign.UserFeignClient;
 import com.elink.esua.epdc.service.WorkUserService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,10 +26,20 @@ public class WorkUserServiceImpl implements WorkUserService {
 	 * @return
 	 */
 	@Override
-	public Result<EpdcResidentDetailResultDto> residentDetail(String userId) {
+	public Result<EpdcResidentDetailResultDTO> residentDetail(String userId) {
 		return userFeignClient.residentDetail(userId);
 	}
 
+	/**
+	 * 认证用户（用户信息审核）
+	 * @param formDTO
+	 * @return
+	 */
+	@Override
+	public Result authenticateResident(EpdcAppAuthenticateResidentFormDTO formDTO) {
+		return userFeignClient.authenticateResident(formDTO);
+	}
+
 	/**
 	 * 获取党员详情（已认证或未认证的党员用户）
 	 * @param userId

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/ImageConstant.java

@@ -16,4 +16,9 @@ public interface ImageConstant {
      * 图片类型-头像
      */
     public final static String TYPE_IMAGE_BIZ_FACE = "face";
+
+    /**
+     * 图片类型-事件拒绝
+     */
+    public final static String TYPE_IMAGE_BIZ_EVENTS_REJECT = "eventsReject";
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueStateStatisticsFormDTO.java

@@ -0,0 +1,17 @@
+package com.elink.esua.epdc.dto.issue.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+@Data
+public class IssueStateStatisticsFormDTO implements Serializable {
+    private static final long serialVersionUID = -8864248267071206774L;
+
+    /**
+     * 用户所属网格ID
+     */
+    private Long deptId;
+
+}

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueStateStatisticsResultDTO.java

@@ -0,0 +1,20 @@
+package com.elink.esua.epdc.dto.issue.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class IssueStateStatisticsResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -4512771534907006929L;
+
+    private Integer pendingResponseNum;
+
+    private Integer pendingHandleNum;
+
+    private Integer rejectedNum;
+
+    private Integer closed;
+}
+

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java

@@ -124,4 +124,7 @@ public interface EpdcEventsDao extends BaseDao<EpdcEventsEntity> {
      * @since 2019/10/30 12:36
      */
     int selectCountOfDeptNotice(Long deptId, int state);
+
+    int selectCountOfEventState(List<Long> deptIdList, int state);
+
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java

@@ -178,4 +178,7 @@ public interface EpdcEventsService extends BaseService<EpdcEventsEntity> {
      * @since 2019/10/30 13:43
      */
     void initMenuNotice();
+
+    int selectCountOfEventState(List<Long> deptIdList, int state);
+
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java

@@ -390,4 +390,9 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
         // 发送菜单消息通知
         newsTask.eventMenuNotice(menuNoticeDTO, userId);
     }
+
+    @Override
+    public int selectCountOfEventState(List<Long> deptIdList, int state) {
+        return baseDao.selectCountOfEventState(deptIdList,state);
+    }
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/EpdcAppIssueController.java

@@ -115,4 +115,15 @@ public class EpdcAppIssueController {
     public Result<EventAppDetailResultDTO> eventDetail(@PathVariable String eventId) {
         return issueService.getEventDetail(eventId);
     }
+
+    /**
+     * 议题状态统计
+     * @param formDto
+     * @return
+     */
+    @GetMapping("stateStatistics")
+    public Result<IssueStateStatisticsResultDTO> stateStatistics(@RequestBody IssueStateStatisticsFormDTO formDto) {
+       return issueService.stateStatistics(formDto);
+    }
+
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java

@@ -106,7 +106,7 @@ public interface IssueDao extends BaseDao<IssueEntity> {
     /**
      * 移动端-议题处理进度
      * @Params: [issueId]
-     * @Return: java.util.List<com.elink.esua.epdc.dto.issue.result.IssueHandleProgressResultDTO>
+     * @Return: java.util.List<com.elink.esua.epdc.dto.issue.result.IssueHandleProgressResultDTO>，
      * @Author: liuchuang
      * @Date: 2019/9/9 14:18
      */
@@ -141,4 +141,13 @@ public interface IssueDao extends BaseDao<IssueEntity> {
      */
     int selectCountOfDeptNotice(Long deptId, int state);
 
+    /**
+     * 根据网格id和状态查询数量
+     * @param deptIdList
+     * @param state
+     * @return
+     */
+    int selectCountOfIssueState(List<Long> deptIdList, int state);
+
+
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java

@@ -31,6 +31,7 @@ import com.elink.esua.epdc.dto.issue.form.IssueFormDTO;
 import com.elink.esua.epdc.dto.issue.form.IssueWaitHandleSubmitFormDTO;
 import com.elink.esua.epdc.dto.issue.result.*;
 import com.elink.esua.epdc.modules.issue.entity.IssueEntity;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 import java.util.Map;
@@ -212,4 +213,11 @@ public interface IssueService extends BaseService<IssueEntity> {
      * @since 2019/10/29 18:13
      */
     void sendIssueHandleMenuNotice(Long deptId, Long userId);
+
+    /**
+     * 移动端-议题状态统计
+     * @param formDto
+     * @return
+     */
+    Result<IssueStateStatisticsResultDTO> stateStatistics(@RequestBody IssueStateStatisticsFormDTO formDto);
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java

@@ -376,4 +376,26 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         return itemEntity;
     }
 
+    @Override
+    public Result<IssueStateStatisticsResultDTO> stateStatistics(IssueStateStatisticsFormDTO formDto) {
+        List<Long> list;
+        if (formDto.getDeptId() == null){
+            list = SecurityUser.getUser().getDeptIdList();
+        }else {
+            list = new ArrayList<>();
+            list.add(formDto.getDeptId());
+        }
+        Integer pendingHandleNum = baseDao.selectCountOfIssueState(list,0);
+        Integer closed = baseDao.selectCountOfIssueState(list,2);
+
+        Integer pendingResponseNum = epdcEventsService.selectCountOfEventState(list,0);
+        Integer rejectedNum = epdcEventsService.selectCountOfEventState(list,2);
+
+        IssueStateStatisticsResultDTO dto = new IssueStateStatisticsResultDTO();
+        dto.setClosed(closed);
+        dto.setPendingHandleNum(pendingHandleNum);
+        dto.setRejectedNum(rejectedNum);
+        dto.setPendingResponseNum(pendingResponseNum);
+        return new Result<IssueStateStatisticsResultDTO>().ok(dto);
+    }
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml

@@ -249,4 +249,16 @@
         SELECT COUNT(ID) AS num FROM epdc_events WHERE DEL_FLAG = '0' AND grid_id = #{deptId} AND EVENT_STATE = #{state}
     </select>
 
+    <select id="selectCountOfEventState" resultType="int">
+        SELECT
+        COUNT(ID) AS num
+        FROM epdc_events
+        WHERE DEL_FLAG = '0'
+        AND GRID_ID IN
+        <foreach collection="deptIdList" item="id" index="index" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+        AND EVENT_STATE = #{state}
+    </select>
+
 </mapper>

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml

@@ -450,4 +450,19 @@
         AND ID NOT IN ( SELECT ISSUE_ID FROM epdc_issue_handle WHERE DEL_FLAG = '0' AND HANDLER_DEPT_ID = #{deptId} AND STATE <![CDATA[ <> ]]> 0 )
     </select>
 
+
+    <select id="selectCountOfIssueState" resultType="int">
+        SELECT
+        COUNT( ID ) AS num
+        FROM
+        epdc_issue
+        WHERE
+        DEL_FLAG = '0'
+        AND GRID_ID IN
+        <foreach collection="deptIdList" item="id" index="index" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+        AND ISSUE_STATE = #{state}
+    </select>
+
 </mapper>

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppAuthenticateResidentFormDTO.java

@@ -0,0 +1,25 @@
+package com.elink.esua.epdc.dto.epdc.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Auther: yinzuomei
+ * @Date: 2019/11/18 16:37
+ * @Description: 业务端 认证用户（用户信息审核）入参DTO
+ */
+@Data
+public class EpdcAppAuthenticateResidentFormDTO implements Serializable {
+	private static final long serialVersionUID = 6035055052382466281L;
+	/**
+	 * 是否认证通过 0否 1是
+	 */
+	private String authenticatedFlag;
+	/**
+	 * 用户ID
+	 */
+	@NotBlank(message = "用户ID不能为空")
+	private String userId;
+}

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcPartyMemberDetailDto.java

@@ -4,6 +4,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.List;
+import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailGridResultDTO;
 
 @Data
 public class EpdcPartyMemberDetailDto implements Serializable {
@@ -60,7 +61,7 @@ public class EpdcPartyMemberDetailDto implements Serializable {
     /**
      * 扫码网格列表
      */
-    private List<EpdcResidentDetailGridResultDto> gridList;
+    private List<EpdcResidentDetailGridResultDTO> gridList;
     /**
      * 党员标签
      */

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcResidentDetailGridResultDto.java

@@ -7,10 +7,10 @@ import java.io.Serializable;
 /**
  * @Auther: yinzuomei
  * @Date: 2019/11/18 12:54
- * @Description:
+ * @Description: 业务端 居民用户详情-扫码网格列表
  */
 @Data
-public class EpdcResidentDetailGridResultDto implements Serializable {
+public class EpdcResidentDetailGridResultDTO implements Serializable {
 	private static final long serialVersionUID = 487797487058257867L;
 	/**
 	 * 市区-街道-社区-网格

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcResidentDetailResultDto.java

@@ -8,10 +8,10 @@ import java.util.List;
 /**
  * @Auther: yinzuomei
  * @Date: 2019/11/18 12:54
- * @Description:
+ * @Description: 业务端 居民用户详情接口返参DTO
  */
 @Data
-public class EpdcResidentDetailResultDto  implements Serializable {
+public class EpdcResidentDetailResultDTO implements Serializable {
 	private static final long serialVersionUID = -6060670578626439431L;
 	/**
 	 * 用户ID
@@ -48,5 +48,5 @@ public class EpdcResidentDetailResultDto  implements Serializable {
 	/**
 	 * 扫码网格列表
 	 */
-	private List<EpdcResidentDetailGridResultDto>  gridList;
+	private List<EpdcResidentDetailGridResultDTO>  gridList;
 }

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/enums/AppUserStatesEnum.java

@@ -33,12 +33,8 @@ public enum AppUserStatesEnum {
     /**
      * 用户未注册
      */
-    STATE_NOT_REGISTERED(NumConstant.FOUR_STR),
+    STATE_NOT_REGISTERED(NumConstant.FOUR_STR);
 
-    /**
-     * 用户认证党员失败
-     */
-    PARTY_MEMBER_AUTHENTICATION_FAILED(NumConstant.FIVE_STR);
 
     private String value;
 

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java

@@ -7,6 +7,11 @@ 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.form.*;
 import com.elink.esua.epdc.dto.epdc.result.*;
+import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import com.elink.esua.epdc.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -252,7 +257,7 @@ public class EpdcAppUserController {
      * @return
      */
     @GetMapping("residentDetail/{userId}")
-    public Result<EpdcResidentDetailResultDto> residentDetail(@PathVariable("userId") String userId){
+    public Result<EpdcResidentDetailResultDTO> residentDetail(@PathVariable("userId") String userId){
         return userService.residentDetail(userId);
     }
 
@@ -265,4 +270,14 @@ public class EpdcAppUserController {
     public Result<EpdcPartyMemberDetailDto> partyMemberDetail(String userId){
         return userService.partyMemberDetail(userId);
     }
+
+	/**
+	 * 认证用户（用户信息审核）
+	 * @param formDTO
+	 * @return
+	 */
+	@PostMapping("authenticateResident")
+		public Result authenticateResident(@RequestBody EpdcAppAuthenticateResidentFormDTO formDTO){
+			return userService.authenticateResident(formDTO);
+		}
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java

@@ -21,6 +21,10 @@ import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
 import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.dto.epdc.result.*;
+import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import com.elink.esua.epdc.entity.UserEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -101,7 +105,7 @@ public interface UserDao extends BaseDao<UserEntity> {
      * @param userId 用户Id
      * @return
      */
-	  EpdcResidentDetailResultDto residentDetailByUserId(@Param("userId")String userId);
+    EpdcResidentDetailResultDTO residentDetailByUserId(@Param("userId")String userId);
 
     /**
      * 获取党员详情（已认证或未认证的党员用户）

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

@@ -24,6 +24,11 @@ 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;
 import com.elink.esua.epdc.dto.epdc.form.*;
+import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.*;
 import com.elink.esua.epdc.entity.UserEntity;
 
@@ -208,4 +213,11 @@ public interface UserService extends BaseService<UserEntity> {
      * @return
      */
 	  Result<EpdcPartyMemberDetailDto> partyMemberDetail(String userId);
+
+    /**
+     * 认证用户（用户信息审核）
+     * @param formDTO
+     * @return
+     */
+    Result authenticateResident(EpdcAppAuthenticateResidentFormDTO formDTO);
 }

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

@@ -42,6 +42,8 @@ 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.*;
+import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO;
 import com.elink.esua.epdc.entity.PartyAuthenticationFailedEntity;
 import com.elink.esua.epdc.entity.PartyMembersEntity;
 import com.elink.esua.epdc.entity.UserEntity;
@@ -436,6 +438,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
 
         UserEntity oldEntity = this.baseDao.selectById(userDto.getId());
 
+        // 身份证号
+        String identityNo = userDto.getIdentityNo();
         if (YesOrNoEnum.YES.value().equals(userDto.getPartyFlag())) {
             PartyMembersEntity partyMembersEntity = new PartyMembersEntity();
             partyMembersEntity.setStreetId(userGridRelation.getStreetId());
@@ -447,7 +451,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             partyMembersEntity.setRegistFlag(YesOrNoEnum.YES.value());
 
             QueryWrapper<PartyMembersEntity> partyWrapper = new QueryWrapper<>();
-            partyWrapper.eq(UserFieldConsant.IDENTITY_NO, userDto.getIdentityNo())
+            partyWrapper.eq(UserFieldConsant.IDENTITY_NO, identityNo)
                     .eq(UserFieldConsant.REAL_NAME, userDto.getRealName());
             int selectCount = this.partyMembersDao.selectCount(partyWrapper);
 
@@ -456,12 +460,16 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
                 PartyAuthenticationFailedEntity authenticationFailedEntity = ConvertUtils.sourceToTarget(partyMembersEntity, PartyAuthenticationFailedEntity.class);
                 authenticationFailedEntity.setState(Integer.parseInt(YesOrNoEnum.NO.value()));
                 authenticationFailedEntity.setAddress(userDto.getAddress());
+                authenticationFailedEntity.setRealName(userDto.getRealName());
+                authenticationFailedEntity.setMobile(userDto.getMobile());
+                authenticationFailedEntity.setIdentityNo(identityNo);
+                authenticationFailedEntity.setRegistTime(oldEntity.getRegisterTime());
                 partyAuthenticationFailedDao.insert(authenticationFailedEntity);
 
-                userDto.setState(AppUserStatesEnum.PARTY_MEMBER_AUTHENTICATION_FAILED.value());
+                userDto.setState(AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value());
-            }else {
+            } else {
                 UpdateWrapper<PartyMembersEntity> partyUpdate = new UpdateWrapper<>();
-                partyUpdate.eq(UserFieldConsant.IDENTITY_NO, userDto.getIdentityNo())
+                partyUpdate.eq(UserFieldConsant.IDENTITY_NO, identityNo)
                         .eq(UserFieldConsant.REAL_NAME, userDto.getRealName());
 
                 this.partyMembersDao.update(partyMembersEntity, partyUpdate);
@@ -472,16 +480,15 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
                 userDto.setState(AppUserStatesEnum.STATE_COMPLETED_INFORMATION_PENDING_REVIEW.value());
             }
         }
-
+        // 昵称前缀
         String nicknamePrefix = "网格长-";
+        if (!oldEntity.getNickname().startsWith(nicknamePrefix)) {
+            nicknamePrefix = userDto.getRoad().concat("-");
+        }
         // 姓
         String lastName = userDto.getRealName().substring(NumConstant.ZERO, NumConstant.ONE);
-        if (oldEntity.getNickname().startsWith(nicknamePrefix)) {
+
-            userDto.setNickname(nicknamePrefix.concat(lastName).concat(UserSexEnum.FEMALE.sex().equals(userDto.getSex()) ? "女士" : "先生"));
+        userDto.setNickname(nicknamePrefix.concat(lastName).concat(UserSexEnum.FEMALE.sex().equals(userDto.getSex()) ? "女士" : "先生"));
-        }else {
-            userDto.setNickname(
-                    userDto.getRoad().concat("-").concat(lastName).concat(UserSexEnum.FEMALE.sex().equals(userDto.getSex()) ? "女士" : "先生"));
-        }
 
         UserEntity userEntity = ConvertUtils.sourceToTarget(userDto, UserEntity.class);
         boolean updateUser = this.updateById(userEntity);
@@ -494,18 +501,41 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
 
     /**
      * 获取居民详情（已认证或待认证（提交信息待审核）的居民用户）
+     *
      * @param userId 用户Id
      * @return
      */
     @Override
-    public Result<EpdcResidentDetailResultDto> residentDetail(String userId) {
+    public Result<EpdcResidentDetailResultDTO> residentDetail(String userId) {
         if(StringUtils.isBlank(userId)){
-            return new Result<EpdcResidentDetailResultDto>().error("用户Id不能为空");
+            return new Result<EpdcResidentDetailResultDTO>().error("用户Id不能为空");
         }
-        EpdcResidentDetailResultDto dto = this.baseDao.residentDetailByUserId(userId);
+        EpdcResidentDetailResultDTO dto = this.baseDao.residentDetailByUserId(userId);
         return new Result().ok(dto);
     }
 
+    /**
+     * 认证用户（用户信息审核）
+     * @param formDTO
+     * @return
+     */
+    @Override
+    public Result authenticateResident(EpdcAppAuthenticateResidentFormDTO formDTO) {
+    	if(StringUtils.isBlank(formDTO.getAuthenticatedFlag())){
+    		formDTO.setAuthenticatedFlag("0");
+	    }
+      UserDTO userDTO=this.get(formDTO.getUserId());
+      if(null!=userDTO){
+          if("0".equals(formDTO.getAuthenticatedFlag())){//不通过
+              userDTO.setState(AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value());
+          }else if("1".equals(formDTO.getAuthenticatedFlag())){//通过
+              userDTO.setState(AppUserStatesEnum.STATE_INFORMATION_PASSED.value());
+          }
+          this.update(userDTO);
+      }
+      return new Result();
+    }
+
     /**
      * 获取党员详情（已认证或未认证的党员用户）
      * @param userId

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml

@@ -90,7 +90,7 @@
             u.register_time desc
     </select>
     <!--  根据userId获取居民详情（已认证或待认证（提交信息待审核）的居民用户）  -->
-    <resultMap id="EpdcResidentDetailResultDtoMap" type="com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDto">
+    <resultMap id="EpdcResidentDetailResultDtoMap" type="com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO">
         <id column="id" property="userId"/>
         <result column="REAL_NAME" property="realName"/>
         <result column="IDENTITY_NO" property="identityNo"/>
@@ -99,7 +99,7 @@
         <result column="DWELLING_PLACE" property="dwellingPlace"/>
         <result column="PARTY_FLAG" property="partyFlag"/>
         <result column="state" property="state"/>
-        <collection property="gridList" ofType="com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailGridResultDto" >
+        <collection property="gridList" ofType="com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailGridResultDTO" >
             <result column="completeName" property="completeName"/>
             <result column="leaderFlag" property="leaderFlag"/>
         </collection>