Merge remote-tracking branch 'origin/test' into test

CeDo

2021-05-07 c8913745b443966b0a9a1ee7766eda0d5293a98b

Merge remote-tracking branch 'origin/test' into test

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberVO.java

@@ -51,4 +51,6 @@
    private Long userId;
    @ApiModelProperty(value = "党员审查结果: 0 待审核 1 已审核 2 自动认证 3 已驳回")
    private Integer auditResult;
    @ApiModelProperty(value = "驳回原因")
    private String refuseReason;
}

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java

@@ -552,6 +552,7 @@
                break;
            case 0:
                partyBuildingMemberVO.setAuditResult(3);
                partyBuildingMemberVO.setRefuseReason(partyBuildingMemberDTO.getRefuseReason());
                break;
            default:
                return R.fail("参数错误");

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/model/dto/PartyBuildingMemberDTO.java

@@ -20,4 +20,7 @@
    @ApiModelProperty(value = "身份证号", required = true)
    private String idCard;

    @ApiModelProperty(value = "驳回原因")
    private String refuseReason;

}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbMemberDO.java

@@ -82,4 +82,9 @@
     */
    private Long userId;

    /**
     * 驳回原因
     */
    private String refuseReason;

}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java

@@ -507,6 +507,9 @@
            return R.fail("未找到党员认证信息");
        }
        comPbMemberDO.setAuditResult(partyBuildingMemberVO.getAuditResult());
        if(partyBuildingMemberVO.getAuditResult().equals(3)){
            comPbMemberDO.setRefuseReason(partyBuildingMemberVO.getRefuseReason());
        }
        if(partyBuildingMemberVO.getAuditResult()!=null && partyBuildingMemberVO.getAuditResult().equals(1)){
            comPbMemberDO.setUpdateAt(new Date());
        }