冲突解决

epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/AuditedPartyMemberFormDTO.java

@@ -0,0 +1,34 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 党员认证-审核历史列表入参
+ * @Author yinzuomei
+ * @Date 2020/4/26 23:28
+ */
+@Data
+public class AuditedPartyMemberFormDTO implements Serializable {
+    private static final long serialVersionUID = -6698685200715718225L;
+    /**
+     * 网格ID
+     */
+    @NotBlank(message = "网格id不能为空")
+    private String gridId;
+
+    /**
+     * 页码
+     */
+    @Min(1)
+    private Integer pageNo;
+
+    /**
+     * 每页显示数量默认20
+     */
+    private Integer pageSize=20;
+}
+

epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/AuditingPartyMemberFormDTO.java

@@ -2,6 +2,7 @@ package com.epmet.dto.form;
 
 import lombok.Data;
 
+import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
@@ -19,5 +20,16 @@ public class AuditingPartyMemberFormDTO implements Serializable {
      */
     @NotBlank(message = "网格id不能为空")
     private String gridId;
+
+    /**
+     * 页码
+     */
+    @Min(1)
+    private Integer pageNo;
+
+    /**
+     * 每页显示数量默认20
+     */
+    private Integer pageSize=20;
 }
 

epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditedPartyMemberResultDTO.java

@@ -0,0 +1,46 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 党员认证-审核历史列表f返参
+ * @Author yinzuomei
+ * @Date 2020/4/26 23:29
+ */
+@Data
+public class AuditedPartyMemberResultDTO implements Serializable {
+    private static final long serialVersionUID = 4203582446687799299L;
+    /**
+     * 居民id
+     */
+    private String userId;
+
+    /**
+     * 用户真实姓名
+     */
+    private String realName;
+
+    /**
+     * 居民头像
+     */
+    private String userHeadPhoto;
+
+    /**
+     * 申请时间
+     */
+    private Date applyTime;
+
+    /**
+     * auto_confirm_failed:自动认证失败,rejected :拒绝
+     */
+    private String status;
+
+    /**
+     * read已读unread未读
+     */
+    private String gridFullPath;
+}
+

epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditingPartyMemberResultDTO.java

@@ -0,0 +1,47 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 党员认证-待审核列表返参
+ * @Author yinzuomei
+ * @Date 2020/4/26 16:08
+ */
+@Data
+public class AuditingPartyMemberResultDTO implements Serializable {
+    private static final long serialVersionUID = 5408510275912925158L;
+
+    /**
+     * 居民id
+     */
+    private String userId;
+
+    /**
+     * 用户真实姓名
+     */
+    private String realName;
+
+    /**
+     * 居民头像
+     */
+    private String userHeadPhoto;
+
+    /**
+     * 申请时间
+     */
+    private Date applyTime;
+
+    /**
+     * 提交网格：XXX街道-XXX社区-XXX网格
+     */
+    private String readFlag;
+
+    /**
+     * read已读unread未读
+     */
+    private String gridFullPath;
+}
+

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java

@@ -1,7 +1,10 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.AuditedPartyMemberFormDTO;
 import com.epmet.dto.form.AuditingPartyMemberFormDTO;
+import com.epmet.dto.result.AuditedPartyMemberResultDTO;
+import com.epmet.dto.result.AuditingPartyMemberResultDTO;
 import com.epmet.service.ResiPartyMemberService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -9,6 +12,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description 基层治理-党员认证
  * @Author yinzuomei
