diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index 5dbc9f0cf2..948e607ed1 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -26,6 +26,7 @@ public enum EpmetErrorCode { MOBILE_GET_CODE_ERROR(8104,"获取验证码失败"), MESSAGE_SMS_SEND_ERROR(8105, "短信发送失败"), NOT_DEL_GRID(8106,"该网格存在工作人员，不允许删除"), + ORG_IS_NOT_NULL(8107,"党组织关系不能为空"), CANNOT_AUDIT_WARM(8201, "请完善居民信息"), NOT_DEL_AGENCY(8202, "该机关存在下级机关，不允许删除"), diff --git a/epmet-module/gov-grid/gov-grid-server/pom.xml b/epmet-module/gov-grid/gov-grid-server/pom.xml index 965969714d..a784496cac 100644 --- a/epmet-module/gov-grid/gov-grid-server/pom.xml +++ b/epmet-module/gov-grid/gov-grid-server/pom.xml @@ -102,7 +102,7 @@ 0 - 127.0.0.1 + 192.168.1.130 6379 123456 diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java index 18e000ed9a..de92cc128b 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java @@ -9,6 +9,13 @@ import com.epmet.dto.form.CertifiedFormDTO; import com.epmet.dto.result.CertifiedResultDTO; import com.epmet.dto.result.AuditedPartyMemberResultDTO; import com.epmet.dto.result.AuditingPartyMemberResultDTO; +import com.epmet.resi.partymember.dto.partymember.form.AuditingDetailFromDTO; +import com.epmet.resi.partymember.dto.partymember.form.AutoFailedDetailFromDTO; +import com.epmet.resi.partymember.dto.partymember.form.PartyMemberConfirmFromDTO; +import com.epmet.resi.partymember.dto.partymember.form.RejectedDetailFromDTO; +import com.epmet.resi.partymember.dto.partymember.result.AuditingDetailResultDTO; +import com.epmet.resi.partymember.dto.partymember.result.AutoFailedDetailResultDTO; +import com.epmet.resi.partymember.dto.partymember.result.RejectedDetailResultDTO; import com.epmet.service.ResiPartyMemberService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -65,6 +72,54 @@ public class ResiPartyMemberController { public Result> certifiedList(@LoginUser TokenDto tokenDto, @RequestBody CertifiedFormDTO certifiedFormDTO){ return resiPartyMemberService.certifiedList(certifiedFormDTO); } + + /** + * 审核党员 + * + * @param fromDTO 参数 + * @return Result + * @author zhaoqifeng + */ + @PostMapping("audit") + public Result manualConfirmResult(@RequestBody PartyMemberConfirmFromDTO fromDTO) { + return resiPartyMemberService.manualConfirmResult(fromDTO); + } + + /** + * 待审核详情 + * + * @param fromDTO 参数 + * @return Result + * @author zhaoqifeng + */ + @PostMapping("auditingdetail") + public Result auditingDetail(@RequestBody AuditingDetailFromDTO fromDTO) { + return resiPartyMemberService.auditingDetail(fromDTO); + } + + /** + * 自动审核失败详情 + * + * @param fromDTO 参数 + * @return Result + * @author zhaoqifeng + */ + @PostMapping("auditingdetail") + public Result autoFailedDetail(@RequestBody AutoFailedDetailFromDTO fromDTO) { + return resiPartyMemberService.autoFailedDetail(fromDTO); + } + + /** + * 拒绝详情 + * + * @param fromDTO 参数 + * @return Result + * @author zhaoqifeng + */ + @PostMapping("rejecteddetail") + public Result rejectedDetail(@RequestBody RejectedDetailFromDTO fromDTO) { + return resiPartyMemberService.rejectedDetail(fromDTO); + } } diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java index c26f3978e6..25b586513b 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java @@ -5,10 +5,8 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.CertifiedFormDTO; import com.epmet.dto.result.CertifiedResultDTO; 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.partymember.form.*; +import com.epmet.resi.partymember.dto.partymember.result.*; 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; @@ -99,4 +97,43 @@ public interface ResiPartymemberFeignClient { @PostMapping(value = "/resi/partymember/partymemberinfo/certified") Result> certified(@RequestBody CertifiedFormDTO certifiedFormDTO); + /** + * 审核党员 + * + * @param fromDTO 参数 + * @return Result + * @author zhaoqifeng + */ + @PostMapping("/resi/partymember/confirm/audit") + Result manualConfirmResult(@RequestBody PartyMemberConfirmFromDTO fromDTO); + + /** + * 待审核详情 + * + * @param fromDTO 参数 + * @return Result + * @author zhaoqifeng + */ + @PostMapping("/resi/partymember/confirm/auditingdetail") + Result auditingDetail(@RequestBody AuditingDetailFromDTO fromDTO); + /** + * 自动审核失败详情 + * + * @param fromDTO 参数 + * @return Result + * @author zhaoqifeng + */ + @PostMapping("/resi/partymember/confirm/auditingdetail") + Result autoFailedDetail(@RequestBody AutoFailedDetailFromDTO fromDTO); + + /** + * 拒绝详情 + * + * @param fromDTO 参数 + * @return Result + * @author zhaoqifeng + */ + @PostMapping("/resi/partymember/confirm/rejecteddetail") + Result rejectedDetail(@RequestBody RejectedDetailFromDTO fromDTO); + } diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java index 81621574bd..aedb5b3d0e 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java @@ -6,10 +6,8 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.CertifiedFormDTO; import com.epmet.dto.result.CertifiedResultDTO; 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.partymember.form.*; +import com.epmet.resi.partymember.dto.partymember.result.*; 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; @@ -64,4 +62,24 @@ public class ResiPartymemberFeignClientFallBack implements ResiPartymemberFeignC return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "certified", certifiedFormDTO); } + @Override + public Result manualConfirmResult(PartyMemberConfirmFromDTO fromDTO) { + return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "manualConfirmResult", fromDTO); + } + + @Override + public Result auditingDetail(AuditingDetailFromDTO fromDTO) { + return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "auditingDetail", fromDTO); + } + + @Override + public Result autoFailedDetail(AutoFailedDetailFromDTO fromDTO) { + return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "autoFailedDetail", fromDTO); + } + + @Override + public Result rejectedDetail(RejectedDetailFromDTO fromDTO) { + return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "rejectedDetail", fromDTO); + } + } diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java index 0d274382e6..93512bde0e 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java @@ -9,6 +9,13 @@ import com.epmet.dto.result.CertifiedResultDTO; import java.util.List; import com.epmet.dto.result.AuditedPartyMemberResultDTO; import com.epmet.dto.result.AuditingPartyMemberResultDTO; +import com.epmet.resi.partymember.dto.partymember.form.AuditingDetailFromDTO; +import com.epmet.resi.partymember.dto.partymember.form.AutoFailedDetailFromDTO; +import com.epmet.resi.partymember.dto.partymember.form.PartyMemberConfirmFromDTO; +import com.epmet.resi.partymember.dto.partymember.form.RejectedDetailFromDTO; +import com.epmet.resi.partymember.dto.partymember.result.AuditingDetailResultDTO; +import com.epmet.resi.partymember.dto.partymember.result.AutoFailedDetailResultDTO; +import com.epmet.resi.partymember.dto.partymember.result.RejectedDetailResultDTO; import java.util.List; @@ -44,4 +51,40 @@ public interface ResiPartyMemberService { * @CreatedTime 2020/4/26 16:18 */ Result> certifiedList(CertifiedFormDTO certifiedFormDTO); + + /** + * 人工审核结果 + * + * @param fromDTO + * @return + * @author zhaoqifeng + */ + Result manualConfirmResult(PartyMemberConfirmFromDTO fromDTO); + + /** + * 待审核详情 + * + * @param fromDTO + * @return + * @author zhaoqifeng + */ + Result auditingDetail(AuditingDetailFromDTO fromDTO); + + /** + * 自动审核失败详情 + * + * @param fromDTO + * @return + * @author zhaoqifeng + */ + Result autoFailedDetail(AutoFailedDetailFromDTO fromDTO); + + /** + * 拒绝详情 + * + * @param fromDTO + * @return + * @author zhaoqifeng + */ + Result rejectedDetail(RejectedDetailFromDTO fromDTO); } diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiPartyMemberServiceImpl.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiPartyMemberServiceImpl.java index 2345960135..a97b886619 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiPartyMemberServiceImpl.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiPartyMemberServiceImpl.java @@ -12,10 +12,8 @@ import com.epmet.feign.ResiPartymemberFeignClient; 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.resi.partymember.dto.partymember.form.*; +import com.epmet.resi.partymember.dto.partymember.result.*; import com.epmet.service.ResiPartyMemberService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -84,5 +82,25 @@ public class ResiPartyMemberServiceImpl implements ResiPartyMemberService { public Result> certifiedList(CertifiedFormDTO certifiedFormDTO) { return resiPartymemberFeignClient.certified(certifiedFormDTO); } + + @Override + public Result manualConfirmResult(PartyMemberConfirmFromDTO fromDTO) { + return resiPartymemberFeignClient.manualConfirmResult(fromDTO); + } + + @Override + public Result auditingDetail(AuditingDetailFromDTO fromDTO) { + return resiPartymemberFeignClient.auditingDetail(fromDTO); + } + + @Override + public Result autoFailedDetail(AutoFailedDetailFromDTO fromDTO) { + return resiPartymemberFeignClient.autoFailedDetail(fromDTO); + } + + @Override + public Result rejectedDetail(RejectedDetailFromDTO fromDTO) { + return resiPartymemberFeignClient.rejectedDetail(fromDTO); + } } diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberServiceImpl.java index eb13aa4bd1..447055431a 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberServiceImpl.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberServiceImpl.java @@ -1,5 +1,6 @@ package com.epmet.modules.partymember.service.impl; +import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.modules.feign.ResiPartymemberFeignClient; @@ -9,6 +10,7 @@ import com.epmet.resi.mine.dto.from.PartyMemberSubmitFromDTO; import com.epmet.resi.mine.dto.from.VerificationCodeFromDTO; import com.epmet.resi.mine.dto.result.PartyMemberInitResultDTO; import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO; +import org.apache.poi.ss.formula.constant.ErrorConstant; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -49,6 +51,9 @@ public class PartyMemberServiceImpl implements PartyMemberService { @Override public Result partyMemberInfoExtra(TokenDto tokenDto, PartyMemberSubmitFromDTO fromDTO) { PartymemberInfoDTO partyMemberInfo = fromDTO.getPartyMemberInfo(); + if (null == partyMemberInfo.getExtraOrganization() || partyMemberInfo.getExtraOrganization().isEmpty()) { + return new Result().error(EpmetErrorCode.ORG_IS_NOT_NULL.getCode(), EpmetErrorCode.ORG_IS_NOT_NULL.getMsg()); + } partyMemberInfo.setCustomerId(fromDTO.getCustomerId()); partyMemberInfo.setGridId(fromDTO.getGridId()); partyMemberInfo.setUserId(tokenDto.getUserId()); diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/AuditingDetailFromDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/AuditingDetailFromDTO.java new file mode 100644 index 0000000000..387c68772c --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/AuditingDetailFromDTO.java @@ -0,0 +1,29 @@ +package com.epmet.resi.partymember.dto.partymember.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/4/27 13:48 + */ +@Data +public class AuditingDetailFromDTO implements Serializable { + private static final long serialVersionUID = 1L; + /** + * 党员认证信息表ID + */ + private String partyMemberId; + + /** + * 党员自动审核表ID + */ + private String autoId; + + /** + * 党员人工审核表ID + */ + private String manualId; +} diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/AutoFailedDetailFromDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/AutoFailedDetailFromDTO.java new file mode 100644 index 0000000000..f1f438117e --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/AutoFailedDetailFromDTO.java @@ -0,0 +1,24 @@ +package com.epmet.resi.partymember.dto.partymember.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/4/27 14:48 + */ +@Data +public class AutoFailedDetailFromDTO implements Serializable { + private static final long serialVersionUID = 1L; + /** + * 党员认证信息表ID + */ + private String partyMemberId; + + /** + * 党员自动审核表ID + */ + private String autoId; +} diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/PartyMemberConfirmFromDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/PartyMemberConfirmFromDTO.java new file mode 100644 index 0000000000..a530da6850 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/PartyMemberConfirmFromDTO.java @@ -0,0 +1,39 @@ +package com.epmet.resi.partymember.dto.partymember.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/4/10 11:11 + */ +@Data +public class PartyMemberConfirmFromDTO implements Serializable { + private static final long serialVersionUID = 1L; + /** + * 党员认证信息表ID + */ + private String partyMemberId; + + /** + * 党员自动审核表ID + */ + private String autoId; + + /** + * 党员人工审核表ID + */ + private String manualId; + + /** + * 审核状态 yes,no + */ + private String partyMemberFlag; + + /** + * 审核理由 + */ + private String reason; +} diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/RejectedDetailFromDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/RejectedDetailFromDTO.java new file mode 100644 index 0000000000..5b8f84da86 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/RejectedDetailFromDTO.java @@ -0,0 +1,29 @@ +package com.epmet.resi.partymember.dto.partymember.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/4/27 15:16 + */ +@Data +public class RejectedDetailFromDTO implements Serializable { + private static final long serialVersionUID = 1L; + /** + * 党员认证信息表ID + */ + private String partyMemberId; + + /** + * 党员自动审核表ID + */ + private String autoId; + + /** + * 党员人工审核表ID + */ + private String manualId; +} diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/AdditionalInfoDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/AdditionalInfoDTO.java new file mode 100644 index 0000000000..b6a981f6d0 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/AdditionalInfoDTO.java @@ -0,0 +1,32 @@ +package com.epmet.resi.partymember.dto.partymember.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/4/27 13:52 + */ +@Data +public class AdditionalInfoDTO implements Serializable { + private static final long serialVersionUID = 1L; + /** + * 工作单位或所属街道 + */ + private String extraOrganization; + /** + * 联系人 + */ + private String contactPeople; + /** + * 联系方式 + */ + private String contactMobile; + /** + * 自动审核失败原因 + */ + private List failedReason; +} diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/AuditingDetailResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/AuditingDetailResultDTO.java new file mode 100644 index 0000000000..a86ee343bb --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/AuditingDetailResultDTO.java @@ -0,0 +1,65 @@ +package com.epmet.resi.partymember.dto.partymember.result; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/4/27 13:50 + */ +@NoArgsConstructor +@Data +public class AuditingDetailResultDTO implements Serializable { + private static final long serialVersionUID = 1L; + /** + * 党员认证信息ID + */ + private String partyMemberId; + /** + * 党员自动审核ID + */ + private String autoId; + /** + * 党员人工审核ID + */ + private String manualId; + /** + * 居民id + */ + private String userId; + /** + * 真实姓名 + */ + private String realName; + /** + * 联系方式 + */ + private String mobile; + /** + * 身份证号 + */ + private String idCard; + /** + * 提交网格：XXX街道-XXX社区-XXX网格 + */ + private String gridFullPath; + /** + * 居民住址 + */ + private String address; + /** + * 提交认证时间 + */ + private Long certifyTime; + + /** + * 补充信息 + */ + private AdditionalInfoDTO additionalInfo; + + +} diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/AutoFailedDetailResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/AutoFailedDetailResultDTO.java new file mode 100644 index 0000000000..7000c5f240 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/AutoFailedDetailResultDTO.java @@ -0,0 +1,49 @@ +package com.epmet.resi.partymember.dto.partymember.result; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/4/27 14:49 + */ +@NoArgsConstructor +@Data +public class AutoFailedDetailResultDTO implements Serializable { + private static final long serialVersionUID = 1L; + /** + * 居民ID + */ + private String userId; + /** + * 姓名 + */ + private String realName; + /** + * 联系方式 + */ + private String mobile; + /** + * 身份证号 + */ + private String idCard; + /** + * 提交网格 + */ + private String gridFullPath; + /** + * 居住地址 + */ + private String address; + /** + * 提交时间 + */ + private Long certifyTime; + /** + * 自动审核失败原因以逗号隔开 + */ + private String failedReason; +} diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/RejectedDetailResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/RejectedDetailResultDTO.java new file mode 100644 index 0000000000..275490c991 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/RejectedDetailResultDTO.java @@ -0,0 +1,66 @@ +package com.epmet.resi.partymember.dto.partymember.result; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/4/27 15:17 + */ +@NoArgsConstructor +@Data +public class RejectedDetailResultDTO implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 居民ID + */ + private String userId; + /** + * 姓名 + */ + private String realName; + /** + * 联系方式 + */ + private String mobile; + /** + * 身份证号 + */ + private String idCard; + /** + * 提交网格XXX街道-XXX社区-XXX网格 + */ + private String gridFullPath; + /** + * 居住地址 + */ + private String address; + /** + * 提交认证时间 + */ + private Long certifyTime; + /** + * 拒绝理由 + */ + private String rejectedReason; + /** + * 工作单位/所属街道 + */ + private String extraOrganization; + /** + * 联系人 + */ + private String contactPeople; + /** + * 联系方式 + */ + private String contactMobile; + /** + * 自动审核失败的原因 + */ + private String failedReason; +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java index d73c5178bc..bb0795b43b 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java @@ -122,17 +122,17 @@ public interface PartyMemberConstant { String ALL = "all"; /** - * 认证成功 + * 居民端 */ - String CONFIRM_SUCCESS = "0"; + String RESI = "resi"; /** - * 认证失败 + * 未读 */ - String CONFIRM_FAILED = "1"; + String UNREAD = "unread"; /** - * 居民端 + * 已读 */ - String RESI = "resi"; + String READ = "read"; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartyMemberConfirmController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartyMemberConfirmController.java index 22be95f523..63dde1c984 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartyMemberConfirmController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartyMemberConfirmController.java @@ -5,7 +5,15 @@ import com.epmet.modules.partymember.service.PartyMemberConfirmService; import com.epmet.resi.mine.dto.from.PartyMemberInitFromDTO; import com.epmet.resi.mine.dto.from.VerificationCodeFromDTO; import com.epmet.resi.mine.dto.result.PartyMemberInitResultDTO; +import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmManualDTO; import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO; +import com.epmet.resi.partymember.dto.partymember.form.AuditingDetailFromDTO; +import com.epmet.resi.partymember.dto.partymember.form.AutoFailedDetailFromDTO; +import com.epmet.resi.partymember.dto.partymember.form.PartyMemberConfirmFromDTO; +import com.epmet.resi.partymember.dto.partymember.form.RejectedDetailFromDTO; +import com.epmet.resi.partymember.dto.partymember.result.AuditingDetailResultDTO; +import com.epmet.resi.partymember.dto.partymember.result.AutoFailedDetailResultDTO; +import com.epmet.resi.partymember.dto.partymember.result.RejectedDetailResultDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -71,4 +79,49 @@ public class PartyMemberConfirmController { public Result partyMemberInfoExtra(@RequestBody PartymemberInfoDTO partyMemberInfoDTO) { return partyMemberConfirmService.partyMemberInfoExtra(partyMemberInfoDTO); } + + /** + * 审核党员 + * + * @param fromDTO 参数 + * @return Result + */ + @PostMapping("audit") + public Result manualConfirmResult(@RequestBody PartyMemberConfirmFromDTO fromDTO) { + return partyMemberConfirmService.manualConfirmResult(fromDTO); + } + + /** + * 待审核详情 + * + * @param fromDTO 参数 + * @return Result + */ + @PostMapping("auditingdetail") + public Result auditingDetail(@RequestBody AuditingDetailFromDTO fromDTO) { + return partyMemberConfirmService.auditingDetail(fromDTO); + } + + /** + * 自动审核失败详情 + * + * @param fromDTO 参数 + * @return Result + */ + @PostMapping("auditingdetail") + public Result autoFailedDetail(@RequestBody AutoFailedDetailFromDTO fromDTO) { + return partyMemberConfirmService.autoFailedDetail(fromDTO); + } + + /** + * 拒绝详情 + * + * @param fromDTO 参数 + * @return Result + */ + @PostMapping("rejecteddetail") + public Result rejectedDetail(@RequestBody RejectedDetailFromDTO fromDTO) { + return partyMemberConfirmService.rejectedDetail(fromDTO); + } + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberConfirmManualEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberConfirmManualEntity.java index 8b65fc2930..6be68841fb 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberConfirmManualEntity.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberConfirmManualEntity.java @@ -68,4 +68,9 @@ public class PartymemberConfirmManualEntity extends BaseEpmetEntity { */ private String refuseReason; + /** + * 是否已读 未读:unread 已读:read + */ + private String readFlag; + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartyMemberConfirmService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartyMemberConfirmService.java index feee93b3cc..e2644fb607 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartyMemberConfirmService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartyMemberConfirmService.java @@ -4,7 +4,15 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.resi.mine.dto.from.PartyMemberInitFromDTO; import com.epmet.resi.mine.dto.from.VerificationCodeFromDTO; import com.epmet.resi.mine.dto.result.PartyMemberInitResultDTO; +import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmManualDTO; import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO; +import com.epmet.resi.partymember.dto.partymember.form.AuditingDetailFromDTO; +import com.epmet.resi.partymember.dto.partymember.form.AutoFailedDetailFromDTO; +import com.epmet.resi.partymember.dto.partymember.form.PartyMemberConfirmFromDTO; +import com.epmet.resi.partymember.dto.partymember.form.RejectedDetailFromDTO; +import com.epmet.resi.partymember.dto.partymember.result.AuditingDetailResultDTO; +import com.epmet.resi.partymember.dto.partymember.result.AutoFailedDetailResultDTO; +import com.epmet.resi.partymember.dto.partymember.result.RejectedDetailResultDTO; /** * 党员认证 @@ -46,5 +54,35 @@ public interface PartyMemberConfirmService { */ Result partyMemberInfoExtra(PartymemberInfoDTO partyMemberInfoDTO); + /** + * 人工审核结果 + * + * @param fromDTO + * @return + */ + Result manualConfirmResult(PartyMemberConfirmFromDTO fromDTO); + + /** + * 待审核详情 + * + * @param fromDTO + * @return + */ + Result auditingDetail(AuditingDetailFromDTO fromDTO); + /** + * 自动审核失败详情 + * + * @param fromDTO + * @return + */ + Result autoFailedDetail(AutoFailedDetailFromDTO fromDTO); + + /** + * 拒绝详情 + * + * @param fromDTO + * @return + */ + Result rejectedDetail(RejectedDetailFromDTO fromDTO); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java index 28959478c1..d5e6be5621 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java @@ -8,9 +8,11 @@ import com.epmet.constant.PartyMemberConstant; import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.UserRoleDTO; import com.epmet.dto.form.UserResiInfoFormDTO; +import com.epmet.dto.result.GridInfoResultDTO; import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.modules.feign.EpmetMessageFeignClient; import com.epmet.modules.feign.EpmetUserFeignClient; +import com.epmet.modules.feign.GovOrgFeignClient; import com.epmet.modules.partymember.entity.*; import com.epmet.modules.partymember.redis.PartymemberInfoRedis; import com.epmet.modules.partymember.service.*; @@ -20,12 +22,22 @@ import com.epmet.resi.mine.dto.result.PartyMemberInitResultDTO; import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmAutoDTO; import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmManualDTO; import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO; +import com.epmet.resi.partymember.dto.partymember.form.AuditingDetailFromDTO; +import com.epmet.resi.partymember.dto.partymember.form.AutoFailedDetailFromDTO; +import com.epmet.resi.partymember.dto.partymember.form.PartyMemberConfirmFromDTO; +import com.epmet.resi.partymember.dto.partymember.form.RejectedDetailFromDTO; +import com.epmet.resi.partymember.dto.partymember.result.AdditionalInfoDTO; +import com.epmet.resi.partymember.dto.partymember.result.AuditingDetailResultDTO; +import com.epmet.resi.partymember.dto.partymember.result.AutoFailedDetailResultDTO; +import com.epmet.resi.partymember.dto.partymember.result.RejectedDetailResultDTO; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; +import java.util.List; import java.util.Map; /** @@ -56,6 +68,8 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService private PartymemberRegisterRelationService partymemberRegisterRelationService; @Autowired private EpmetMessageFeignClient messageFeignClient; + @Autowired + private GovOrgFeignClient govOrgFeignClient; @Override @Transactional(rollbackFor = Exception.class) @@ -158,7 +172,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_FAILED); //自动认证失败 - partyMemberInfoEntity.setConfirmResult(PartyMemberConstant.CONFIRM_FAILED); + partyMemberInfoEntity.setConfirmResult(PartyMemberConstant.AUTO_CONFIRM_FAILED); if (partyMemberInfoEntity.getId().isEmpty()) { partymemberInfoService.insert(partyMemberInfoEntity); } else { @@ -172,7 +186,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_SUCCESS); //自动认证成功 - partyMemberInfoEntity.setConfirmResult(PartyMemberConstant.CONFIRM_SUCCESS); + partyMemberInfoEntity.setConfirmResult(PartyMemberConstant.AUTO_CONFIRM_SUCCESS); if (partyMemberInfoEntity.getId().isEmpty()) { partymemberInfoService.insert(partyMemberInfoEntity); } else { @@ -242,6 +256,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService manualEntity.setUserId(infoDTO.getUserId()); manualEntity.setPartymemberInfoId(infoDTO.getId()); manualEntity.setAuditStatus(PartyMemberConstant.UNDER_AUDITTING); + manualEntity.setReadFlag(PartyMemberConstant.UNREAD); partymemberConfirmManualService.insert(manualEntity); } @@ -249,6 +264,204 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService return new Result(); } + @Override + public Result manualConfirmResult(PartyMemberConfirmFromDTO fromDTO) { + PartymemberConfirmManualEntity manualEntity = partymemberConfirmManualService.selectById(fromDTO.getManualId()); + PartymemberInfoEntity partyMemberInfoEntity = partymemberInfoService.selectById(fromDTO.getPartyMemberId()); + partyMemberInfoEntity.setId(manualEntity.getPartymemberInfoId()); + partyMemberInfoEntity.setConfirmResult(fromDTO.getPartyMemberFlag()); + + partymemberInfoService.updateById(partyMemberInfoEntity); + + manualEntity.setAuditStatus(fromDTO.getPartyMemberFlag()); + manualEntity.setRefuseReason(fromDTO.getReason()); + partymemberConfirmManualService.updateById(manualEntity); + + if (PartyMemberConstant.APPROVED.equals(fromDTO.getPartyMemberFlag())) { + //添加用户党员角色关系 + UserRoleDTO userRole = new UserRoleDTO(); + userRole.setCustomerId(partyMemberInfoEntity.getCustomerId()); + userRole.setGridId(PartyMemberConstant.ALL); + userRole.setUserId(partyMemberInfoEntity.getUserId()); + userRole.setRoleKey(EpmetRoleKeyConstant.PARTYMEMBER); + userRole.setApp(PartyMemberConstant.RESI); + epmetUserFeignClient.saveUserRole(userRole); + //存入党员注册关系表 用于统计客户网格的认证党员数 + saveRegisterRelation(ConvertUtils.sourceToTarget(partyMemberInfoEntity, + PartymemberInfoDTO.class)); + } + + return new Result(); + } + + @Override + public Result auditingDetail(AuditingDetailFromDTO fromDTO) { + AuditingDetailResultDTO resultDTO = new AuditingDetailResultDTO(); + AdditionalInfoDTO additionalInfoDTO = new AdditionalInfoDTO(); + resultDTO.setPartyMemberId(fromDTO.getPartyMemberId()); + resultDTO.setAutoId(fromDTO.getAutoId()); + resultDTO.setManualId(fromDTO.getManualId()); + + //获取人工审核信息 + PartymemberConfirmManualEntity manualEntity = partymemberConfirmManualService.selectById(fromDTO.getManualId()); + //人工审核信息设为已读 + manualEntity.setReadFlag(PartyMemberConstant.READ); + partymemberConfirmManualService.updateById(manualEntity); + + //获取党员认证信息 + PartymemberInfoEntity partyMemberInfoEntity = partymemberInfoService.selectById(fromDTO.getPartyMemberId()); + resultDTO.setUserId(partyMemberInfoEntity.getUserId()); + resultDTO.setRealName(partyMemberInfoEntity.getSurname() + partyMemberInfoEntity.getName()); + resultDTO.setIdCard(partyMemberInfoEntity.getIdCard()); + resultDTO.setMobile(resultDTO.getMobile()); + resultDTO.setAddress(partyMemberInfoEntity.getStreet() + partyMemberInfoEntity.getEstate() + partyMemberInfoEntity.getBuilding()); + resultDTO.setCertifyTime(manualEntity.getCreatedTime().getTime()); + + //获取党员自动认证信息 + List failedReason = new ArrayList<>(); + + if (null != fromDTO.getAutoId() && !fromDTO.getAutoId().isEmpty()) { + PartymemberConfirmAutoEntity autoEntity = partymemberConfirmAutoService.selectById(fromDTO.getAutoId()); + if (PartyMemberConstant.SAME.equals(autoEntity.getMobileResult())) { + failedReason.add("手机号匹配"); + } else { + failedReason.add("手机号未匹配"); + } + if (PartyMemberConstant.SAME.equals(autoEntity.getIdCardResult())) { + failedReason.add("身份证匹配"); + } else { + failedReason.add("身份证未匹配"); + } + if (PartyMemberConstant.SAME.equals(autoEntity.getNameResult())) { + failedReason.add("姓名匹配"); + } else { + failedReason.add("姓名未匹配"); + } + } else { + failedReason.add("手机号未匹配"); + failedReason.add("身份证未匹配"); + failedReason.add("姓名未匹配"); + } + //补充信息 + additionalInfoDTO.setExtraOrganization(partyMemberInfoEntity.getExtraOrganization()); + additionalInfoDTO.setContactMobile(partyMemberInfoEntity.getExtraCertifierMobile() == null ? "" : partyMemberInfoEntity.getExtraCertifierMobile()); + additionalInfoDTO.setContactPeople(partyMemberInfoEntity.getExtraCertifierName() == null ? "" : partyMemberInfoEntity.getExtraCertifierName()); + additionalInfoDTO.setFailedReason(failedReason); + resultDTO.setAdditionalInfo(additionalInfoDTO); + //查询网格信息 + Result gridInfoResult = govOrgFeignClient.queryGridInfo(partyMemberInfoEntity.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(); + } + resultDTO.setGridFullPath(gridFullPath); + + return new Result().ok(resultDTO); + } + + @Override + public Result autoFailedDetail(AutoFailedDetailFromDTO fromDTO) { + AutoFailedDetailResultDTO resultDTO = new AutoFailedDetailResultDTO(); + //获取党员认证信息 + PartymemberInfoEntity partyMemberInfo = partymemberInfoService.selectById(fromDTO.getPartyMemberId()); + resultDTO.setUserId(partyMemberInfo.getUserId()); + resultDTO.setRealName(partyMemberInfo.getSurname() + partyMemberInfo.getName()); + resultDTO.setIdCard(partyMemberInfo.getIdCard()); + resultDTO.setMobile(resultDTO.getMobile()); + resultDTO.setAddress(partyMemberInfo.getStreet() + partyMemberInfo.getEstate() + partyMemberInfo.getBuilding()); + String failedReason = ""; + if (null != fromDTO.getAutoId() && !fromDTO.getAutoId().isEmpty()) { + PartymemberConfirmAutoEntity autoEntity = partymemberConfirmAutoService.selectById(fromDTO.getAutoId()); + resultDTO.setCertifyTime(autoEntity.getContrastTime().getTime()); + if (PartyMemberConstant.SAME.equals(autoEntity.getMobileResult())) { + failedReason = failedReason + "手机号匹配,"; + } else { + failedReason = failedReason + "手机号未匹配,"; + } + if (PartyMemberConstant.SAME.equals(autoEntity.getIdCardResult())) { + failedReason = failedReason + "身份证匹配,"; + } else { + failedReason = failedReason + "身份证未匹配,"; + } + if (PartyMemberConstant.SAME.equals(autoEntity.getNameResult())) { + failedReason = failedReason + "姓名匹配"; + } else { + failedReason = failedReason + "姓名未匹配"; + } + } else { + failedReason = "手机号未匹配,身份证未匹配，姓名未匹配"; + resultDTO.setCertifyTime(partyMemberInfo.getUpdatedTime().getTime()); + } + resultDTO.setFailedReason(failedReason); + //查询网格信息 + Result gridInfoResult = govOrgFeignClient.queryGridInfo(partyMemberInfo.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(); + } + resultDTO.setGridFullPath(gridFullPath); + + return new Result().ok(resultDTO); + } + + @Override + public Result rejectedDetail(RejectedDetailFromDTO fromDTO) { + RejectedDetailResultDTO resultDTO = new RejectedDetailResultDTO(); + //获取党员认证信息 + PartymemberInfoEntity partyMemberInfo = partymemberInfoService.selectById(fromDTO.getPartyMemberId()); + resultDTO.setUserId(partyMemberInfo.getUserId()); + resultDTO.setRealName(partyMemberInfo.getSurname() + partyMemberInfo.getName()); + resultDTO.setIdCard(partyMemberInfo.getIdCard()); + resultDTO.setMobile(resultDTO.getMobile()); + resultDTO.setAddress(partyMemberInfo.getStreet() + partyMemberInfo.getEstate() + partyMemberInfo.getBuilding()); + resultDTO.setExtraOrganization(partyMemberInfo.getExtraOrganization()); + resultDTO.setContactMobile(partyMemberInfo.getExtraCertifierMobile() == null ? "" : partyMemberInfo.getExtraCertifierMobile()); + resultDTO.setContactPeople(partyMemberInfo.getExtraCertifierName() == null ? "" : partyMemberInfo.getExtraCertifierName()); + String failedReason =""; + if (null != fromDTO.getAutoId() && !fromDTO.getAutoId().isEmpty()) { + PartymemberConfirmAutoEntity autoEntity = partymemberConfirmAutoService.selectById(fromDTO.getAutoId()); + if (PartyMemberConstant.SAME.equals(autoEntity.getMobileResult())) { + failedReason = failedReason + "手机号匹配,"; + } else { + failedReason = failedReason + "手机号未匹配,"; + } + if (PartyMemberConstant.SAME.equals(autoEntity.getIdCardResult())) { + failedReason = failedReason + "身份证匹配,"; + } else { + failedReason = failedReason + "身份证未匹配,"; + } + if (PartyMemberConstant.SAME.equals(autoEntity.getNameResult())) { + failedReason = failedReason + "姓名匹配"; + } else { + failedReason = failedReason + "姓名未匹配"; + } + } else { + failedReason = "手机号未匹配,身份证未匹配，姓名未匹配"; + } + resultDTO.setFailedReason(failedReason); + //获取人工审核信息 + PartymemberConfirmManualEntity manualEntity = partymemberConfirmManualService.selectById(fromDTO.getManualId()); + resultDTO.setCertifyTime(manualEntity.getCreatedTime().getTime()); + resultDTO.setFailedReason(manualEntity.getRefuseReason()); + //查询网格信息 + Result gridInfoResult = govOrgFeignClient.queryGridInfo(partyMemberInfo.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(); + } + resultDTO.setGridFullPath(gridFullPath); + return new Result().ok(resultDTO); + } + /** * 判断是否已注册居民，如果没有则注册居民 * diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberConfirmManualServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberConfirmManualServiceImpl.java index 926218c9ef..184ed1e49f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberConfirmManualServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberConfirmManualServiceImpl.java @@ -23,6 +23,7 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.constant.PartyMemberConstant; import com.epmet.modules.partymember.dao.PartymemberConfirmManualDao; import com.epmet.modules.partymember.entity.PartymemberConfirmManualEntity; import com.epmet.modules.partymember.redis.PartymemberConfirmManualRedis; @@ -104,7 +105,9 @@ public class PartymemberConfirmManualServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(partymemberInfoId), "PARTYMEMBER_INFO_ID", partymemberInfoId); + wrapper.eq(StringUtils.isNotBlank(partymemberInfoId), "PARTYMEMBER_INFO_ID", partymemberInfoId) + .eq("AUDIT_STATUS", PartyMemberConstant.UNDER_AUDITTING); + PartymemberConfirmManualEntity entity = baseDao.selectOne(wrapper); return ConvertUtils.sourceToTarget(entity, PartymemberConfirmManualDTO.class); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml index b30353f09d..3e6a3b68d4 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml @@ -40,7 +40,7 @@ pi.CUSTOMER_ID = #{customerId} AND pi.GRID_ID = #{gridId} AND pi.USER_ID = #{userId} - AND pi.CONFIRM_RESULT = '1' + AND pi.CONFIRM_RESULT = 'auto_confirm_failed' AND pi.DEL_FLAG = 0 AND ( pcm.AUDIT_STATUS = 'under_auditting' OR pi.ORGANIZATION_TYPE IS NULL ) @@ -54,7 +54,7 @@ WHERE CUSTOMER_ID = #{customerId} AND MOBILE = #{mobile} - AND CONFIRM_RESULT = '0' + AND (CONFIRM_RESULT = 'auto_confirm_success' OR CONFIRM_RESULT = 'approved') AND DEL_FLAG = 0