bug修改

101captain

2022-07-15 4ada4733bfded6398387103e64d01a1ecc0407e8

bug修改

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/BaseException.java

New file
@@ -0,0 +1,84 @@
package com.panzhihua.common.exceptions;

import com.panzhihua.common.utlis.MessageUtils;
import org.apache.commons.lang3.StringUtils;

/**
 * 基础异常
 *
 * @author
 */
public class BaseException extends RuntimeException {
    private static final long serialVersionUID = 1L;

    /**
     * 所属模块
     */
    private String module;

    /**
     * 错误码
     */
    private String code;

    /**
     * 错误码对应的参数
     */
    private Object[] args;

    /**
     * 错误消息
     */
    private String defaultMessage;

    public BaseException(String module, String code, Object[] args, String defaultMessage) {
        this.module = module;
        this.code = code;
        this.args = args;
        this.defaultMessage = defaultMessage;
    }

    public BaseException(String module, String code, Object[] args) {
        this(module, code, args, null);
    }

    public BaseException(String module, String defaultMessage) {
        this(module, null, null, defaultMessage);
    }

    public BaseException(String code, Object[] args) {
        this(null, code, args, null);
    }

    public BaseException(String defaultMessage) {
        this(null, null, null, defaultMessage);
    }

    @Override
    public String getMessage() {
        String message = null;
        if (!StringUtils.isEmpty(code)) {
            message = MessageUtils.message(code, args);
        }
        if (message == null) {
            message = defaultMessage;
        }
        return message;
    }

    public String getModule() {
        return module;
    }

    public String getCode() {
        return code;
    }

    public Object[] getArgs() {
        return args;
    }