@@ -28,9 +33,21 @@ public class ResiPartyMemberController {
      * @Date 2020/4/26 16:04
      **/
     @PostMapping("auditing")
-    public Result auditing(@RequestBody AuditingPartyMemberFormDTO formDTO) {
+    public Result<List<AuditingPartyMemberResultDTO>> auditing(@RequestBody AuditingPartyMemberFormDTO formDTO) {
         return resiPartyMemberService.auditing(formDTO);
     }
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.AuditedPartyMemberResultDTO>>
+     * @param formDTO
+     * @Author yinzuomei
+     * @Description 党员认证-审核历史列表（审核历史：只包括自动审核失败和拒绝的审核失败：居民未填写补充信息。）
+     * @Date 2020/4/26 23:31
+     **/
+    @PostMapping("audited")
+    public Result<List<AuditedPartyMemberResultDTO>> audited(@RequestBody AuditedPartyMemberFormDTO formDTO) {
+        return resiPartyMemberService.audited(formDTO);
+    }
 }
 
 

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java

@@ -3,10 +3,15 @@ package com.epmet.feign;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.feign.fallback.ResiPartymemberFeignClientFallBack;
+import com.epmet.resi.partymember.dto.partymember.form.ReviewedParyMemberFormDTO;
+import com.epmet.resi.partymember.dto.partymember.form.UnderReviewParyMemberFormDTO;
+import com.epmet.resi.partymember.dto.partymember.result.ReviewedParyMemberResultDTO;
+import com.epmet.resi.partymember.dto.partymember.result.UnderReviewParyMemberResultDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.*;
 import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmAuditResultDTO;
 import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedAuditedResultDTO;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -24,7 +29,7 @@ public interface ResiPartymemberFeignClient {
 	 *
 	 * @author zhaoqf
 	 **/
-	@PostMapping(value = "resi/partymember/resiwarmheartedapply/audited")
+	@PostMapping(value = "resi/partymember/resiwarmheartedapply/audited", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
 	Result<List<ResiWarmheartedAuditedResultDTO>> audited(@RequestBody ResiWarmheartedAuditedFromDTO formDTO);
 
 	/**
@@ -33,7 +38,7 @@ public interface ResiPartymemberFeignClient {
 	 * @return void
 	 * @author sun
 	 */
-	@PostMapping(value = "resi/partymember/resiwarmheartedapply/auditing")
+	@PostMapping(value = "resi/partymember/resiwarmheartedapply/auditing", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
 	Result<List<ResiWarmAuditResultDTO>> auditing(@RequestBody ResiWarmAuditFormDTO formDTO);
 
 	/**
@@ -42,7 +47,7 @@ public interface ResiPartymemberFeignClient {
 	 * @return void
 	 * @author sun
 	 */
-	@PostMapping(value = "resi/partymember/resiwarmheartedapply/approve")
+	@PostMapping(value = "resi/partymember/resiwarmheartedapply/approve", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
 	Result approve(@RequestBody ResiWarmAuditApproveFormDTO formDTO);
 
 	/**
@@ -51,7 +56,7 @@ public interface ResiPartymemberFeignClient {
 	 * @return void
 	 * @author sun
 	 */
-	@PostMapping(value = "resi/partymember/resiwarmheartedapply/reject")
+	@PostMapping(value = "resi/partymember/resiwarmheartedapply/reject", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
 	Result reject(@RequestBody ResiWarmAuditRejectFormDTO formDTO);
 
 	/**
@@ -60,7 +65,26 @@ public interface ResiPartymemberFeignClient {
 	 * @return void
 	 * @author sun
 	 */
-	@PostMapping(value = "resi/partymember/resiwarmheartedapply/getdetail")
+	@PostMapping(value = "resi/partymember/resiwarmheartedapply/getdetail", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
 	Result<ResiWarmAuditResultDTO> getDetail(@RequestBody ResiWarmGetDetailFormDTO formDTO);
 
+	/**
+	 * @param underReviewParyMemberFormDTO
+	 * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.resi.partymember.dto.partymember.result.UnderReviewParyMemberResultDTO>>
+	 * @Author yinzuomei
+	 * @Description 政府端（小程序端）查询待审核列表
+	 * @Date 2020/4/26 21:53
+	 **/
+	@PostMapping(value = "resi/partymember/partymemberbaseinfo/auditing", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	Result<List<UnderReviewParyMemberResultDTO>> auditingPartyMember(@RequestBody UnderReviewParyMemberFormDTO underReviewParyMemberFormDTO);
+
+	/**
+	 * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.resi.partymember.dto.partymember.result.ReviewedParyMemberResultDTO>>
+	 * @param reviewedParyMemberFormDTO
+	 * @Author yinzuomei
+	 * @Description 党员认证-审核历史列表查询
+	 * @Date 2020/4/26 23:38
+	 **/
+	@PostMapping(value = "resi/partymember/partymemberbaseinfo/audited", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    Result<List<ReviewedParyMemberResultDTO>> auditedPartyMember(@RequestBody ReviewedParyMemberFormDTO reviewedParyMemberFormDTO);
 }

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java

@@ -4,6 +4,10 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.feign.ResiPartymemberFeignClient;
+import com.epmet.resi.partymember.dto.partymember.form.ReviewedParyMemberFormDTO;
+import com.epmet.resi.partymember.dto.partymember.form.UnderReviewParyMemberFormDTO;
+import com.epmet.resi.partymember.dto.partymember.result.ReviewedParyMemberResultDTO;
+import com.epmet.resi.partymember.dto.partymember.result.UnderReviewParyMemberResultDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.*;
 import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmAuditResultDTO;
 import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedAuditedResultDTO;
@@ -43,4 +47,14 @@ public class ResiPartymemberFeignClientFallBack implements ResiPartymemberFeignC
 		return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "getDetail", formDTO);
 	}
 
+	@Override
+	public Result<List<UnderReviewParyMemberResultDTO>> auditingPartyMember(UnderReviewParyMemberFormDTO underReviewParyMemberFormDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "auditing", underReviewParyMemberFormDTO);
+	}
+
+	@Override
+	public Result<List<ReviewedParyMemberResultDTO>> auditedPartyMember(ReviewedParyMemberFormDTO reviewedParyMemberFormDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "audited", reviewedParyMemberFormDTO);
+	}
+
 }

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java

@@ -1,7 +1,12 @@
 package com.epmet.service;
 
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.AuditedPartyMemberFormDTO;
 import com.epmet.dto.form.AuditingPartyMemberFormDTO;
+import com.epmet.dto.result.AuditedPartyMemberResultDTO;
+import com.epmet.dto.result.AuditingPartyMemberResultDTO;
+
+import java.util.List;
 
 /**
  * @Description 基层治理-党员认证
@@ -16,5 +21,13 @@ public interface ResiPartyMemberService {
      * @Description 待审核列表
      * @Date 2020/4/26 16:04
      **/
-    Result auditing(AuditingPartyMemberFormDTO formDTO);
+    Result<List<AuditingPartyMemberResultDTO>> auditing(AuditingPartyMemberFormDTO formDTO);
+    /**
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.AuditedPartyMemberResultDTO>>
+     * @param formDTO
+     * @Author yinzuomei
+     * @Description  党员认证-审核历史列表（审核历史：只包括自动审核失败和拒绝的审核失败：居民未填写补充信息。）
+     * @Date 2020/4/26 23:32
+     **/
+    Result<List<AuditedPartyMemberResultDTO>> audited(AuditedPartyMemberFormDTO formDTO);
 }

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiPartyMemberServiceImpl.java

@@ -1,12 +1,27 @@
 package com.epmet.service.impl;
 
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.AuditedPartyMemberFormDTO;
 import com.epmet.dto.form.AuditingPartyMemberFormDTO;
+import com.epmet.dto.result.AuditedPartyMemberResultDTO;
+import com.epmet.dto.result.AuditingPartyMemberResultDTO;
+import com.epmet.feign.ResiPartymemberFeignClient;
+import com.epmet.resi.partymember.dto.partymember.form.ReviewedParyMemberFormDTO;
+import com.epmet.resi.partymember.dto.partymember.form.UnderReviewParyMemberFormDTO;
+import com.epmet.resi.partymember.dto.partymember.result.ReviewedParyMemberResultDTO;
+import com.epmet.resi.partymember.dto.partymember.result.UnderReviewParyMemberResultDTO;
 import com.epmet.service.ResiPartyMemberService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @Description 基层治理-党员认证
  * @Author yinzuomei
@@ -15,10 +30,41 @@ import org.springframework.stereotype.Service;
 @Service
 public class ResiPartyMemberServiceImpl implements ResiPartyMemberService {
     protected final Logger logger = LoggerFactory.getLogger(getClass());
+    @Autowired
+    private ResiPartymemberFeignClient resiPartymemberFeignClient;
+
+    @Override
+    public Result<List<AuditingPartyMemberResultDTO>> auditing(AuditingPartyMemberFormDTO formDTO) {
+        UnderReviewParyMemberFormDTO underReviewParyMemberFormDTO = ConvertUtils.sourceToTarget(formDTO, UnderReviewParyMemberFormDTO.class);
+        List<AuditingPartyMemberResultDTO> list = new ArrayList<>();
+        Result<List<UnderReviewParyMemberResultDTO>> result = resiPartymemberFeignClient.auditingPartyMember(underReviewParyMemberFormDTO);
+        if (!result.success()) {
+            logger.error(String.format("调用resi-partymember-server模块失败,错误提示%s", result.getMsg()));
+            throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+        }
+        if (null == result.getData() || result.getData().isEmpty()) {
+            logger.info(String.format("网格id[%s],待审核党员列表查询为空", formDTO.getGridId()));
+            return new Result<List<AuditingPartyMemberResultDTO>>().ok(list);
+        }
+        list = ConvertUtils.sourceToTarget(result.getData(), AuditingPartyMemberResultDTO.class);
+        return new Result<List<AuditingPartyMemberResultDTO>>().ok(list);
+    }
 
     @Override
-    public Result auditing(AuditingPartyMemberFormDTO formDTO) {
-        return null;
+    public Result<List<AuditedPartyMemberResultDTO>> audited(AuditedPartyMemberFormDTO formDTO) {
+        ReviewedParyMemberFormDTO reviewedParyMemberFormDTO = ConvertUtils.sourceToTarget(formDTO, ReviewedParyMemberFormDTO.class);
+        List<AuditedPartyMemberResultDTO> list = new ArrayList<>();
+        Result<List<ReviewedParyMemberResultDTO>> result = resiPartymemberFeignClient.auditedPartyMember(reviewedParyMemberFormDTO);
+        if (!result.success()) {
+            logger.error(String.format("调用resi-partymember-server模块失败,错误提示%s", result.getMsg()));
+            throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+        }
+        if (null == result.getData() || result.getData().isEmpty()) {
+            logger.info(String.format("网格id[%s],待审核党员列表查询为空", formDTO.getGridId()));
+            return new Result<List<AuditedPartyMemberResultDTO>>().ok(list);
+        }
+        list = ConvertUtils.sourceToTarget(result.getData(), AuditedPartyMemberResultDTO.class);
+        return new Result<List<AuditedPartyMemberResultDTO>>().ok(list);
     }
 }
 

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridInfoResultDTO.java

@@ -0,0 +1,81 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 网格所属组织基本信息
+ * @Author yinzuomei
+ * @Date 2020/4/26 22:35
+ */
+@Data
+public class GridInfoResultDTO implements Serializable {
+    private static final long serialVersionUID = 4360690752084258055L;
+
+    /**
+     * 网格ID
+     */
+    private String gridId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
+    /**
+     * 社区组织ID
+     */
+    private String commnuityName;
+
+    /**
+     * 社区名称
+     */
+    private String commuityId;
+
+    /**
+     * 乡（镇、街道）级组织名称
+     */
+    private String streetName;
+
+    /**
+     * 乡（镇、街道）级id
+     */
+    private String streetId;
+
+    /**
+     * 区县级组织id
+     */
+    private String districtId;
+
+    /**
+     * 区县级组织名称
+     */
+    private String districtName;
+
+    /**
+     * 市级组织id
+     */
+    private String cityId;
+
+    /**
+     * 市级组织名称
+     */
+    private String cityName;
+
+    /**
+     * 省级组织id
+     */
+    private String provinceId;
+
+    /**
+     * 省级组织名称
+     */
+    private String proviceName;
+}
+

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java

@@ -30,6 +30,7 @@ import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.dto.form.ListCustomerGridFormDTO;
 import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
 import com.epmet.dto.result.CustomerGridForStrangerResultDTO;
+import com.epmet.dto.result.GridInfoResultDTO;
 import com.epmet.excel.CustomerGridExcel;
 import com.epmet.service.CustomerGridService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -126,6 +127,18 @@ public class CustomerGridController {
         return new Result<CustomerGridDTO>().ok(data);
     }
 
+    /**
+     * @param gridId
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.GridInfoResultDTO>
+     * @Author yinzuomei
+     * @Description 根据网格id查询所属组织信息
+     * @Date 2020/4/26 22:41
+     **/
+    @GetMapping("getGridInfo/{gridId}")
+    public Result<GridInfoResultDTO> getGridInfo(@PathVariable("gridId") String gridId) {
+        return customerGridService.getGridInfo(gridId);
+    }
+
     /**
      * @param userId
      * @return

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java

@@ -28,6 +28,8 @@ import com.epmet.dto.result.AddGridResultDTO;
 import com.epmet.dto.form.CommonAgencyIdFormDTO;
 import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.dto.form.ListCustomerGridFormDTO;
+import com.epmet.dto.result.CustomerGridForStrangerResultDTO;
+import com.epmet.dto.result.GridInfoResultDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.CustomerGridEntity;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -120,6 +122,15 @@ public interface CustomerGridService extends BaseService<CustomerGridEntity> {
      */
     Result<CustomerGridDTO> getCustomerGridByGridId(CustomerGridFormDTO customerGridFormDTO);
 
+    /**
+     * @param gridId
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.GridInfoResultDTO>
+     * @Author yinzuomei
+     * @Description 根据网格id查询所属组织信息
+     * @Date 2020/4/26 22:42
+     **/
+    Result<GridInfoResultDTO> getGridInfo(String gridId);
+
     /**
      * @param userId
      * @return
@@ -163,7 +174,7 @@ public interface CustomerGridService extends BaseService<CustomerGridEntity> {
      * @Date 2020.04.23 14:45
      **/
     Result<GridListInfoResultDTO> getGridListByAgency(CommonAgencyIdFormDTO agencyFormDTO);
-    
+
     /**
      * @Description 查找指定机构下的全部网格列表 对应接口:/gov/org/grid/allgrids
      * @Param CommonAgencyIdFormDTO -> agencyId

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
@@ -28,6 +29,7 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.CustomerGridDao;
+import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dao.CustomerStaffGridDao;
 import com.epmet.dto.*;
 import com.epmet.dto.form.*;
@@ -38,9 +40,12 @@ import com.epmet.dto.StaffGridListDTO;
 import com.epmet.dto.form.CommonAgencyIdFormDTO;
 import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.dto.form.ListCustomerGridFormDTO;
+import com.epmet.dto.result.CustomerGridForStrangerResultDTO;
+import com.epmet.dto.result.GridInfoResultDTO;
 import com.epmet.entity.CustomerGridEntity;
 import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.redis.CustomerGridRedis;
+import com.epmet.service.CustomerAgencyService;
 import com.epmet.service.CustomerGridService;
 import com.epmet.service.CustomerStaffGridService;
 import com.epmet.util.ModuleConstant;
@@ -70,6 +75,8 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
     @Autowired
     private CustomerGridRedis customerGridRedis;
     @Autowired
+    private CustomerAgencyService customerAgencyService;
+    @Autowired
     private EpmetUserFeignClient epmetUserFeignClient;
     @Autowired
     private CustomerStaffGridService customerStaffGridService;
@@ -172,6 +179,51 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         return new Result<CustomerGridDTO>().ok(baseDao.getCustomerGridByGridId(customerGridFormDTO));
     }
 
+    @Override
+    public Result<GridInfoResultDTO> getGridInfo(String gridId) {
+        GridInfoResultDTO gridInfoResultDTO=new GridInfoResultDTO();
+        CustomerGridDTO customerGridDTO = this.get(gridId);
+        if(null==customerGridDTO){
+            return new Result<>();
+        }
+        gridInfoResultDTO.setCustomerId(customerGridDTO.getCustomerId());
+        String pids=customerGridDTO.getPids();
+        String[] pidArray = pids.split(":");
+        for(String agencyId:pidArray){
+            CustomerAgencyDTO customerAgencyDTO=customerAgencyService.get(agencyId);
+            if(null!=customerAgencyDTO){
+                switch(customerAgencyDTO.getLevel()){
+                    case "community" :
+                        //社区级
+                        gridInfoResultDTO.setCommuityId(customerAgencyDTO.getId());
+                        gridInfoResultDTO.setCommnuityName(customerAgencyDTO.getOrganizationName());
+                        break;
+                    case "street" :
+                        //乡（镇、街道）级
+                        gridInfoResultDTO.setStreetId(customerAgencyDTO.getId());
+                        gridInfoResultDTO.setStreetName(customerAgencyDTO.getOrganizationName());
+                        break;
+                    case "district":
+                        //区县级
+                        gridInfoResultDTO.setDistrictId(customerAgencyDTO.getId());
+                        gridInfoResultDTO.setDistrictName(customerAgencyDTO.getOrganizationName());
+                        break;
+                    case "city":
+                        //市级
+                        gridInfoResultDTO.setCityId(customerAgencyDTO.getId());
+                        gridInfoResultDTO.setCityName(customerAgencyDTO.getOrganizationName());
+                        break;
+                    case "province":
+                        //省级
+                        gridInfoResultDTO.setProvinceId(customerAgencyDTO.getId());
+                        gridInfoResultDTO.setProviceName(customerAgencyDTO.getOrganizationName());
+                        break;
+                }
+            }
+        }
+        return new Result<GridInfoResultDTO>().ok(gridInfoResultDTO);
+    }
+
     /**
      * @param userId
      * @return

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/ReviewedParyMemberFormDTO.java

@@ -0,0 +1,32 @@
+package com.epmet.resi.partymember.dto.partymember.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Description 政府端（小程序）党员认证-审核历史列表入参
+ * @Author yinzuomei
+ * @Date 2020/4/26 23:35
+ */
+@Data
+public class ReviewedParyMemberFormDTO {
+    /**
+     * 网格ID
+     */
+    @NotBlank(message = "网格id不能为空")
+    private String gridId;
+
+    /**
+     * 页码
+     */
+    @Min(1)
+    private Integer pageNo;
+
+    /**
+     * 每页显示数量默认20
+     */
+    private Integer pageSize=20;
+}
+

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/UnderReviewParyMemberFormDTO.java

@@ -0,0 +1,34 @@
+package com.epmet.resi.partymember.dto.partymember.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 政府端（小程序端）查询待审核列表入参
+ * @Author yinzuomei
+ * @Date 2020/4/26 17:57
+ */
+@Data
+public class UnderReviewParyMemberFormDTO implements Serializable {
+    private static final long serialVersionUID = 1730875402752895514L;
+    /**
+     * 网格ID
+     */
+    @NotBlank(message = "网格id不能为空")
+    private String gridId;
+
+    /**
+     * 页码
+     */
+    @Min(1)
+    private Integer pageNo;
+
+    /**
+     * 每页显示数量默认20
+     */
+    private Integer pageSize=20;
+}
+

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/ReviewedParyMemberResultDTO.java

@@ -0,0 +1,44 @@
+package com.epmet.resi.partymember.dto.partymember.result;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Description 政府端（小程序）党员认证-审核历史列表返参
+ * @Author yinzuomei
+ * @Date 2020/4/26 23:36
+ */
+@Data
+public class ReviewedParyMemberResultDTO {
+    /**
+     * 居民id
+     */
+    private String userId;
+
+    /**
+     * 用户真实姓名
+     */
+    private String realName;
+
+    /**
+     * 居民头像
+     */
+    private String userHeadPhoto;
+
+    /**
+     * 申请时间
+     */
+    private Date applyTime;
+
+    /**
+     * auto_confirm_failed:自动认证失败,rejected :拒绝
+     */
+    private String status;
+
+    /**
+     * 提交网格：XXX街道-XXX社区-XXX网格
+     */
+    private String gridFullPath;
+}
+

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/UnderReviewParyMemberResultDTO.java

@@ -0,0 +1,47 @@
+package com.epmet.resi.partymember.dto.partymember.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 政府端（小程序端）查询待审核列表返参
+ * @Author yinzuomei
+ * @Date 2020/4/26 18:47
+ */
+@Data
+public class UnderReviewParyMemberResultDTO implements Serializable {
+    private static final long serialVersionUID = 2890001061547093376L;
+
+    /**
+     * 居民id
+     */
+    private String userId;
+
+    /**
+     * 用户真实姓名
+     */
+    private String realName;
+
+    /**
+     * 居民头像
+     */
+    private String userHeadPhoto;
+
+    /**
+     * 申请时间
+     */
+    private Date applyTime;
+
+    /**
+     * read已读unread未读
+     */
+    private String readFlag;
+
+    /**
+     * 提交网格：XXX街道-XXX社区-XXX网格
+     */
+    private String gridFullPath;
+}
+

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java

@@ -97,15 +97,25 @@ public interface PartyMemberConstant {
 	String UNDER_AUDITTING = "under_auditting";
 
 	/**
-	 * 审核状态 通过
+	 * 审核状态 通过 approved:人工审核通过，
 	 */
 	String APPROVED = "approved";
 
 	/**
-	 * 审核状态 未通过
+	 * 审核状态 未通过rejected :拒绝
 	 */
 	String REJECTED = "rejected";
 
+	/**
+	 * 自动认证成功
+	 */
+	String AUTO_CONFIRM_SUCCESS="auto_confirm_success";
+
+	/**
+	 * 自动认证失败
+	 */
+	String AUTO_CONFIRM_FAILED="auto_confirm_failed";
+
 	/**
 	 * 网格ID
 	 */

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/GovOrgFeignClient.java

@@ -5,9 +5,11 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.form.CustomerGridFormDTO;
-import com.epmet.dto.form.ListCustomerGridFormDTO;
+import com.epmet.dto.result.GridInfoResultDTO;
 import com.epmet.modules.feign.fallback.GovOrgFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -28,8 +30,13 @@ public interface GovOrgFeignClient {
     @PostMapping("/gov/org/customergrid/getcustomergridbygridid")
     Result<CustomerGridDTO> getCustomerGridByGridId(@RequestBody CustomerGridFormDTO customerGridFormDTO);
 
-
-
-
-
+    /**
+     * @param gridId
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.GridInfoResultDTO>
+     * @Author yinzuomei
+     * @Description 根据网格id查询所属组织信息
+     * @Date 2020/4/26 23:16
+     **/
+    @GetMapping("/gov/org/customergrid/getGridInfo/{gridId}")
+    Result<GridInfoResultDTO> queryGridInfo(@PathVariable("gridId") String gridId);
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/GovOrgFeignClientFallBack.java

@@ -5,6 +5,7 @@ import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.form.CustomerGridFormDTO;
+import com.epmet.dto.result.GridInfoResultDTO;
 import com.epmet.modules.feign.GovOrgFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -25,4 +26,9 @@ public class GovOrgFeignClientFallBack implements GovOrgFeignClient {
     public Result<CustomerGridDTO> getCustomerGridByGridId(CustomerGridFormDTO customerGridFormDTO) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getCustomerGridByGridId",customerGridFormDTO);
     }
+
+    @Override
+    public Result<GridInfoResultDTO> queryGridInfo(String gridId) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getGridInfo",gridId);
+    }
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberBaseInfoController.java

@@ -28,10 +28,15 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.modules.partymember.excel.PartymemberBaseInfoExcel;
 import com.epmet.modules.partymember.service.PartymemberBaseInfoService;
 import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO;
+import com.epmet.resi.partymember.dto.partymember.form.ReviewedParyMemberFormDTO;
+import com.epmet.resi.partymember.dto.partymember.form.UnderReviewParyMemberFormDTO;
+import com.epmet.resi.partymember.dto.partymember.result.ReviewedParyMemberResultDTO;
+import com.epmet.resi.partymember.dto.partymember.result.UnderReviewParyMemberResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 
@@ -91,4 +96,27 @@ public class PartymemberBaseInfoController {
         ExcelUtils.exportExcelToTarget(response, null, list, PartymemberBaseInfoExcel.class);
     }
 
+    /**
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.resi.partymember.dto.partymember.result.UnderReviewParyMemberResultDTO>>
+     * @param formDTO
+     * @Author yinzuomei
+     * @Description 政府端（小程序端）查询待审核列表
+     * @Date 2020/4/26 20:35
+     **/
+    @PostMapping("auditing")
+    public Result<List<UnderReviewParyMemberResultDTO>> auditing(@RequestBody @Valid UnderReviewParyMemberFormDTO formDTO){
+        return partymemberBaseInfoService.auditing(formDTO);
+    }
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.resi.partymember.dto.partymember.result.ReviewedParyMemberResultDTO>>
+     * @param formDTO
+     * @Author yinzuomei
+     * @Description 政府端（小程序端）查询审核历史
+     * @Date 2020/4/26 23:40
+     **/
+    @PostMapping("audited")
+    public Result<List<ReviewedParyMemberResultDTO>> audited(@RequestBody @Valid ReviewedParyMemberFormDTO formDTO){
+        return partymemberBaseInfoService.audited(formDTO);
+    }
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberBaseInfoDao.java

@@ -20,6 +20,10 @@ package com.epmet.modules.partymember.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.modules.partymember.entity.PartymemberBaseInfoEntity;
 import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
+import com.epmet.resi.partymember.dto.partymember.form.ReviewedParyMemberFormDTO;
+import com.epmet.resi.partymember.dto.partymember.form.UnderReviewParyMemberFormDTO;
+import com.epmet.resi.partymember.dto.partymember.result.ReviewedParyMemberResultDTO;
+import com.epmet.resi.partymember.dto.partymember.result.UnderReviewParyMemberResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -57,4 +61,21 @@ public interface PartymemberBaseInfoDao extends BaseDao<PartymemberBaseInfoEntit
 	 */
 	List<PartymemberBaseInfoEntity> selectBaseInfoByName(PartymemberInfoDTO param);
 
+	/**
+	 * @param formDTO
+	 * @return java.util.List<com.epmet.resi.partymember.dto.partymember.result.UnderReviewParyMemberResultDTO>
+	 * @Author yinzuomei
+	 * @Description 政府端（小程序端）查询待审核列表-根据网格id分页查询待审核党员列表
+	 * @Date 2020/4/26 20:43
+	 **/
+	List<UnderReviewParyMemberResultDTO> selectListUnderReviewParyMember(UnderReviewParyMemberFormDTO formDTO);
+
+	/**
+	 * @param formDTO
+	 * @return java.util.List<com.epmet.resi.partymember.dto.partymember.result.ReviewedParyMemberResultDTO>
+	 * @Author yinzuomei
+	 * @Description 政府端（小程序端）查询待审核列表-根据网格id分页查询待审核党员列表 自动审核失败且未填写补充信息的+拒绝的
+	 * @Date 2020/4/26 23:43
+	 **/
+	List<ReviewedParyMemberResultDTO> selectListReviewedParyMember(ReviewedParyMemberFormDTO formDTO);
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberBaseInfoService.java

@@ -19,16 +19,21 @@ package com.epmet.modules.partymember.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.modules.partymember.entity.PartymemberBaseInfoEntity;
 import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO;
 import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmAutoDTO;
 import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
+import com.epmet.resi.partymember.dto.partymember.form.ReviewedParyMemberFormDTO;
+import com.epmet.resi.partymember.dto.partymember.form.UnderReviewParyMemberFormDTO;
+import com.epmet.resi.partymember.dto.partymember.result.ReviewedParyMemberResultDTO;
+import com.epmet.resi.partymember.dto.partymember.result.UnderReviewParyMemberResultDTO;
 
 import java.util.List;
 import java.util.Map;
 
 /**
- * 党员库基本信息表 
+ * 党员库基本信息表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-03-30
@@ -97,8 +102,27 @@ public interface PartymemberBaseInfoService extends BaseService<PartymemberBaseI
 
     /**
      * 根据身份证，手机号，姓名匹配党员基本信息
+     *
      * @param partyMemberInfoDTO 参数
      * @return GetPartyMemberBaseInfoResultDTO
      */
     PartymemberConfirmAutoDTO getPartyMemberBaseInfo(PartymemberInfoDTO partyMemberInfoDTO);
+
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.resi.partymember.dto.partymember.result.UnderReviewParyMemberResultDTO>>
+     * @Author yinzuomei
+     * @Description 政府端（小程序端）查询待审核列表
+     * @Date 2020/4/26 20:36
+     **/
+    Result<List<UnderReviewParyMemberResultDTO>> auditing(UnderReviewParyMemberFormDTO formDTO);
+
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.resi.partymember.dto.partymember.result.ReviewedParyMemberResultDTO>>
+     * @Author yinzuomei
+     * @Description 政府端（小程序端）查询审核历史
+     * @Date 2020/4/26 23:40
+     **/
+    Result<List<ReviewedParyMemberResultDTO>> audited(ReviewedParyMemberFormDTO formDTO);
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java

@@ -21,9 +21,16 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.PartyMemberConstant;
+import com.epmet.dto.form.UserResiInfoListFormDTO;
+import com.epmet.dto.result.GridInfoResultDTO;
+import com.epmet.dto.result.UserResiInfoResultDTO;
+import com.epmet.modules.feign.EpmetUserFeignClient;
+import com.epmet.modules.feign.GovOrgFeignClient;
 import com.epmet.modules.partymember.dao.PartymemberBaseInfoDao;
 import com.epmet.modules.partymember.entity.PartymemberBaseInfoEntity;
 import com.epmet.modules.partymember.redis.PartymemberBaseInfoRedis;
@@ -31,6 +38,10 @@ import com.epmet.modules.partymember.service.PartymemberBaseInfoService;
 import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO;
 import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmAutoDTO;
 import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
+import com.epmet.resi.partymember.dto.partymember.form.ReviewedParyMemberFormDTO;
+import com.epmet.resi.partymember.dto.partymember.form.UnderReviewParyMemberFormDTO;
+import com.epmet.resi.partymember.dto.partymember.result.ReviewedParyMemberResultDTO;
+import com.epmet.resi.partymember.dto.partymember.result.UnderReviewParyMemberResultDTO;
 import info.debatty.java.stringsimilarity.Levenshtein;
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
@@ -39,8 +50,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import static java.util.stream.Collectors.toList;
 
@@ -55,6 +64,10 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl<PartymemberB
 
 	@Autowired
 	private PartymemberBaseInfoRedis partymemberBaseInfoRedis;
+	@Autowired
+	private EpmetUserFeignClient epmetUserFeignClient;
+	@Autowired
+	private GovOrgFeignClient govOrgFeignClient;
 
 	private final static String EQUAL = "11";
 	private final static int START = 0;
@@ -258,6 +271,87 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl<PartymemberB
 		return getResult(similar, partyMemberInfo, false);
 	}
 
+	@Override
+	public Result<List<UnderReviewParyMemberResultDTO>> auditing(UnderReviewParyMemberFormDTO formDTO) {
+		int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
+		formDTO.setPageNo(pageIndex);
+		List<UnderReviewParyMemberResultDTO> list = baseDao.selectListUnderReviewParyMember(formDTO);
+		if (null == list || list.isEmpty()) {
+			return new Result<List<UnderReviewParyMemberResultDTO>>().ok(new ArrayList<>());
+		}
+		//查询网格信息
+		Result<GridInfoResultDTO> gridInfoResult = govOrgFeignClient.queryGridInfo(formDTO.getGridId());
+		String gridFullPath = "";
+		if (gridInfoResult.success() && null != gridInfoResult.getData()) {
+			gridFullPath = String.format("%s-%s-%s", gridInfoResult.getData().getStreetName(),
+					gridInfoResult.getData().getCommnuityName(),
+					gridInfoResult.getData().getGridName());
+			gridFullPath = gridFullPath.replaceAll("--", "").trim();
+		}
+		//查询居民认证信息，获取居民头像
+		List<String> userIdList = new ArrayList<>();
+		for (UnderReviewParyMemberResultDTO underReviewParyMember : list) {
+			userIdList.add(underReviewParyMember.getUserId());
+			underReviewParyMember.setGridFullPath(gridFullPath);
+		}
+		UserResiInfoListFormDTO userResiInfoListFormDTO = new UserResiInfoListFormDTO();
+		userResiInfoListFormDTO.setUserIdList(userIdList);
+		Result<List<UserResiInfoResultDTO>> userResiInfoResult = epmetUserFeignClient.getUserResiInfoList(userResiInfoListFormDTO);
+		if (userResiInfoResult.success()) {
+			for (UnderReviewParyMemberResultDTO underReviewParyMemberInfo : list) {
+				for (UserResiInfoResultDTO userResiInfo : userResiInfoResult.getData()) {
+					if (underReviewParyMemberInfo.getUserId().equals(userResiInfo.getUserId())) {
+						underReviewParyMemberInfo.setUserHeadPhoto(userResiInfo.getHeadPhoto());
+						break;
+					}
+				}
+			}
+		}
+		return new Result<List<UnderReviewParyMemberResultDTO>>().ok(list);
+	}
+
+
+	@Override
+	public Result<List<ReviewedParyMemberResultDTO>> audited(ReviewedParyMemberFormDTO formDTO) {
+		int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
+		formDTO.setPageNo(pageIndex);
+		//审核历史：只包括自动审核失败和拒绝的
+		//审核失败：居民未填写补充信息。
+		List<ReviewedParyMemberResultDTO> list = baseDao.selectListReviewedParyMember(formDTO);
+		if (null == list || list.isEmpty()) {
+			return new Result<List<ReviewedParyMemberResultDTO>>().ok(new ArrayList<>());
+		}
+		//查询网格信息
+		Result<GridInfoResultDTO> gridInfoResult = govOrgFeignClient.queryGridInfo(formDTO.getGridId());
+		String gridFullPath = "";
+		if (gridInfoResult.success() && null != gridInfoResult.getData()) {
+			gridFullPath = String.format("%s-%s-%s", gridInfoResult.getData().getStreetName(),
+					gridInfoResult.getData().getCommnuityName(),
+					gridInfoResult.getData().getGridName());
+			gridFullPath = gridFullPath.replaceAll("--", "").trim();
+		}
+		//查询居民认证信息，获取居民头像
+		List<String> userIdList = new ArrayList<>();
+		for (ReviewedParyMemberResultDTO reviewedParyMemberResultDTO : list) {
+			userIdList.add(reviewedParyMemberResultDTO.getUserId());
+			reviewedParyMemberResultDTO.setGridFullPath(gridFullPath);
+		}
+		UserResiInfoListFormDTO userResiInfoListFormDTO = new UserResiInfoListFormDTO();
+		userResiInfoListFormDTO.setUserIdList(userIdList);
+		Result<List<UserResiInfoResultDTO>> userResiInfoResult = epmetUserFeignClient.getUserResiInfoList(userResiInfoListFormDTO);
+		if (userResiInfoResult.success()) {
+			for (ReviewedParyMemberResultDTO reviewedParyMember : list) {
+				for (UserResiInfoResultDTO userResiInfo : userResiInfoResult.getData()) {
+					if (reviewedParyMember.getUserId().equals(userResiInfo.getUserId())) {
+						reviewedParyMember.setUserHeadPhoto(userResiInfo.getHeadPhoto());
+						break;
+					}
+				}
+			}
+		}
+		return new Result<List<ReviewedParyMemberResultDTO>>().ok(list);
+	}
+
 
 	/**
 	 * 生成返回结果

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml

@@ -54,5 +54,58 @@
           AND DEL_FLAG = 0
     </select>
 
+    <!--  根据网格id分页查询待审核党员列表 -->
+    <select id="selectListUnderReviewParyMember" parameterType="com.epmet.resi.partymember.dto.partymember.form.UnderReviewParyMemberFormDTO"
+            resultType="com.epmet.resi.partymember.dto.partymember.result.UnderReviewParyMemberResultDTO">
+        SELECT
+            pi.USER_ID AS userId,
+            concat( pi.SURNAME, pi.NAME ) AS realName,
+            pi.CREATED_TIME AS applyTime,
+            pcm.READ_FLAG AS readFlag
+        FROM
+            partymember_info pi
+            LEFT JOIN partymember_confirm_manual pcm ON ( pi.id = pcm.PARTYMEMBER_INFO_ID )
+        WHERE
+            pi.DEL_FLAG = '0'
+            AND pcm.DEL_FLAG = '0'
+            AND pi.CONFIRM_RESULT = 'auto_confirm_failed'
+            AND pi.EXTRA_ORGANIZATION IS NOT NULL
+            AND pi.GRID_ID = #{gridId}
+        ORDER BY
+            pi.CREATED_TIME DESC
+        LIMIT #{pageNo},#{pageSize}
+    </select>
 
+    <!--   根据网格id分页查询待审核党员列表 自动审核失败且未填写补充信息的+拒绝的  -->
+    <select id="selectListReviewedParyMember" parameterType="com.epmet.resi.partymember.dto.partymember.form.ReviewedParyMemberFormDTO"
+            resultType="com.epmet.resi.partymember.dto.partymember.result.ReviewedParyMemberResultDTO">
+        SELECT
+            pi.USER_ID AS userId,
+            concat( pi.SURNAME, pi.NAME ) AS realName,
+            pi.CREATED_TIME AS applyTime,
+            pi.CONFIRM_RESULT AS status
+        FROM
+            partymember_info pi
+        WHERE
+            pi.DEL_FLAG = '0'
+            AND pi.CONFIRM_RESULT ='auto_confirm_failed'
+            AND (pi.EXTRA_ORGANIZATION is null or trim(pi.EXTRA_ORGANIZATION)='')
+            AND pi.GRID_ID = #{gridId}
+        union all
+        SELECT
+            pi.USER_ID AS userId,
+            concat( pi.SURNAME, pi.NAME ) AS realName,
+            pi.CREATED_TIME AS applyTime,
+            pi.CONFIRM_RESULT AS status
+        FROM
+            partymember_info pi
+        WHERE
+            pi.DEL_FLAG = '0'
+            AND pi.CONFIRM_RESULT ='rejected'
+            AND pi.EXTRA_ORGANIZATION IS NOT NULL
+            AND pi.GRID_ID = #{gridId}
+        ORDER BY
+            applyTime DESC
+        LIMIT #{pageNo},#{pageSize}
+    </select>
 </mapper>

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/redis/migration/db.sql

@@ -4,4 +4,6 @@ ALTER TABLE resi_warmhearted_apply ADD (
 	MESSAGE_TEXT VARCHAR (500) DEFAULT NULL COMMENT '消息通知内容'
 );
 -- 修改党员认证结果2020-04-26
-alter table partymember_info modify column CONFIRM_RESULT varchar(20) COMMENT '认证结果:auto_confirm_success:自动认证成功,auto_confirm_failed:自动认证失败,approved:人工审核通过，rejected :拒绝)';
+alter table partymember_info modify column CONFIRM_RESULT varchar(20) COMMENT '认证结果:auto_confirm_success:自动认证成功,auto_confirm_failed:自动认证失败,approved:人工审核通过，rejected :拒绝)';
+-- 添加已读未读标志
+ALTER TABLE partymember_confirm_manual ADD ( READ_FLAG VARCHAR ( 20 ) COMMENT '审核人员已读未读标识(未读:unread 界面显示红点; 已读:read 不显示红点)' );