    public String getDefaultMessage() {
        return defaultMessage;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/FileException.java

New file
@@ -0,0 +1,18 @@
package com.panzhihua.common.exceptions;


/**
 * 文件信息异常类
 * 
 * @author
 */
public class FileException extends BaseException
{
    private static final long serialVersionUID = 1L;

    public FileException(String code, Object[] args)
    {
        super("file", code, args, null);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/FileNameLengthLimitExceededException.java

New file
@@ -0,0 +1,16 @@
package com.panzhihua.common.exceptions;

/**
 * 文件名称超长限制异常类
 * 
 * @author ruoyi
 */
public class FileNameLengthLimitExceededException extends FileException
{
    private static final long serialVersionUID = 1L;

    public FileNameLengthLimitExceededException(int defaultFileNameLength)
    {
        super("upload.filename.exceed.length", new Object[] { defaultFileNameLength });
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/FileSizeLimitExceededException.java

New file
@@ -0,0 +1,16 @@
package com.panzhihua.common.exceptions;

/**
 * 文件名大小限制异常类
 * 
 * @author ruoyi
 */
public class FileSizeLimitExceededException extends FileException
{
    private static final long serialVersionUID = 1L;

    public FileSizeLimitExceededException(long defaultMaxSize)
    {
        super("upload.exceed.maxSize", new Object[] { defaultMaxSize });
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/InvalidExtensionException.java

New file
@@ -0,0 +1,82 @@
package com.panzhihua.common.exceptions;

import org.apache.commons.fileupload.FileUploadException;

import java.util.Arrays;

/**
 * 文件上传 误异常类
 * 
 * @author ruoyi
 */
public class InvalidExtensionException extends FileUploadException
{
    private static final long serialVersionUID = 1L;

    private String[] allowedExtension;
    private String extension;
    private String filename;

    public InvalidExtensionException(String[] allowedExtension, String extension, String filename)
    {
        super("filename : [" + filename + "], extension : [" + extension + "], allowed extension : [" + Arrays.toString(allowedExtension) + "]");
        this.allowedExtension = allowedExtension;
        this.extension = extension;
        this.filename = filename;
    }

    public String[] getAllowedExtension()
    {
        return allowedExtension;
    }

    public String getExtension()
    {
        return extension;
    }

    public String getFilename()
    {
        return filename;
    }

    public static class InvalidImageExtensionException extends InvalidExtensionException
    {
        private static final long serialVersionUID = 1L;

        public InvalidImageExtensionException(String[] allowedExtension, String extension, String filename)
        {
            super(allowedExtension, extension, filename);
        }
    }

    public static class InvalidFlashExtensionException extends InvalidExtensionException
    {
        private static final long serialVersionUID = 1L;

        public InvalidFlashExtensionException(String[] allowedExtension, String extension, String filename)
        {
            super(allowedExtension, extension, filename);
        }
    }

    public static class InvalidMediaExtensionException extends InvalidExtensionException
    {
        private static final long serialVersionUID = 1L;

        public InvalidMediaExtensionException(String[] allowedExtension, String extension, String filename)
        {
            super(allowedExtension, extension, filename);
        }
    }

    public static class InvalidVideoExtensionException extends InvalidExtensionException
    {
        private static final long serialVersionUID = 1L;

        public InvalidVideoExtensionException(String[] allowedExtension, String extension, String filename)
        {
            super(allowedExtension, extension, filename);
        }
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/dpc/AddDpcDTO.java

New file
@@ -0,0 +1,58 @@
package com.panzhihua.common.model.dtos.community.dpc;

import javax.validation.constraints.NotBlank;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @title: AddDpcDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 人大代表新增请求参数类
 * @author: hans
 * @date: 2022/06/07 11:00
 */
@Data
@ApiModel("人大代表新增请求参数类")
public class AddDpcDTO {

    @ApiModelProperty("姓名")
    @NotBlank(message = "姓名不能为空")
    private String name;

    @ApiModelProperty("手机号")
    @NotBlank(message = "手机号不能为空")
    private String phone;

    @ApiModelProperty("民族")
    private String nation;

    @ApiModelProperty("性别（1.男 2.女 3.未知）")
    private Integer sex;

    @ApiModelProperty("选区")
    @NotBlank(message = "选区不能为空")
    private String area;

    @ApiModelProperty("所属家/站")
    private String belong;

    @ApiModelProperty("代表类别")
    private String category;

    @ApiModelProperty("单位职务")
    private String position;

    @ApiModelProperty("照片")
    private String photo;

    @ApiModelProperty(value = "社区id", hidden = true)
    private Long communityId;

    @ApiModelProperty(value = "创建者", hidden = true)
    private Long createdBy;

    @ApiModelProperty(value = "由谁更新", hidden = true)
    private Long updatedBy;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/dpc/EditDpcDTO.java

New file
@@ -0,0 +1,60 @@
package com.panzhihua.common.model.dtos.community.dpc;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @title: EditDpcDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 人大代表编辑请求参数类
 * @author: hans
 * @date: 2022/06/07 11:06
 */
@Data
@ApiModel("人大代表编辑请求参数类")
public class EditDpcDTO {

    @ApiModelProperty("人大代表id")
    @NotNull(message = "人大代表id不能为空")
    private Long id;

    @ApiModelProperty("姓名")
    @NotBlank(message = "姓名不能为空")
    private String name;

    @ApiModelProperty("手机号")
    @NotBlank(message = "手机号不能为空")
    private String phone;

    @ApiModelProperty("民族")
    private String nation;

    @ApiModelProperty("性别（1.男 2.女 3.未知）")
    private Integer sex;

    @ApiModelProperty("选区")
    @NotBlank(message = "选区不能为空")
    private String area;

    @ApiModelProperty("所属家/站")
    private String belong;

    @ApiModelProperty("代表类别")
    private String category;

    @ApiModelProperty("单位职务")
    private String position;

    @ApiModelProperty("照片")
    private String photo;

    @ApiModelProperty(value = "社区id", hidden = true)
    private Long communityId;

    @ApiModelProperty(value = "由谁更新", hidden = true)
    private Long updatedBy;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/dpc/PageDpcDTO.java

New file
@@ -0,0 +1,33 @@
package com.panzhihua.common.model.dtos.community.dpc;

import javax.validation.constraints.NotNull;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @title: PageDpcDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 分页查询人大代表请求参数
 * @author: hans
 * @date: 2022/06/07 11:08
 */
@Data
@ApiModel("分页查询人大代表请求参数")
public class PageDpcDTO {

    @ApiModelProperty(value = "关键字")
    private String keyword;

    @ApiModelProperty(value = "分页-当前页数", example = "1")
    @NotNull(message = "分页参数不能为空")
    private Long pageNum;

    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    @NotNull(message = "分页参数不能为空")
    private Long pageSize;

    @ApiModelProperty(value = "社区id")
    private Long communityId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/enterprise/AddEnterpriseDTO.java

New file
@@ -0,0 +1,65 @@
package com.panzhihua.common.model.dtos.community.enterprise;

import java.util.Date;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @title: AddEnterpriseDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 社区企业新增请求参数类
 * @author: hans
 * @date: 2022/05/31 10:30
 */
@Data
@ApiModel("社区企业新增请求参数类")
public class AddEnterpriseDTO {

    @ApiModelProperty("企业名称")
    @NotBlank(message = "企业名称不能为空")
    private String name;

    @ApiModelProperty("统一社会信用代码")
    @NotBlank(message = "统一社会信用代码不能为空")
    private String agencyCode;

    @ApiModelProperty("法定代表人")
    @NotBlank(message = "法定代表人不能为空")
    private String legalRepresentative;

    @ApiModelProperty("联系电话")
    @NotBlank(message = "联系电话不能为空")
    private String phone;

    @ApiModelProperty("注册时间")
    private Date registeAt;

    @ApiModelProperty("所属社区")
    @NotNull(message = "所属社区不能为空")
    private Long communityId;

    @ApiModelProperty("地址")
    @NotBlank(message = "地址不能为空")
    private String address;

    @ApiModelProperty("企业介绍")
    private String introduct;

    @ApiModelProperty("企业logo")
    private String logo;

    @ApiModelProperty("服务分类id")
    @NotNull(message = "服务分类不能为空")
    private Long type;

    @ApiModelProperty(value = "创建者", hidden = true)
    private Long createdBy;

    @ApiModelProperty(value = "由谁更新", hidden = true)
    private Long updatedBy;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/enterprise/AddEnterpriseTypeDTO.java

New file
@@ -0,0 +1,40 @@
package com.panzhihua.common.model.dtos.community.enterprise;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @title: AddEnterpriseDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 社区企业服务分类新增请求参数类
 * @author: hans
 * @date: 2022/05/31 10:30
 */
@Data
@ApiModel("社区企业服务分类新增请求参数类")
public class AddEnterpriseTypeDTO {

    @ApiModelProperty("服务分类名称")
    @NotBlank(message = "服务分类名称不能为空")
    private String name;

    @ApiModelProperty("状态（1.启用 2.停用）")
    @NotNull(message = "状态不能为空")
    private Integer status;

    @ApiModelProperty("描述")
    private String description;

    @ApiModelProperty(value = "创建者", hidden = true)
    private Long createdBy;

    @ApiModelProperty(value = "由谁更新", hidden = true)
    private Long updatedBy;

    @ApiModelProperty(value = "社区id", hidden = true)
    private Long communityId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/enterprise/EditEnterpriseDTO.java

New file
@@ -0,0 +1,67 @@
package com.panzhihua.common.model.dtos.community.enterprise;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * @title: EditEnterpriseDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 社区企业编辑请求参数类
 * @author: hans
 * @date: 2022/05/31 10:45
 */
@Data
@ApiModel("社区企业编辑请求参数类")
public class EditEnterpriseDTO {

    @ApiModelProperty("企业id")
    @NotNull(message = "企业id不能为空")
    private Long id;

    @ApiModelProperty("企业名称")
    @NotBlank(message = "企业名称不能为空")
    private String name;

    @ApiModelProperty("统一社会信用代码")
    @NotBlank(message = "统一社会信用代码不能为空")
    private String agencyCode;

    @ApiModelProperty("法定代表人")
    @NotBlank(message = "法定代表人不能为空")
    private String legalRepresentative;

    @ApiModelProperty("联系电话")
    @NotBlank(message = "联系电话不能为空")
    private String phone;

    @ApiModelProperty("注册时间")
    private Date registeAt;

    @ApiModelProperty("所属社区")
    @NotNull(message = "所属社区不能为空")
    private Long communityId;

    @ApiModelProperty("地址")
    @NotBlank(message = "地址不能为空")
    private String address;

    @ApiModelProperty("企业介绍")
    private String introduct;

    @ApiModelProperty("企业logo")
    private String logo;

    @ApiModelProperty("服务分类id")
    @NotNull(message = "服务分类不能为空")
    private Long type;

    @ApiModelProperty(value = "由谁更新", hidden = true)
    private Long updatedBy;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/enterprise/EditEnterpriseTypeDTO.java

New file
@@ -0,0 +1,41 @@
package com.panzhihua.common.model.dtos.community.enterprise;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @title: EditEnterpriseDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 社区企业服务分类编辑请求参数类
 * @author: hans
 * @date: 2022/05/31 10:45
 */
@Data
@ApiModel("社区企业服务分类编辑请求参数类")
public class EditEnterpriseTypeDTO {

    @ApiModelProperty("分类id")
    @NotNull(message = "分类id不能为空")
    private Long id;

    @ApiModelProperty("服务分类名称")
    @NotBlank(message = "服务分类名称不能为空")
    private String name;

    @ApiModelProperty("状态（1.启用 2.停用）")
    @NotNull(message = "状态不能为空")
    private Integer status;

    @ApiModelProperty("描述")
    private String description;

    @ApiModelProperty(value = "由谁更新", hidden = true)
    private Long updatedBy;

    @ApiModelProperty(value = "社区id", hidden = true)
    private Long communityId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/enterprise/PageEnterpriseDTO.java

New file
@@ -0,0 +1,42 @@
package com.panzhihua.common.model.dtos.community.enterprise;

import javax.validation.constraints.NotNull;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @title: PageEnterpriseDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 分页查询社区企业请求参数
 * @author: hans
 * @date: 2022/05/31 13:31
 */
@Data
@ApiModel("分页查询社区企业请求参数")
public class PageEnterpriseDTO {

    @ApiModelProperty(value = "关键字")
    private String keyword;

    @ApiModelProperty(value = "状态（1.启用 2.禁用）")
    private Integer status;

    @ApiModelProperty(value = "分页-当前页数", example = "1")
    @NotNull(message = "分页参数不能为空")
    private Long pageNum;

    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    @NotNull(message = "分页参数不能为空")
    private Long pageSize;

    @ApiModelProperty(value = "社区id")
    private Long communityId;

    @ApiModelProperty("服务分类id")
    private Long type;

    @ApiModelProperty(value = "街道id", hidden = true)
    private Long streetId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/enterprise/PageEnterpriseTypeDTO.java

New file
@@ -0,0 +1,36 @@
package com.panzhihua.common.model.dtos.community.enterprise;

import javax.validation.constraints.NotNull;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @title: PageEnterpriseDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 分页查询社区企业服务分类请求参数
 * @author: hans
 * @date: 2022/05/31 13:31
 */
@Data
@ApiModel("分页查询社区企业服务分类请求参数")
public class PageEnterpriseTypeDTO {

    @ApiModelProperty(value = "关键字")
    private String keyword;

    @ApiModelProperty(value = "状态（1.启用 2.停用）")
    private Integer status;

    @ApiModelProperty(value = "分页-当前页数", example = "1")
    @NotNull(message = "分页参数不能为空")
    private Long pageNum;

    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    @NotNull(message = "分页参数不能为空")
    private Long pageSize;

    @ApiModelProperty(value = "社区id", hidden = true)
    private Long communityId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/social/HatchAuditProcessDTO.java

New file
@@ -0,0 +1,20 @@
package com.panzhihua.common.model.dtos.community.social;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @title: HatchAuditProcessDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 孵化流程修改
 * @author: hans
 * @date: 2022/04/18 17:36
 */
@Data
@ApiModel("孵化流程修改")
public class HatchAuditProcessDTO {

    @ApiModelProperty("孵化流程")
    private String process;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/social/PageProjectDTO.java

New file
@@ -0,0 +1,30 @@
package com.panzhihua.common.model.dtos.community.social;

import javax.validation.constraints.NotNull;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @title: PageProjectDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 分页查询项目数据请求参数
 * @author: hans
 * @date: 2022/04/19 15:23
 */
@Data
@ApiModel("分页查询项目数据请求参数")
public class PageProjectDTO {

    @ApiModelProperty(value = "分页-当前页数", example = "1", required = true)
    @NotNull(message = "分页参数不能为空")
    private Long pageNum;

    @ApiModelProperty(value = "分页-每页记录数", example = "10", required = true)
    @NotNull(message = "分页参数不能为空")
    private Long pageSize;

    @ApiModelProperty(value = "用户id", hidden = true)
    private Long userId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/social/PageProjectSignListDTO.java

New file
@@ -0,0 +1,31 @@
package com.panzhihua.common.model.dtos.community.social;

import javax.validation.constraints.NotNull;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @title: PageProjectSignListDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 分页查询项目报名列表请求参数
 * @author: hans
 * @date: 2022/04/15 13:39
 */
@Data
@ApiModel("分页查询项目报名列表请求参数")
public class PageProjectSignListDTO {

    @ApiModelProperty(value = "分页-当前页数", example = "1", required = true)
    @NotNull(message = "分页参数不能为空")
    private Long pageNum;

    @ApiModelProperty(value = "分页-每页记录数", example = "10", required = true)
    @NotNull(message = "分页参数不能为空")
    private Long pageSize;

    @ApiModelProperty(value = "项目id", example = "1", required = true)
    @NotNull(message = "项目id不能为空")
    private Long projectId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/social/PageSocialOrgHatchAuditDTO.java

New file
@@ -0,0 +1,35 @@
package com.panzhihua.common.model.dtos.community.social;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @title: PageSocialOrgHatchAuditDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 分页查询孵化申请请求参数
 * @author: hans
 * @date: 2022/04/18 14:34
 */
@Data
@ApiModel("分页查询孵化申请请求参数")
public class PageSocialOrgHatchAuditDTO {

    @ApiModelProperty(value = "关键字")
    private String keyword;

    @ApiModelProperty("孵化单位")
    private Long hatchUnit;

    @ApiModelProperty("孵化单位类型（1.街道 2.社区）")
    private Integer hatchUnitType;

    @ApiModelProperty("申请状态（1.待审核 2.审核通过 3.已驳回）")
    private Integer status;

    @ApiModelProperty(value = "分页-当前页数", example = "1")
    private Long pageNum;

    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    private Long pageSize;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/social/PageSocialOrgHatchDTO.java

New file
@@ -0,0 +1,35 @@
package com.panzhihua.common.model.dtos.community.social;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @title: PageSocialOrgHatchAuditDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 分页查询孵化申请请求参数
 * @author: hans
 * @date: 2022/04/18 14:34
 */
@Data
@ApiModel("分页查询孵化申请请求参数")
public class PageSocialOrgHatchDTO {

    @ApiModelProperty(value = "关键字")
    private String keyword;

    @ApiModelProperty("孵化单位")
    private Long hatchUnit;

    @ApiModelProperty("孵化单位类型（1.街道 2.社区）")
    private Integer hatchUnitType;

    @ApiModelProperty("孵化状态（1.孵化中 2.孵化成功）")
    private Integer status;

    @ApiModelProperty(value = "分页-当前页数", example = "1")
    private Long pageNum;

    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    private Long pageSize;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/social/SocialOrgHatchAuditDTO.java

New file
@@ -0,0 +1,64 @@
package com.panzhihua.common.model.dtos.community.social;

import javax.validation.constraints.NotNull;

import com.panzhihua.common.validated.PutGroup;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @title: SocialOrgHatchAuditDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 新增/编辑孵化申请请求参数
 * @author: hans
 * @date: 2022/04/18 15:18
 */
@Data
@ApiModel("新增/编辑孵化申请请求参数")
public class SocialOrgHatchAuditDTO {

    @ApiModelProperty("孵化申请id")
    @NotNull(groups = {PutGroup.class}, message = "孵化申请id不能为空")
    private Long id;

    @ApiModelProperty("准社会组织名称")
    private String name;

    @ApiModelProperty("负责人")
    private String responsibility;

    @ApiModelProperty("联系电话")
    private String phone;

    @ApiModelProperty("孵化单位")
    private Long hatchUnit;

    @ApiModelProperty("孵化单位类型（1.街道 2.社区）")
    private Integer hatchUnitType;

    @ApiModelProperty("孵化单位名称")
    private String hatchUnitName;

    @ApiModelProperty("申请状态（1.待审核 2.审核通过 3.已驳回）")
    private Integer status;

    @ApiModelProperty("组织介绍")
    private String introduction;

    @ApiModelProperty("组织标识")
    private String logo;

    @ApiModelProperty("申请原因")
    private String applyReason;

    @ApiModelProperty("服务范围")
    private String serviceScope;

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

    @ApiModelProperty(value = "申请用户", hidden = true)
    private Long userId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComPbServiceTeamDTO.java

@@ -53,4 +53,7 @@

    @ApiModelProperty("社区id")
    private Long communityId;

    @ApiModelProperty(value = "区域编码", hidden = true)
    private String areaCode;
}

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

New file
@@ -0,0 +1,22 @@
package com.panzhihua.common.model.vos.partybuilding.west;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 负责人
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-07 14:45
 **/
@Data
@ApiModel("负责人")
public class ActivityManagerVO {

    @ApiModelProperty("负责人id")
    private Long managerId;

    @ApiModelProperty("负责人名字")
    private String name;
}

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

New file
@@ -0,0 +1,28 @@
package com.panzhihua.common.model.vos.partybuilding.west;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

/**
 * @author lyq
 * 查询党建数据统计党组织返回参数
 */
@Data
@ApiModel("查询党建数据统计党组织返回参数")
public class ComDataStatisticsHeaderOrgVo {

    @ApiModelProperty(value = "党组织数量")
    private Integer orgNum = 0;

    @ApiModelProperty(value = "党组织绑定小区数量")
    private Integer areaNum = 0;

    @ApiModelProperty(value = "社区下小区数量")
    private Integer villageNum = 0;

    @ApiModelProperty(value = "小区覆盖率")
    private BigDecimal villageRate = BigDecimal.ZERO;
}

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

New file
@@ -0,0 +1,108 @@
package com.panzhihua.common.model.vos.partybuilding.west;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @author lyq
 * 分页查询党建数据统计返回参数
 */
@Data
@ApiModel("分页查询党建数据统计返回参数")
public class ComDataStatisticsMemberVo {

    @ApiModelProperty(value = "党员id")
    private Long id;

    @ApiModelProperty(value = "党员姓名")
    private String name;

    @ApiModelProperty(value = "党员头像url")
    private String photoPath;

    @ApiModelProperty(value = "是否是党委（1.是 2.否）")
    private Integer isRole;

    @ApiModelProperty(value = "党员类型（1.预备党员 2.正式党员）")
    private Integer type;

    @ApiModelProperty(value = "性别（1.是 2.否）")
    private Integer sex;

    @ApiModelProperty(value = "年龄")
    private Integer age;

    @ApiModelProperty(value = "党龄")
    private Integer partyAge;

    @ApiModelProperty(value = "职能")
    private String function;

    @ApiModelProperty(value = "特长类别（1.体育类 2.舞蹈类 3.音乐类 4.美术类 5.其他）")
    private Integer specialtyCategory;

    @ApiModelProperty(value = "特长描述")
    private String specialtyName;

    @ApiModelProperty(value = "职位")
    private String position;

    @ApiModelProperty(value = "职位2")
    private String positionTwo;

    @ApiModelProperty(value = "身份证号")
    private String idCard;

    @ApiModelProperty(value = "手机号")
    private String phone;

    @ApiModelProperty(value = "报道单位id")
    private Long checkUnitId;

    @ApiModelProperty(value = "报道单位名称")
    private String checkUnitName;

    @ApiModelProperty(value = "所属党组织id")
    private Long orgId;

    @ApiModelProperty(value = "所属党组织名称")
    private String orgName;

    @ApiModelProperty(value = "社区id")
    private Long communityId;

    @ApiModelProperty(value = "总活动次数")
    private Integer activityCount;

    @ApiModelProperty(value = "总活动时长（小时）")
    private Integer activityDuration;

    @ApiModelProperty(value = "党员活动次数")
    private Integer partyActivityCount;

    @ApiModelProperty(value = "党员活动时长（小时）")
    private Integer partyActivityDuration = 0;

    @ApiModelProperty(value = "党员活动积分数量")
    private Integer partyActivityIntegral;

    @ApiModelProperty(value = "志愿者活动次数")
    private Integer volunteerActivityCount;

    @ApiModelProperty(value = "志愿者活动时长（小时）")
    private Integer volunteerActivityDuration;

    @ApiModelProperty(value = "志愿者活动积分数量")
    private Integer volunteerActivityIntegral;

    @ApiModelProperty(value = "完成微心愿数量")
    private Integer wishCount;

    @ApiModelProperty(value = "完成随手拍数量")
    private Integer easyCount;

    @ApiModelProperty(value = "用户id")
    private Long userId;

}

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

New file
@@ -0,0 +1,122 @@
package com.panzhihua.common.model.vos.partybuilding.west;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

/**
 * @author lyq
 * 查询党建数据统计党组织返回参数
 */
@Data
@ApiModel("查询党建数据统计党组织返回参数")
public class ComDataStatisticsOrgVo {

    @ApiModelProperty(value = "党员人数")
    private Integer partyMemberNum;

    @ApiModelProperty(value = "正式党员人数")
    private Integer formalPartyMemberNum;

    @ApiModelProperty(value = "正式党员人数百分比")
    private BigDecimal formalPartyMemberNumPercent = new BigDecimal(0);

    @ApiModelProperty(value = "预备党员人数")
    private Integer preparePartyMemberNum;

    @ApiModelProperty(value = "预备党员人数百分比")
    private BigDecimal preparePartyMemberNumPercent = new BigDecimal(0);

    @ApiModelProperty(value = "体育类党员人数")
    private Integer tyNum;

    @ApiModelProperty(value = "体育类党员人数百分比")
    private BigDecimal tyNumPercent = new BigDecimal(0);

    @ApiModelProperty(value = "美术类党员人数")
    private Integer msNum;

    @ApiModelProperty(value = "美术类党员人数百分比")
    private BigDecimal msNumPercent = new BigDecimal(0);

    @ApiModelProperty(value = "音乐类党员人数")
    private Integer yyNum;

    @ApiModelProperty(value = "音乐类党员人数百分比")
    private BigDecimal yyNumPercent = new BigDecimal(0);

    @ApiModelProperty(value = "舞蹈类党员人数")
    private Integer wdNum;

    @ApiModelProperty(value = "舞蹈类党员人数百分比")
    private BigDecimal wdNumPercent = new BigDecimal(0);

    @ApiModelProperty(value = "其他类党员人数")
    private Integer qtNum;

    @ApiModelProperty(value = "其他类党员人数百分比")
    private BigDecimal qtNumPercent = new BigDecimal(0);

    @ApiModelProperty(value = "无类型党员人数")
    private Integer wuNum;

    @ApiModelProperty(value = "无类型党员人数百分比")
    private BigDecimal wuNumPercent = new BigDecimal(0);

    @ApiModelProperty(value = "党员列表")
    private List<PartyBuildingMemberVO> partyMemberList;

    @ApiModelProperty(value = "参与活动次数")
    private Integer participateActivityNum;

    @ApiModelProperty(value = "参与活动时长")
    private Integer participateActivityDuration;

    @ApiModelProperty(value = "参与志愿者活动次数")
    private Integer participateVolunteerActivityNum;

    @ApiModelProperty(value = "参与志愿者活动次数百分比")
    private BigDecimal participateVolunteerActivityNumPercent = new BigDecimal(0);

    @ApiModelProperty(value = "参与志愿者活动时长")
    private Integer participateVolunteerActivityDuration;

    @ApiModelProperty(value = "参与志愿者活动时长百分比")
    private BigDecimal participateVolunteerActivityDurationPercent = new BigDecimal(0);

    @ApiModelProperty(value = "参与党员活动次数")
    private Integer participatePartyActivityNum;

    @ApiModelProperty(value = "参与党员活动次数百分比")
    private BigDecimal participatePartyActivityNumPercent = new BigDecimal(0);

    @ApiModelProperty(value = "参与党员活动时长")
    private Integer participatePartyActivityDuration;

    @ApiModelProperty(value = "参与党员活动时长百分比")
    private BigDecimal participatePartyActivityDurationPercent = new BigDecimal(0);

    @ApiModelProperty(value = "月份统计list")
    private List<String> monthList;

    @ApiModelProperty(value = "完成微心愿折线统计数据")
    private List<String> completeWishList;

    @ApiModelProperty(value = "累计微心愿折线统计数据")
    private List<String> cumulativeWishList;

    @ApiModelProperty(value = "完成随手拍折线统计数据")
    private List<String> completeEasyList;

    @ApiModelProperty(value = "累计随手拍折线统计数据")
    private List<String> cumulativeEasyList;

    @ApiModelProperty(value = "完成微心愿数量")
    private String wishNum = "0";

    @ApiModelProperty(value = "完成随手拍数量")
    private String easyNum = "0";
}

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

New file
@@ -0,0 +1,31 @@
package com.panzhihua.common.model.vos.partybuilding.west;

import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;

import java.util.Date;

/**
 * @description: 党员信息导出
 * @author: lyq
 * @date: 2021/5/6 17:48
 */
@Data
public class ComEldersAuthHistoryExcelVO {

    @ExcelProperty(value = "姓名", index = 0)
    private String name;

    @ExcelProperty(value = "身份证号", index = 1)
    private String idCard;

    @ExcelProperty(value = "出生年月", index = 2)
    private String brithday;

    @ExcelProperty(value = "年龄", index = 3)
    private Date age;

    @ExcelProperty(value = "户籍地", index = 4)
    private Date domicile;

}

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

New file
@@ -0,0 +1,30 @@
package com.panzhihua.common.model.vos.partybuilding.west;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 动态、政策文件、阅读记录
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-02 17:17
 **/
@Data
@ApiModel("党员动态阅读记录表")
public class ComPbDynUserVO {

    @ApiModelProperty("id")
    private Long id;

    @ApiModelProperty("党员动态、政策文件id")
    private Long dynId;

    @ApiModelProperty("小程序用户id")
    private Long userId;

    @ApiModelProperty("阅读时间")
    private Date createAt;
}

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

New file
@@ -0,0 +1,39 @@
package com.panzhihua.common.model.vos.partybuilding.west;

import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;

import java.util.Date;

/**
 * @description: 党员信息导出
 * @author: lyq
 * @date: 2021/5/6 17:48
 */
@Data
public class ComPbMemberExcelVO {

    @ExcelProperty(value = "账号", index = 0)
    private String phone;

    @ExcelProperty(value = "党员姓名", index = 1)
    private String name;

    @ExcelProperty(value = "所属党组织", index = 2)
    private String orgName;

    @ExcelProperty(value = "入党日期", index = 3)
    private Date joinTime;

    @ExcelProperty(value = "转正日期", index = 4)
    private Date employmentTime;

    @ExcelProperty(value = "报道单位", index = 5)
    private String checkUnitName;

    @ExcelProperty(value = "党龄", index = 6)
    private Integer partyAge;

    @ExcelProperty(value = "状态",index = 7)
    private String status;
}

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

New file
@@ -0,0 +1,94 @@
package com.panzhihua.common.model.vos.partybuilding.west;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * @author zzj
 */
@Data
@ApiModel
public class ComPbMemberVO {
    private Long id;

    /**
     * 所属党组织id
     */
    @ApiModelProperty("所属党组织id")
    private Long orgId;

    /**
     * 身份证号
     */
    @ApiModelProperty("身份证号")
    private String idCard;

    /**
     * 姓名
     */
    @ApiModelProperty("姓名")
    private String name;

    /**
     * 头像图片路径
     */
    @ApiModelProperty("头像图片路径")
    private String photoPath;

    /**
     * 入党时间
     */
    @ApiModelProperty("入党时间")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date joinTime;

    /**
     * 转正时间
     */
    @ApiModelProperty("转正时间")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date employmentTime;

    /**
     * 党员审查结果
     */
    private Integer auditResult;

    /**
     * 创建时间
     */
    @ApiModelProperty("创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
    private Date createAt;

    /**
     * 修改时间
     */
    @ApiModelProperty("修改时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
    private Date updateAt;
    /**
     * 社区id
     */
    private Long communityId;

    /**
     * 用户id
     */
    private Long userId;

    /**
     * 驳回原因
     */
    private String refuseReason;
    @ApiModelProperty("手机号")
    private String phone;

    @ApiModelProperty("党组织")
    private String orgName;

}

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

New file
@@ -0,0 +1,51 @@
package com.panzhihua.common.model.vos.partybuilding.west;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 服务团队人员
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2021-01-21 18:11
 **/
@Data
@ApiModel("服务团队人员")
public class ComPbServiceTeamVO {

    @ApiModelProperty("id")
    private Long id;

    @ApiModelProperty("姓名")
    private String name;

    @ApiModelProperty("职位")
    private String job;

    @ApiModelProperty("职位2")
    private String jobTwo;

    @ApiModelProperty("岗位职责")
    private String jobResponsibilities;

    @ApiModelProperty("照片")
    private String url;

    @ApiModelProperty("create_at")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty("社区id")
    private Long communityId;
    @ApiModelProperty("电话")
    private String phone;
    @ApiModelProperty("是否注册")
    private Integer isReg;

    @ApiModelProperty("社区名称")
    private String communityName;
}

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

New file
@@ -0,0 +1,23 @@
package com.panzhihua.common.model.vos.partybuilding.west;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 微心愿服务团队人员
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2021-01-21 18:11
 **/
@Data
@ApiModel("微心愿服务团队人员")
public class ComPbServiceTeamWishVO {

    @ApiModelProperty("managerId")
    private Long managerId;

    @ApiModelProperty("姓名")
    private String name;

}

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

New file
@@ -0,0 +1,32 @@
package com.panzhihua.common.model.vos.partybuilding.west;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 分页活动人员
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-01 09:50
 **/
@Data
@ApiModel(value = "分页活动人员")
public class PageActivityMembersVO {
    @ApiModelProperty(value = "手机号")
    private String phone;
    @ApiModelProperty(value = "姓名")
    private String name;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "报名时间")
    private String registrationTime;
    @ApiModelProperty(value = "人员主键")
    private Long id;
    @ApiModelProperty(value = "当前页数")
    private Long pageNum;
    @ApiModelProperty(value = "每页记录数")
    private Long pageSize;
    @ApiModelProperty(value = "活动id", required = true)
    private Long activityId;
}

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

New file
@@ -0,0 +1,32 @@
package com.panzhihua.common.model.vos.partybuilding.west;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 分页党员认证
 * @author: cedoo
 * @create: 2021-4-7
 **/
@Data
@ApiModel(value = "分页党员认证")
public class PagePartyBuildingMemberVO {
    @ApiModelProperty(value = "手机号")
    private String phone;
    @ApiModelProperty(value = "姓名")
    private String name;
    @ApiModelProperty(value = "状态")
    private Integer auditStatus;

    @ApiModelProperty(value = "当前页数")
    private Long pageNum;
    @ApiModelProperty(value = "每页记录数")
    private Long pageSize;
    @ApiModelProperty(value = "社区id", hidden = true)
    private Long communityId;

    @ApiModelProperty(value = "区域编码", hidden = true)
    private String areaCode;
}

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

New file
@@ -0,0 +1,65 @@
package com.panzhihua.common.model.vos.partybuilding.west;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 分页党员
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-11-30 16:10
 **/
@Data
@ApiModel(value = "分页查询党员")
public class PagePartyOrganizationVO {

    @ApiModelProperty(value = "组织名字")
    private String orgName;

    @ApiModelProperty(value = "组织ID")
    private Long orgId;

    @ApiModelProperty(value = "账户")
    private String account;

    @ApiModelProperty(value = "党员姓名")
    private String name;

    @ApiModelProperty(value = "当前页数")
    private Long pageNum;

    @ApiModelProperty(value = "每页记录数")
    private Long pageSize;

    @ApiModelProperty(value = "社区id", hidden = true)
    private Long communityId;

    @ApiModelProperty(value = "关键词")
    private String keyWord;

    @ApiModelProperty(value = "党员类型（1.预备党员 2.正式党员）")
    private Integer type;

    @ApiModelProperty(value = "报道单位id")
    private Long checkUnitId;

    @ApiModelProperty(value = "特长类别（1.体育类 2.舞蹈类 3.音乐类 4.美术类 5.其他）")
    private Long specialtyCategory;

    @ApiModelProperty("开始时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date startTime;

    @ApiModelProperty("结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date endTime;

    @ApiModelProperty(value = "区域编码", hidden = true)
    private String areaCode;

    private String specialtyName;
}

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

New file
@@ -0,0 +1,109 @@
package com.panzhihua.common.model.vos.partybuilding.west;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;
import java.util.List;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 活动
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-01 09:08
 **/
@Data
@ApiModel("党员活动")
public class PartyBuildingActivityVO {
    @ApiModelProperty("党员活动id")
    private Long id;

    @ApiModelProperty("活动名称")
    private String name;

    @ApiModelProperty("活动地点")
    private String address;

    @ApiModelProperty("1 待发布 2 未开始 3 报名中 4 进行中 5 已结束 6 已取消")
    private Integer status;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty("发布时间")
    private Date releaseTime;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty("发布开始时间")
    private Date releaseTimeBegin;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty("发布结束时间")
    private Date releaseTimeEnd;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty("活动开始时间")
    private Date activityTimeBegin;
    @ApiModelProperty("活动开始时间-格式化后的")
    private String activityTimeBeginFormat;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty("活动结束时间")
    private Date activityTimeEnd;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty("报名开始时间")
    private Date enrollTimeBegin;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty("报名结束时间")
    private Date enrollTimeEnd;

    @ApiModelProperty("当前页数")
    private Long pageNum;

    @ApiModelProperty("每页记录数")
    private Long pageSize;

    @ApiModelProperty("活动最多参入人数")
    private Integer participationNum;

    @ApiModelProperty("活动最低参入人数-未达到到时间自动取消")
    private Integer participationLowestNum;

    @ApiModelProperty("活动已经参与人数")
    private Integer participationActualNum;

    @ApiModelProperty("活动封面")
    private String cover;

    @ApiModelProperty("活动内容-富文本")
    private String richText;

    @ApiModelProperty("取消原因")
    private String cancelReason;

    @ApiModelProperty("发布人id")
    private Long createBy;

    @ApiModelProperty("发布人名字")
    private String createByName;

    @ApiModelProperty("社区id")
    private Long communityId;

    @ApiModelProperty("社区名称")
    private String communityName;

    @ApiModelProperty("活动党员列表")
    private List<PartyBuildingMemberVO> partyBuildingMemberVOS;

    @ApiModelProperty("是否已经报名")
    private Integer isSign;

    @ApiModelProperty(value = "活动报名人员id集合", hidden = true)
    private List<Long> userIds;

    @ApiModelProperty("是否是小程序请求")
    private Integer isAppliets;

    @ApiModelProperty("是否是个人发起 1 是 0 否")
    private Integer isPerson;

    @ApiModelProperty("二维码类型 1居民，志愿者 2党员")
    private Integer codeType;

}

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

New file
@@ -0,0 +1,95 @@
package com.panzhihua.common.model.vos.partybuilding.west;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 党建动态
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-01 15:53
 **/
@Data
@ApiModel("社区管理》党建》党员动态/政策文件")
public class PartyBuildingComPbDynVO {

    @ApiModelProperty("党建动态/政策文件id")
    private Long id;

    @ApiModelProperty("标题")
    private String title;

    @ApiModelProperty("状态 1 待发布 2 已发布")
    private Integer status;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty("发布时间")
    private Date publishAt;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty("发布开始时间")
    private Date publishAtBegin;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty("发布结束时间")
    private Date publishAtEnd;

    @ApiModelProperty("封面url")
    private String cover;

    @ApiModelProperty("创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty("内容")
    private String content;

    @ApiModelProperty("发布人id")
    private Long createBy;

    @ApiModelProperty("发布人名字")
    private String createByName;

    @ApiModelProperty("阅读量")
    private Integer readingVolume;

    @ApiModelProperty("当前页数")
    private Long pageNum;

    @ApiModelProperty("每页记录数")
    private Long pageSize;

    @ApiModelProperty("1动态 2政策文件")
    private Integer type;

    @ApiModelProperty("社区id")
    private Long communityId;

    @ApiModelProperty("动态内容富文本--纯文本")
    private String contentText;

    @ApiModelProperty(value = "是否增加 1 增加 0 不增加")
    private Integer isAdd;

    @ApiModelProperty("动态分类：1-党建动态 2-党员帮扶 3-党员示范")
    private Integer dynType;

    @ApiModelProperty("封面模式：1-小图展示 2-大图展示")
    private Integer coverMode;

    @ApiModelProperty("社区名称")
    private String communityName;

    @ApiModelProperty("跳转链接")
    private String jumpUrl;

    @ApiModelProperty("跳转状态")
    private Integer jumpType;

    @ApiModelProperty("政策分类: 1-社工人才政策 2-社会组织培育政策 3-其他政策")
    private Integer policyType;

    @ApiModelProperty("排序方式 正序 ASC")
    private String sort;
}

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

New file
@@ -0,0 +1,46 @@
package com.panzhihua.common.model.vos.partybuilding.west;

import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;

import java.io.Serializable;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 批量党员
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-11-30 14:57
 **/
@Data
public class PartyBuildingMemberExcelVO implements Serializable {
    /**
     * 党员姓名
     */
    @ExcelProperty(value = "党员姓名", index = 0)
    private String name;
    /**
     * 身份证号
     */
    @ExcelProperty(value = "身份证号", index = 1)
    private String idCard;
    /**
     * 所属党组织
     */
    @ExcelProperty(value = "所属党组织", index = 2)
    private String orgName;
    /**
     * 入党日期
     */
    @ExcelProperty(value = "入党日期", index = 3)
    private String joinTime;
    /**
     * 转正日期
     */
    @ExcelProperty(value = "转正日期", index = 4)
    private String employmentTime;
    /**
     * 所属社区
     */
    @ExcelProperty(value = "所属社区", index = 5)
    private String communityName;
}

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

New file
@@ -0,0 +1,88 @@
package com.panzhihua.common.model.vos.partybuilding.west;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 党建
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-11-30 10:03
 **/
@Data
@ApiModel("社区管理》党建》党员信息")
public class PartyBuildingMemberVO {
    @ApiModelProperty(value = "姓名")
    private String name;
    @ApiModelProperty(value = "身份证")
    private String idCard;
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    @ApiModelProperty(value = "入党时间")
    private Date joinTime;
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    @ApiModelProperty(value = "转正时间")
    private Date employmentTime;
    @ApiModelProperty(value = "所属党组织id")
    private Long orgId;
    @ApiModelProperty(value = "头像图片路径")
    private String photoPath;
    @ApiModelProperty(value = "社区ID", hidden = true)
    private Long communityId;
    @ApiModelProperty(value = "社区名字")
    private String communityName;
    @ApiModelProperty(value = "党组织名字")
    private String orgName;
    @ApiModelProperty(value = "手机号")
    private String phone;
    @ApiModelProperty(value = "党龄")
    private Integer partyAge;
    @ApiModelProperty(value = "状态")
    private String status;
    @ApiModelProperty(value = "党员唯一标识id")
    private Long id;
    @ApiModelProperty(value = "报名时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;
    @ApiModelProperty(value = "用户ID", hidden = true)
    private Long userId;
    @ApiModelProperty(value = "党员审查结果: 0 待审核 1 已审核 2 自动认证 3 已驳回")
    private Integer auditResult;
    @ApiModelProperty(value = "驳回原因")
    private String refuseReason;
    @ApiModelProperty(value = "是否党员 1是 2否")
    private Integer isPb;

    @ApiModelProperty(value = "党员类型（1.预备党员 2.正式党员）")
    private Integer type;

    @ApiModelProperty(value = "职位")
    private String position;

    @ApiModelProperty(value = "报道单位id")
    private Long checkUnitId;

    @ApiModelProperty(value = "报道单位名称")
    private String checkUnitName;

    @ApiModelProperty(value = "职能")
    private String function;

    @ApiModelProperty(value = "特长类别（1.体育类 2.舞蹈类 3.音乐类 4.美术类 5.其他）")
    private Integer specialtyCategory;

    @ApiModelProperty(value = "特长描述")
    private String specialtyName;

    @ApiModelProperty(value = "职位2")
    private String positionTwo;

    @ApiModelProperty(value = "活动时长")
    private Integer partyTime;

    @ApiModelProperty(value = "活动积分")
    private Integer partyInterval;
}

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

New file
@@ -0,0 +1,109 @@
package com.panzhihua.common.model.vos.partybuilding.west;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotBlank;
import java.util.Date;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 党委
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-01 14:15
 **/
@Data
@ApiModel("党委")
public class PartyCommitteeVO {

    @ApiModelProperty("主键")
    private Long id;

    @ApiModelProperty("电话")
    @NotBlank(groups = {AddGroup.class}, message = "电话不能为空")
    private String phone;

    @ApiModelProperty("是否注册")
    private Integer isReg;

    @ApiModelProperty("姓名")
    @NotBlank(groups = {AddGroup.class}, message = "姓名不能为空")
    private String name;

    @ApiModelProperty("性别")
    private Integer sex;

    @ApiModelProperty("出生日期")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date birthTime;

    @ApiModelProperty(value = "年龄")
    private Integer age;

    @ApiModelProperty("职位")
    @NotBlank(groups = {AddGroup.class}, message = "职位不能为空")
    private String position;

    @ApiModelProperty("职位2")
    private String positionTwo;

    @ApiModelProperty("岗位职责")
    @NotBlank(groups = {AddGroup.class}, message = "岗位职责不能为空")
    private String jobResponsibilities;

    @ApiModelProperty("头像图片路径")
    @NotBlank(groups = {AddGroup.class}, message = "头像不能为空")
    private String photoPath;

    @ApiModelProperty("社区id")
    private Long communityId;

    @ApiModelProperty(value = "当前页数")
    private Long pageNum;

    @ApiModelProperty(value = "每页记录数")
    private Long pageSize;

    @ApiModelProperty(value = "关键词")
    private String keyWord;

    @ApiModelProperty(value = "党委标签（1.社区党委 2.区域党委委员）")
    private Integer type;

    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    @ApiModelProperty(value = "入党时间")
    private Date joinTime;
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    @ApiModelProperty(value = "转正时间")
    private Date employmentTime;

    @ApiModelProperty(value = "职能")
    private String function;

    @ApiModelProperty(value = "特长类别（1.体育类 2.舞蹈类 3.音乐类 4.美术类 5.其他）")
    private Integer specialtyCategory;

    @ApiModelProperty(value = "特长描述")
    private String specialtyName;

    @ApiModelProperty(value = "报道单位id")
    private Long checkUnitId;

    @ApiModelProperty(value = "报道单位名称")
    private String checkUnitName;

    @ApiModelProperty(value = "负责党组织id")
    private Long orgId;

    @ApiModelProperty(value = "负责党组织名字")
    private String orgName;

    @ApiModelProperty(value = "身份证")
    private String idCard;

    @ApiModelProperty(value = "区域编码", hidden = true)
    private String areaCode;
}

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

New file
@@ -0,0 +1,77 @@
package com.panzhihua.common.model.vos.partybuilding.west;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 党组织
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-11-30 11:15
 **/
@Data
@ApiModel("党组织")
public class PartyOrganizationVO {
    @ApiModelProperty(value = "党组织id")
    private Long id;
    @ApiModelProperty(value = "党组织名字")
    private String name;
    @ApiModelProperty(value = "状态")
    private Integer status;
    @ApiModelProperty(value = "党员人数")
    private Integer countPerson;
    @ApiModelProperty(value = "社区id", hidden = true)
    private Long communityId;
    @ApiModelProperty(value = "分页-当前页数", example = "1")
    private Long pageNum = 1L;
    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    private Long pageSize = 10L;
    @ApiModelProperty(value = "关键词")
    private String keyWord;

    @ApiModelProperty(value = "上级id")
    private Long parentId;
    @ApiModelProperty(value = "组织类别（1.基层党委 2.二级基层党委 3.党总支 4.党支部 5.党小组）")
    private Integer type;
    @ApiModelProperty(value = "组织隶属（1.乡镇 2.机关 3.域市街道 3.域市社区（居委会） 4.农村社区居委会 5.建制村 6.国有经济控制 7.集体经济控制 8.非公有经济控制 9.事业单位 10.社会组织 11.其他）")
    private Integer subjection;
    @ApiModelProperty(value = "小区id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long areaId;
    @ApiModelProperty(value = "楼栋id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long buildId;
    @ApiModelProperty(value = "楼栋名称")
    private String buildName;
    @ApiModelProperty(value = "所属小区名字")
    private String areaName;
    @ApiModelProperty(value = "组织地址")
    private String address;
    @ApiModelProperty(value = "经度")
    private String longitude;
    @ApiModelProperty(value = "纬度")
    private String latitude;
    @ApiModelProperty(value = "一级id")
    private Long oneId;
    @ApiModelProperty(value = "二级id")
    private Long twoId;
    @ApiModelProperty(value = "三级id")
    private Long thirdId;
    @ApiModelProperty(value = "四级id")
    private Long fourId;
    @ApiModelProperty(value = "五级id")
    private Long fiveId;

    @ApiModelProperty(value = "党组织负责人名称")
    private String userName;
    @ApiModelProperty(value = "党组织负责人联系电话")
    private String phone;

    @ApiModelProperty(value = "党组织下子组织")
    private List<PartyOrganizationVO> childList;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityWestService.java

@@ -5,9 +5,7 @@
import com.panzhihua.common.model.dtos.community.dpc.AddDpcDTO;
import com.panzhihua.common.model.dtos.community.dpc.EditDpcDTO;
import com.panzhihua.common.model.dtos.community.dpc.PageDpcDTO;
import com.panzhihua.common.model.dtos.community.enterprise.AddEnterpriseTypeDTO;
import com.panzhihua.common.model.dtos.community.enterprise.EditEnterpriseTypeDTO;
import com.panzhihua.common.model.dtos.community.enterprise.PageEnterpriseTypeDTO;
import com.panzhihua.common.model.dtos.community.enterprise.*;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.scheduling.annotation.Async;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -170,9 +168,6 @@
import com.panzhihua.common.model.dtos.community.elder.PageElderAuthStatisticDTO;
import com.panzhihua.common.model.dtos.community.elder.PagePensionAuthStatisticDTO;
import com.panzhihua.common.model.dtos.community.elder.SignElderAuthStatisticDTO;
import com.panzhihua.common.model.dtos.community.enterprise.AddEnterpriseDTO;
import com.panzhihua.common.model.dtos.community.enterprise.EditEnterpriseDTO;
import com.panzhihua.common.model.dtos.community.enterprise.PageEnterpriseDTO;
import com.panzhihua.common.model.dtos.community.fms.AddFmsClassroomAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.AddFmsServiceAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.AddTeamDTO;
@@ -428,7 +423,7 @@
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-07 15:59
 **/
@FeignClient(name = "community")
@FeignClient(name = "huacheng-community", contextId = "community1")
public interface CommunityWestService {
    /**
     * 新增社区活动

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingWestService.java

@@ -19,7 +19,7 @@
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-11-30 09:50
 **/
@FeignClient(value = "partybuilding")
@FeignClient(value = "huacheng-partybuilding", contextId = "partybuilding1")
public interface PartyBuildingWestService {
    /**
     * 新增党员

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxXCXTempSend.java

@@ -7,6 +7,9 @@
import java.util.Map;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.user.SysAppConfigVO;
import com.panzhihua.common.service.user.UserService;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.FileItemFactory;
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
@@ -39,6 +42,7 @@
    private static String APP_IMAGE_NAME = "5.jpg";
    @Resource
    private RedisTemplate redisTemplate;
    UserService userService;

    private static WxXCXTempSend wxXCXTempSend;
    /**
@@ -88,33 +92,35 @@
     * @return
     */
    public String getAccessToken() throws Exception {
         String appid=this.getAppId();
         String accessToken = "";
         Boolean aBoolean = wxXCXTempSend.redisTemplate.hasKey(SecurityConstants.APPLETS_ACCESS_TOKEN);
         Boolean aBoolean = wxXCXTempSend.redisTemplate.hasKey(SecurityConstants.APPLETS_ACCESS_TOKEN+"_"+appid);
         ValueOperations<String, String> valueOperations = wxXCXTempSend.redisTemplate.opsForValue();
         if(aBoolean){
         Long expireTime = Long.parseLong(valueOperations.get(SecurityConstants.APPLETS_ACCESS_TOKEN_TIME));
         Long expireTime = Long.parseLong(valueOperations.get(SecurityConstants.APPLETS_ACCESS_TOKEN_TIME+"_"+appid));
         if(expireTime <= System.currentTimeMillis()){
             wxXCXTempSend.redisTemplate.delete(SecurityConstants.APPLETS_ACCESS_TOKEN);//如果过期则删除
             wxXCXTempSend.redisTemplate.delete(SecurityConstants.APPLETS_ACCESS_TOKEN_TIME);//如果过期则删除
             wxXCXTempSend.redisTemplate.delete(SecurityConstants.APPLETS_ACCESS_TOKEN+"_"+appid);//如果过期则删除
             wxXCXTempSend.redisTemplate.delete(SecurityConstants.APPLETS_ACCESS_TOKEN_TIME+"_"+appid);//如果过期则删除

         valueOperations.set(SecurityConstants.APPLETS_ACCESS_TOKEN, getAppAccessToken());
         valueOperations.set(SecurityConstants.APPLETS_ACCESS_TOKEN_TIME, System.currentTimeMillis() + 1100000 + "");
         valueOperations.set(SecurityConstants.APPLETS_ACCESS_TOKEN+"_"+appid, getAppAccessToken(appid));
         valueOperations.set(SecurityConstants.APPLETS_ACCESS_TOKEN_TIME+"_"+appid, System.currentTimeMillis() + 1100000 + "");
         }else{
         accessToken = valueOperations.get(SecurityConstants.APPLETS_ACCESS_TOKEN);
         accessToken = valueOperations.get(SecurityConstants.APPLETS_ACCESS_TOKEN+"_"+appid);
         }
         }else{
         accessToken = getAppAccessToken();
         valueOperations.set(SecurityConstants.APPLETS_ACCESS_TOKEN, accessToken);
         valueOperations.set(SecurityConstants.APPLETS_ACCESS_TOKEN_TIME, System.currentTimeMillis() + 1100000 + "");
         accessToken = getAppAccessToken(appid);
         valueOperations.set(SecurityConstants.APPLETS_ACCESS_TOKEN+"_"+appid, accessToken);
         valueOperations.set(SecurityConstants.APPLETS_ACCESS_TOKEN_TIME+"_"+appid, System.currentTimeMillis() + 1100000 + "");
         }
        return accessToken;
    }

    public String getAppAccessToken() throws Exception {
    public String getAppAccessToken(String appid) throws Exception {
        R<SysAppConfigVO> sysAppConfigVOR=userService.selectByAppid(appid);
        String accessToken = "0";
        try {
            log.info("获取微信token参数：appid=" + APP_ID + "，appSecret=" + APP_SECRET);
            String accessTokenUrl = ACCESS_TOKEN_URL + "&appid=" + APP_ID + "&secret=" + APP_SECRET;
            String accessTokenUrl = ACCESS_TOKEN_URL + "&appid=" + sysAppConfigVOR.getData().getAppId() + "&secret=" + sysAppConfigVOR.getData().getSecret();
            String result = HttpClientUtil.httpGet(accessTokenUrl, null, null);
            Map<String, Object> resultMap = JSON.parseObject(result, Map.class);
            if (resultMap.containsKey("access_token")) {

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

@@ -725,7 +725,7 @@
                    R<SysTemplateConfigVO> sysTemplateConfigVO=userService.selectTemplate(this.getAreaCode(),5);
                    WxXCXTempSend util = new WxXCXTempSend();
                    try {
                        WxUtil.sendSubscribeRZSH(openid, util.getAppAccessToken(), "党员认证",
                        WxUtil.sendSubscribeRZSH(openid, util.getAccessToken(), "党员认证",
                                DateUtils.format(vo1.getCreateAt(), DateUtils.ymdhms_format), "审核通过",sysTemplateConfigVO.getData().getTemplateId());
                    } catch (Exception e) {
                        log.error("消息推送失败，失败原因：" + e.getMessage());
@@ -756,7 +756,7 @@
                        R<SysTemplateConfigVO> sysTemplateConfigVO=userService.selectTemplate(this.getAreaCode(),5);
                        WxXCXTempSend util = new WxXCXTempSend();
                        try {
                            WxUtil.sendSubscribeRZSH(openid, util.getAppAccessToken(), "党员认证",
                            WxUtil.sendSubscribeRZSH(openid, util.getAccessToken(), "党员认证",
                                    DateUtils.format(vo1.getCreateAt(), DateUtils.ymdhms_format),
                                    "审核驳回，驳回原因：" + partyBuildingMemberVO.getRefuseReason(),sysTemplateConfigVO.getData().getTemplateId());
                        } catch (Exception e) {

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java

@@ -47,88 +47,88 @@
    @Resource
    private PartyBuildingService partyBuildingService;

    /**
     * 社区所有启用的党组织列表
     *
     * @return 党组织集合
     */
    @PostMapping("listpartyorganization")
    public R listPartyOrganization(@RequestParam("communityId") Long communityId) {
        List<PartyOrganizationVO> partyOrganizationVOS = partyOrganizationService.listPartyOrganization(communityId);
        return R.ok(partyOrganizationVOS);
    }

    /**
     * 分页查询社区所有党组织列表
     *
     * @return 党组织集合
     */
    @PostMapping("listpartyorganizationAll")
    public R listPartyOrganizationAll(@RequestBody PartyOrganizationVO partyOrganizationVO) {
        return partyOrganizationService.listPartyOrganizationAll(partyOrganizationVO);
    }

    /**
     * 查询所有党组织列表
     * @param partyOrganizationVO   请求参数
     * @return  党组织列表
     */
    @PostMapping("getPbOrgAllList")
    public R getPbOrgAllList(@RequestBody PartyOrganizationVO partyOrganizationVO) {
        return partyOrganizationService.getPbOrgAllList(partyOrganizationVO);
    }

    /**
     * 新增党支部
     *
     * @param partyOrganizationVO
     *            党支部基本信息
     * @return 新增结果
     */
    @PostMapping("addpartyorganization")
    public R addPartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO) {
        return partyOrganizationService.addPartyOrganization(partyOrganizationVO);

    }

    /**
     * 编辑党支部
     *
     * @param partyOrganizationVO
     *            党支部基本信息
     * @return 编辑结果
     */
    @PostMapping("updatepartyorganization")
    public R updatePartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO) {
        return partyOrganizationService.updatePartyOrganization(partyOrganizationVO);

    }

    /**
     * 启用，禁用党支部
     *
     * @param partyOrganizationVO
     *            党支部基本信息
     * @return 编辑结果
     */
    @PostMapping("resetpartyorganization")
    public R resetPartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO) {
        return partyOrganizationService.resetPartyOrganization(partyOrganizationVO);

    }

    /**
     * 删除党支部
     *
     * @param partyOrganizationVO
     *            党支部基本信息
     * @return 编辑结果
     */
    @PostMapping("deletepartyorganization")
    public R deletePartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO) {
        return partyOrganizationService.deletePartyOrganization(partyOrganizationVO);

    }
//    /**
//     * 社区所有启用的党组织列表
//     *
//     * @return 党组织集合
//     */
//    @PostMapping("listpartyorganization")
//    public R listPartyOrganization(@RequestParam("communityId") Long communityId) {
//        List<PartyOrganizationVO> partyOrganizationVOS = partyOrganizationService.listPartyOrganization(communityId);
//        return R.ok(partyOrganizationVOS);
//    }
//
//    /**
//     * 分页查询社区所有党组织列表
//     *
//     * @return 党组织集合
//     */
//    @PostMapping("listpartyorganizationAll")
//    public R listPartyOrganizationAll(@RequestBody PartyOrganizationVO partyOrganizationVO) {
//        return partyOrganizationService.listPartyOrganizationAll(partyOrganizationVO);
//    }
//
//    /**
//     * 查询所有党组织列表
//     * @param partyOrganizationVO   请求参数
//     * @return  党组织列表
//     */
//    @PostMapping("getPbOrgAllList")
//    public R getPbOrgAllList(@RequestBody PartyOrganizationVO partyOrganizationVO) {
//        return partyOrganizationService.getPbOrgAllList(partyOrganizationVO);
//    }
//
//    /**
//     * 新增党支部
//     *
//     * @param partyOrganizationVO
//     *            党支部基本信息
//     * @return 新增结果
//     */
//    @PostMapping("addpartyorganization")
//    public R addPartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO) {
//        return partyOrganizationService.addPartyOrganization(partyOrganizationVO);
//
//    }
//
//    /**
//     * 编辑党支部
//     *
//     * @param partyOrganizationVO
//     *            党支部基本信息
//     * @return 编辑结果
//     */
//    @PostMapping("updatepartyorganization")
//    public R updatePartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO) {
//        return partyOrganizationService.updatePartyOrganization(partyOrganizationVO);
//
//    }
//
//    /**
//     * 启用，禁用党支部
//     *
//     * @param partyOrganizationVO
//     *            党支部基本信息
//     * @return 编辑结果
//     */
//    @PostMapping("resetpartyorganization")
//    public R resetPartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO) {
//        return partyOrganizationService.resetPartyOrganization(partyOrganizationVO);
//
//    }
//
//    /**
//     * 删除党支部
//     *
//     * @param partyOrganizationVO
//     *            党支部基本信息
//     * @return 编辑结果
//     */
//    @PostMapping("deletepartyorganization")
//    public R deletePartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO) {
//        return partyOrganizationService.deletePartyOrganization(partyOrganizationVO);
//
//    }

    /**
     * 新增党员
@@ -658,17 +658,17 @@
        return comPbMemberService.pagePrePartyBuilingMember(pagePartyBuildingMemberVO);
    }

    /**
     * 社区所有启用的党组织列表
     *
     * @return 党组织集合
     */
    @PostMapping("listpartyorganizationByApp")
    public R listPartyOrganizationByApp(@RequestBody ComListPartyDTO comListPartyDTO) {
        List<PartyOrganizationVO> partyOrganizationVOS =
            partyOrganizationService.listPartyOrganizationByApp(comListPartyDTO);
        return R.ok(partyOrganizationVOS);
    }
//    /**
//     * 社区所有启用的党组织列表
//     *
//     * @return 党组织集合
//     */
//    @PostMapping("listpartyorganizationByApp")
//    public R listPartyOrganizationByApp(@RequestBody ComListPartyDTO comListPartyDTO) {
//        List<PartyOrganizationVO> partyOrganizationVOS =
//            partyOrganizationService.listPartyOrganizationByApp(comListPartyDTO);
//        return R.ok(partyOrganizationVOS);
//    }

    /**
     * 根据党员认证id删除

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngWestApi.java

@@ -5,7 +5,7 @@

import javax.annotation.Resource;

import com.panzhihua.common.model.vos.partybuilding.*;
import com.panzhihua.common.model.vos.partybuilding.west.*;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbMemberRoleExcelVo;
import org.springframework.beans.BeanUtils;
import org.springframework.util.ObjectUtils;
@@ -193,35 +193,35 @@

    }

    /**
     * 党员活动查询
     *
     * @param partyBuildingActivityVO
     *            查询参数
     * @return 参加的所有活动
     */
    @PostMapping("listpartymemberactivities")
    public R listPartyMemberActivities(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
        Long id = partyBuildingActivityVO.getId();
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("党员id不能为空");
        }
        return comBpActivityService.listPartyMemberActivities(partyBuildingActivityVO);
//    /**
//     * 党员活动查询
//     *
//     * @param partyBuildingActivityVO
//     *            查询参数
//     * @return 参加的所有活动
//     */
//    @PostMapping("listpartymemberactivities")
//    public R listPartyMemberActivities(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
//        Long id = partyBuildingActivityVO.getId();
//        if (ObjectUtils.isEmpty(id)) {
//            return R.fail("党员id不能为空");
//        }
//        return comBpActivityService.listPartyMemberActivities(partyBuildingActivityVO);
//
//    }

    }

    /**
     * 活动报名名单分页查询
     *
     * @param pageActivityMembersVO
     *            查询参数 手机号 名字
     * @return 分页数据
     */
    @PostMapping("pageactivitymembers")
    public R pageActivityMembers(@RequestBody PageActivityMembersVO pageActivityMembersVO) {
        return comBpActivityService.pageActivityMembers(pageActivityMembersVO);

    }
//    /**
//     * 活动报名名单分页查询
//     *
//     * @param pageActivityMembersVO
//     *            查询参数 手机号 名字
//     * @return 分页数据
//     */
//    @PostMapping("pageactivitymembers")
//    public R pageActivityMembers(@RequestBody PageActivityMembersVO pageActivityMembersVO) {
//        return comBpActivityService.pageActivityMembers(pageActivityMembersVO);
//
//    }

    /**
     * 编辑党员信息 新增字段均可编辑
@@ -378,31 +378,31 @@

    }

    /**
     * 新增党员活动
     *
     * @param partyBuildingActivityVO
     *            参数
     * @return 新增结果
     */
    @PostMapping("addactivity")
    public R addactivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
        return comBpActivityService.addactivity(partyBuildingActivityVO);
//    /**
//     * 新增党员活动
//     *
//     * @param partyBuildingActivityVO
//     *            参数
//     * @return 新增结果
//     */
//    @PostMapping("addactivity")
//    public R addactivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
//        return comBpActivityService.addactivity(partyBuildingActivityVO);
//
//    }

    }

    /**
     * 编辑党员活动
     *
     * @param partyBuildingActivityVO
     *            编辑内容
     * @return 编辑结果
     */
    @PostMapping("updateactivity")
    public R updateActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
        return comBpActivityService.updateActivity(partyBuildingActivityVO);

    }
//    /**
//     * 编辑党员活动
//     *
//     * @param partyBuildingActivityVO
//     *            编辑内容
//     * @return 编辑结果
//     */
//    @PostMapping("updateactivity")
//    public R updateActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
//        return comBpActivityService.updateActivity(partyBuildingActivityVO);
//
//    }

    /**
     * 发布党员活动
@@ -430,18 +430,18 @@

    }

    /**
     * 分页查询党员活动
     *
     * @param partyBuildingActivityVO
     *            查询条件
     * @return 查询结果
     */
    @PostMapping("pageactivity")
    public R pageActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
        return comBpActivityService.pageActivity(partyBuildingActivityVO);

    }
//    /**
//     * 分页查询党员活动
//     *
//     * @param partyBuildingActivityVO
//     *            查询条件
//     * @return 查询结果
//     */
//    @PostMapping("pageactivity")
//    public R pageActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
//        return comBpActivityService.pageActivity(partyBuildingActivityVO);
//
//    }

    /**
     * 增加阅读记录
@@ -469,18 +469,18 @@

    }

    /**
     * 取消活动
     *
     * @param partyBuildingActivityVO
     *            取消原因
     * @return 操作结果
     */
    @PostMapping("cancelactivity")
    public R cancelActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
        return comBpActivityService.cancelActivity(partyBuildingActivityVO);

    }
//    /**
//     * 取消活动
//     *
//     * @param partyBuildingActivityVO
//     *            取消原因
//     * @return 操作结果
//     */
//    @PostMapping("cancelactivity")
//    public R cancelActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
//        return comBpActivityService.cancelActivity(partyBuildingActivityVO);
//
//    }

    /**
     * 用户的所有党建活动

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbDynDAO.java

@@ -8,7 +8,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.partybuilding.PartyBuildingComPbDynVO;
import com.panzhihua.common.model.vos.partybuilding.west.PartyBuildingComPbDynVO;
import com.panzhihua.service_dangjian.model.dos.ComPbDynDO;

/**

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberRoleDAO.java

@@ -1,5 +1,6 @@
package com.panzhihua.service_dangjian.dao;

import com.panzhihua.common.model.vos.community.ComActVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -8,7 +9,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.partybuilding.PartyCommitteeVO;
import com.panzhihua.common.model.vos.partybuilding.west.PartyCommitteeVO;
import com.panzhihua.common.model.vos.user.SysUserVO;
import com.panzhihua.service_dangjian.model.dos.ComPbMemberRoleDO;

@@ -36,16 +37,18 @@
    /**
     * 根据身份证查询小程序用户id
     * @param idCard 身份证
     * @param areaCode
     * @return  小程序用户id
     */
    Long getUserIdByIdCard(@Param("idCard") String idCard);
    Long getUserIdByIdCard(@Param("idCard") String idCard, @Param("areaCode") String areaCode);

    /**
     * 根据手机号查询小程序用户id
     * @param phone 手机号
     * @param areaCode
     * @return  小程序用户id
     */
    Long getSysUserIdByPhone(@Param("phone") String phone);
    Long getSysUserIdByPhone(@Param("phone") String phone, @Param("areaCode") String areaCode);

    @Update("update sys_user u set u.phone=#{newphone} where u.phone=#{oldphone}")
    void updateUserPhone(@Param("newphone") String newphone, @Param("oldphone") String oldphone);
@@ -56,7 +59,15 @@
    /**
     * 根据身份证查询用户数量
     * @param idCard    身份证号码
     * @param areaCode
     * @return  用户数量
     */
    Integer getSysUserByIdCardCount(@Param("idCard") String idCard);
    Integer getSysUserByIdCardCount(@Param("idCard") String idCard, @Param("areaCode") String areaCode);

    /**
     * 获取社区信息
     * @param communityId
     * @return
     */
    ComActVO selectActById(@Param("communityId") Long communityId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberWestDAO.java

@@ -4,7 +4,7 @@
import java.util.Map;

import com.panzhihua.common.model.dtos.partybuilding.PageComDataStatisticsMemberDto;
import com.panzhihua.common.model.vos.partybuilding.*;
import com.panzhihua.common.model.vos.partybuilding.west.*;
import com.panzhihua.common.model.vos.partybuilding.excel.ComDataStatisticsMemberExcelVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbOrgDAO.java

@@ -7,7 +7,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.partybuilding.PartyOrganizationVO;
import com.panzhihua.common.model.vos.partybuilding.west.PartyOrganizationVO;
import com.panzhihua.service_dangjian.model.dos.ComPbOrgDO;

import java.util.List;

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbMemberWestService.java

@@ -6,7 +6,7 @@
import com.panzhihua.common.model.dtos.partybuilding.ComDataStatisticsOrgDto;
import com.panzhihua.common.model.dtos.partybuilding.PageComDataStatisticsMemberDto;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.partybuilding.*;
import com.panzhihua.common.model.vos.partybuilding.west.*;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbMemberRoleExcelVo;
import com.panzhihua.service_dangjian.model.dos.ComPbMemberWestDO;


 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/PartyOrganizationService.java

@@ -4,7 +4,7 @@

import com.panzhihua.common.model.dtos.partybuilding.ComListPartyDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.partybuilding.PartyOrganizationVO;
import com.panzhihua.common.model.vos.partybuilding.west.PartyOrganizationVO;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ

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

@@ -283,167 +283,187 @@
        return R.ok(partyBuildingMemberVOS);
    }

    /**
     * 新增党委
     *
     * @param partyCommitteeVO
     *            新增信息
     * @return 新增结果
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R addPartyCommittee(PartyCommitteeVO partyCommitteeVO) {
        ComPbMemberRoleDO comPbMemberRoleDO = new ComPbMemberRoleDO();
        BeanUtils.copyProperties(partyCommitteeVO, comPbMemberRoleDO);
        comPbMemberRoleDO.setCreateAt(new Date());
        comPbMemberRoleDO.setUpdateAt(new Date());
        comPbMemberRoleDO.setIsReg(2);
        comPbMemberRoleDO.setSex(Integer.parseInt(partyCommitteeVO.getIdCard().substring(16,17))%2==0?2:1);
        Integer userCount = comPbMemberRoleDAO.getSysUserByIdCardCount(partyCommitteeVO.getIdCard());
        if (userCount > 0) {
            comPbMemberRoleDO.setIsReg(1);
        }
        Date nowDate = new Date();
        //判断党员信息是否存在党委信息
        ComPbMemberDO pbMemberDO = comPbMemberDAO.selectOne(new QueryWrapper<ComPbMemberDO>().lambda()
                .eq(ComPbMemberDO::getIdCard,partyCommitteeVO.getIdCard())
                .eq(ComPbMemberDO::getAuditResult,ComPbMemberDO.AuditResult.SHTG)
                .eq(ComPbMemberDO::getCommunityId,partyCommitteeVO.getCommunityId()));
        if(pbMemberDO == null){
            //不存在则创建党委党员信息
            pbMemberDO = new ComPbMemberDO();
            BeanUtils.copyProperties(partyCommitteeVO, pbMemberDO);
            pbMemberDO.setAuditResult(ComPbMemberDO.AuditResult.SHTG);
            pbMemberDO.setCreateAt(nowDate);
            pbMemberDO.setUpdateAt(nowDate);
            pbMemberDO.setType(ComPbMemberDO.Type.ZSDY);
            comPbMemberDAO.insert(pbMemberDO);
            //金沙特殊需求
            if(pbMemberDO.getCommunityId()==2L){
                ComMngVolunteerMngVO comMngVolunteerMngVO=new ComMngVolunteerMngVO();
                comMngVolunteerMngVO.setOrgId(53L);
                comMngVolunteerMngVO.setName(pbMemberDO.getName());
                comMngVolunteerMngVO.setPhone(pbMemberDO.getPhone());
                comMngVolunteerMngVO.setIdCard(pbMemberDO.getIdCard());
                comMngVolunteerMngVO.setState(2);
                comMngVolunteerMngVO.setCommunityId(2L);
                R r = communityService.addVolunteer(comMngVolunteerMngVO);
                // 支援者添加成功，修改小程序用户的志愿者状态    ，通过手机号
                if (R.isOk(r)) {
                    String phone = comMngVolunteerMngVO.getPhone();
                    R r1 = userService.putUserIsVolunteer(phone, 1);
                    if (R.isOk(r1)) {
                        log.info("修改手机号【{}】的支援者状态为是", phone);
                    } else {
                        log.info("手机号【{}】没有小程序用户", phone);
                    }
                }
            }
        }else{
            //存在则更新党委党员信息
            BeanUtils.copyProperties(partyCommitteeVO, pbMemberDO);
            pbMemberDO.setUpdateAt(nowDate);
            pbMemberDO.setType(ComPbMemberDO.Type.ZSDY);
            comPbMemberDAO.updateById(pbMemberDO);
        }
        int insert = comPbMemberRoleDAO.insert(comPbMemberRoleDO);
        if (insert > 0) {
            return R.ok();
        }
        return R.fail();
        return null;
    }

    /**
     * 编辑党委
     *
     * @param partyCommitteeVO
     *            编辑信息
     * @return 编辑结果
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R updatePartyCommittee(PartyCommitteeVO partyCommitteeVO) {
        ComPbMemberRoleDO comPbMemberRoleDO = new ComPbMemberRoleDO();
        Date nowDate = new Date();
        BeanUtils.copyProperties(partyCommitteeVO, comPbMemberRoleDO);
        comPbMemberRoleDO.setUpdateAt(nowDate);
        comPbMemberRoleDO.setIsReg(2);
        Integer userCount = comPbMemberRoleDAO.getSysUserByIdCardCount(partyCommitteeVO.getIdCard());
        if (userCount > 0) {
            comPbMemberRoleDO.setIsReg(1);
        }
        //查询党员信息并更新
        ComPbMemberDO pbMemberDO = comPbMemberDAO.selectOne(new QueryWrapper<ComPbMemberDO>().lambda()
                .eq(ComPbMemberDO::getIdCard,partyCommitteeVO.getIdCard())
                .eq(ComPbMemberDO::getAuditResult,ComPbMemberDO.AuditResult.SHTG)
                .eq(ComPbMemberDO::getCommunityId,partyCommitteeVO.getCommunityId()));
        if(pbMemberDO != null){
            Long id = pbMemberDO.getId();
            BeanUtils.copyProperties(partyCommitteeVO, pbMemberDO);
            pbMemberDO.setId(id);
            pbMemberDO.setUpdateAt(nowDate);
            pbMemberDO.setType(ComPbMemberDO.Type.ZSDY);
            comPbMemberDAO.updateById(pbMemberDO);
        }
        int update = comPbMemberRoleDAO.updateById(comPbMemberRoleDO);
        if (update > 0) {
            return R.ok();
        }
        return R.fail();
        return null;
    }

    /**
     * 删除党委
     *
     * @param partyCommitteeVO
     *            删除id
     * @return 删除结果
     */
    @Override
    public R deletePartyCommittee(PartyCommitteeVO partyCommitteeVO) {
        ComPbMemberRoleDO comPbMemberRoleDO = comPbMemberRoleDAO.selectById(partyCommitteeVO.getId());
        if (comPbMemberRoleDO == null) {
            return R.fail("记录不存在");
        }
        int delete = comPbMemberRoleDAO.deleteById(partyCommitteeVO.getId());
        if (delete > 0) {
            Long userId = comPbMemberRoleDAO.getUserIdByIdCard(comPbMemberRoleDO.getIdCard());
            // 删除用户信息缓存
            if (userId != null) {
                String userKey = UserConstants.LOGIN_USER_INFO + userId;
                stringRedisTemplate.delete(userKey);
            }
            return R.ok();
        }
        return R.fail();
        return null;
    }

    /**
     * 分页社区党委查询
     *
     * @param partyCommitteeVO
     *            查询参数
     * @return 分页集合
     */
    @Override
    public R pagePartyCommittee(PartyCommitteeVO partyCommitteeVO) {
        Page page = new Page<>();
        Long pageNum = partyCommitteeVO.getPageNum();
        Long pageSize = partyCommitteeVO.getPageSize();
        if (null == pageNum || 0 == pageNum) {
            pageNum = 1l;
        }
        if (null == pageSize || 0 == pageSize) {
            pageSize = 10l;
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<PartyCommitteeVO> iPage = comPbMemberRoleDAO.pagePartyOrganization(page, partyCommitteeVO);
        iPage.getRecords().forEach(record -> {
            record.setPhone(SensitiveUtil.desensitizedPhoneNumber(record.getPhone()));
        });
        return R.ok(iPage);
        return null;
    }

//    /**
//     * 新增党委
//     *
//     * @param partyCommitteeVO
//     *            新增信息
//     * @return 新增结果
//     */
//    @Override
//    @Transactional(rollbackFor = Exception.class)
//    public R addPartyCommittee(PartyCommitteeVO partyCommitteeVO) {
//        ComPbMemberRoleDO comPbMemberRoleDO = new ComPbMemberRoleDO();
//        BeanUtils.copyProperties(partyCommitteeVO, comPbMemberRoleDO);
//        comPbMemberRoleDO.setCreateAt(new Date());
//        comPbMemberRoleDO.setUpdateAt(new Date());
//        comPbMemberRoleDO.setIsReg(2);
//        comPbMemberRoleDO.setSex(Integer.parseInt(partyCommitteeVO.getIdCard().substring(16,17))%2==0?2:1);
//        Integer userCount = comPbMemberRoleDAO.getSysUserByIdCardCount(partyCommitteeVO.getIdCard());
//        if (userCount > 0) {
//            comPbMemberRoleDO.setIsReg(1);
//        }
//        Date nowDate = new Date();
//        //判断党员信息是否存在党委信息
//        ComPbMemberDO pbMemberDO = comPbMemberDAO.selectOne(new QueryWrapper<ComPbMemberDO>().lambda()
//                .eq(ComPbMemberDO::getIdCard,partyCommitteeVO.getIdCard())
//                .eq(ComPbMemberDO::getAuditResult,ComPbMemberDO.AuditResult.SHTG)
//                .eq(ComPbMemberDO::getCommunityId,partyCommitteeVO.getCommunityId()));
//        if(pbMemberDO == null){
//            //不存在则创建党委党员信息
//            pbMemberDO = new ComPbMemberDO();
//            BeanUtils.copyProperties(partyCommitteeVO, pbMemberDO);
//            pbMemberDO.setAuditResult(ComPbMemberDO.AuditResult.SHTG);
//            pbMemberDO.setCreateAt(nowDate);
//            pbMemberDO.setUpdateAt(nowDate);
//            pbMemberDO.setType(ComPbMemberDO.Type.ZSDY);
//            comPbMemberDAO.insert(pbMemberDO);
//            //金沙特殊需求
//            if(pbMemberDO.getCommunityId()==2L){
//                ComMngVolunteerMngVO comMngVolunteerMngVO=new ComMngVolunteerMngVO();
//                comMngVolunteerMngVO.setOrgId(53L);
//                comMngVolunteerMngVO.setName(pbMemberDO.getName());
//                comMngVolunteerMngVO.setPhone(pbMemberDO.getPhone());
//                comMngVolunteerMngVO.setIdCard(pbMemberDO.getIdCard());
//                comMngVolunteerMngVO.setState(2);
//                comMngVolunteerMngVO.setCommunityId(2L);
//                R r = communityService.addVolunteer(comMngVolunteerMngVO);
//                // 支援者添加成功，修改小程序用户的志愿者状态    ，通过手机号
//                if (R.isOk(r)) {
//                    String phone = comMngVolunteerMngVO.getPhone();
//                    R r1 = userService.putUserIsVolunteer(phone, 1);
//                    if (R.isOk(r1)) {
//                        log.info("修改手机号【{}】的支援者状态为是", phone);
//                    } else {
//                        log.info("手机号【{}】没有小程序用户", phone);
//                    }
//                }
//            }
//        }else{
//            //存在则更新党委党员信息
//            BeanUtils.copyProperties(partyCommitteeVO, pbMemberDO);
//            pbMemberDO.setUpdateAt(nowDate);
//            pbMemberDO.setType(ComPbMemberDO.Type.ZSDY);
//            comPbMemberDAO.updateById(pbMemberDO);
//        }
//        int insert = comPbMemberRoleDAO.insert(comPbMemberRoleDO);
//        if (insert > 0) {
//            return R.ok();
//        }
//        return R.fail();
//    }

//    /**
//     * 编辑党委
//     *
//     * @param partyCommitteeVO
//     *            编辑信息
//     * @return 编辑结果
//     */
//    @Override
//    @Transactional(rollbackFor = Exception.class)
//    public R updatePartyCommittee(PartyCommitteeVO partyCommitteeVO) {
//        ComPbMemberRoleDO comPbMemberRoleDO = new ComPbMemberRoleDO();
//        Date nowDate = new Date();
//        BeanUtils.copyProperties(partyCommitteeVO, comPbMemberRoleDO);
//        comPbMemberRoleDO.setUpdateAt(nowDate);
//        comPbMemberRoleDO.setIsReg(2);
//        Integer userCount = comPbMemberRoleDAO.getSysUserByIdCardCount(partyCommitteeVO.getIdCard());
//        if (userCount > 0) {
//            comPbMemberRoleDO.setIsReg(1);
//        }
//        //查询党员信息并更新
//        ComPbMemberDO pbMemberDO = comPbMemberDAO.selectOne(new QueryWrapper<ComPbMemberDO>().lambda()
//                .eq(ComPbMemberDO::getIdCard,partyCommitteeVO.getIdCard())
//                .eq(ComPbMemberDO::getAuditResult,ComPbMemberDO.AuditResult.SHTG)
//                .eq(ComPbMemberDO::getCommunityId,partyCommitteeVO.getCommunityId()));
//        if(pbMemberDO != null){
//            Long id = pbMemberDO.getId();
//            BeanUtils.copyProperties(partyCommitteeVO, pbMemberDO);
//            pbMemberDO.setId(id);
//            pbMemberDO.setUpdateAt(nowDate);
//            pbMemberDO.setType(ComPbMemberDO.Type.ZSDY);
//            comPbMemberDAO.updateById(pbMemberDO);
//        }
//        int update = comPbMemberRoleDAO.updateById(comPbMemberRoleDO);
//        if (update > 0) {
//            return R.ok();
//        }
//        return R.fail();
//    }
//
//    /**
//     * 删除党委
//     *
//     * @param partyCommitteeVO
//     *            删除id
//     * @return 删除结果
//     */
//    @Override
//    public R deletePartyCommittee(PartyCommitteeVO partyCommitteeVO) {
//        ComPbMemberRoleDO comPbMemberRoleDO = comPbMemberRoleDAO.selectById(partyCommitteeVO.getId());
//        if (comPbMemberRoleDO == null) {
//            return R.fail("记录不存在");
//        }
//        int delete = comPbMemberRoleDAO.deleteById(partyCommitteeVO.getId());
//        if (delete > 0) {
//            Long userId = comPbMemberRoleDAO.getUserIdByIdCard(comPbMemberRoleDO.getIdCard());
//            // 删除用户信息缓存
//            if (userId != null) {
//                String userKey = UserConstants.LOGIN_USER_INFO + userId;
//                stringRedisTemplate.delete(userKey);
//            }
//            return R.ok();
//        }
//        return R.fail();
//    }
//
//    /**
//     * 分页社区党委查询
//     *
//     * @param partyCommitteeVO
//     *            查询参数
//     * @return 分页集合
//     */
//    @Override
//    public R pagePartyCommittee(PartyCommitteeVO partyCommitteeVO) {
//        Page page = new Page<>();
//        Long pageNum = partyCommitteeVO.getPageNum();
//        Long pageSize = partyCommitteeVO.getPageSize();
//        if (null == pageNum || 0 == pageNum) {
//            pageNum = 1l;
//        }
//        if (null == pageSize || 0 == pageSize) {
//            pageSize = 10l;
//        }
//        page.setSize(pageSize);
//        page.setCurrent(pageNum);
//        IPage<PartyCommitteeVO> iPage = comPbMemberRoleDAO.pagePartyOrganization(page, partyCommitteeVO);
//        iPage.getRecords().forEach(record -> {
//            record.setPhone(SensitiveUtil.desensitizedPhoneNumber(record.getPhone()));
//        });
//        return R.ok(iPage);
//    }

    /**
     * 新建党建动态
@@ -482,83 +502,98 @@
        return R.fail();
    }

    /**
     * 动态详情
     *
     * @param id
     *            动态主键
     * @return 详情
     */
    @Override
    public R infoYnamic(Long id) {
        PartyBuildingComPbDynVO comPbDynVO = comPbDynDAO.selectVoById(id);
        if (ObjectUtils.isEmpty(comPbDynVO)) {
            return R.fail("动态不存在");
        }
        // ComPbMemberDO comPbMemberDO = comPbMemberDAO.selectById(createBy);
        // String name = comPbMemberDAO.selectNameByUserId(createBy);

        if (ObjectUtils.isEmpty(comPbDynVO.getCreateByName())) {
            // return R.fail("发布人不存在");
            String name = comPbMemberDAO.selectNameByUserId(comPbDynVO.getCreateBy());
            name = "后台发布";
            comPbDynVO.setCreateByName(name);
        }
        // Integer integer = comPbDynUserDAO.selectCount(new
        // QueryWrapper<ComPbDynUserDO>().lambda().eq(ComPbDynUserDO::getDynId, id));
        comPbDynVO.setReadingVolume(null == comPbDynVO.getReadingVolume() ? 0 : comPbDynVO.getReadingVolume());
        return R.ok(comPbDynVO);
        return null;
    }

    /**
     * 分页查询党员动态
     *
     * @param partyBuildingComPbDynVO
     *            查询参数
     * @return 分页数据
     */
    @Override
    public R pageYnamic(PartyBuildingComPbDynVO partyBuildingComPbDynVO) {
        Page page = new Page<>();
        Long pageNum = partyBuildingComPbDynVO.getPageNum();
        Long pageSize = partyBuildingComPbDynVO.getPageSize();
        if (null == pageNum) {
            pageNum = 1l;
        }
        if (null == pageSize) {
            pageSize = 10l;
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<PartyBuildingComPbDynVO> iPage = comPbDynDAO.pageYnamic(page, partyBuildingComPbDynVO);
        List<PartyBuildingComPbDynVO> records = iPage.getRecords();
        if (!(ObjectUtils.isEmpty(records))) {
            records.forEach(partyBuildingComPbDynVO1 -> {
                String content = partyBuildingComPbDynVO1.getContent();
                if (!ObjectUtils.isEmpty(content)) {
                    String text = RichTextUtil.getText(content);
                    partyBuildingComPbDynVO1.setContentText(text);
                }
            });
        }
        return R.ok(iPage);
        return null;
    }

    /**
     * 删除动态
     *
     * @param id
     *            动态主键
     * @return 删除结果
     */
    @Override
    public R deleteYnamic(Integer id) {
        int delete = comPbDynDAO.deleteById(id);
        if (delete > 0) {
            return R.ok();
        }
        return R.fail();
        return null;
    }

//    /**
//     * 动态详情
//     *
//     * @param id
//     *            动态主键
//     * @return 详情
//     */
//    @Override
//    public R infoYnamic(Long id) {
//        PartyBuildingComPbDynVO comPbDynVO = comPbDynDAO.selectVoById(id);
//        if (ObjectUtils.isEmpty(comPbDynVO)) {
//            return R.fail("动态不存在");
//        }
//        // ComPbMemberDO comPbMemberDO = comPbMemberDAO.selectById(createBy);
//        // String name = comPbMemberDAO.selectNameByUserId(createBy);
//
//        if (ObjectUtils.isEmpty(comPbDynVO.getCreateByName())) {
//            // return R.fail("发布人不存在");
//            String name = comPbMemberDAO.selectNameByUserId(comPbDynVO.getCreateBy());
//            name = "后台发布";
//            comPbDynVO.setCreateByName(name);
//        }
//        // Integer integer = comPbDynUserDAO.selectCount(new
//        // QueryWrapper<ComPbDynUserDO>().lambda().eq(ComPbDynUserDO::getDynId, id));
//        comPbDynVO.setReadingVolume(null == comPbDynVO.getReadingVolume() ? 0 : comPbDynVO.getReadingVolume());
//        return R.ok(comPbDynVO);
//    }
//
//    /**
//     * 分页查询党员动态
//     *
//     * @param partyBuildingComPbDynVO
//     *            查询参数
//     * @return 分页数据
//     */
//    @Override
//    public R pageYnamic(PartyBuildingComPbDynVO partyBuildingComPbDynVO) {
//        Page page = new Page<>();
//        Long pageNum = partyBuildingComPbDynVO.getPageNum();
//        Long pageSize = partyBuildingComPbDynVO.getPageSize();
//        if (null == pageNum) {
//            pageNum = 1l;
//        }
//        if (null == pageSize) {
//            pageSize = 10l;
//        }
//        page.setSize(pageSize);
//        page.setCurrent(pageNum);
//        IPage<PartyBuildingComPbDynVO> iPage = comPbDynDAO.pageYnamic(page, partyBuildingComPbDynVO);
//        List<PartyBuildingComPbDynVO> records = iPage.getRecords();
//        if (!(ObjectUtils.isEmpty(records))) {
//            records.forEach(partyBuildingComPbDynVO1 -> {
//                String content = partyBuildingComPbDynVO1.getContent();
//                if (!ObjectUtils.isEmpty(content)) {
//                    String text = RichTextUtil.getText(content);
//                    partyBuildingComPbDynVO1.setContentText(text);
//                }
//            });
//        }
//        return R.ok(iPage);
//    }
//
//    /**
//     * 删除动态
//     *
//     * @param id
//     *            动态主键
//     * @return 删除结果
//     */
//    @Override
//    public R deleteYnamic(Integer id) {
//        int delete = comPbDynDAO.deleteById(id);
//        if (delete > 0) {
//            return R.ok();
//        }
//        return R.fail();
//    }

    /**
     * 增加阅读记录
@@ -970,126 +1005,131 @@
        return R.ok(memberList);
    }

    /**
     * 党委导入接口
     * @param list 数据列表
     * @param communityId   社区id
     * @param userId    用户id
     * @return  导入结果
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R importPbMemberRole(List<ComPbMemberRoleExcelVo> list, Long communityId, Long userId) {
        ArrayList<ComPbMemberRoleErrorExcelVo> mistakes = Lists.newArrayList();
        ArrayList<ComPbMemberRoleDO> saveList = Lists.newArrayList();
        Date nowDate = new Date();
        if(list != null && list.size() > 0){
            list.forEach(memberRole -> {
                ComPbMemberRoleDO memberRoleDO = comPbMemberRoleDAO.selectOne(new QueryWrapper<ComPbMemberRoleDO>().lambda()
                        .eq(ComPbMemberRoleDO::getCommunityId,communityId).eq(ComPbMemberRoleDO::getIdCard,memberRole.getIdCard()));
                if(memberRoleDO != null){
                    ComPbMemberRoleErrorExcelVo roleErrorExcelVo = new ComPbMemberRoleErrorExcelVo();
                    BeanUtils.copyProperties(memberRole,roleErrorExcelVo);
                    roleErrorExcelVo.setError("该党委已存在，不可重复导入");
                    mistakes.add(roleErrorExcelVo);
                }else{
                    memberRoleDO = new ComPbMemberRoleDO();
                    BeanUtils.copyProperties(memberRole,memberRoleDO);
                    Integer type = ComPbMemberRoleTypeEnum.getCodeByName(memberRole.getTypeName());
                    if(type.equals(0)){
                        ComPbMemberRoleErrorExcelVo roleErrorExcelVo = new ComPbMemberRoleErrorExcelVo();
                        BeanUtils.copyProperties(memberRole,roleErrorExcelVo);
                        roleErrorExcelVo.setError("党委标签不存在，请核对后再重新导入");
                        mistakes.add(roleErrorExcelVo);
                        return;
                    }else{
                        memberRoleDO.setType(type);
                    }
                    try {
                        Date joinTime = DateUtils.stringToDate(memberRole.getJoinTime(),DateUtils.yyyyMMdd_format);
                        memberRoleDO.setJoinTime(joinTime);
                    } catch (Exception e) {
                        ComPbMemberRoleErrorExcelVo roleErrorExcelVo = new ComPbMemberRoleErrorExcelVo();
                        BeanUtils.copyProperties(memberRole,roleErrorExcelVo);
                        roleErrorExcelVo.setError("入党时间格式错误，请按照正确格式填写，如：2022-01-01");
                        mistakes.add(roleErrorExcelVo);
                        return;
                    }
                    if(StringUtils.isNotEmpty(memberRole.getOrg())){
                        ComPbOrgDO comPbOrgDO=comPbOrgDAO.selectOne(new QueryWrapper<ComPbOrgDO>().lambda().eq(ComPbOrgDO::getName,memberRole.getOrg()).eq(ComPbOrgDO::getCommunityId,communityId));
                        if(comPbOrgDO!=null){
                            memberRoleDO.setOrgId(comPbOrgDO.getId());
                        }
                    }
                    try {
                        Date employmentTime = DateUtils.stringToDate(memberRole.getEmploymentTime(),DateUtils.yyyyMMdd_format);
                        memberRoleDO.setEmploymentTime(employmentTime);
                    } catch (Exception e) {
                        ComPbMemberRoleErrorExcelVo roleErrorExcelVo = new ComPbMemberRoleErrorExcelVo();
                        BeanUtils.copyProperties(memberRole,roleErrorExcelVo);
                        roleErrorExcelVo.setError("转正时间格式错误，请按照正确格式填写，如：2022-01-01");
                        mistakes.add(roleErrorExcelVo);
                        return;
                    }
                    Integer userCount = comPbMemberRoleDAO.getSysUserByIdCardCount(memberRole.getIdCard());
                    memberRoleDO.setIsReg(userCount > 0 ? 1 : 2);
                    memberRoleDO.setCommunityId(communityId);
                    memberRoleDO.setSex(Integer.parseInt(memberRoleDO.getIdCard().substring(16,17))%2==0?2:1);
                    saveList.add(memberRoleDO);
                }
            });
        }

        if(saveList.size() > 0){
            saveList.forEach(save -> {
                int result = comPbMemberRoleDAO.insert(save);
                if(result>0){
                    //判断党员信息是否存在党委信息
                    ComPbMemberDO pbMemberDO = comPbMemberDAO.selectOne(new QueryWrapper<ComPbMemberDO>().lambda()
                            .eq(ComPbMemberDO::getIdCard,save.getIdCard())
                            .eq(ComPbMemberDO::getAuditResult,ComPbMemberDO.AuditResult.SHTG)
                            .eq(ComPbMemberDO::getCommunityId,save.getCommunityId()));
                    if(pbMemberDO == null){
                        //不存在则创建党委党员信息
                        pbMemberDO = new ComPbMemberDO();
                        BeanUtils.copyProperties(save, pbMemberDO);
                        pbMemberDO.setAuditResult(ComPbMemberDO.AuditResult.SHTG);
                        pbMemberDO.setCreateAt(nowDate);
                        pbMemberDO.setUpdateAt(nowDate);
                        pbMemberDO.setType(ComPbMemberDO.Type.ZSDY);
                        comPbMemberDAO.insert(pbMemberDO);
                        //金沙特殊需求
                        if(pbMemberDO.getCommunityId()==2L){
                            ComMngVolunteerMngVO comMngVolunteerMngVO=new ComMngVolunteerMngVO();
                            comMngVolunteerMngVO.setOrgId(53L);
                            comMngVolunteerMngVO.setName(pbMemberDO.getName());
                            comMngVolunteerMngVO.setPhone(pbMemberDO.getPhone());
                            comMngVolunteerMngVO.setIdCard(pbMemberDO.getIdCard());
                            comMngVolunteerMngVO.setState(2);
                            comMngVolunteerMngVO.setCommunityId(2L);
                            R r = communityService.addVolunteer(comMngVolunteerMngVO);
                            // 支援者添加成功，修改小程序用户的志愿者状态    ，通过手机号
                            if (R.isOk(r)) {
                                String phone = comMngVolunteerMngVO.getPhone();
                                R r1 = userService.putUserIsVolunteer(phone, 1);
                                if (R.isOk(r1)) {
                                    log.info("修改手机号【{}】的支援者状态为是", phone);
                                } else {
                                    log.info("手机号【{}】没有小程序用户", phone);
                                }
                            }
                        }
                    }
                }
                userService.updateUserIsPartymember(save.getIdCard());
            });
        }
        if(mistakes.size() > 0){
            return R.fail(mistakes);
        }
        return R.ok();
        return null;
    }

//    /**
//     * 党委导入接口
//     * @param list 数据列表
//     * @param communityId   社区id
//     * @param userId    用户id
//     * @return  导入结果
//     */
//    @Override
//    @Transactional(rollbackFor = Exception.class)
//    public R importPbMemberRole(List<ComPbMemberRoleExcelVo> list, Long communityId, Long userId) {
//        ArrayList<ComPbMemberRoleErrorExcelVo> mistakes = Lists.newArrayList();
//        ArrayList<ComPbMemberRoleDO> saveList = Lists.newArrayList();
//        Date nowDate = new Date();
//        if(list != null && list.size() > 0){
//            list.forEach(memberRole -> {
//                ComPbMemberRoleDO memberRoleDO = comPbMemberRoleDAO.selectOne(new QueryWrapper<ComPbMemberRoleDO>().lambda()
//                        .eq(ComPbMemberRoleDO::getCommunityId,communityId).eq(ComPbMemberRoleDO::getIdCard,memberRole.getIdCard()));
//                if(memberRoleDO != null){
//                    ComPbMemberRoleErrorExcelVo roleErrorExcelVo = new ComPbMemberRoleErrorExcelVo();
//                    BeanUtils.copyProperties(memberRole,roleErrorExcelVo);
//                    roleErrorExcelVo.setError("该党委已存在，不可重复导入");
//                    mistakes.add(roleErrorExcelVo);
//                }else{
//                    memberRoleDO = new ComPbMemberRoleDO();
//                    BeanUtils.copyProperties(memberRole,memberRoleDO);
//                    Integer type = ComPbMemberRoleTypeEnum.getCodeByName(memberRole.getTypeName());
//                    if(type.equals(0)){
//                        ComPbMemberRoleErrorExcelVo roleErrorExcelVo = new ComPbMemberRoleErrorExcelVo();
//                        BeanUtils.copyProperties(memberRole,roleErrorExcelVo);
//                        roleErrorExcelVo.setError("党委标签不存在，请核对后再重新导入");
//                        mistakes.add(roleErrorExcelVo);
//                        return;
//                    }else{
//                        memberRoleDO.setType(type);
//                    }
//                    try {
//                        Date joinTime = DateUtils.stringToDate(memberRole.getJoinTime(),DateUtils.yyyyMMdd_format);
//                        memberRoleDO.setJoinTime(joinTime);
//                    } catch (Exception e) {
//                        ComPbMemberRoleErrorExcelVo roleErrorExcelVo = new ComPbMemberRoleErrorExcelVo();
//                        BeanUtils.copyProperties(memberRole,roleErrorExcelVo);
//                        roleErrorExcelVo.setError("入党时间格式错误，请按照正确格式填写，如：2022-01-01");
//                        mistakes.add(roleErrorExcelVo);
//                        return;
//                    }
//                    if(StringUtils.isNotEmpty(memberRole.getOrg())){
//                        ComPbOrgDO comPbOrgDO=comPbOrgDAO.selectOne(new QueryWrapper<ComPbOrgDO>().lambda().eq(ComPbOrgDO::getName,memberRole.getOrg()).eq(ComPbOrgDO::getCommunityId,communityId));
//                        if(comPbOrgDO!=null){
//                            memberRoleDO.setOrgId(comPbOrgDO.getId());
//                        }
//                    }
//                    try {
//                        Date employmentTime = DateUtils.stringToDate(memberRole.getEmploymentTime(),DateUtils.yyyyMMdd_format);
//                        memberRoleDO.setEmploymentTime(employmentTime);
//                    } catch (Exception e) {
//                        ComPbMemberRoleErrorExcelVo roleErrorExcelVo = new ComPbMemberRoleErrorExcelVo();
//                        BeanUtils.copyProperties(memberRole,roleErrorExcelVo);
//                        roleErrorExcelVo.setError("转正时间格式错误，请按照正确格式填写，如：2022-01-01");
//                        mistakes.add(roleErrorExcelVo);
//                        return;
//                    }
//                    Integer userCount = comPbMemberRoleDAO.getSysUserByIdCardCount(memberRole.getIdCard());
//                    memberRoleDO.setIsReg(userCount > 0 ? 1 : 2);
//                    memberRoleDO.setCommunityId(communityId);
//                    memberRoleDO.setSex(Integer.parseInt(memberRoleDO.getIdCard().substring(16,17))%2==0?2:1);
//                    saveList.add(memberRoleDO);
//                }
//            });
//        }
//
//        if(saveList.size() > 0){
//            saveList.forEach(save -> {
//                int result = comPbMemberRoleDAO.insert(save);
//                if(result>0){
//                    //判断党员信息是否存在党委信息
//                    ComPbMemberDO pbMemberDO = comPbMemberDAO.selectOne(new QueryWrapper<ComPbMemberDO>().lambda()
//                            .eq(ComPbMemberDO::getIdCard,save.getIdCard())
//                            .eq(ComPbMemberDO::getAuditResult,ComPbMemberDO.AuditResult.SHTG)
//                            .eq(ComPbMemberDO::getCommunityId,save.getCommunityId()));
//                    if(pbMemberDO == null){
//                        //不存在则创建党委党员信息
//                        pbMemberDO = new ComPbMemberDO();
//                        BeanUtils.copyProperties(save, pbMemberDO);
//                        pbMemberDO.setAuditResult(ComPbMemberDO.AuditResult.SHTG);
//                        pbMemberDO.setCreateAt(nowDate);
//                        pbMemberDO.setUpdateAt(nowDate);
//                        pbMemberDO.setType(ComPbMemberDO.Type.ZSDY);
//                        comPbMemberDAO.insert(pbMemberDO);
//                        //金沙特殊需求
//                        if(pbMemberDO.getCommunityId()==2L){
//                            ComMngVolunteerMngVO comMngVolunteerMngVO=new ComMngVolunteerMngVO();
//                            comMngVolunteerMngVO.setOrgId(53L);
//                            comMngVolunteerMngVO.setName(pbMemberDO.getName());
//                            comMngVolunteerMngVO.setPhone(pbMemberDO.getPhone());
//                            comMngVolunteerMngVO.setIdCard(pbMemberDO.getIdCard());
//                            comMngVolunteerMngVO.setState(2);
//                            comMngVolunteerMngVO.setCommunityId(2L);
//                            R r = communityService.addVolunteer(comMngVolunteerMngVO);
//                            // 支援者添加成功，修改小程序用户的志愿者状态    ，通过手机号
//                            if (R.isOk(r)) {
//                                String phone = comMngVolunteerMngVO.getPhone();
//                                R r1 = userService.putUserIsVolunteer(phone, 1);
//                                if (R.isOk(r1)) {
//                                    log.info("修改手机号【{}】的支援者状态为是", phone);
//                                } else {
//                                    log.info("手机号【{}】没有小程序用户", phone);
//                                }
//                            }
//                        }
//                    }
//                }
//                userService.updateUserIsPartymember(save.getIdCard());
//            });
//        }
//        if(mistakes.size() > 0){
//            return R.fail(mistakes);
//        }
//        return R.ok();
//    }

    @Override
    public R exportPartyMember(PagePartyOrganizationVO pagePartyOrganizationVO) {
        return R.ok(comPbMemberDAO.exportPartyMemberList(pagePartyOrganizationVO));

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

@@ -16,7 +16,7 @@
import com.panzhihua.common.model.dtos.partybuilding.PageComDataStatisticsMemberDto;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
import com.panzhihua.common.model.vos.partybuilding.*;
import com.panzhihua.common.model.vos.partybuilding.west.*;
import com.panzhihua.common.model.vos.partybuilding.excel.ComDataStatisticsMemberExcelVo;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbMemberRoleErrorExcelVo;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbMemberRoleExcelVo;

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

@@ -54,7 +54,7 @@
        ComPbServiceTeamDO comPbServiceTeamDO = new ComPbServiceTeamDO();
        BeanUtils.copyProperties(comPbServiceTeamDTO, comPbServiceTeamDO);
        comPbServiceTeamDO.setIsReg(2);
        Long userId = comPbMemberRoleDAO.getSysUserIdByPhone(comPbServiceTeamDTO.getPhone());
        Long userId = comPbMemberRoleDAO.getSysUserIdByPhone(comPbServiceTeamDTO.getPhone(), comPbServiceTeamDTO.getAreaCode());
        if (nonNull(userId)) {
            comPbServiceTeamDO.setIsReg(1);
        }

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

@@ -18,7 +18,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.partybuilding.ComListPartyDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.partybuilding.PartyOrganizationVO;
import com.panzhihua.common.model.vos.partybuilding.west.PartyOrganizationVO;
import com.panzhihua.service_dangjian.dao.ComPbMemberDAO;
import com.panzhihua.service_dangjian.dao.ComPbOrgDAO;
import com.panzhihua.service_dangjian.model.dos.ComPbMemberDO;

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbMemberWestMapper.xml

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.panzhihua.service_dangjian.dao.ComPbMemberDAO">
<mapper namespace="com.panzhihua.service_dangjian.dao.ComPbMemberWestDAO">

    <resultMap type="com.panzhihua.service_dangjian.model.dos.ComPbMemberDO" id="ComPbMemberMap">
    <resultMap type="com.panzhihua.service_dangjian.model.dos.ComPbMemberWestDO" id="ComPbMemberMap">
        <result property="id" column="id" jdbcType="INTEGER"/>
        <result property="orgId" column="org_id" jdbcType="INTEGER"/>
        <result property="name" column="name" jdbcType="VARCHAR"/>
@@ -24,11 +24,10 @@
        <result property="specialtyCategory" column="specialty_category" jdbcType="INTEGER"/>
        <result property="specialtyName" column="specialty_name" jdbcType="VARCHAR"/>
        <result property="positionTwo" column="position_two" jdbcType="VARCHAR"/>
        <result property="otherRemark" column="other_remark" jdbcType="VARCHAR"/>
    </resultMap>

    <!--查询单个-->
    <select id="queryById" resultType="com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO">
    <select id="queryById" resultType="com.panzhihua.common.model.vos.partybuilding.west.PartyBuildingMemberVO">
        select
        m.id, m.org_id, m.name, m.id_card, m.photo_path, m.join_time, m.employment_time, m.audit_result, m.create_at, m.update_at,
        m.community_id, m.user_id, m.refuse_reason, m.phone, m.type, m.position, m.check_unit_id, m.function, m.specialty_category,
@@ -42,33 +41,46 @@
        WHEN u.id_card IS NULL THEN
        '未注册' ELSE '已注册'
        END status
        from com_pb_member as m
        LEFT JOIN sys_user u ON m.id_card = u.id_card
        from com_pb_member_west as m
        LEFT JOIN (
            SELECT su.* FROM sys_user su
            LEFT JOIN com_act act ON su.community_id = act.community_id
            WHERE act.area_code = #{areaCode}
        ) u ON m.id_card = u.id_card and u.`type` = 1
        LEFT JOIN com_pb_org o ON m.org_id = o.id
        LEFT JOIN com_pb_check_unit as cpcu ON m.check_unit_id = cpcu.id
        where m.id = #{id}
    </select>

    <!--查询指定行数据-->
    <select id="queryAllByLimit" resultType="com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO">
    <select id="queryAllByLimit" resultType="com.panzhihua.common.model.vos.partybuilding.west.PartyBuildingMemberVO">
        select
        m.id, m.org_id, m.name, m.id_card, m.photo_path, m.join_time, m.employment_time, m.audit_result, m.create_at, m.update_at,
        m.community_id, m.user_id, m.refuse_reason, m.phone, m.type, m.position, m.check_unit_id, m.function, m.specialty_category,
        m.specialty_name, m.position_two, m.org_name,cpcu.name as checkUnitName,t2.partyTime,t2.partyInterval,cmv.name as villageName,ca.name as communityName,cpcu.belong_to,
        m.specialty_name, m.position_two, o.`name` orgName,cpcu.name as checkUnitName,t2.partyTime,t2.partyInterval,
        TIMESTAMPDIFF(
        YEAR,
        m.employment_time,
        DATE_FORMAT( NOW(), '%Y-%m-%d' )) as partyAge
        from com_pb_member as m
        DATE_FORMAT( NOW(), '%Y-%m-%d' )) as partyAge,
        CASE

        WHEN u.id_card IS NULL THEN
        '未注册' ELSE '已注册'
        END status
        from com_pb_member_west as m
        LEFT JOIN (
            SELECT su.* FROM sys_user su
            LEFT JOIN com_act act ON su.community_id = act.community_id
            WHERE act.area_code = #{dto.areaCode}
        ) u ON m.id_card = u.id_card and u.type = 1
        LEFT JOIN com_act act ON u.community_id = act.community_id
        LEFT JOIN com_pb_org o ON m.org_id = o.id
        LEFT JOIN com_pb_check_unit as cpcu ON m.check_unit_id = cpcu.id
        LEFT JOIN com_mng_village cmv on m.village_id = cmv.village_id
        LEFT JOIN com_act ca on m.community_id = ca.community_id
        LEFT JOIN (select t1.user_id,sum(t.duration) as partyTime,sum(t.reward_integral) as partyInterval  from com_act_activity t LEFT JOIN com_act_act_regist t1 on t.id = t1.activity_id where t.type = 3
        <if test="dto.startTime !=null">
            and t.begin_at between #{dto.startTime} and #{dto.endTime}
        </if>
        GROUP BY t1.user_id ) t2 on m.user_id = t2.user_id
        GROUP BY t1.user_id ) t2 on u.user_id = t2.user_id
        <where>
            and m.audit_result = 1
            <if test='dto.orgName != null and dto.orgName != &quot;&quot;'>
@@ -78,7 +90,7 @@
               and o.id = #{dto.orgId}
            </if>
            <if test='dto.account != null and dto.account != &quot;&quot;'>
                and m.phone like concat (#{dto.account},'%')
                and u.phone like concat (#{dto.account},'%')
            </if>
            <if test='dto.name != null and dto.name != &quot;&quot;'>
                and m.name like concat (#{dto.name},'%')
@@ -86,13 +98,13 @@
            <if test="dto.orgId != null">
                and m.org_id = #{dto.orgId}
            </if>
            <if test="dto.communityId != null and dto.communityId !=0">
            <if test="dto.communityId != null">
                and m.community_id = ${dto.communityId}
            </if>
            <if test="dto.keyWord != null and dto.keyWord != ''">
                and (m.name like concat ('%',#{dto.keyWord},'%') or
                m.phone like concat ('%',#{dto.keyWord},'%') or
                cpcu.name like concat ('%',#{dto.keyWord},'%') or ca.name like concat ('%',#{dto.keyWord},'%')
                and (m.name like concat (#{dto.keyWord},'%') or
                u.phone like concat (#{dto.keyWord},'%') or
                cpcu.name like concat (#{dto.keyWord},'%')
                )
            </if>
            <if test="dto.type != null">
@@ -101,11 +113,8 @@
            <if test="dto.checkUnitId != null">
                and m.check_unit_id = #{dto.checkUnitId}
            </if>
            <if test="dto.specialtyName != null and dto.specialtyName !=''">
                and m.specialty_name like concat('%',#{dto.specialtyName},'%')
            </if>
            <if test="dto.belongTo !=null and dto.belongTo !=''">
                and cpcu.belong_to = #{dto.belongTo}
            <if test="dto.specialtyCategory != null">
                and m.specialty_category = #{dto.specialtyCategory}
            </if>
        </where>
        order by m.create_at desc
@@ -115,21 +124,30 @@
        select
        m.id, m.org_id, m.name, m.id_card, m.photo_path, m.join_time, m.employment_time, m.audit_result, m.create_at, m.update_at,
        m.community_id, m.user_id, m.refuse_reason, m.phone, m.type, m.position, m.check_unit_id, m.function, m.specialty_category,
        m.specialty_name, m.position_two, m.org_name,cpcu.name as checkUnitName,t2.partyTime,t2.partyInterval,cmv.name as villageName,ca.name as communityName,cpcu.belong_to,cpcu.help_community_name,
        m.specialty_name, m.position_two, o.`name` orgName,cpcu.name as checkUnitName,t2.partyTime,t2.partyInterval,
        TIMESTAMPDIFF(
        YEAR,
        m.employment_time,
        DATE_FORMAT( NOW(), '%Y-%m-%d' )) as partyAge
        from com_pb_member as m
        DATE_FORMAT( NOW(), '%Y-%m-%d' )) as partyAge,
        CASE

        WHEN u.id_card IS NULL THEN
        '未注册' ELSE '已注册'
        END status
        from com_pb_member_west as m
        LEFT JOIN (
            SELECT su.* FROM sys_user su
            LEFT JOIN com_act act ON su.community_id = act.community_id
            WHERE act.area_code = #{dto.areaCode}
        ) u ON m.id_card = u.id_card and u.type = 1
        LEFT JOIN com_act act ON u.community_id = act.community_id
        LEFT JOIN com_pb_org o ON m.org_id = o.id
        LEFT JOIN com_pb_check_unit as cpcu ON m.check_unit_id = cpcu.id
        LEFT JOIN com_mng_village cmv on m.village_id = cmv.village_id
        LEFT JOIN com_act ca on m.community_id = ca.community_id
        LEFT JOIN (select t1.user_id,sum(t.duration) as partyTime,sum(t.reward_integral) as partyInterval  from com_act_activity t LEFT JOIN com_act_act_regist t1 on t.id = t1.activity_id where t.type = 3
        <if test="dto.startTime !=null">
            and t.begin_at between #{dto.startTime} and #{dto.endTime}
        </if>
        GROUP BY t1.user_id ) t2 on m.user_id = t2.user_id
        GROUP BY t1.user_id ) t2 on u.user_id = t2.user_id
        <where>
            and m.audit_result = 1
            <if test='dto.orgName != null and dto.orgName != &quot;&quot;'>
@@ -139,7 +157,7 @@
                and o.id = #{dto.orgId}
            </if>
            <if test='dto.account != null and dto.account != &quot;&quot;'>
                and m.phone like concat (#{dto.account},'%')
                and u.phone like concat (#{dto.account},'%')
            </if>
            <if test='dto.name != null and dto.name != &quot;&quot;'>
                and m.name like concat (#{dto.name},'%')
@@ -147,13 +165,13 @@
            <if test="dto.orgId != null">
                and m.org_id = #{dto.orgId}
            </if>
            <if test="dto.communityId != null and dto.communityId !=0">
            <if test="dto.communityId != null">
                and m.community_id = ${dto.communityId}
            </if>
            <if test="dto.keyWord != null and dto.keyWord != ''">
                and (m.name like concat ('%',#{dto.keyWord},'%') or
                m.phone like concat ('%',#{dto.keyWord},'%') or
                cpcu.name like concat ('%',#{dto.keyWord},'%') or ca.name like concat ('%',#{dto.keyWord},'%')
                and (m.name like concat (#{dto.keyWord},'%') or
                u.phone like concat (#{dto.keyWord},'%') or
                cpcu.name like concat (#{dto.keyWord},'%')
                )
            </if>
            <if test="dto.type != null">
@@ -162,17 +180,14 @@
            <if test="dto.checkUnitId != null">
                and m.check_unit_id = #{dto.checkUnitId}
            </if>
            <if test="dto.specialtyName != null and dto.specialtyName !=''">
                and m.specialty_name like concat('%',#{dto.specialtyName},'%')
            </if>
            <if test="dto.belongTo !=null and dto.belongTo !=''">
                and cpcu.belong_to = #{dto.belongTo}
            <if test="dto.specialtyCategory != null">
                and m.specialty_category = #{dto.specialtyCategory}
            </if>
        </where>
        order by m.create_at desc
    </select>

    <select id="pagePartyBuildingMembersVO" resultType="com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO">
    <select id="pagePartyBuildingMembersVO" resultType="com.panzhihua.common.model.vos.partybuilding.west.PartyBuildingMemberVO">
        select
        m.id, m.org_id, m.name, m.id_card, m.photo_path, m.join_time, m.employment_time, m.audit_result, m.create_at, m.update_at,
        m.community_id, m.user_id, m.refuse_reason, m.phone, m.type, m.position, m.check_unit_id, m.function, m.specialty_category,
@@ -186,8 +201,13 @@
        WHEN u.id_card IS NULL THEN
        '未注册' ELSE '已注册'
        END status
        from com_pb_member as m
        LEFT JOIN sys_user u ON m.id_card = u.id_card AND u.`type` = 1
        from com_pb_member_west as m
        LEFT JOIN (
            SELECT su.* FROM sys_user su
            LEFT JOIN com_act act ON su.community_id = act.community_id
            WHERE act.area_code = #{pagePartyBuildingMemberVO.areaCode}
        ) u ON m.id_card = u.id_card AND u.`type` = 1
        LEFT JOIN com_act act ON u.community_id = act.community_id
        LEFT JOIN com_pb_org o ON m.org_id = o.id
        LEFT JOIN com_pb_check_unit as cpcu on cpcu.id = m.check_unit_id
        WHERE
@@ -220,7 +240,7 @@
            cpm.id_card,
            cpm.phone,
            cpm.check_unit_id,
            t1.user_id,
            cpm.user_id,
            cpcu.`name` AS checkUnitName,
            cpm.org_id,
            cpm.community_id,
@@ -230,10 +250,14 @@
                datediff( now( ), cpm.join_time ))) AS partyAge,
            (select count(id) from com_pb_member_role where id_card = cpm.id_card) as isRole
        FROM
            com_pb_member AS cpm
            com_pb_member_west AS cpm
            LEFT JOIN com_pb_check_unit AS cpcu ON cpcu.id = cpm.check_unit_id
            LEFT JOIN com_pb_org AS cpo ON cpo.id = cpm.org_id
            LEFT JOIN sys_user t1 on cpm.id_card = t1.id_card and t1.type=1
            LEFT JOIN (
                SELECT su.* FROM sys_user su
                LEFT JOIN com_act act ON su.community_id = act.community_id
                WHERE act.area_code = #{dto.areaCode}
            ) t1 on cpm.id_card = t1.id_card and t1.type=1
            <where>
                and cpm.audit_result = 1
                <if test="dto.communityId != null">
@@ -261,45 +285,34 @@
            count( cpam.id ) AS partyActivityCount,
            IFNULL(( SELECT integral_available_party FROM com_act_integral_user WHERE user_id = #{userId} AND community_id = #{communityId} ), 0 ) AS partyActivityIntegral,
            IFNULL(( SELECT integral_available_volunteer FROM com_act_integral_user WHERE user_id = #{userId} AND community_id = #{communityId} ), 0 ) AS volunteerActivityIntegral,
            ( SELECT count( caas.id ) FROM com_act_act_regist AS caas
            ( SELECT count( caas.id ) FROM com_act_act_sign AS caas
            LEFT JOIN com_act_activity AS caa ON caa.id = caas.activity_id
            WHERE caas.user_id = #{userId} and caas.type = 1 and caa.type = 1 and caa.community_id = #{communityId}
            WHERE caas.user_id = #{userId} and caas.status = 1 and caa.type = 1 and caa.community_id = #{communityId}
            ) AS volunteerActivityCount,
            IFNULL((
                SELECT
                    sum( caa.duration )
                FROM
                    com_act_act_regist AS caas
                    com_act_act_sign AS caas
                    LEFT JOIN com_act_activity AS caa ON caa.id = caas.activity_id
                WHERE
                    caas.user_id = #{userId} and caas.type = 1 and caa.type = 1 and caa.community_id = #{communityId}
                    caas.user_id = #{userId} and caas.status = 1 and caa.type = 1 and caa.community_id = #{communityId}
                    ),
                0
            ) AS volunteerActivityDuration,
            IFNULL((
                       SELECT
                           sum( caa.duration )
                       FROM
                           com_act_act_regist AS caas
                               LEFT JOIN com_act_activity AS caa ON caa.id = caas.activity_id
                       WHERE
                           caas.user_id = #{userId} and caas.type = 3 and caas.end_time is not null and caa.type = 3 and caa.community_id = #{communityId}
                   ),
                   0
                ) AS partyActivityDuration,
            ( SELECT count( id ) FROM com_act_micro_wish WHERE sponsor_id = #{userId} AND `status` = 6 AND community_id = #{communityId} ) AS wishCount,
            ( SELECT count( id ) FROM com_act_easy_photo WHERE sponsor_id = #{userId} AND `status` = 4 AND community_id = #{communityId} ) AS easyCount
        FROM
            com_act_act_regist AS cpam
            LEFT JOIN com_act_activity AS caa ON caa.id = cpam.activity_id
            com_pb_activity_member AS cpam
            LEFT JOIN com_pb_member_west AS cpm ON cpm.id = cpam.member_id
        WHERE
            cpam.user_id = #{userId} and caa.type = 3 and cpam.end_time is not null
            cpm.user_id = #{userId}
    </select>

    <select id="getOrgDataStatistics" resultType="com.panzhihua.common.model.vos.partybuilding.ComDataStatisticsOrgVo">
        SELECT
            count( id ) AS tyNum,
            ( SELECT count( id ) FROM com_pb_member WHERE audit_result = 1 AND community_id = #{communityId} AND specialty_category = 2
            ( SELECT count( id ) FROM com_pb_member_west WHERE audit_result = 1 AND community_id = #{communityId} AND specialty_category = 2
                <if test="orgIds != null and orgIds.size > 0">
                    AND org_id in
                    <foreach collection="orgIds" item="item" open="(" separator="," close=")">
@@ -307,7 +320,7 @@
                    </foreach>
                </if>
            ) AS wdNum,
            ( SELECT count( id ) FROM com_pb_member WHERE audit_result = 1 AND community_id = #{communityId} AND specialty_category = 3
            ( SELECT count( id ) FROM com_pb_member_west WHERE audit_result = 1 AND community_id = #{communityId} AND specialty_category = 3
                <if test="orgIds != null and orgIds.size > 0">
                    AND org_id in
                    <foreach collection="orgIds" item="item" open="(" separator="," close=")">
@@ -315,7 +328,7 @@
                    </foreach>
                </if>
            ) AS yyNum,
            ( SELECT count( id ) FROM com_pb_member WHERE audit_result = 1 AND community_id = #{communityId} AND specialty_category = 4
            ( SELECT count( id ) FROM com_pb_member_west WHERE audit_result = 1 AND community_id = #{communityId} AND specialty_category = 4
        <if test="orgIds != null and orgIds.size > 0">
            AND org_id in
            <foreach collection="orgIds" item="item" open="(" separator="," close=")">
@@ -323,7 +336,7 @@
            </foreach>
        </if>
            ) AS msNum,
            ( SELECT count( id ) FROM com_pb_member WHERE audit_result = 1 AND community_id = #{communityId} AND specialty_category = 5
            ( SELECT count( id ) FROM com_pb_member_west WHERE audit_result = 1 AND community_id = #{communityId} AND specialty_category = 5
        <if test="orgIds != null and orgIds.size > 0">
            AND org_id in
            <foreach collection="orgIds" item="item" open="(" separator="," close=")">
@@ -331,7 +344,7 @@
            </foreach>
        </if>
            ) AS qtNum,
            ( SELECT count( id ) FROM com_pb_member WHERE audit_result = 1 AND community_id = #{communityId} AND specialty_category IS NULL
            ( SELECT count( id ) FROM com_pb_member_west WHERE audit_result = 1 AND community_id = #{communityId} AND specialty_category IS NULL
        <if test="orgIds != null and orgIds.size > 0">
            AND org_id in
            <foreach collection="orgIds" item="item" open="(" separator="," close=")">
@@ -339,7 +352,7 @@
            </foreach>
        </if>
            ) AS wuNum,
            ( SELECT count( id ) FROM com_pb_member WHERE audit_result = 1 AND community_id = #{communityId} AND type = 1
            ( SELECT count( id ) FROM com_pb_member_west WHERE audit_result = 1 AND community_id = #{communityId} AND type = 1
        <if test="orgIds != null and orgIds.size > 0">
            AND org_id in
            <foreach collection="orgIds" item="item" open="(" separator="," close=")">
@@ -347,7 +360,7 @@
            </foreach>
        </if>
            ) AS preparePartyMemberNum,
            ( SELECT count( id ) FROM com_pb_member WHERE audit_result = 1 AND community_id = #{communityId} AND type = 2
            ( SELECT count( id ) FROM com_pb_member_west WHERE audit_result = 1 AND community_id = #{communityId} AND type = 2
        <if test="orgIds != null and orgIds.size > 0">
            AND org_id in
            <foreach collection="orgIds" item="item" open="(" separator="," close=")">
@@ -355,7 +368,7 @@
            </foreach>
        </if>
            ) AS formalPartyMemberNum,
            ( SELECT count( id ) FROM com_pb_member WHERE audit_result = 1 AND community_id = #{communityId}
            ( SELECT count( id ) FROM com_pb_member_west WHERE audit_result = 1 AND community_id = #{communityId}
        <if test="orgIds != null and orgIds.size > 0">
            AND org_id in
            <foreach collection="orgIds" item="item" open="(" separator="," close=")">
@@ -364,7 +377,7 @@
        </if>
            ) AS partyMemberNum
        FROM
            com_pb_member
            com_pb_member_west
        WHERE
            audit_result = 1
            AND community_id = #{communityId}
@@ -389,7 +402,12 @@
            WHERE
                caas.`status` = 1
                AND caa.type = 1
                AND caas.user_id IN ( SELECT t1.user_id FROM com_pb_member t left join sys_user t1 on t.id_card=t1.id_card WHERE audit_result = 1 AND t.community_id = #{communityId} AND t1.type=1
                AND caas.user_id IN ( SELECT t1.user_id FROM com_pb_member_west t LEFT JOIN (
                    SELECT su.* FROM sys_user su
                    LEFT JOIN com_act act ON su.community_id = act.community_id
                    WHERE act.area_code = #{areaCode}
                    ) t1 on t.id_card=t1.id_card WHERE audit_result = 1
                AND t.community_id = #{communityId} AND t1.type=1
        <if test="orgIds != null and orgIds.size > 0">
            AND org_id in
            <foreach collection="orgIds" item="item" open="(" separator="," close=")">
@@ -400,89 +418,35 @@
                AND caas.create_at BETWEEN #{startTime}
                AND #{endTime}
            ) AS participateVolunteerActivityDuration,
        (
        SELECT
        IFNULL( sum( caa3.duration ), 0 )
        FROM
        com_act_act_sign AS caas3
        LEFT JOIN com_act_activity AS caa3 ON caa3.id = caas3.activity_id
        WHERE
        caas3.`status` = 1
        AND caa3.type = 3
        AND caas3.user_id IN ( SELECT t1.user_id FROM com_pb_member t left join sys_user t1 on t.id_card=t1.id_card WHERE audit_result = 1 AND t.community_id = #{communityId} AND t1.type=1
        <if test="orgIds != null and orgIds.size > 0">
            AND org_id in
            <foreach collection="orgIds" item="item" open="(" separator="," close=")">
                #{item}
            </foreach>
        </if>
        )
        AND caas3.create_at BETWEEN #{startTime}
        AND #{endTime}
        ) AS participatePartyActivityDuration,
        (
        SELECT
        IFNULL( sum( caa4.duration ), 0 )
        FROM
        com_act_act_sign AS caas4
        LEFT JOIN com_act_activity AS caa4 ON caa4.id = caas4.activity_id
        WHERE
        caas4.`status` = 1 and (caa4.type = 1 or caa4.type = 3)
        AND caas4.user_id IN ( SELECT t1.user_id FROM com_pb_member t left join sys_user t1 on t.id_card=t1.id_card WHERE audit_result = 1 AND t.community_id = #{communityId} AND t1.type=1
        <if test="orgIds != null and orgIds.size > 0">
            AND org_id in
            <foreach collection="orgIds" item="item" open="(" separator="," close=")">
                #{item}
            </foreach>
        </if>
        )
        AND caas4.create_at BETWEEN #{startTime}
        AND #{endTime}
        ) AS participateActivityDuration,
            (
            SELECT
                count( caas2.id )
                count( cpam.id )
            FROM
                com_act_act_sign as caas2
                left join com_act_activity as caa2 on caa2.id = caas2.activity_id
                com_pb_activity_member AS cpam
                LEFT JOIN com_pb_member_west AS cpm ON cpm.id = cpam.member_id
            WHERE
                caas2.`status` = 1 and caa2.type = 3
            AND caas2.user_id IN ( SELECT t1.user_id FROM com_pb_member t left join sys_user t1 on t.id_card=t1.id_card WHERE audit_result = 1 AND t.community_id = #{communityId} AND t1.type=1
            <if test="orgIds != null and orgIds.size > 0">
                AND org_id in
                <foreach collection="orgIds" item="item" open="(" separator="," close=")">
                    #{item}
                </foreach>
            </if>
            )
            AND caas2.create_at BETWEEN #{startTime}
            AND #{endTime}
            ) AS participatePartyActivityNum,
        (
        SELECT
        count( caas5.id )
        FROM
        com_act_act_sign as caas5
        left join com_act_activity as caa5 on caa5.id = caas5.activity_id
        WHERE
        caas5.`status` = 1 and (caa5.type = 1 or caa5.type = 3)
        AND caas5.user_id IN ( SELECT t1.user_id FROM com_pb_member t left join sys_user t1 on t.id_card=t1.id_card WHERE audit_result = 1 AND t.community_id = #{communityId} AND t1.type=1
                cpm.audit_result = 1
                AND cpm.community_id = #{communityId}
                AND cpam.create_at BETWEEN #{startTime}
                AND #{endTime}
        <if test="orgIds != null and orgIds.size > 0">
            AND org_id in
            <foreach collection="orgIds" item="item" open="(" separator="," close=")">
                #{item}
            </foreach>
        </if>
        )
        AND caas5.create_at BETWEEN #{startTime}
        AND #{endTime}
        ) AS participateActivityNum
            ) AS participatePartyActivityNum
        FROM
            com_act_act_sign as caas1
            left join com_act_activity as caa1 on caa1.id = caas1.activity_id
        WHERE
        caas1.`status` = 1 and caa1.type = 1
            AND caas1.user_id IN ( SELECT t1.user_id FROM com_pb_member t left join sys_user t1 on t.id_card=t1.id_card WHERE audit_result = 1 AND t.community_id = #{communityId} AND t1.type=1
            AND caas1.user_id IN ( SELECT t1.user_id FROM com_pb_member_west t LEFT JOIN (
            SELECT su.* FROM sys_user su
            LEFT JOIN com_act act ON su.community_id = act.community_id
            WHERE act.area_code = #{areaCode}
            ) t1 on t.id_card=t1.id_card WHERE audit_result = 1
            AND t.community_id = #{communityId} AND t1.type=1
        <if test="orgIds != null and orgIds.size > 0">
            AND org_id in
            <foreach collection="orgIds" item="item" open="(" separator="," close=")">
@@ -494,7 +458,7 @@
            AND #{endTime}
    </select>

    <select id="getOrgDataStatisticsMember" resultType="com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO">
    <select id="getOrgDataStatisticsMember" resultType="com.panzhihua.common.model.vos.partybuilding.west.PartyBuildingMemberVO">
        select
        m.id, m.org_id, m.name, m.id_card, m.photo_path, m.join_time, m.employment_time, m.audit_result, m.create_at, m.update_at,
        m.community_id, m.user_id, m.refuse_reason, m.phone, m.type, m.position, m.check_unit_id, m.function, m.specialty_category,
@@ -508,8 +472,12 @@
        WHEN u.id_card IS NULL THEN
        '未注册' ELSE '已注册'
        END status
        from com_pb_member as m
        LEFT JOIN sys_user u ON m.id_card = u.id_card
        from com_pb_member_west as m
        LEFT JOIN (
        SELECT su.* FROM sys_user su
        LEFT JOIN com_act act ON su.community_id = act.community_id
        WHERE act.area_code = #{areaCode}
        ) u ON m.id_card = u.id_card AND u.`type` = 1
        LEFT JOIN com_pb_org o ON m.org_id = o.id
        LEFT JOIN com_pb_check_unit as cpcu ON m.check_unit_id = cpcu.id
        <where>
@@ -539,7 +507,7 @@
                SELECT
                    user_id
                FROM
                    com_pb_member
                    com_pb_member_west
                WHERE
                    community_id = #{communityId}
                    AND audit_result = 1
@@ -564,7 +532,7 @@
                SELECT
                    user_id
                FROM
                    com_pb_member
                    com_pb_member_west
                WHERE
                    community_id = #{communityId}
                    AND audit_result = 1
@@ -588,7 +556,7 @@
                SELECT
                    user_id
                FROM
                    com_pb_member
                    com_pb_member_west
                WHERE
                    community_id = #{communityId}
                    AND audit_result = 1
@@ -611,7 +579,7 @@
            SELECT
                user_id
            FROM
                com_pb_member
                com_pb_member_west
            WHERE
                community_id = #{communityId}
                AND audit_result = 1
@@ -660,7 +628,7 @@
        datediff( now( ), cpm.join_time ))) AS partyAge,
        (select count(id) from com_pb_member_role where id_card = cpm.id_card) as isRole
        FROM
        com_pb_member AS cpm
        com_pb_member_west AS cpm
        LEFT JOIN com_pb_check_unit AS cpcu ON cpcu.id = cpm.check_unit_id
        LEFT JOIN com_pb_org AS cpo ON cpo.id = cpm.org_id
        <where>
@@ -680,77 +648,6 @@
            </if>
        </where>
        order by cpm.create_at desc
    </select>

    <select id="getPbMemberByApplets" resultType="com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO">
        select
        m.id, m.org_id, m.name, m.id_card, m.photo_path, m.join_time, m.employment_time, m.audit_result, m.create_at, m.update_at,
        m.community_id, m.user_id, m.refuse_reason, m.phone, m.type, m.position, m.check_unit_id, m.function, m.specialty_category,
        m.specialty_name, m.position_two, IFNULL(m.org_Name,cpo.`name`) as orgName,cpcu.name as checkUnitName,t2.partyTime,t2.partyInterval,
        TIMESTAMPDIFF(
        YEAR,
        m.employment_time,
        DATE_FORMAT( NOW(), '%Y-%m-%d' )) as partyAge
        from com_pb_member as m
        LEFT JOIN sys_user u ON m.id_card = u.id_card and u.type = 1
        LEFT JOIN com_pb_org as cpo on cpo.id = m.org_id
        LEFT JOIN com_pb_check_unit as cpcu ON m.check_unit_id = cpcu.id
        LEFT JOIN (select t1.user_id,sum(t.duration) as partyTime,sum(t.reward_integral) as partyInterval  from com_act_activity t LEFT JOIN com_act_act_regist t1 on t.id = t1.activity_id where t.type = 3
        GROUP BY t1.user_id ) t2 on u.user_id = t2.user_id
        where m.audit_result = 1
        <if test="dto.checkUnitId != null">
            and m.check_unit_id = #{dto.checkUnitId}
        </if>
        <if test="dto.specialtyCategory != null">
            and m.specialty_category = #{dto.specialtyCategory}
        </if>
        <if test="dto.specialtyName != null and dto.specialtyName != ''">
            and m.specialty_name = #{dto.specialtyName}
        </if>
        <if test="dto.name != null">
            and m.name like concat('%',#{dto.name},'%')
        </if>
        <if test="dto.communityId != null">
            and m.community_id =#{dto.communityId}
        </if>
        order by m.create_at desc
    </select>

    <select id="selectDetail" resultType="com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO">
        select t.*,
               t1.contacts       as contactsName,
               t1.phone          as contacts,
               t1.name           as checkUnitName,
               t2.name           as villageName,
               t1.contacts       as helpCommunityContactsName,
               t1.phone as helpCommunityContacts,
               t4.name           as communityName,
               t1.address,
               t1.village_name as unitVillageName,
               t1.belong_to
        from com_pb_member t
                 left join com_pb_check_unit t1 on t.check_unit_id = t1.id
                 left join com_mng_village t2 on t.village_id = t2.village_id
                 left join com_act t4 on t.community_id = t4.community_id
        where t.phone = #{phone}
          and t.type = #{type} limit 1
    </select>
    <select id="getDetailByApp" resultType="com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO">
        select t.*,
               t1.contacts       as contactsName,
               t1.phone          as contacts,
               t1.name           as checkUnitName,
               t2.name           as villageName,
               t1.contacts       as helpCommunityContactsName,
               t1.phone as helpCommunityContacts,
               t4.name           as communityName,
               t1.address,
               t1.village_name as unitVillageName,
               t1.belong_to
        from com_pb_member t
                 left join com_pb_check_unit t1 on t.check_unit_id = t1.id
                 left join com_mng_village t2 on t.village_id = t2.village_id
                 left join com_act t4 on t.community_id = t4.community_id where t.id = #{id}
    </select>
</mapper>