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

huanghongfa

2022-03-07 bf71f1fd72fa08204b67bd14a656890015b75247

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

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActRaffleApi.java

@@ -41,7 +41,7 @@
    @ApiOperation(value = "分页查询",response = ComActRaffleVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        commonPage.setCommunityId(this.getCommunityId());
        commonPage.setType(1);
        return this.communityService.selectAllComActRaffle(commonPage);
    }


 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialProjectApi.java

@@ -40,6 +40,7 @@
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        commonPage.setCommunityId(this.getCommunityId());
        commonPage.setParamId2(0);
        return communityService.selectAllComActSocialProject(commonPage);
    }


 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialWorkerApi.java

@@ -98,7 +98,7 @@
     */
    @GetMapping("/{id}")
    @ApiOperation(value = "查询社工详细信息")
    R<ComActSocialWorkerDetailsVO> details(@PathVariable("id") Long id){
    R<ComActSocialWorkerVO> details(@PathVariable("id") Long id){
        return communityService.comActSocialWorkerDetails(id);
    }


 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPbCheckUnitApi.java

New file
@@ -0,0 +1,79 @@
package com.panzhihua.applets.api;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.common.PageComPbCheckUnitDto;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.common.ComPbCheckUnitVo;
import com.panzhihua.common.service.partybuilding.ComPbCheckUnitFeign;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;


/**
 * title: 党建-报到单位(ComPbCheckUnit)  控制层
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 党建-报到单位
 *
 * @author lyq
 * @date 2022-02-16 16:22:18
 */

@Slf4j
@Api(tags = {"党建-报到单位"})
@RestController
@RequestMapping("/checkUnit")
public class ComPbCheckUnitApi extends BaseController {

    @Resource
    private ComPbCheckUnitFeign comPbCheckUnitService;

    /**
     * description  queryByPage  分页查询
     *
     * @param comPbCheckUnit 请求参数
     * @return 分页查询返回参数
     * @author lyq
     * @date 2022-02-16 16:22:18
     */
    @ApiOperation(value = "分页查询报道单位", response = ComPbCheckUnitVo.class)
    @PostMapping("/page")
    public R queryByPage(@RequestBody PageComPbCheckUnitDto comPbCheckUnit) {
        comPbCheckUnit.setCommunityId(this.getCommunityId());
        return this.comPbCheckUnitService.queryByPage(comPbCheckUnit);
    }

    /**
     * description  detailById  查询详情
     *
     * @param id 主键id
     * @return 详情数据
     * @author lyq
     * @date 2022-02-16 16:22:18
     */
    @ApiOperation(value = "查询报道单位", response = ComPbCheckUnitVo.class)
    @GetMapping("/detail")
    public R detailById(@RequestParam("id") Long id) {
        return this.comPbCheckUnitService.detailById(id);
    }

    /**
     * description  queryByPage  查询列表
     *
     * @param comPbCheckUnit 请求参数
     * @return 列表数据
     * @author lyq
     * @date 2022-02-16 16:22:18
     */
    @ApiOperation(value = "查询报道单位列表", response = ComPbCheckUnitVo.class)
    @PostMapping("/list")
    public R queryByList(@RequestBody PageComPbCheckUnitDto comPbCheckUnit) {
        comPbCheckUnit.setCommunityId(this.getCommunityId());
        return this.comPbCheckUnitService.queryByList(comPbCheckUnit);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java

@@ -11,6 +11,7 @@
import com.panzhihua.common.model.vos.common.ComMngVolunteerServiceTypeVo;
import com.panzhihua.common.model.vos.common.ComMngVolunteerSkillVo;
import com.panzhihua.common.model.vos.community.*;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -346,4 +347,13 @@
    public R detailCommunity() {
        return communityService.detailCommunity(this.getCommunityId());
    }

    @ApiOperation(value = "查询活动报名名单集合",response = ActivitySignVO.class)
    @PostMapping("listactivitysign")
    public R listActivitySign(@RequestBody ActivitySignVO activitySignVO) {
        if (ObjectUtils.isEmpty(activitySignVO.getActivityId())) {
            return R.fail("活动id主键不能为空");
        }
        return communityService.listActivitySign(activitySignVO);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java

@@ -2,7 +2,9 @@

import javax.annotation.Resource;

import com.panzhihua.common.model.dtos.common.EvaluateEasyDto;
import com.panzhihua.common.model.vos.community.easyPhoto.BannerVO;
import com.panzhihua.common.service.community.ComActEasyPhotoEvaluateFeign;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -49,6 +51,8 @@
    private UserService userService;
    @Resource
    private CheckService checkService;
    @Resource
    private ComActEasyPhotoEvaluateFeign easyPhotoEvaluateFeign;

    @ApiOperation(value = "分页展示社区随手拍", response = ComActEasyPhotoVO.class)
    @PostMapping("pageeasyphoto")
@@ -379,4 +383,11 @@
    public R easyPhotoClassifyList() {
        return communityService.listPhotoClassify(this.getAreaCode());
    }

    @ApiOperation(value = "随手拍评价")
    @PostMapping("easyphoto/whistle/evaluate")
    public R evaluateEasyPhotoWhistle(@RequestBody EvaluateEasyDto whistleDto) {
        whistleDto.setUserId(this.getUserId());
        return easyPhotoEvaluateFeign.evaluateEasyApplets(whistleDto);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java

@@ -5,6 +5,9 @@
import javax.annotation.Resource;

import com.panzhihua.common.interfaces.OperLog;
import com.panzhihua.common.model.dtos.common.PageComPbCheckUnitDto;
import com.panzhihua.common.model.vos.common.ComPbCheckUnitVo;
import com.panzhihua.common.service.partybuilding.ComPbCheckUnitFeign;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -45,6 +48,8 @@
    private UserService userService;
    @Resource
    private CheckService checkService;
    @Resource
    private ComPbCheckUnitFeign pbCheckUnitFeign;

    public static void main(String[] args) {
        Date date = new Date();
@@ -262,4 +267,13 @@
        }
        return R.fail();
    }

    @ApiOperation(value = "查询社区下所有党员报到单位", response = ComPbCheckUnitVo.class)
    @PostMapping("/comPbCheckUnit/list")
    public R getPbCheckUnitList(@RequestBody PageComPbCheckUnitDto comPbCheckUnit) {
        if(comPbCheckUnit.getCommunityId() == null){
            comPbCheckUnit.setCommunityId(this.getCommunityId());
        }
        return pbCheckUnitFeign.queryByList(comPbCheckUnit);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java

@@ -269,14 +269,13 @@
    }

    @ApiOperation(value = "我的活动", response = ComActActivityVO.class)
    @ApiImplicitParam(name = "status", value = "活动状态（4 进行中 5 已结束 6 已取消）", required = false)
    @GetMapping("listactivity")
    public R listActivity(@RequestParam(value = "status", required = false) Integer status) {
    public R listActivity(@RequestParam(value = "status", required = false) Integer status,@RequestParam(value = "type", required = false) Integer type) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long userId = loginUserInfo.getUserId();
        Long communityId = loginUserInfo.getCommunityId();
        List<ComActActivityVO> comActActivityVOS = new ArrayList<>();
        R r = communityService.listActivity(userId, status);
        R r = communityService.listActivity(userId, status,type);
        if (R.isOk(r)&&r.getData()!=null) {
            comActActivityVOS = (List<ComActActivityVO>)r.getData();
        }

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/model/dtos/ComPbMemberCertificationDTO.java

@@ -24,4 +24,17 @@
    private Long orgId;
    @ApiModelProperty(value = "头像图片路径")
    private String photoPath;

    @ApiModelProperty(value = "党员类型（1.预备党员 2.正式党员）")
    private Integer type;
    @ApiModelProperty(value = "报道单位id")
    private Integer checkUnitId;
    @ApiModelProperty(value = "职位")
    private String position;
    @ApiModelProperty(value = "职能")
    private String function;
    @ApiModelProperty(value = "特长类别（1.体育类 2.舞蹈类 3.音乐类 4.美术类 5.其他）")
    private Integer specialtyCategory;
    @ApiModelProperty(value = "特长描述")
    private String specialtyName;
}

 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java

@@ -5,6 +5,7 @@
import javax.annotation.Resource;

import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.data.redis.core.ValueOperations;
@@ -108,10 +109,13 @@
        LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
        String token = JWTTokenUtil.generateToken(loginUser);
        String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
        ComActVO comActVO = loginUser.getComActVO();
        LoginReturnVO loginReturnVO = new LoginReturnVO();
        loginReturnVO.setToken(token);
        loginReturnVO.setRefreshToken(refeshToken);
        loginReturnVO.setCommunityId(loginUser.getCommunityId());
        loginReturnVO.setLat(comActVO.getLat());
        loginReturnVO.setLng(comActVO.getLng());
        return loginReturnVO;
    }


 springcloud_k8s_panzhihuazhihuishequ/common/common.iml

File was deleted

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java

@@ -196,6 +196,10 @@

    public static final String COM_MNG_VOLUNTEER_ERROR_LIST = "COM_MNG_VOLUNTEER_ERROR_LIST_";

    public static final String PB_CHECK_UNIT_ERROR_LIST = "PB_CHECK_UNIT_ERROR_LIST_";

    public static final String PB_MEMBER_ROLE_ERROR_LIST = "PB_MEMBER_ROLE_ERROR_LIST_";

    public static final String CLUSTER_MEMBER_DEFAULT_IMAGE_URL = "https://www.psciio.com/files/4822602b68af48bcbbea7842aa463227/a6a7882b3fd24d60ac6809fef42d879d.png";

    public static final String FMS_MEMBER_ERROR_LIST = "FMS_MEMBER_ERROR_LIST_";
@@ -231,4 +235,12 @@
     * 字典表民族系统配置码key
     */
    public static final String NATION_DICT_KEY = "nation";
    /**
     * 党建包名
     */
    public static final String SERVICE_PARTYBUILDING = "partybuilding";
    /**
     * service_community包
     */
    public static final String SERVICE_COMMUNITY = "community";
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/ComPbCheckUnitTypeEnum.java

New file
@@ -0,0 +1,41 @@
package com.panzhihua.common.enums;

import lombok.Getter;

/**
 * @author lyq
 * 党员双报道单位类型枚举
 */
@Getter
public enum ComPbCheckUnitTypeEnum {

    GYQY(1, "国有企业"), GYKGQY(2, "国有控股企业"), WZQY(3, "外资企业")
    , HZQY(4, "合资企业"), SYQY(5, "私营企业"), SYDW(6, "事业单位")
    , GJXZJG(7, "国家行政机关"), ZF(6, "政府");

    private final Integer code;
    private final String name;

    ComPbCheckUnitTypeEnum(Integer code, String name) {
        this.code = code;
        this.name = name;
    }

    public static int getCodeByName(String name) {
        for (ComPbCheckUnitTypeEnum item : ComPbCheckUnitTypeEnum.values()) {
            if (item.name.equals(name)) {
                return item.getCode();
            }
        }
        return 0;
    }

    public static String getCnDescByName(Integer code) {
        for (ComPbCheckUnitTypeEnum item : ComPbCheckUnitTypeEnum.values()) {
            if (item.code.equals(code)) {
                return item.getName();
            }
        }
        return "";
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/ComPbMemberRoleTypeEnum.java

New file
@@ -0,0 +1,39 @@
package com.panzhihua.common.enums;

import lombok.Getter;

/**
 * @author lyq
 * 党委标签枚举
 */
@Getter
public enum ComPbMemberRoleTypeEnum {

    SQDW(1, "社区党委"), CYDWWY(2, "区域党委委员");

    private final Integer code;
    private final String name;

    ComPbMemberRoleTypeEnum(Integer code, String name) {
        this.code = code;
        this.name = name;
    }

    public static int getCodeByName(String name) {
        for (ComPbMemberRoleTypeEnum item : ComPbMemberRoleTypeEnum.values()) {
            if (item.name.equals(name)) {
                return item.getCode();
            }
        }
        return 0;
    }

    public static String getCnDescByName(Integer code) {
        for (ComPbMemberRoleTypeEnum item : ComPbMemberRoleTypeEnum.values()) {
            if (item.code.equals(code)) {
                return item.getName();
            }
        }
        return "";
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComPbCheckUnitExcelListen.java

New file
@@ -0,0 +1,178 @@
package com.panzhihua.common.listen;

import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
import com.alibaba.fastjson.JSONArray;
import com.google.common.collect.Lists;
import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.cluster.admin.ComClusterMemberExcelErrorVO;
import com.panzhihua.common.model.vos.community.cluster.admin.ComClusterMemberExcelVO;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitErrorExcelVO;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitExcelVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.partybuilding.ComPbCheckUnitFeign;
import com.panzhihua.common.utlis.ListUtils;
import com.panzhihua.common.utlis.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.data.redis.core.ValueOperations;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;

/**
 * title: 党员双报到单位导入监听
 * @author : lyq
 */
@Slf4j
public class ComPbCheckUnitExcelListen extends AnalysisEventListener<Map<Integer, String>> {
    /**
     * 每隔5条存储数据库，实际使用中可以3000条，然后清理list ，方便内存回收
     */
    private static final int BATCH_COUNT = 3000;
    private static int headSize = 0;
    List<Map<Integer, String>> list = new ArrayList<Map<Integer, String>>();
    private ComPbCheckUnitFeign checkUnitService;
    private Long communityId;
    private Long userId;
    private Map<Integer, String> headData;
    private StringRedisTemplate stringRedisTemplate;

    public ComPbCheckUnitExcelListen(ComPbCheckUnitFeign checkUnitService, Long communityId, Long userId,
                                     StringRedisTemplate stringRedisTemplate) {
        this.checkUnitService = checkUnitService;
        this.communityId = communityId;
        this.userId = userId;
        this.stringRedisTemplate = stringRedisTemplate;
    }

    @Override
    public void invoke(Map<Integer, String> data, AnalysisContext context) {
        list.add(data);
        if (list.size() >= BATCH_COUNT) {
            saveData();
            list.clear();
        }
    }

    /**
     * 这里会一行行的返回头
     *
     * @param headMap
     * @param context
     */
    @Override
    public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
        headSize = headMap.size();
        headData = headMap;
    }

    @Override
    public void doAfterAllAnalysed(AnalysisContext context) {
        saveData();
        log.info("所有数据解析完成！");
    }

    /**
     * 不是固定的列只能手动处理
     */
    private void saveData() {
        log.info("表格总数据：" + list.size());
        if (list.size() == 0) {
            throw new ServiceException("000", "导入数据为空！");
        }
        ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
        String key = Constants.PB_CHECK_UNIT_ERROR_LIST + communityId;
        int index = 2;
        try {
            ArrayList<ComPbCheckUnitExcelVO> voList = Lists.newArrayList();
            ArrayList<ComPbCheckUnitErrorExcelVO> mistakes = Lists.newArrayList();
            for (Map<Integer, String> oneData : list) {
                ComPbCheckUnitExcelVO vo = new ComPbCheckUnitExcelVO();

                if (StringUtils.isEmpty(oneData.get(0))) {
                    index++;
                    mistakes.add(setErrorObject(oneData,"单位名称不可为空，请填写单位名称"));
                    continue;
                }else{
                    //判断导入的名字的长度是否超过30
                    if(oneData.get(0).length() > 30){
                        index++;
                        mistakes.add(setErrorObject(oneData,"单位名称长度不可超过30，请重新填写单位名称"));
                        continue;
                    }
                }
                vo.setName(oneData.get(0));
                if (StringUtils.isEmpty(oneData.get(1))) {
                    index++;
                    mistakes.add(setErrorObject(oneData,"单位类别不可为空，请填写单位类别"));
                    continue;
                }
                vo.setType(oneData.get(1));
                if (StringUtils.isNotEmpty(oneData.get(2))) {
                    vo.setContacts(oneData.get(2));
                }
                if (StringUtils.isNotEmpty(oneData.get(3))) {
                    //验证手机号正则
                    String regex = "^[1][3,4,5,6,7,8,9][0-9]{9}$";
                    Pattern pattern = Pattern.compile(regex);
                    Matcher m = pattern.matcher(oneData.get(3));
                    if(!m.matches()){
                        index++;
                        mistakes.add(setErrorObject(oneData,"联系电话输入错误，请核对联系电话"));
                        continue;
                    }
                    vo.setPhone(oneData.get(3));
                }
                voList.add(vo);
                index++;
            }
            List<ComPbCheckUnitExcelVO> newVoList =
                voList.stream().filter(ListUtils.distinctByKey(ComPbCheckUnitExcelVO::getName))
                    .collect(Collectors.toList());
            R r = checkUnitService.importCheckUnit(newVoList, communityId, userId);
            if (!R.isOk(r)) {
                List<ComPbCheckUnitErrorExcelVO> list =
                    JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComPbCheckUnitErrorExcelVO.class);
                mistakes.addAll(list);
                valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
                throw new ServiceException("500", key);
            } else {
                if (!mistakes.isEmpty()) {
                    valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
                    throw new ServiceException("500", key);
                }
            }
        } catch (NumberFormatException e) {
            e.printStackTrace();
            throw new ServiceException("500", "导入失败");
        }
    }

    private void setError(Map<Integer, String> map, ComPbCheckUnitErrorExcelVO vo) {
        vo.setName(map.get(0));
        vo.setType(map.get(1));
        vo.setContacts(map.get(2));
        vo.setPhone(map.get(3));
    }

    /**
     * 组装错误信息
     * @param oneData   数据表格对象
     * @param error     错误信息
     * @return  错误对象
     */
    private ComPbCheckUnitErrorExcelVO setErrorObject(Map<Integer, String> oneData, String error){
        ComPbCheckUnitErrorExcelVO mistake = new ComPbCheckUnitErrorExcelVO();
        setError(oneData, mistake);
        mistake.setError(error);
        return mistake;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComPbMemberRoleExcelListen.java

New file
@@ -0,0 +1,195 @@
package com.panzhihua.common.listen;

import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
import com.alibaba.fastjson.JSONArray;
import com.google.common.collect.Lists;
import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitErrorExcelVO;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitExcelVO;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbMemberRoleErrorExcelVo;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbMemberRoleExcelVo;
import com.panzhihua.common.service.partybuilding.ComPbCheckUnitFeign;
import com.panzhihua.common.service.partybuilding.PartyBuildingService;
import com.panzhihua.common.utlis.ListUtils;
import com.panzhihua.common.utlis.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.data.redis.core.ValueOperations;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;

/**
 * title: 社区党委导入监听
 * @author : lyq
 */
@Slf4j
public class ComPbMemberRoleExcelListen extends AnalysisEventListener<Map<Integer, String>> {
    /**
     * 每隔5条存储数据库，实际使用中可以3000条，然后清理list ，方便内存回收
     */
    private static final int BATCH_COUNT = 3000;
    private static int headSize = 0;
    List<Map<Integer, String>> list = new ArrayList<Map<Integer, String>>();
    private PartyBuildingService partyBuildingService;;
    private Long communityId;
    private Long userId;
    private Map<Integer, String> headData;
    private StringRedisTemplate stringRedisTemplate;

    public ComPbMemberRoleExcelListen(PartyBuildingService partyBuildingService, Long communityId, Long userId,
                                      StringRedisTemplate stringRedisTemplate) {
        this.partyBuildingService = partyBuildingService;
        this.communityId = communityId;
        this.userId = userId;
        this.stringRedisTemplate = stringRedisTemplate;
    }

    @Override
    public void invoke(Map<Integer, String> data, AnalysisContext context) {
        list.add(data);
        if (list.size() >= BATCH_COUNT) {
            saveData();
            list.clear();
        }
    }

    /**
     * 这里会一行行的返回头
     *
     * @param headMap
     * @param context
     */
    @Override
    public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
        headSize = headMap.size();
        headData = headMap;
    }

    @Override
    public void doAfterAllAnalysed(AnalysisContext context) {
        saveData();
        log.info("所有数据解析完成！");
    }

    /**
     * 不是固定的列只能手动处理
     */
    private void saveData() {
        log.info("表格总数据：" + list.size());
        if (list.size() == 0) {
            throw new ServiceException("000", "导入数据为空！");
        }
        ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
        String key = Constants.PB_MEMBER_ROLE_ERROR_LIST + communityId;
        int index = 2;
        try {
            ArrayList<ComPbMemberRoleExcelVo> voList = Lists.newArrayList();
            ArrayList<ComPbMemberRoleErrorExcelVo> mistakes = Lists.newArrayList();
            for (Map<Integer, String> oneData : list) {
                ComPbMemberRoleExcelVo vo = new ComPbMemberRoleExcelVo();

                if (StringUtils.isEmpty(oneData.get(0))) {
                    index++;
                    mistakes.add(setErrorObject(oneData,"党员姓名不可为空，请填写党员姓名"));
                    continue;
                }else{
                    //判断导入的名字的长度是否超过30
                    if(oneData.get(0).length() > 10){
                        index++;
                        mistakes.add(setErrorObject(oneData,"党员姓名长度不可超过10，请重新填写党员姓名"));
                        continue;
                    }
                }
                vo.setName(oneData.get(0));
                if (StringUtils.isEmpty(oneData.get(1))) {
                    index++;
                    mistakes.add(setErrorObject(oneData,"身份证号不可为空，请填写身份证号"));
                    continue;
                }
                vo.setIdCard(oneData.get(1));

                if (StringUtils.isEmpty(oneData.get(2))) {
                    index++;
                    mistakes.add(setErrorObject(oneData,"手机号不可为空，请填写手机号"));
                    continue;
                }
                vo.setPhone(oneData.get(2));

                if (StringUtils.isNotEmpty(oneData.get(3))) {
                    vo.setTypeName(oneData.get(3));
                }

                if (StringUtils.isEmpty(oneData.get(4))) {
                    index++;
                    mistakes.add(setErrorObject(oneData,"入党日期不可为空，请填写入党日期"));
                    continue;
                }
                vo.setJoinTime(oneData.get(4));

                if (StringUtils.isNotEmpty(oneData.get(5))) {
                    vo.setEmploymentTime(oneData.get(5));
                }
                if (StringUtils.isNotEmpty(oneData.get(6))) {
                    vo.setPosition(oneData.get(6));
                }
                if (StringUtils.isNotEmpty(oneData.get(7))) {
                    vo.setJobResponsibilities(oneData.get(7));
                }
                voList.add(vo);
                index++;
            }
            List<ComPbMemberRoleExcelVo> newVoList =
                voList.stream().filter(ListUtils.distinctByKey(ComPbMemberRoleExcelVo::getIdCard))
                    .collect(Collectors.toList());
            R r = partyBuildingService.importPbMemberRole(newVoList, communityId, userId);
            if (!R.isOk(r)) {
                List<ComPbMemberRoleErrorExcelVo> list =
                    JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComPbMemberRoleErrorExcelVo.class);
                mistakes.addAll(list);
                valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
                throw new ServiceException("500", key);
            } else {
                if (!mistakes.isEmpty()) {
                    valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
                    throw new ServiceException("500", key);
                }
            }
        } catch (NumberFormatException e) {
            e.printStackTrace();
            throw new ServiceException("500", "导入失败");
        }
    }

    private void setError(Map<Integer, String> map, ComPbMemberRoleErrorExcelVo vo) {
        vo.setName(map.get(0));
        vo.setIdCard(map.get(1));
        vo.setPhone(map.get(2));
        vo.setTypeName(map.get(3));
        vo.setJoinTime(map.get(4));
        vo.setEmploymentTime(map.get(5));
        vo.setPosition(map.get(6));
        vo.setJobResponsibilities(map.get(7));
    }

    /**
     * 组装错误信息
     * @param oneData   数据表格对象
     * @param error     错误信息
     * @return  错误对象
     */
    private ComPbMemberRoleErrorExcelVo setErrorObject(Map<Integer, String> oneData, String error){
        ComPbMemberRoleErrorExcelVo mistake = new ComPbMemberRoleErrorExcelVo();
        setError(oneData, mistake);
        mistake.setError(error);
        return mistake;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComActEasyPhotoEvaluateDto.java

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

import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * title: 新增随手拍、微心愿评价表请求参数
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 新增随手拍、微心愿评价表请求参数
 *
 * @author lyq
 * @date 2022-03-01 13:44:37
 */
@Data
@ApiModel("新增随手拍、微心愿评价表请求参数")
public class AddComActEasyPhotoEvaluateDto {


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

    /**
     * 业务记录id
     */
    @ApiModelProperty(value = "业务记录id")
    private Long serviceId;

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

    /**
     * 评分
     */
    @ApiModelProperty(value = "评分")
    private Integer score;

    /**
     * 评价内容
     */
    @ApiModelProperty(value = "评价内容")
    private String content;

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

    /**
     * 业务分类（1.随手拍 2.微心愿）
     */
    @ApiModelProperty(value = "业务分类（1.随手拍 2.微心愿）")
    private Integer serviceType;


}


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComActEasyPhotoHandlerDto.java

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

import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * title: 新增随手拍、微心愿处理人绑定表请求参数
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 新增随手拍、微心愿处理人绑定表请求参数
 *
 * @author lyq
 * @date 2022-03-01 13:45:12
 */
@Data
@ApiModel("新增随手拍、微心愿处理人绑定表请求参数")
public class AddComActEasyPhotoHandlerDto {


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

    /**
     * 处理人id
     */
    @ApiModelProperty(value = "处理人id")
    private Long userId;

    /**
     * 业务id
     */
    @ApiModelProperty(value = "业务id")
    private Long serviceId;

    /**
     * 人员类型（1.后台用户 2.党员 3.志愿者 4.社工 5.四长四员）
     */
    @ApiModelProperty(value = "人员类型（1.后台用户 2.党员 3.志愿者 4.社工 5.四长四员）")
    private Integer type;

    /**
     * 业务类型（1.随手拍 2.微心愿）
     */
    @ApiModelProperty(value = "业务类型（1.随手拍 2.微心愿）")
    private Integer serviceType;


}


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComPbCheckUnitDto.java

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

import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * title: 新增党建-报到单位请求参数
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 新增党建-报到单位请求参数
 *
 * @author lyq
 * @date 2022-02-16 16:22:40
 */
@Data
@ApiModel("新增党建-报到单位请求参数")
public class AddComPbCheckUnitDto {


    /**
     * 单位名称
     */
    @ApiModelProperty(value = "单位名称")
    private String name;

    /**
     * 单位类别（1.国有企业 2.国有控股企业 3.外资企业 4.合资企业 5.私营企业 6.事业单位 7.国家行政机关 8.政府）
     */
    @ApiModelProperty(value = "单位类别（1.国有企业 2.国有控股企业 3.外资企业 4.合资企业 5.私营企业 6.事业单位 7.国家行政机关 8.政府）")
    private Integer type;

    /**
     * 负责人
     */
    @ApiModelProperty(value = "负责人")
    private String contacts;

    /**
     * 负责人联系电话
     */
    @ApiModelProperty(value = "负责人联系电话")
    private String phone;

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

    /**
     * 创建人id
     */
    @ApiModelProperty(value = "创建人id")
    private Long createBy;

    /**
     * 修改时间
     */
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "修改时间")
    private Date updateAt;

    /**
     * 修改人id
     */
    @ApiModelProperty(value = "修改人id")
    private Long updateBy;

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


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComActEasyPhotoEvaluateDto.java

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

import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * title: 编辑随手拍、微心愿评价表请求参数
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 编辑随手拍、微心愿评价表请求参数
 *
 * @author lyq
 * @date 2022-03-01 13:44:37
 */
@Data
@ApiModel("编辑随手拍、微心愿评价表请求参数")
public class EditComActEasyPhotoEvaluateDto {

    /**
     * 主键id
     */
    @ApiModelProperty(value = "主键id")
    private Long id;
    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    private Long communityId;
    /**
     * 业务记录id
     */
    @ApiModelProperty(value = "业务记录id")
    private Long serviceId;
    /**
     * 用户id
     */
    @ApiModelProperty(value = "用户id")
    private Long userId;
    /**
     * 评分
     */
    @ApiModelProperty(value = "评分")
    private Integer score;
    /**
     * 评价内容
     */
    @ApiModelProperty(value = "评价内容")
    private String content;
    /**
     * 创建时间
     */
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "创建时间")
    private Date createAt;
    /**
     * 业务分类（1.随手拍 2.微心愿）
     */
    @ApiModelProperty(value = "业务分类（1.随手拍 2.微心愿）")
    private Integer serviceType;

}


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComActEasyPhotoHandlerDto.java

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

import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * title: 编辑随手拍、微心愿处理人绑定表请求参数
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 编辑随手拍、微心愿处理人绑定表请求参数
 *
 * @author lyq
 * @date 2022-03-01 13:45:12
 */
@Data
@ApiModel("编辑随手拍、微心愿处理人绑定表请求参数")
public class EditComActEasyPhotoHandlerDto {

    /**
     * 主键id
     */
    @ApiModelProperty(value = "主键id")
    private Long id;
    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    private Long communityId;
    /**
     * 处理人id
     */
    @ApiModelProperty(value = "处理人id")
    private Long userId;
    /**
     * 业务id
     */
    @ApiModelProperty(value = "业务id")
    private Long serviceId;
    /**
     * 人员类型（1.后台用户 2.党员 3.志愿者 4.社工 5.四长四员）
     */
    @ApiModelProperty(value = "人员类型（1.后台用户 2.党员 3.志愿者 4.社工 5.四长四员）")
    private Integer type;
    /**
     * 业务类型（1.随手拍 2.微心愿）
     */
    @ApiModelProperty(value = "业务类型（1.随手拍 2.微心愿）")
    private Integer serviceType;

}


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComPbCheckUnitDto.java

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

import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * title: 编辑党建-报到单位请求参数
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 编辑党建-报到单位请求参数
 *
 * @author lyq
 * @date 2022-02-16 16:22:40
 */
@Data
@ApiModel("编辑党建-报到单位请求参数")
public class EditComPbCheckUnitDto {

    /**
     * 主键id
     */
    @ApiModelProperty(value = "主键id")
    private Long id;
    /**
     * 单位名称
     */
    @ApiModelProperty(value = "单位名称")
    private String name;
    /**
     * 单位类别（1.国有企业 2.国有控股企业 3.外资企业 4.合资企业 5.私营企业 6.事业单位 7.国家行政机关 8.政府）
     */
    @ApiModelProperty(value = "单位类别（1.国有企业 2.国有控股企业 3.外资企业 4.合资企业 5.私营企业 6.事业单位 7.国家行政机关 8.政府）")
    private Integer type;
    /**
     * 负责人
     */
    @ApiModelProperty(value = "负责人")
    private String contacts;
    /**
     * 负责人联系电话
     */
    @ApiModelProperty(value = "负责人联系电话")
    private String phone;
    /**
     * 创建时间
     */
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "创建时间")
    private Date createAt;
    /**
     * 创建人id
     */
    @ApiModelProperty(value = "创建人id")
    private Long createBy;
    /**
     * 修改时间
     */
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "修改时间")
    private Date updateAt;
    /**
     * 修改人id
     */
    @ApiModelProperty(value = "修改人id")
    private Long updateBy;

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


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EvaluateEasyDto.java

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

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

/**
 * @author lyq
 * 随手拍、微心愿评价请求参数
 */
@Data
@ApiModel("随手拍、微心愿评价请求参数")
public class EvaluateEasyDto {

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

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

    @ApiModelProperty(value = "评论内容")
    private String content;

    @ApiModelProperty(value = "评分")
    private Integer score;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComActEasyPhotoEvaluateDto.java

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

import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * title: 分页查询随手拍、微心愿评价表请求参数
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 分页查询随手拍、微心愿评价表请求参数
 *
 * @author lyq
 * @date 2022-03-01 13:44:24
 */
@Data
@ApiModel("分页查询随手拍、微心愿评价表请求参数")
public class PageComActEasyPhotoEvaluateDto {

    /**
     * 主键id
     */
    @ApiModelProperty(value = "主键id")
    private Long id;
    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    private Long communityId;
    /**
     * 业务记录id
     */
    @ApiModelProperty(value = "业务记录id")
    private Long serviceId;
    /**
     * 用户id
     */
    @ApiModelProperty(value = "用户id")
    private Long userId;
    /**
     * 评分
     */
    @ApiModelProperty(value = "评分")
    private Integer score;
    /**
     * 评价内容
     */
    @ApiModelProperty(value = "评价内容")
    private String content;
    /**
     * 创建时间
     */
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "创建时间")
    private Date createAt;
    /**
     * 业务分类（1.随手拍 2.微心愿）
     */
    @ApiModelProperty(value = "业务分类（1.随手拍 2.微心愿）")
    private Integer serviceType;

    @ApiModelProperty(value = "分页每页数量", example = "10")
    private Long pageSize = 10L;

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

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

}


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComActEasyPhotoHandlerDto.java

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

import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * title: 分页查询随手拍、微心愿处理人绑定表请求参数
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 分页查询随手拍、微心愿处理人绑定表请求参数
 *
 * @author lyq
 * @date 2022-03-01 13:45:11
 */
@Data
@ApiModel("分页查询随手拍、微心愿处理人绑定表请求参数")
public class PageComActEasyPhotoHandlerDto {

    /**
     * 主键id
     */
    @ApiModelProperty(value = "主键id")
    private Long id;
    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    private Long communityId;
    /**
     * 处理人id
     */
    @ApiModelProperty(value = "处理人id")
    private Long userId;
    /**
     * 业务id
     */
    @ApiModelProperty(value = "业务id")
    private Long serviceId;
    /**
     * 人员类型（1.后台用户 2.党员 3.志愿者 4.社工 5.四长四员）
     */
    @ApiModelProperty(value = "人员类型（1.后台用户 2.党员 3.志愿者 4.社工 5.四长四员）")
    private Integer type;
    /**
     * 业务类型（1.随手拍 2.微心愿）
     */
    @ApiModelProperty(value = "业务类型（1.随手拍 2.微心愿）")
    private Integer serviceType;

    @ApiModelProperty(value = "分页每页数量", example = "10")
    private Long pageSize = 10L;

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

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

}


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComPbCheckUnitDto.java

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

import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * title: 分页查询党建-报到单位请求参数
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 分页查询党建-报到单位请求参数
 *
 * @author lyq
 * @date 2022-02-16 16:22:26
 */
@Data
@ApiModel("分页查询党建-报到单位请求参数")
public class PageComPbCheckUnitDto {

    /**
     * 主键id
     */
    @ApiModelProperty(value = "主键id")
    private Long id;
    /**
     * 单位名称
     */
    @ApiModelProperty(value = "单位名称")
    private String name;
    /**
     * 单位类别（1.国有企业 2.国有控股企业 3.外资企业 4.合资企业 5.私营企业 6.事业单位 7.国家行政机关 8.政府）
     */
    @ApiModelProperty(value = "单位类别（1.国有企业 2.国有控股企业 3.外资企业 4.合资企业 5.私营企业 6.事业单位 7.国家行政机关 8.政府）")
    private Integer type;
    /**
     * 负责人
     */
    @ApiModelProperty(value = "负责人")
    private String contacts;
    /**
     * 负责人联系电话
     */
    @ApiModelProperty(value = "负责人联系电话")
    private String phone;
    /**
     * 创建时间
     */
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "创建时间")
    private Date createAt;
    /**
     * 创建人id
     */
    @ApiModelProperty(value = "创建人id")
    private Long createBy;
    /**
     * 修改时间
     */
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "修改时间")
    private Date updateAt;
    /**
     * 修改人id
     */
    @ApiModelProperty(value = "修改人id")
    private Long updateBy;

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

    @ApiModelProperty(value = "分页每页数量", example = "10")
    private Long pageSize = 10L;

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

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

}


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

@@ -89,6 +89,9 @@
    @NotBlank(message = "投票结果不能为空", groups = {PutGroup.class})
    private String publishResult;

    @ApiModelProperty("议事内容类型（1.社区议事 2.院落议事 3.党群议事）")
    private Integer contentType;

    /**
     * 类型 1 议事 2 投票
     */

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

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

    @ApiModelProperty(value = "展示状态，小程序获取不同状态的投票列表 1.进行中 2.已结束", allowableValues = "1,2")
    private Integer displayStatus;

    @ApiModelProperty("议事内容类型（1.社区议事 2.院落议事 3.党群议事）")
    private Integer contentType;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/AddFmsServiceAdminDTO.java

@@ -4,8 +4,6 @@

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

import com.fasterxml.jackson.annotation.JsonFormat;

@@ -25,13 +23,9 @@
public class AddFmsServiceAdminDTO {

    @ApiModelProperty("服务用户")
    @NotBlank
    @Size(min = 1, max = 10)
    private String userName;

    @ApiModelProperty("联系电话")
    @NotBlank(message = "联系电话不能为空")
    @Pattern(message = "联系电话格式错误", regexp = "^(13[0-9]|14[01456879]|15[0-3,5-9]|16[2567]|17[0-8]|18[0-9]|19[0-3,5-9])\\d{8}$")
    private String phone;

    @ApiModelProperty("服务时间")
@@ -53,6 +47,9 @@
    @ApiModelProperty("服务过程图片，多张逗号隔开")
    private String processImage;

    @ApiModelProperty("分派服务人员id")
    private Long memberId;

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


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

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

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

/**
 * @author lyq
 * 查询党建数据统计请求参数
 */
@Data
@ApiModel("查询党建数据统计请求参数")
public class ComDataStatisticsOrgDto {

    @ApiModelProperty(value = "党员列表分页参数-当前页数")
    private Long pageNum = 1L;

    @ApiModelProperty(value = "党员列表分页参数-每页记录数")
    private Long pageSize = 10L;

    @ApiModelProperty(value = "党组织id",required = true)
    private Long orgId;

    @ApiModelProperty(value = "查询年份",required = true)
    private Integer year;

    @ApiModelProperty(value = "查询开始时间",hidden = true)
    private String startTime;

    @ApiModelProperty(value = "查询结束时间",hidden = true)
    private String endTime;

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

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

New file
@@ -0,0 +1,29 @@
package com.panzhihua.common.model.dtos.partybuilding;

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

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

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

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

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

    @ApiModelProperty(value = "年份")
    private Integer month;

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

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java

@@ -65,4 +65,8 @@
    private Long streetId;
    @ApiModelProperty("分类2")
    private Integer type2;
    @ApiModelProperty("一级分类")
    private Integer columnId;
    @ApiModelProperty("二级分类")
    private Integer secondColumnId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/ComActSocialMemberVO.java

@@ -90,4 +90,6 @@
     * 用户id
     */
    private Long userId;

    private Long communityId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginReturnVO.java

@@ -1,8 +1,11 @@
package com.panzhihua.common.model.vos;

import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotBlank;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -21,4 +24,8 @@
    private Long communityId;
    @ApiModelProperty("openId")
    private String openId;
    @ApiModelProperty("社区经度")
    private String lng;
    @ApiModelProperty("社区维度")
    private String lat;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComActEasyPhotoEvaluateVo.java

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

import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * title: 随手拍、微心愿评价表返回参数
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 随手拍、微心愿评价表返回参数
 *
 * @author lyq
 * @date 2022-03-01 13:44:37
 */
@Data
@ApiModel("随手拍、微心愿评价表返回参数")
public class ComActEasyPhotoEvaluateVo {

    /**
     * 主键id
     */
    @ApiModelProperty(value = "主键id")
    private Long id;
    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    private Long communityId;
    /**
     * 业务记录id
     */
    @ApiModelProperty(value = "业务记录id")
    private Long serviceId;
    /**
     * 用户id
     */
    @ApiModelProperty(value = "用户id")
    private Long userId;
    /**
     * 评分
     */
    @ApiModelProperty(value = "评分")
    private Integer score;
    /**
     * 评价内容
     */
    @ApiModelProperty(value = "评价内容")
    private String content;
    /**
     * 创建时间
     */
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "创建时间")
    private Date createAt;
    /**
     * 业务分类（1.随手拍 2.微心愿）
     */
    @ApiModelProperty(value = "业务分类（1.随手拍 2.微心愿）")
    private Integer serviceType;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComActEasyPhotoHandlerVo.java

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

import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * title: 随手拍、微心愿处理人绑定表返回参数
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 随手拍、微心愿处理人绑定表返回参数
 *
 * @author lyq
 * @date 2022-03-01 13:45:12
 */
@Data
@ApiModel("随手拍、微心愿处理人绑定表返回参数")
public class ComActEasyPhotoHandlerVo {

    /**
     * 主键id
     */
    @ApiModelProperty(value = "主键id")
    private Long id;
    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    private Long communityId;
    /**
     * 处理人id
     */
    @ApiModelProperty(value = "处理人id")
    private Long userId;
    /**
     * 业务id
     */
    @ApiModelProperty(value = "业务id")
    private Long serviceId;
    /**
     * 人员类型（1.后台用户 2.党员 3.志愿者 4.社工 5.四长四员）
     */
    @ApiModelProperty(value = "人员类型（1.后台用户 2.党员 3.志愿者 4.社工 5.四长四员）")
    private Integer type;
    /**
     * 业务类型（1.随手拍 2.微心愿）
     */
    @ApiModelProperty(value = "业务类型（1.随手拍 2.微心愿）")
    private Integer serviceType;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComPbCheckUnitVo.java

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

import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * title: 党建-报到单位返回参数
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 党建-报到单位返回参数
 *
 * @author lyq
 * @date 2022-02-16 16:22:40
 */
@Data
@ApiModel("党建-报到单位返回参数")
public class ComPbCheckUnitVo {

    /**
     * 主键id
     */
    @ApiModelProperty(value = "主键id")
    private Long id;
    /**
     * 单位名称
     */
    @ApiModelProperty(value = "单位名称")
    private String name;
    /**
     * 单位类别（1.国有企业 2.国有控股企业 3.外资企业 4.合资企业 5.私营企业 6.事业单位 7.国家行政机关 8.政府）
     */
    @ApiModelProperty(value = "单位类别（1.国有企业 2.国有控股企业 3.外资企业 4.合资企业 5.私营企业 6.事业单位 7.国家行政机关 8.政府）")
    private Integer type;
    /**
     * 负责人
     */
    @ApiModelProperty(value = "负责人")
    private String contacts;
    /**
     * 负责人联系电话
     */
    @ApiModelProperty(value = "负责人联系电话")
    private String phone;
    /**
     * 创建时间
     */
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "创建时间")
    private Date createAt;
    /**
     * 创建人id
     */
    @ApiModelProperty(value = "创建人id")
    private Long createBy;
    /**
     * 修改时间
     */
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "修改时间")
    private Date updateAt;
    /**
     * 修改人id
     */
    @ApiModelProperty(value = "修改人id")
    private Long updateBy;

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

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java

@@ -246,6 +246,9 @@

    private String areaCode;

    @ApiModelProperty("单次活动时长（小时）")
    private Integer duration;

    @ApiModelProperty("项目Id")
    private Long projectId;

@@ -275,4 +278,7 @@

    @ApiModelProperty("单次活动时长")
    private Integer activityTime;

    @ApiModelProperty("1签到 2签退")
    private Integer signType;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActColumnVO.java

@@ -60,4 +60,9 @@

    @ApiModelProperty(value = "父类id")
    private Long parentId;

    @ApiModelProperty("街道id")
    private Long streetId;

    private String description;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java

@@ -126,6 +126,9 @@
    @ApiModelProperty("已投票记录列表")
    private List<ComActDiscussOptionUserVO> comActDiscussOptionUserVOList;

    @ApiModelProperty("议事内容类型（1.社区议事 2.院落议事 3.党群议事）")
    private Integer contentType;

    @ApiModelProperty("已参与投票人数")
    private Integer votedPersonNum;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java

@@ -43,7 +43,7 @@
    @ApiModelProperty("发起人头像")
    private String imageUrl;

    @ApiModelProperty("状态 1待审核  2进行中 3已驳回 4已完成")
    @ApiModelProperty("状态 1待审核  2进行中 3已驳回 4待评价 5.已完成")
    private Integer status;

    @ApiModelProperty("处理人id")
@@ -207,4 +207,17 @@
    @ApiModelProperty(value = "单张图片高度")
    private BigDecimal imgHeight;

    @ApiModelProperty(value = "评价时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date evaluateDate;

    @ApiModelProperty(value = "评价分数")
    private Integer score;

    @ApiModelProperty(value = "评价内容")
    private String content;

    @ApiModelProperty(value = "微心愿分配人员集合")
    private List<ComActMicroWishHandleVO> handleList;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishHandleVO.java

New file
@@ -0,0 +1,21 @@
package com.panzhihua.common.model.vos.community;

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

/**
 * @author lyq
 * 微心愿处理人请求参数
 */
@Data
@ApiModel("微心愿处理人请求参数")
public class ComActMicroWishHandleVO {

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

    @ApiModelProperty("处理人类型（1.后台用户  2.党员  3.志愿者 4.社工 5.四长四员）")
    private Integer type;
}


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java

@@ -168,6 +168,9 @@
    @ApiModelProperty(value = "微心愿分配人id集合")
    private List<Long> handleIds;

    @ApiModelProperty(value = "微心愿分配人员集合")
    private List<ComActMicroWishHandleVO> handleList;

    @ApiModelProperty(value = "微心愿处理人id，多个以逗号隔开")
    private String handleId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.java

@@ -122,4 +122,8 @@
    @Length(max = 30)
    @ApiModelProperty(value = "大学名称")
    private String universityName;

    private Long streetId;

    private String communityName;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenAlarmStatisticsInfo.java

New file
@@ -0,0 +1,57 @@
package com.panzhihua.common.model.vos.community.bigscreen;

import java.util.List;

import com.panzhihua.common.model.vos.community.StatisticsCommVO;

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

/**
 * @title: BigScreenAlarmStatisticsInfo
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 杨家坪定制-居家养老大屏统计数据
 * @author: hans
 * @date: 2022/02/28 17:23
 */
@Data
@ApiModel("杨家坪定制-居家养老大屏统计数据")
public class BigScreenAlarmStatisticsInfo {

    @ApiModelProperty(value = "监测设备数量")
    private Integer abnormalAlarmTotal;

    @ApiModelProperty("服务设备数量")
    private Integer oneKeyAlarmTotal;

    @ApiModelProperty("异常总次数")
    private Integer abnormalTotal;

    @ApiModelProperty("服务总次数")
    private Integer oneKeyTotal;

    @ApiModelProperty("待处理异常总数")
    private Integer pendingAbnormalTotal;

    @ApiModelProperty("已处理异常总数")
    private Integer completeAbnormalTotal;

    @ApiModelProperty("待服务总数")
    private Integer pendingServiceTotal;

    @ApiModelProperty("已服务总数")
    private Integer completeServiceTotal;

    @ApiModelProperty(value = "异常新增折线数据")
    private List<StatisticsCommVO> abnormalAddPolylineData;

    @ApiModelProperty(value = "异常累计折线数据")
    private List<StatisticsCommVO> abnormalTotalPolylineData;

    @ApiModelProperty(value = "服务新增折线数据")
    private List<StatisticsCommVO> serviceAddPolylineData;

    @ApiModelProperty(value = "服务累计折线数据")
    private List<StatisticsCommVO> serviceTotalPolylineData;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenFmsStatisticsInfo.java

New file
@@ -0,0 +1,72 @@
package com.panzhihua.common.model.vos.community.bigscreen;

import java.util.List;

import com.panzhihua.common.model.vos.community.StatisticsCommVO;

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

/**
 * @title: BigScreenFmsStatisticsInfo
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 杨家坪定制-五微服务大屏统计数据
 * @author: hans
 * @date: 2022/02/26 14:57
 */
@Data
@ApiModel("杨家坪定制-五微服务大屏统计数据")
public class BigScreenFmsStatisticsInfo {

    @ApiModelProperty(value = "团队/微团队总数")
    private Integer teamTotal;

    @ApiModelProperty("成员总数")
    private Integer memberTotal;

    @ApiModelProperty("服务/微服务总数")
    private Integer serviceTotal;

    @ApiModelProperty("已服务总数")
    private Integer completeServiceTotal;

    @ApiModelProperty("微讲堂/开课总数")
    private Integer classroomTotal;

    @ApiModelProperty("微调节")
    private Integer adjustTotal;

    @ApiModelProperty("微防控")
    private Integer controlTotal;

    @ApiModelProperty("参与学习人数")
    private Integer learnTotal;

    @ApiModelProperty("发现隐患数")
    private Integer fxyhTotal;

    @ApiModelProperty("解决隐患数")
    private Integer jjyhTotal;

    @ApiModelProperty(value = "团队类型占比圆形图数据")
    private List<StatisticsCommVO> teamTypeCircleData;

    @ApiModelProperty(value = "微服务新增折线数据")
    private List<StatisticsCommVO> serviceAddPolylineData;

    @ApiModelProperty(value = "微服务累计折线数据")
    private List<StatisticsCommVO> serviceTotalPolylineData;

    @ApiModelProperty(value = "微调节矛盾类型占比圆形图数据")
    private List<StatisticsCommVO> adjustCircleData;

    @ApiModelProperty(value = "新增解决矛盾折线数据")
    private List<StatisticsCommVO> adjustAddPolylineData;

    @ApiModelProperty(value = "累计解决矛盾折线数据")
    private List<StatisticsCommVO> adjustTotalPolylineData;

    @ApiModelProperty(value = "微防控防控类型占比圆形图数据")
    private List<StatisticsCommVO> controlCircleData;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenFourMemberStatisticsInfo.java

New file
@@ -0,0 +1,70 @@
package com.panzhihua.common.model.vos.community.bigscreen;

import java.util.List;

import com.panzhihua.common.model.vos.community.ComActFourMemberVO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;

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

/**
 * @title: BigScreenPartyBuildIngStatisticsInfo
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 金沙定制-四长四员大屏统计数据
 * @author: hans
 * @date: 2022/02/21 16:22
 */
@Data
@ApiModel("金沙定制-四长四员大屏统计数据")
public class BigScreenFourMemberStatisticsInfo {

    @ApiModelProperty(value = "四长四员总数/群众线总数")
    private Integer szsyTotal;

    @ApiModelProperty("居民小组长")
    private Integer jmxzzTotal;

    @ApiModelProperty("妇女小组长")
    private Integer fnxzzTotal;

    @ApiModelProperty("楼栋党小组长")
    private Integer dxzzTotal;

    @ApiModelProperty("楼栋长")
    private Integer ldzTotal;

    @ApiModelProperty("调解员")
    private Integer tjyTotal;

    @ApiModelProperty("安全员")
    private Integer aqyTotal;

    @ApiModelProperty("宣传员")
    private Integer xcyTotal;

    @ApiModelProperty("监督员")
    private Integer jdyTotal;

    @ApiModelProperty("解决问题数")
    private Integer jjwtTotal;

    @ApiModelProperty("院落议事数")
    private Integer ylysTotal;

    @ApiModelProperty(value = "解决问题新增折线数据")
    private List<StatisticsCommVO> jjwtAddPolylineData;

    @ApiModelProperty(value = "解决问题累计折线数据")
    private List<StatisticsCommVO> jjwtTotalPolylineData;

    @ApiModelProperty(value = "院落议事新增折线数据")
    private List<StatisticsCommVO> ylysAddPolylineData;

    @ApiModelProperty(value = "院落议事累计折线数据")
    private List<StatisticsCommVO> ylysTotalPolylineData;

    @ApiModelProperty("四长四员组织列表")
    private List<FourMemberOrgRelationVO> fourMemberOrgList;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenPartyBuildIngStatisticsInfo.java

New file
@@ -0,0 +1,114 @@
package com.panzhihua.common.model.vos.community.bigscreen;

import java.util.List;

import com.panzhihua.common.model.vos.community.ComActDynVO;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.community.ComSwPatrolRecordVO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;

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

/**
 * @title: BigScreenPartyBuildIngStatisticsInfo
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 金沙定制-党建引领大屏统计数据
 * @author: hans
 * @date: 2022/02/21 16:22
 */
@Data
@ApiModel("金沙定制-党建引领大屏统计数据")
public class BigScreenPartyBuildIngStatisticsInfo {

    @ApiModelProperty("党建动态数")
    private Integer djdtTotal;

    @ApiModelProperty("党建活动数")
    private Integer djhdTotal;

    @ApiModelProperty(value = "议事投票总数/议事线总数")
    private Integer ystpTotal;

    @ApiModelProperty(value = "议事投票总参与人数")
    private Integer ystpcyTotal;

    @ApiModelProperty(value = "议事总数")
    private Integer ysTotal;

    @ApiModelProperty(value = "投票总数")
    private Integer tpTotal;

    @ApiModelProperty(value = "院落议事总数")
    private Integer ylysTotal = 0;

    @ApiModelProperty(value = "社区议事总数")
    private Integer sqysTotal = 0;

    @ApiModelProperty(value = "党员线总数")
    private Integer dyTotal;

    @ApiModelProperty(value = "志愿线总数")
    private Integer zyfwTotal;

    @ApiModelProperty(value = "四长四员总数/群众线总数")
    private Integer szsyTotal;

    @ApiModelProperty(value = "安全线总数")
    private Integer aqxTotal;

    @ApiModelProperty("居民小组长")
    private Integer jmxzzTotal;

    @ApiModelProperty("妇女小组长")
    private Integer fnxzzTotal;

    @ApiModelProperty("楼栋党小组长")
    private Integer dxzzTotal;

    @ApiModelProperty("楼栋长")
    private Integer ldzTotal;

    @ApiModelProperty("调解员")
    private Integer tjyTotal;

    @ApiModelProperty("安全员")
    private Integer aqyTotal;

    @ApiModelProperty("宣传员")
    private Integer xcyTotal;

    @ApiModelProperty("监督员")
    private Integer jdyTotal;

    @ApiModelProperty("志愿线总服务次数")
    private Integer zyxServiceTotal;

    @ApiModelProperty("志愿线帮助群众次数")
    private Integer zyxHelpTotal;

    @ApiModelProperty("居民宣传次数")
    private Integer jmxcTotal;

    @ApiModelProperty("商户监督次数")
    private Integer shjdTotal = 0;

    @ApiModelProperty("辖区巡查次数")
    private Integer xqxcTotal;

    @ApiModelProperty("群众满意度分数")
    private Double qzmydStar;

    @ApiModelProperty("随手拍治安防控记录列表")
    private List<ComActEasyPhotoVO> zafkList;

    @ApiModelProperty("居民宣传记录列表")
    private List<ComActDynVO> jmxcList;

    @ApiModelProperty("商户监督记录列表")
    private List shjdList;

    @ApiModelProperty("辖区巡查记录列表")
    private List<ComSwPatrolRecordVO> xqxcList;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenVolunteerStatisticsInfo.java

New file
@@ -0,0 +1,45 @@
package com.panzhihua.common.model.vos.community.bigscreen;

import java.util.List;

import com.panzhihua.common.model.vos.community.StatisticsCommVO;

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

/**
 * @title: BigScreenVolunteerStatisticsInfo
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 杨家坪定制-志愿服务大屏统计数据
 * @author: hans
 * @date: 2022/03/02 15:25
 */
@Data
@ApiModel("杨家坪定制-志愿服务大屏统计数据")
public class BigScreenVolunteerStatisticsInfo extends BigScreenVolunteerActStatisticsInfo {

    @ApiModelProperty("志愿者人数")
    private Integer volunteerNum = 0;

    @ApiModelProperty("志愿者组织")
    private Integer volunteerOrgNum = 0;

    @ApiModelProperty("志愿者队伍")
    private Integer volunteerTeamNum = 0;

    @ApiModelProperty(value = "志愿者统计-组织人数直方图")
    private List<StatisticsCommVO> volunteerOrgHistogram;

    @ApiModelProperty(value = "志愿者服务类型占比圆形图")
    private List<StatisticsCommVO> volunteerServiceTypeCircleData;

    @ApiModelProperty(value = "志愿者年龄段占比圆形图")
    private List<StatisticsCommVO> volunteerAgeCircleData;

    @ApiModelProperty(value = "志愿者技能占比圆形图")
    private List<StatisticsCommVO> volunteerSkillCircleData;

    @ApiModelProperty(value = "志愿者组织关系")
    private List<VolunteerOrgRelationVO> volunteerOrgRelationList;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/EquipmentPointMapDataVO.java

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

import java.util.List;

import com.panzhihua.common.model.vos.community.ComActFourMemberVO;

import com.panzhihua.common.model.vos.property.ComPropertyEquipmentVO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @title: EquipmentPointMapDataVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 设备点位图数据
 * @author: hans
 * @date: 2022/03/02 11:21
 */
@Data
public class EquipmentPointMapDataVO {

    @ApiModelProperty("经纬度位置")
    private String position;

    @ApiModelProperty("设备数")
    private Integer equipmentNum;

    @ApiModelProperty("点位展示颜色（1.红色 2.黄色 3.绿色）")
    private Integer pointColor;

    @ApiModelProperty("设备")
    List<ComPropertyEquipmentVO> equipments;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/FourMemberOrgRelationVO.java

New file
@@ -0,0 +1,25 @@
package com.panzhihua.common.model.vos.community.bigscreen;

import java.util.List;

import com.panzhihua.common.model.vos.community.ComActFourMemberVO;

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

/**
 * @title: FourMemberOrgRelationVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 四长四员组织关系
 * @author: hans
 * @date: 2022/02/25 16:57
 */
@Data
public class FourMemberOrgRelationVO {

    @ApiModelProperty("关系")
    private String relation;

    @ApiModelProperty("成员")
    List<ComActFourMemberVO> members;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/VolunteerOrgRelationVO.java

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

import java.util.List;

import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;

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

/**
 * @title: VolunteerOrgRelationVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 志愿者组织关系
 * @author: hans
 * @date: 2022/03/03 13:30
 */
@Data
public class VolunteerOrgRelationVO {

    @ApiModelProperty("组织")
    private String org;

    @ApiModelProperty("组织人数")
    private Integer orgPersonNum;

    @ApiModelProperty("志愿者")
    List<ComMngVolunteerMngVO> volunteers;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsServiceEvaluateVO.java

@@ -26,7 +26,7 @@
    private Long serviceId;

    @ApiModelProperty("评分星级（1.非常差2.差3.一般4.满意5.非常满意）")
    private String starLevel;
    private Integer starLevel;

    @ApiModelProperty("内")
    private String evaluateContent;

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsTeamVO.java

@@ -31,6 +31,9 @@
    @ApiModelProperty("所属团队类型")
    private Long teamType;

    @ApiModelProperty("所属团队类型名")
    private String teamTypeName;

    @ApiModelProperty("团队照片")
    private String image;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRaffleRecordExcelVO.java

@@ -36,16 +36,28 @@
    @ExcelProperty(value = "奖品名称",index = 4)
    private String prizeName;

    @ApiModelProperty(value = "奖品图片")
    @ExcelProperty(value = "奖品图片",index = 5)
    private URL imageUrl;

    @ApiModelProperty(value = "核销人名称")
    @ExcelProperty(value = "核销人",index = 6)
    @ExcelProperty(value = "核销人",index = 5)
    private String staffName;

    @ApiModelProperty(value = "核销时间")
    @ExcelProperty(value = "核销时间",index = 7)
    @ExcelProperty(value = "核销时间",index = 6)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date staffTime;

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

    public String getStatus() {
        if("1".equals(this.status)){
            return "待兑奖";
        }
        if("2".equals(this.status)){
            return "已兑奖";
        }
        if("3".equals(this.status)){
            return "已失效";
        }
        return "";
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRaffleVO.java

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

    @ApiModelProperty(value = "参与状态 0 不可参与 1 可参与")
    private Integer joinStatus;

    @ApiModelProperty("是否参与  0参与 1没参与")
    private Integer isJoin;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/SocialProjectVO.java

@@ -115,6 +115,12 @@
    private String streetPhone;

    /**
     * 社区电话
     */
    @ApiModelProperty(value = "社区电话")
    private String communityPhone;

    /**
     * 分类id
     */
    @ApiModelProperty(value = "分类id")

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

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

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 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/ComDataStatisticsMemberVo.java

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

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/ComDataStatisticsOrgVo.java

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

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

import java.util.List;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    @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/PagePartyOrganizationVO.java

@@ -35,4 +35,15 @@
    @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;
}

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

@@ -56,4 +56,28 @@
    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;
}

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

@@ -68,4 +68,41 @@

    @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 Long checkUnitName;

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

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

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

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

@@ -1,8 +1,12 @@
package com.panzhihua.common.model.vos.partybuilding;

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
@@ -27,4 +31,47 @@
    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/model/vos/partybuilding/excel/ComDataStatisticsMemberExcelVo.java

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

import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

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

    @ExcelProperty(value = "序号", index = 0)
    private Long id;

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

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

    @ExcelProperty(value = "联系电话", index = 3)
    private String phone;

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

    @ExcelProperty(value = "职能", index = 5)
    private String function;

    @ExcelProperty(value = "特长", index = 6)
    private String specialtyName;

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

    @ExcelProperty(value = "总参与活动次数", index = 8)
    private Integer activityCount;

    @ExcelProperty(value = "总参与活动时长（小时）", index = 9)
    private Integer activityDuration;

    @ExcelProperty(value = "参与党员活动次数", index = 10)
    private Integer partyActivityCount;

    @ExcelProperty(value = "参与党员活动时长（小时）", index = 11)
    private Integer partyActivityDuration;

    @ExcelProperty(value = "参与党员活动积分", index = 12)
    private Integer partyActivityIntegral;

    @ExcelProperty(value = "参与志愿者活动次数", index = 13)
    private Integer volunteerActivityCount;

    @ExcelProperty(value = "参与志愿者活动时长（小时）", index = 14)
    private Integer volunteerActivityDuration;

    @ExcelProperty(value = "参与志愿者活动积分", index = 15)
    private Integer volunteerActivityIntegral;

    @ExcelProperty(value = "完成微心愿数量", index = 16)
    private Integer wishCount;

    @ExcelProperty(value = "完成随手拍数量", index = 17)
    private Integer easyCount;

    private Long communityId;

    private Long userId;

}

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

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

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

import java.io.Serializable;

/**
 * @description: 批量导入党员双报道单位
 * @author : lyq
 */
@Data
public class ComPbCheckUnitErrorExcelVO implements Serializable {

    @ExcelProperty(value = "单位名称", index = 0)
    private String name;

    @ExcelProperty(value = "单位类别", index = 1)
    private String type;

    @ExcelProperty(value = "单位负责人", index = 2)
    private String contacts;

    @ExcelProperty(value = "负责人联系电话", index = 3)
    private String phone;

    @ExcelProperty(value = "错误信息", index = 4)
    private String error;
}

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

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

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

import java.io.Serializable;

/**
 * @description: 批量导入党员双报道单位
 * @author : lyq
 */
@Data
public class ComPbCheckUnitExcelVO implements Serializable {

    @ExcelProperty(value = "单位名称", index = 0)
    private String name;

    @ExcelProperty(value = "单位类别", index = 1)
    private String type;

    @ExcelProperty(value = "单位负责人", index = 2)
    private String contacts;

    @ExcelProperty(value = "负责人联系电话", index = 3)
    private String phone;
}

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

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

import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.annotations.ApiModel;
import lombok.Data;

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


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

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

    @ExcelProperty(value = "*手机号", index = 2)
    private String phone;

    @ExcelProperty(value = "党委标签(社区党委/区域党委委员)", index = 3)
    private String typeName;

    @ExcelProperty(value = "*入党日期(格式：年-月-日)", index = 4)
    private String joinTime;

    @ExcelProperty(value = "转正日期(格式：年-月-日)", index = 5)
    private String employmentTime;

    @ExcelProperty(value = "职位", index = 6)
    private String position;

    @ExcelProperty(value = "岗位职责", index = 7)
    private String jobResponsibilities;

    @ExcelProperty(value = "错误信息", index = 8)
    private String error;

}

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

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

import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.annotations.ApiModel;
import lombok.Data;

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


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

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

    @ExcelProperty(value = "手机号", index = 2)
    private String phone;

    @ExcelProperty(value = "党委标签(社区党委/区域党委委员)", index = 3)
    private String typeName;

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

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

    @ExcelProperty(value = "职位", index = 6)
    private String position;

    @ExcelProperty(value = "岗位职责", index = 7)
    private String jobResponsibilities;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyEquipmentVO.java

@@ -62,7 +62,7 @@
    /**
     * 设备类型
     */
    @ApiModelProperty(value = "设备类型 1红外报警 2一键报警 ")
    @ApiModelProperty(value = "设备类型 1异常报警 2一键报警 ")
    private Integer type;

    @ApiModelProperty(value = "手机号")
@@ -73,4 +73,7 @@

    @ApiModelProperty(value = "回显路径")
    private String path;

    @ApiModelProperty(value = "设备状态（1.待服务 2.有异常报警 3.正常）")
    private Integer equipmentStatus;
}

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

New file
@@ -0,0 +1,85 @@
package com.panzhihua.common.service.community;

import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.vos.R;
import org.springframework.web.bind.annotation.*;
import com.panzhihua.common.constants.Constants;
import org.springframework.cloud.openfeign.FeignClient;

/**
 * title: 随手拍、微心愿评价表业务层接口
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 随手拍、微心愿评价表业务层接口
 *
 * @author lyq
 * @date 2022-03-01 13:44:43
 */
@FeignClient(name = Constants.SERVICE_COMMUNITY, contextId = "comActEasyPhotoEvaluate", path = "comActEasyPhotoEvaluate")
public interface ComActEasyPhotoEvaluateFeign {

    /**
     * description  queryByPage  分页查询
     *
     * @param comActEasyPhotoEvaluate 请求参数
     * @return 分页查询列表数据
     * @author lyq
     * @date 2022-03-01 13:44:43
     */
    @PostMapping("/page")
    R queryByPage(@RequestBody PageComActEasyPhotoEvaluateDto comActEasyPhotoEvaluate);

    /**
     * description  insert  新增数据
     *
     * @param comActEasyPhotoEvaluate 请求参数
     * @return 新增结果
     * @author lyq
     * @date 2022-03-01 13:44:43
     */
    @PostMapping("/add")
    R insert(@RequestBody AddComActEasyPhotoEvaluateDto comActEasyPhotoEvaluate);

    /**
     * description  update  修改数据
     *
     * @param comActEasyPhotoEvaluate 请求参数
     * @return 修改结果
     * @author lyq
     * @date 2022-03-01 13:44:43
     */
    @PutMapping("/edit")
    R update(@RequestBody EditComActEasyPhotoEvaluateDto comActEasyPhotoEvaluate);

    /**
     * description  deleteById  通过主键删除数据
     *
     * @param id 主键id
     * @return 删除结果
     * @author lyq
     * @date 2022-03-01 13:44:43
     */
    @GetMapping("/delete")
    R deleteById(@RequestParam("id") Long id);

    /**
     * description  detailById  查询详情
     *
     * @param id 主键id
     * @return 详情数据
     * @author lyq
     * @date 2022-03-01 13:44:43
     */
    @GetMapping("/detail")
    R detailById(@RequestParam("id") Long id);

    /**
     * 随手拍评价
     * @param whistleDto    请求参数
     * @return  评价结果
     */
    @PostMapping("/easy/evaluate")
    R evaluateEasyApplets(@RequestBody EvaluateEasyDto whistleDto);

}

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

New file
@@ -0,0 +1,77 @@
package com.panzhihua.common.service.community;

import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.vos.R;
import org.springframework.web.bind.annotation.*;
import com.panzhihua.common.constants.Constants;
import org.springframework.cloud.openfeign.FeignClient;

/**
 * title: 随手拍、微心愿处理人绑定表业务层接口
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 随手拍、微心愿处理人绑定表业务层接口
 *
 * @author lyq
 * @date 2022-03-01 13:45:12
 */
@FeignClient(name = Constants.SERVICE_COMMUNITY, contextId = "comActEasyPhotoHandler", path = "comActEasyPhotoHandler")
public interface ComActEasyPhotoHandlerFeign {

    /**
     * description  queryByPage  分页查询
     *
     * @param comActEasyPhotoHandler 请求参数
     * @return 分页查询列表数据
     * @author lyq
     * @date 2022-03-01 13:45:12
     */
    @PostMapping("/page")
    R queryByPage(@RequestBody PageComActEasyPhotoHandlerDto comActEasyPhotoHandler);

    /**
     * description  insert  新增数据
     *
     * @param comActEasyPhotoHandler 请求参数
     * @return 新增结果
     * @author lyq
     * @date 2022-03-01 13:45:12
     */
    @PostMapping("/add")
    R insert(@RequestBody AddComActEasyPhotoHandlerDto comActEasyPhotoHandler);

    /**
     * description  update  修改数据
     *
     * @param comActEasyPhotoHandler 请求参数
     * @return 修改结果
     * @author lyq
     * @date 2022-03-01 13:45:12
     */
    @PutMapping("/edit")
    R update(@RequestBody EditComActEasyPhotoHandlerDto comActEasyPhotoHandler);

    /**
     * description  deleteById  通过主键删除数据
     *
     * @param id 主键id
     * @return 删除结果
     * @author lyq
     * @date 2022-03-01 13:45:12
     */
    @GetMapping("/delete")
    R deleteById(@RequestParam("id") Long id);

    /**
     * description  detailById  查询详情
     *
     * @param id 主键id
     * @return 详情数据
     * @author lyq
     * @date 2022-03-01 13:45:12
     */
    @GetMapping("/detail")
    R detailById(@RequestParam("id") Long id);

}

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

@@ -2,6 +2,33 @@

import java.util.List;

import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.civil.*;
import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseApplyDTO;
import com.panzhihua.common.model.dtos.community.GetIdentityEidTokenDTO;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.community.building.admin.*;
import com.panzhihua.common.model.dtos.community.cluster.PageClusterMemberDto;
import com.panzhihua.common.model.dtos.community.cluster.admin.*;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussDetailDTO;
import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussPublishResultDTO;
import com.panzhihua.common.model.dtos.community.elder.ElderAuthStatisticHeaderDTO;
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.neighbor.*;
import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerDetailsVO;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.cluster.admin.ComClusterMemberExcelVO;
import com.panzhihua.common.model.vos.community.raffle.ComActRaffleRecordVO;
import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
import com.panzhihua.common.model.vos.community.social.*;
import io.swagger.annotations.ApiOperation;
import com.panzhihua.common.model.vos.community.*;
import org.springframework.beans.BeanUtils;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.scheduling.annotation.Async;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -1148,7 +1175,7 @@
     * @return 活动列表
     */
    @PostMapping("listactivity")
    R listActivity(@RequestParam("userId") Long userId, @RequestParam(value = "status", required = false) Integer status);
    R listActivity(@RequestParam("userId") Long userId, @RequestParam(value = "status", required = false) Integer status,@RequestParam(value = "type",required = false)Integer type);

    /**
     * 用户确认心愿
@@ -8623,7 +8650,7 @@
     * @return 查找结果
     */
    @PostMapping("/comActSocialWorker/{id}")
    R<ComActSocialWorkerDetailsVO> comActSocialWorkerDetails(@PathVariable("id") Long id);
    R<ComActSocialWorkerVO> comActSocialWorkerDetails(@PathVariable("id") Long id);

    /**
     * 批量导入社工
@@ -9332,4 +9359,108 @@

    @GetMapping("/activity/partyMemberCount")
    R partyMemberCount(@RequestParam("communityId")Long communityId,@RequestParam("year")String year);

    /**
     * 根据小区id查询楼栋列表
     * @param villageId 小区id
     * @return  查询楼栋列表
     */
    @GetMapping("/building/getBuildListByVillageId")
    R getBuildListByVillageId(@RequestParam(value = "villageId") Long villageId);

    /**
     * 金沙定制页面-党建引领基础数据
     * @param communityId
     * @return
     */
    @GetMapping("/screen/partyBuildIng/base")
    R getPartyBuildIngBaseData(@RequestParam("communityId") Long communityId);

    /**
     * 党员活动展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/partyBuildIng/partyAct")
    R pagePartyBuildIngAct(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 议事投票展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/partyBuildIng/discuss")
    R pagePartyBuildIngDiscuss(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 金沙定制页面-四长四员
     * @param communityId
     * @return
     */
    @GetMapping("/screen/fourMember/base")
    R getFourMemberBaseData(@RequestParam("communityId") Long communityId);

    /**
     * 杨家坪定制页面-五微服务
     * @param communityId
     * @return
     */
    @GetMapping("/screen/fms/base")
    R getFmsBaseData(@RequestParam("communityId") Long communityId);

    /**
     * 杨家坪定制页面-微团队展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/fms/team")
    R pageFmsTeam(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 杨家坪定制页面-居家养老基础数据
     * @param communityId
     * @return
     */
    @GetMapping("/screen/alarm/base")
    R getAlarmBaseData(@RequestParam("communityId") Long communityId);

    /**
     * 杨家坪定制页面-报警记录展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/alarm/record")
    R pageAlarmRecord(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 杨家坪定制页面-报警设备点位图
     * @param communityId
     * @return
     */
    @GetMapping("/screen/alarm/pointMap")
    R getAlarmPointMap(@RequestParam("communityId") Long communityId);

    /**
     * 杨家坪定制页面-志愿服务
     * @param communityId
     * @return
     */
    @GetMapping("/screen/volunteer/base")
    R getVolunteerBaseData(@RequestParam("communityId") Long communityId);

    /**
     * 金沙定制页面-志愿线展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/partyBuildIng/microWish")
    R pagePartyBuildIngMicroWish(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 金沙定制页面-四长四员解决问题展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/fourMember/resolve")
    R pageFourMemberResolve(@RequestBody PageBaseDTO pageBaseDTO);
}

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

New file
@@ -0,0 +1,38 @@
package com.panzhihua.common.service.partybuilding;

import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.model.dtos.common.AddComPbCheckUnitDto;
import com.panzhihua.common.model.dtos.common.EditComPbCheckUnitDto;
import com.panzhihua.common.model.dtos.common.PageComPbCheckUnitDto;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitExcelVO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * title: 党建-数据统计业务层接口
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 党建-数据统计业务层接口
 *
 * @author lyq
 * @date 2022-02-16 16:22:48
 */
@FeignClient(name = Constants.SERVICE_PARTYBUILDING, contextId = "comDataStatistics", path = "comDataStatistics")
public interface ComDataStatisticsFeign {

    /**
     * description  queryByPage  分页查询
     *
     * @param comPbCheckUnit 请求参数
     * @return 分页查询列表数据
     * @author lyq
     * @date 2022-02-16 16:22:48
     */
    @PostMapping("/page")
    R pageDataStatisticsMember(@RequestBody PageComPbCheckUnitDto comPbCheckUnit);

}

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

New file
@@ -0,0 +1,101 @@
package com.panzhihua.common.service.partybuilding;

import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitExcelVO;
import org.springframework.web.bind.annotation.*;
import com.panzhihua.common.constants.Constants;
import org.springframework.cloud.openfeign.FeignClient;

import java.util.List;

/**
 * title: 党建-报到单位业务层接口
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 党建-报到单位业务层接口
 *
 * @author lyq
 * @date 2022-02-16 16:22:48
 */
@FeignClient(name = Constants.SERVICE_PARTYBUILDING, contextId = "comPbCheckUnit", path = "comPbCheckUnit")
public interface ComPbCheckUnitFeign {

    /**
     * description  queryByPage  分页查询
     *
     * @param comPbCheckUnit 请求参数
     * @return 分页查询列表数据
     * @author lyq
     * @date 2022-02-16 16:22:48
     */
    @PostMapping("/page")
    R queryByPage(@RequestBody PageComPbCheckUnitDto comPbCheckUnit);

    /**
     * description  insert  新增数据
     *
     * @param comPbCheckUnit 请求参数
     * @return 新增结果
     * @author lyq
     * @date 2022-02-16 16:22:48
     */
    @PostMapping("/add")
    R insert(@RequestBody AddComPbCheckUnitDto comPbCheckUnit);

    /**
     * description  update  修改数据
     *
     * @param comPbCheckUnit 请求参数
     * @return 修改结果
     * @author lyq
     * @date 2022-02-16 16:22:48
     */
    @PutMapping("/edit")
    R update(@RequestBody EditComPbCheckUnitDto comPbCheckUnit);

    /**
     * description  deleteById  通过主键删除数据
     *
     * @param id 主键id
     * @return 删除结果
     * @author lyq
     * @date 2022-02-16 16:22:48
     */
    @GetMapping("/delete")
    R deleteById(@RequestParam("id") Long id);

    /**
     * description  detailById  查询详情
     *
     * @param id 主键id
     * @return 详情数据
     * @author lyq
     * @date 2022-02-16 16:22:48
     */
    @GetMapping("/detail")
    R detailById(@RequestParam("id") Long id);

    /**
     * description  queryByList  查询列表
     *
     * @param comPbCheckUnit 请求参数
     * @return 查询列表数据
     * @author lyq
     * @date 2022-02-16 16:22:48
     */
    @PostMapping("/list")
    R queryByList(@RequestBody PageComPbCheckUnitDto comPbCheckUnit);

    /**
     * 批量导入报道单位
     * @param list  导入数据
     * @param communityId   社区id
     * @param userId    用户id
     * @return  导入结果
     */
    @PostMapping("/importCheckUnit")
    R importCheckUnit(@RequestBody List<ComPbCheckUnitExcelVO> list,@RequestParam(value = "communityId") Long communityId
            ,@RequestParam(value = "userId") Long userId);
}

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

@@ -2,6 +2,7 @@

import java.util.List;

import com.panzhihua.common.model.vos.partybuilding.excel.ComPbMemberRoleExcelVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -22,7 +23,7 @@
public interface PartyBuildingService {
    /**
     * 新增党员
     * 
     *
     * @param partyBuildingMemberVO
     *            党员基本信息
     * @return 新增结果
@@ -32,23 +33,31 @@

    /**
     * 社区所有启用的党组织列表
     * 
     *
     * @return 党组织集合
     */
    @PostMapping("/partybuildIng/listpartyorganization")
    R listPartyOrganization(@RequestParam("communityId") Long communityId);

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

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

    /**
     * 新增党支部
     * 
     *
     * @param partyOrganizationVO
     *            党支部基本信息
     * @return 新增结果
@@ -58,7 +67,7 @@

    /**
     * 编辑党支部
     * 
     *
     * @param partyOrganizationVO
     *            党支部基本信息
     * @return 编辑结果
@@ -68,7 +77,7 @@

    /**
     * 启用，禁用党支部
     * 
     *
     * @param partyOrganizationVO
     *            党支部基本信息
     * @return 编辑结果
@@ -78,7 +87,7 @@

    /**
     * 删除党支部
     * 
     *
     * @param partyOrganizationVO
     *            党支部基本信息
     * @return 删除结果
@@ -88,7 +97,7 @@

    /**
     * 批量新增党员
     * 
     *
     * @param list
     *            党员集合
     */
@@ -97,7 +106,7 @@

    /**
     * 分页查询党员信息
     * 
     *
     * @param pagePartyOrganizationVO
     *            查询信息
     * @return 分页数据
@@ -107,7 +116,7 @@

    /**
     * 党员活动
     * 
     *
     * @param partyBuildingActivityVO
     *            党员活动查询参数
     * @return 参加的所有活动
@@ -117,7 +126,7 @@

    /**
     * 活动报名名单分页查询
     * 
     *
     * @param pageActivityMembersVO
     *            查询参数 手机号 名字
     * @return 分页数据
@@ -127,7 +136,7 @@

    /**
     * 编辑党员信息 新增字段均可编辑
     * 
     *
     * @param partyBuildingMemberVO
     *            编辑字段
     * @return 编辑结果
@@ -137,7 +146,7 @@

    /**
     * 党员活动详情
     * 
     *
     * @param id
     *            活动id
     * @return 活动详情内容
@@ -147,7 +156,7 @@

    /**
     * 查询指定社区的所有党员
     * 
     *
     * @param communityId
     *            社区id
     * @return 党员列表
@@ -157,7 +166,7 @@

    /**
     * 社区下拉选择身份
     * 
     *
     * @return 身份集合
     */
    @PostMapping("/partybuildIng/listidentity")
@@ -165,7 +174,7 @@

    /**
     * 新增党委
     * 
     *
     * @param partyCommitteeVO
     *            新增信息
     * @return 新增结果
@@ -175,7 +184,7 @@

    /**
     * 编辑党委
     * 
     *
     * @param partyCommitteeVO
     *            编辑信息
     * @return 编辑结果
@@ -185,7 +194,7 @@

    /**
     * 删除党委
     * 
     *
     * @param partyCommitteeVO
     *            删除id
     * @return 删除结果
@@ -195,7 +204,7 @@

    /**
     * 分页社区党委查询
     * 
     *
     * @param partyCommitteeVO
     *            查询参数
     * @return 分页集合
@@ -205,7 +214,7 @@

    /**
     * 新建党建动态
     * 
     *
     * @param partyCommitteeVO
     *            动态内容
     * @return 新增结果
@@ -215,7 +224,7 @@

    /**
     * 编辑动态
     * 
     *
     * @param partyCommitteeVO
     *            编辑内容
     * @return 编辑结果
@@ -225,7 +234,7 @@

    /**
     * 动态详情
     * 
     *
     * @param id
     *            动态主键
     * @return 详情
@@ -235,7 +244,7 @@

    /**
     * 分页查询党员动态/政策文件
     * 
     *
     * @param partyBuildingComPbDynVO
     *            查询参数
     * @return 分页数据
@@ -245,7 +254,7 @@

    /**
     * 删除动态
     * 
     *
     * @param id
     *            动态主键
     * @return 删除结果
@@ -255,7 +264,7 @@

    /**
     * 新增党员活动
     * 
     *
     * @param partyBuildingActivityVO
     *            参数
     * @return 新增结果
@@ -265,7 +274,7 @@

    /**
     * 编辑党员活动
     * 
     *
     * @param partyBuildingActivityVO
     *            编辑内容
     * @return 编辑结果
@@ -275,7 +284,7 @@

    /**
     * 发布党员活动
     * 
     *
     * @param id
     *            主键id
     * @return 发布结果
@@ -285,7 +294,7 @@

    /**
     * 删除党员活动
     * 
     *
     * @param id
     *            主键id
     * @return 删除结果
@@ -295,7 +304,7 @@

    /**
     * 分页查询党员活动
     * 
     *
     * @param partyBuildingActivityVO
     *            查询条件
     * @return 查询结果
@@ -305,7 +314,7 @@

    /**
     * 增加阅读记录
     * 
     *
     * @param comPbDynUserVO
     *            记录内容
     * @return 增加结果
@@ -315,7 +324,7 @@

    /**
     * 删除党员
     * 
     *
     * @param id
     *            党员主键
     * @return 删除结果
@@ -325,7 +334,7 @@

    /**
     * 取消活动
     * 
     *
     * @param partyBuildingActivityVO
     *            取消原因
     * @return 操作结果
@@ -335,7 +344,7 @@

    /**
     * 用户的所有党建活动
     * 
     *
     * @param userId
     *            用户id
     * @param communityId
@@ -349,7 +358,7 @@

    /**
     * 党员活动人员参入列表
     * 
     *
     * @param id
     *            活动id
     * @return 党员集合
@@ -359,7 +368,7 @@

    /**
     * 报名、取消报名党员活动
     * 
     *
     * @param activitySignUpDTO
     *            操作参数
     * @return 操作结果
@@ -369,7 +378,7 @@

    /**
     * 获取党建活动所有参入人员的id集合
     * 
     *
     * @param id
     *            党建活动id
     * @return 人员id集合
@@ -379,7 +388,7 @@

    /**
     * 定时任务刷新党建动态发布状态
     * 
     *
     * @return 刷新数据数量
     */
    @PostMapping("/partybuildIng/timedtaskpartybuildingstatus")
@@ -387,7 +396,7 @@

    /**
     * 定时任务取消党建活动
     * 
     *
     * @return 需要取消的所有党建活动
     */
    @PostMapping("/partybuildIng/timedtaskpartybuildingactivity")
@@ -395,7 +404,7 @@

    /**
     * 定时任务刷新党建活动的各个状态 除取消外
     * 
     *
     * @return 修改结果
     */
    @PostMapping("/partybuildIng/timedtaskpartybuildingactivityall")
@@ -403,7 +412,7 @@

    /**
     * 新增服务团队人员
     * 
     *
     * @param comPbServiceTeamDTO
     *            新增内容
     * @return 新增结果
@@ -413,7 +422,7 @@

    /**
     * 编辑团队人员
     * 
     *
     * @param comPbServiceTeamDTO
     *            编辑内容
     * @return 编辑结果
@@ -423,7 +432,7 @@

    /**
     * 删除服务团队人员
     * 
     *
     * @param comPbServiceTeamDTO
     *            删除主键
     * @return 删除结果
@@ -433,7 +442,7 @@

    /**
     * 分页查询服务团队成员
     * 
     *
     * @param pageComPbServiceTeamDTO
     *            查询参数
     * @return 查询结果
@@ -443,7 +452,7 @@

    /**
     * 创建党员活动 小程序创建党员活动
     * 
     *
     * @param comPbActivityDTO
     *            创建内容
     * @return 创建结果
@@ -453,7 +462,7 @@

    /**
     * 查询用户党员认证信息
     * 
     *
     * @param id
     *            用户ID
     * @return 查询结果
@@ -463,7 +472,7 @@

    /**
     * 查询待认证党员信息
     * 
     *
     * @param pagePartyBuildingMemberVO
     *            查询参数
     * @return 查询结果
@@ -473,7 +482,7 @@

    /**
     * 根据身份证号码查询党员信息
     * 
     *
     * @param idCard
     *            身份证号码
     * @return 党员信息
@@ -483,7 +492,7 @@

    /**
     * 社区所有启用的党组织列表
     * 
     *
     * @return 党组织集合
     */
    @PostMapping("/partybuildIng/listpartyorganizationByApp")
@@ -491,7 +500,7 @@

    /**
     * 根据id删除党员认证
     * 
     *
     * @param id
     *            党员认证id
     * @return 党员认证id
@@ -501,7 +510,7 @@

    /**
     * 导出党员信息
     * 
     *
     * @param organizationVO
     *            请求参数
     * @return 党员信息列表
@@ -511,7 +520,7 @@

    /**
     * 选择人员
     * 
     *
     * @param param
     *            查询条件
     * @param communityId
@@ -524,11 +533,54 @@

    /**
     * 根据党员活动id查询活动下报名人员
     * 
     *
     * @param activityId
     *            党员活动id
     * @return 活动下报名人员
     */
    @PostMapping("/partybuildIng/getTaskPbActivityPeopleList")
    R getTaskPbActivityPeopleList(@RequestParam("activityId") Long activityId);

    /**
     * 分页查询党员数据统计
     * @param statisticsMemberDto   请求参数
     * @return  党员数据统计
     */
    @PostMapping("/partybuildIng/pageDataStatisticsMember")
    R pageDataStatisticsMember(@RequestBody PageComDataStatisticsMemberDto statisticsMemberDto);

    /**
     * 根据组织id查询组织下统计数据
     * @param statisticsOrgDto  请求参数
     * @return  组织下统计数据
     */
    @PostMapping("/partybuildIng/getOrgDataStatistics")
    R getOrgDataStatistics(@RequestBody ComDataStatisticsOrgDto statisticsOrgDto);

    /**
     * 查询党组织表头统计数据
     * @param communityId
     *            社区id
     * @return  党组织表头统计数据
     */
    @GetMapping("/partybuildIng/getHeaderOrgDataStatistics")
    R getHeaderOrgDataStatistics(@RequestParam("communityId") Long communityId);

    /**
     * 党员数据统计-党员导出数据查询
     * @param statisticsMemberDto   请求参数
     * @return  党员导出数据
     */
    @PostMapping("/partybuildIng/exportDataStatisticsMember")
    R exportDataStatisticsMember(@RequestBody PageComDataStatisticsMemberDto statisticsMemberDto);

    /**
     * 党委导入接口
     * @param memberRoleExcelVoList 数据列表
     * @param communityId   社区id
     * @param userId    用户id
     * @return  导入结果
     */
    @PostMapping("/partybuildIng/importPbMemberRole")
    R importPbMemberRole(@RequestBody List<ComPbMemberRoleExcelVo> memberRoleExcelVoList,@RequestParam("communityId") Long communityId,@RequestParam("userId") Long userId);
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java

@@ -1191,4 +1191,11 @@
     */
    @PostMapping("/mcs/bindPhone")
    R bindOrAddMcsUser(@RequestBody @Valid BindUserPhoneDTO bindUserPhoneDTO);

    /**
     * 删除用户信息缓存
     * @param phone
     */
    @DeleteMapping("/deleteUserCashByPhone")
    R deleteUserCashByPhone(@RequestParam("phone") String phone);
}

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

@@ -1038,4 +1038,95 @@
        calendar.set(Calendar.DAY_OF_MONTH, 1);
        return format_yyymmdd.format(calendar.getTime());
    }

    /**
     * 获取某年的月份最后一天时间
     * @param year  年份
     * @return  月份list
     */
    public static List<String> getYearLastMonths(Integer year){
        List<String> list = new ArrayList<>();
        list.add(getLastDayOfMonth(year,1));
        list.add(getLastDayOfMonth(year,2));
        list.add(getLastDayOfMonth(year,3));
        list.add(getLastDayOfMonth(year,4));
        list.add(getLastDayOfMonth(year,5));
        list.add(getLastDayOfMonth(year,6));
        list.add(getLastDayOfMonth(year,7));
        list.add(getLastDayOfMonth(year,8));
        list.add(getLastDayOfMonth(year,9));
        list.add(getLastDayOfMonth(year,10));
        list.add(getLastDayOfMonth(year,11));
        list.add(getLastDayOfMonth(year,12));
        return list;
    }

    /**
     * 获取某年的月份第一天时间
     * @param year  年份
     * @return  月份list
     */
    public static List<String> getYearFirstMonths(Integer year){
        List<String> list = new ArrayList<>();
        list.add(getFirstDayOfMonth(year,1));
        list.add(getFirstDayOfMonth(year,2));
        list.add(getFirstDayOfMonth(year,3));
        list.add(getFirstDayOfMonth(year,4));
        list.add(getFirstDayOfMonth(year,5));
        list.add(getFirstDayOfMonth(year,6));
        list.add(getFirstDayOfMonth(year,7));
        list.add(getFirstDayOfMonth(year,8));
        list.add(getFirstDayOfMonth(year,9));
        list.add(getFirstDayOfMonth(year,10));
        list.add(getFirstDayOfMonth(year,11));
        list.add(getFirstDayOfMonth(year,12));
        return list;
    }

    /**
     * 获取某年某月最后一天
     * @param year  年份
     * @param month 月份
     * @return  某年某月最后一天
     */
    public static String getLastDayOfMonth(int year,int month)
    {
        Calendar cal = Calendar.getInstance();
        //设置年份
        cal.set(Calendar.YEAR,year);
        //设置月份
        cal.set(Calendar.MONTH, month-1);
        //获取某月最大天数
        int lastDay = cal.getActualMaximum(Calendar.DAY_OF_MONTH);
        //设置日历中月份的最大天数
        cal.set(Calendar.DAY_OF_MONTH, lastDay);
        //格式化日期
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
        String lastDayOfMonth = sdf.format(cal.getTime());
        return lastDayOfMonth;
    }

    /**
     *  获取某年某月的第一天
     * @param year  年份
     * @param month 月份
     * @return  某年某月第一天
     */
    public static String getFirstDayOfMonth(int year,int month)
    {
        Calendar cal = Calendar.getInstance();
        //设置年份
        cal.set(Calendar.YEAR,year);
        //设置月份
        cal.set(Calendar.MONTH, month-1);
        //获取某月最小天数
        int firstDay = cal.getActualMinimum(Calendar.DAY_OF_MONTH);
        //设置日历中月份的最小天数
        cal.set(Calendar.DAY_OF_MONTH, firstDay);
        //格式化日期
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
        String firstDayOfMonth = sdf.format(cal.getTime());

        return firstDayOfMonth;
    }
}

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

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

import javax.annotation.Resource;

import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenResidentActStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenVolunteerActStatisticsInfo;
import com.panzhihua.common.model.vos.community.screen.event.EventGridIncidentStatisticsVO;
import io.swagger.annotations.ApiImplicitParam;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import com.panzhihua.common.model.vos.community.bigscreen.EquipmentPointMapDataVO;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -33,35 +22,44 @@
import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenDrawEventListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO;
import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
import com.panzhihua.common.model.dtos.community.integral.ComActIntegralCommunityRankDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyOrg;
import com.panzhihua.common.model.vos.community.bigscreen.WestScreenStatics;
import com.panzhihua.common.model.vos.partybuilding.PartyBuildingComPbDynVO;
import com.panzhihua.common.service.partybuilding.PartyBuildingService;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.community.ComActDiscussVO;
import com.panzhihua.common.model.vos.community.ComActDynVO;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
import com.panzhihua.common.model.vos.community.ComActQuestnaireVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenActivityLine;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenAlarmStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenCommunityStatisticsVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenDynStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenEasyPhotoStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenFmsStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenFourMemberStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkBaseInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenMerchantStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenMicroWishStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenNeighborStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenPartyBuildIngStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenQuestionnaireStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenResidentActStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenServiceData;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenServiceUser;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyOrg;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenVolunteerActStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenVolunteerStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.GridsGovernanceStatisticsVO;
import com.panzhihua.common.model.vos.community.bigscreen.IndexInfo;
import com.panzhihua.common.model.vos.community.bigscreen.ResidentAutonomyStatisticsVO;
import com.panzhihua.common.model.vos.community.bigscreen.WestScreenStatics;
import com.panzhihua.common.model.vos.community.bigscreen.*;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import com.panzhihua.common.model.vos.community.fms.ComFmsTeamVO;
import com.panzhihua.common.model.vos.community.integral.ComActIntegralCommunityRankVO;
import com.panzhihua.common.model.vos.community.screen.civil.CivilStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.event.EventComprehensiveGovernanceStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.event.EventGridIncidentStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.event.EventGridMemberVO;
import com.panzhihua.common.model.vos.community.screen.event.EventGridStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.event.EventListVO;
@@ -70,11 +68,11 @@
import com.panzhihua.common.model.vos.community.screen.event.EventPopulationStreetVO;
import com.panzhihua.common.model.vos.community.screen.event.EventStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.index.IndexStatisticsVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAdminVO;
import com.panzhihua.common.model.vos.partybuilding.PartyBuildingComPbDynVO;
import com.panzhihua.common.model.vos.community.switchs.StreetAllAppletsVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAdminVO;
import com.panzhihua.common.model.vos.partybuilding.PartyBuildingActivityVO;
import com.panzhihua.common.model.vos.partybuilding.PartyBuildingComPbDynVO;
import com.panzhihua.common.model.vos.property.ComPropertyAlarmVO;
import com.panzhihua.common.model.vos.screen.ScreenDrawEventPopulationTotalVO;
import com.panzhihua.common.model.vos.screen.ScreenDrawEventVO;
import com.panzhihua.common.service.community.CommunityService;
@@ -85,10 +83,9 @@
import com.panzhihua.common.utlis.HttpUtils;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;

import static java.util.Objects.isNull;

@Slf4j
@Api(tags = {"大屏统计数据模块"})
@@ -324,7 +321,7 @@
    /**
     * 首页二级页面-社区问卷展示列表
     */
    @ApiOperation(value = "首页二级页面-随手拍展示列表", response = ComActQuestnaireVO.class)
    @ApiOperation(value = "首页二级页面-社区问卷展示列表", response = ComActQuestnaireVO.class)
    @PostMapping("/index/questionnaireList")
    public R indexQuestionnaireList(@RequestBody PageBaseDTO pageBaseDTO) {
        pageBaseDTO.setCommunityId(this.getCommunityId());
@@ -578,4 +575,93 @@
    public R projectActivityTop(@RequestBody CommonPage commonPage){
        return communityService.projectActivityProject(commonPage);
    }

    @ApiOperation(value = "金沙定制页面-党建引领基础数据", response = BigScreenPartyBuildIngStatisticsInfo.class)
    @GetMapping("/partyBuildIng/base")
    public R getPartyBuildIngBaseData() {
        return communityService.getPartyBuildIngBaseData(this.getCommunityId());
    }

    @ApiOperation(value = "金沙定制页面-党员活动展示列表", response = PartyBuildingActivityVO.class)
    @PostMapping("/partyBuildIng/partyAct")
    public R pagePartyAct(@RequestBody PageBaseDTO pageBaseDTO) {
        pageBaseDTO.setCommunityId(this.getCommunityId());
        return communityService.pagePartyBuildIngAct(pageBaseDTO);
    }

    @ApiOperation(value = "金沙定制页面-议事投票展示列表", response = ComActDiscussVO.class)
    @PostMapping("/partyBuildIng/discuss")
    public R pageDiscuss(@RequestBody PageBaseDTO pageBaseDTO) {
        pageBaseDTO.setCommunityId(this.getCommunityId());
        return communityService.pagePartyBuildIngDiscuss(pageBaseDTO);
    }

    @ApiOperation(value = "金沙定制页面-志愿线展示列表", response = ComActMicroWishVO.class)
    @PostMapping("/partyBuildIng/microWish")
    public R pagePartyBuildIngMicroWish(@RequestBody PageBaseDTO pageBaseDTO) {
        pageBaseDTO.setCommunityId(this.getCommunityId());
        return communityService.pagePartyBuildIngMicroWish(pageBaseDTO);
    }

    @ApiOperation(value = "金沙定制页面-四长四员", response = BigScreenFourMemberStatisticsInfo.class)
    @GetMapping("/fourMember/base")
    public R getFourMemberBaseData() {
        return communityService.getFourMemberBaseData(this.getCommunityId());
    }

    @ApiOperation(value = "金沙定制页面-四长四员解决问题展示列表", response = ComActMicroWishVO.class)
    @PostMapping("/fourMember/resolve")
    public R pageFourMemberResolve(@RequestBody PageBaseDTO pageBaseDTO) {
        pageBaseDTO.setCommunityId(this.getCommunityId());
        return communityService.pageFourMemberResolve(pageBaseDTO);
    }

    @ApiOperation(value = "杨家坪定制页面-五微服务", response = BigScreenFmsStatisticsInfo.class)
    @GetMapping("/fms/base")
    public R getFmsBaseData() {
        return communityService.getFmsBaseData(this.getCommunityId());
    }

    @ApiOperation(value = "杨家坪定制页面-微团队展示列表", response = ComFmsTeamVO.class)
    @PostMapping("/fms/team")
    public R pageFmsTeam(@RequestBody PageBaseDTO pageBaseDTO) {
        pageBaseDTO.setCommunityId(this.getCommunityId());
        return communityService.pageFmsTeam(pageBaseDTO);
    }

    @ApiOperation(value = "杨家坪定制页面-居家养老", response = BigScreenAlarmStatisticsInfo.class)
    @GetMapping("/alarm/base")
    public R getAlarmBaseData() {
        return communityService.getAlarmBaseData(this.getCommunityId());
    }

    @ApiOperation(value = "杨家坪定制页面-报警记录展示列表，参数param3（1.待处理异常 2.已处理 3.待服务 4.已服务）", response = ComPropertyAlarmVO.class)
    @PostMapping("/alarm/record")
    public R pageAlarmRecord(@RequestBody PageBaseDTO pageBaseDTO) {
        if (isNull(pageBaseDTO.getParam3())) {
            return R.fail("缺少参数");
        }
        pageBaseDTO.setCommunityId(this.getCommunityId());
        return communityService.pageAlarmRecord(pageBaseDTO);
    }

    @ApiOperation(value = "杨家坪定制页面-报警设备点位图", response = EquipmentPointMapDataVO.class)
    @GetMapping("/alarm/pointMap")
    public R getAlarmPointMap() {
        return communityService.getAlarmPointMap(this.getCommunityId());
    }

    @ApiOperation(value = "杨家坪定制页面-志愿服务", response = BigScreenVolunteerStatisticsInfo.class)
    @GetMapping("/volunteer/base")
    public R getVolunteerBaseData() {
        return communityService.getVolunteerBaseData(this.getCommunityId());
    }

    @ApiOperation(value = "杨家坪定制页面-志愿者积分排行榜", response = ComActIntegralCommunityRankVO.class)
    @PostMapping("/volunteer/rank")
    public R getIntegralCommunityRank(@RequestBody ComActIntegralCommunityRankDTO communityRankDTO) {
        communityRankDTO.setType(3);
        communityRankDTO.setCommunityId(this.getCommunityId());
        return communityService.getIntegralCommunityRankApplets(communityRankDTO);
    }
}

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

@@ -96,6 +96,12 @@
        return communityService.pageBuildingAdmin(pageBuildingListDto);
    }

    @ApiOperation(value = "根据小区id查询楼栋列表")
    @GetMapping("/getBuildList")
    public R getBuildListByVillageId(@RequestParam(value = "villageId") Long villageId) {
        return communityService.getBuildListByVillageId(villageId);
    }

    @ApiOperation(value = "楼栋列表表头统计", response = BuildingListHeaderStatisticsAdminVo.class)
    @GetMapping("/header/statistics")
    public R headerStatistics() {

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

@@ -42,7 +42,12 @@
    @ApiOperation(value = "分页查询所有数据",response = ComActColumnVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        commonPage.setCommunityId(this.getCommunityId());
        if(this.getLoginUserInfo().getStreetId()!=null){
            commonPage.setStreetId(this.getLoginUserInfo().getStreetId());
        }
        else {
            commonPage.setCommunityId(this.getCommunityId());
        }
        return this.communityService.comActColumnSelectAll(commonPage);
    }

@@ -67,8 +72,15 @@
    @ApiOperation("新增数据")
    @PostMapping
    public R insert(@RequestBody ComActColumnVO comActColumnVO) {
        comActColumnVO.setCommunityId(this.getCommunityId());
        comActColumnVO.setStatus(1);
        if(this.getLoginUserInfo().getStreetId()!=null){
            comActColumnVO.setStreetId(this.getLoginUserInfo().getStreetId());
        }
        else {
            comActColumnVO.setCommunityId(this.getCommunityId());
        }
        if(comActColumnVO.getStatus()==null){
            comActColumnVO.setStatus(1);
        }
        comActColumnVO.setCreateTime(new Date());
        if(StringUtils.isNotEmpty(this.getLoginUserInfo().getName())){
            comActColumnVO.setCreateBy(this.getLoginUserInfo().getName());
@@ -110,6 +122,12 @@
    @ApiOperation("项目分类级联查询")
    @PostMapping("/queryLevel")
    public R queryLevel(@RequestBody ComActColumnVO comActColumnVO){
        if(this.getLoginUserInfo().getStreetId()!=null){
            comActColumnVO.setStreetId(this.getLoginUserInfo().getStreetId());
        }
        else {
            comActColumnVO.setCommunityId(this.getCommunityId());
        }
        return this.communityService.queryLevel(comActColumnVO);
    }
}

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

@@ -40,6 +40,12 @@
    @ApiOperation(value = "分页查询所有数据",response = ComActSocialMemberVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        if(this.getLoginUserInfo().getStreetId()!=null){
            commonPage.setStreetId(this.getLoginUserInfo().getStreetId());
        }
        else {
            commonPage.setCommunityId(this.getCommunityId());
        }
        return this.communityService.comActSocialMemberSelectAll(commonPage);
    }

@@ -64,6 +70,7 @@
    @ApiOperation("新增数据")
    @PostMapping
    public R insert(@RequestBody ComActSocialMemberVO comActSocialMember) {
        comActSocialMember.setCommunityId(this.getCommunityId());
        return this.communityService.comActSocialMemberInsert(comActSocialMember);
    }
    /**

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

@@ -64,7 +64,6 @@
    @ApiOperation("新增数据")
    @PostMapping
    public R insert(@RequestBody ComActSocialProjectMemberVO comActSocialProjectMemberVO) {
        comActSocialProjectMemberVO.setCommunityId(this.getCommunityId());
        return communityService.insertComActSocialProjectMember(comActSocialProjectMemberVO);
    }
    /**
@@ -76,7 +75,6 @@
    @ApiOperation("批量新增数据")
    @PostMapping("/batch")
    public R insertBatch(@RequestBody ComActSocialProjectMemberVO comActSocialMember) {
        comActSocialMember.setCommunityId(this.getCommunityId());
        return this.communityService.comActSocialMemberInsertBatch(comActSocialMember);
    }


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

@@ -89,7 +89,12 @@
    @GetMapping()
    @ApiOperation(value = "查询社工", response= ComActSocialWorkerVO.class)
    R query(@Validated @ModelAttribute PageComActSocialWorkerDTO pageComActSocialWorkerDTO){
        pageComActSocialWorkerDTO.setCommunityId(this.getCommunityId());
        if(this.getLoginUserInfo().getStreetId()!=null){
            pageComActSocialWorkerDTO.setStreetId(this.getLoginUserInfo().getStreetId().toString());
        }
        else {
            pageComActSocialWorkerDTO.setCommunityId(this.getCommunityId());
        }
        return communityService.queryComactsocialworker(pageComActSocialWorkerDTO);
    }

@@ -111,7 +116,7 @@
     */
    @GetMapping("/{id}")
    @ApiOperation(value = "查询社工详细信息")
    R<ComActSocialWorkerDetailsVO> details(@PathVariable("id") Long id){
    R<ComActSocialWorkerVO> details(@PathVariable("id") Long id){
        return communityService.comActSocialWorkerDetails(id);
    }


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

New file
@@ -0,0 +1,235 @@
package com.panzhihua.community_backstage.api;

import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.write.metadata.WriteSheet;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.alibaba.fastjson.JSONArray;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.listen.ComMngPopulationServeExcelListen;
import com.panzhihua.common.listen.ComPbCheckUnitExcelListen;
import com.panzhihua.common.model.dtos.FtpConfig;
import com.panzhihua.common.model.dtos.common.AddComPbCheckUnitDto;
import com.panzhihua.common.model.dtos.common.EditComPbCheckUnitDto;
import com.panzhihua.common.model.dtos.common.PageComPbCheckUnitDto;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.common.ComPbCheckUnitVo;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitErrorExcelVO;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitExcelVO;
import com.panzhihua.common.service.partybuilding.ComPbCheckUnitFeign;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.SFTPUtil;
import com.panzhihua.community_backstage.config.SFTPConfig;
import com.panzhihua.community_backstage.excel.CustomSheetWriteHandler;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.data.redis.core.ValueOperations;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

/**
 * title: 党建-报到单位(ComPbCheckUnit)  控制层
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 党建-报到单位
 *
 * @author lyq
 * @date 2022-02-16 16:22:18
 */

@Slf4j
@Api(tags = {"党建-报到单位"})
@RestController
@RequestMapping("/checkUnit")
public class ComPbCheckUnitApi extends BaseController {

    @Resource
    private ComPbCheckUnitFeign comPbCheckUnitService;
    @Resource
    private StringRedisTemplate stringRedisTemplate;
    @Resource
    private SFTPConfig sftpConfig;

    /**
     * description  queryByPage  分页查询
     *
     * @param comPbCheckUnit 请求参数
     * @return 分页查询返回参数
     * @author lyq
     * @date 2022-02-16 16:22:18
     */
    @ApiOperation(value = "分页查询报道单位", response = ComPbCheckUnitVo.class)
    @PostMapping("/page")
    public R queryByPage(@RequestBody PageComPbCheckUnitDto comPbCheckUnit) {
        comPbCheckUnit.setCommunityId(this.getCommunityId());
        return this.comPbCheckUnitService.queryByPage(comPbCheckUnit);
    }

    /**
     * description  add  新增数据
     *
     * @param comPbCheckUnit 请求参数
     * @return 新增结果
     * @author lyq
     * @date 2022-02-16 16:22:18
     */
    @ApiOperation(value = "新增报道单位")
    @PostMapping("/add")
    public R add(@RequestBody AddComPbCheckUnitDto comPbCheckUnit) {
        comPbCheckUnit.setCommunityId(this.getCommunityId());
        comPbCheckUnit.setCreateBy(this.getUserId());
        comPbCheckUnit.setCreateAt(new Date());
        return this.comPbCheckUnitService.insert(comPbCheckUnit);
    }

    /**
     * description  edit  编辑数据
     *
     * @param comPbCheckUnit 请求参数
     * @return 编辑结果
     * @author lyq
     * @date 2022-02-16 16:22:18
     */
    @ApiOperation(value = "编辑报道单位")
    @PutMapping("/edit")
    public R edit(@RequestBody EditComPbCheckUnitDto comPbCheckUnit) {
        comPbCheckUnit.setCommunityId(this.getCommunityId());
        comPbCheckUnit.setUpdateBy(this.getUserId());
        comPbCheckUnit.setUpdateAt(new Date());
        return this.comPbCheckUnitService.update(comPbCheckUnit);
    }

    /**
     * description  deleteById  删除数据
     *
     * @param id 主键id
     * @return 删除结果
     * @author lyq
     * @date 2022-02-16 16:22:18
     */
    @ApiOperation(value = "删除报道单位")
    @GetMapping("/delete")
    public R deleteById(@RequestParam("id") Long id) {
        return this.comPbCheckUnitService.deleteById(id);
    }

    /**
     * description  detailById  查询详情
     *
     * @param id 主键id
     * @return 详情数据
     * @author lyq
     * @date 2022-02-16 16:22:18
     */
    @ApiOperation(value = "查询报道单位", response = ComPbCheckUnitVo.class)
    @GetMapping("/detail")
    public R detailById(@RequestParam("id") Long id) {
        return this.comPbCheckUnitService.detailById(id);
    }

    /**
     * description  queryByPage  查询列表
     *
     * @param comPbCheckUnit 请求参数
     * @return 列表数据
     * @author lyq
     * @date 2022-02-16 16:22:18
     */
    @ApiOperation(value = "查询报道单位列表", response = ComPbCheckUnitVo.class)
    @PostMapping("/list")
    public R queryByList(@RequestBody PageComPbCheckUnitDto comPbCheckUnit) {
        comPbCheckUnit.setCommunityId(this.getCommunityId());
        return this.comPbCheckUnitService.queryByList(comPbCheckUnit);
    }

    @ApiOperation(value = "批量新增党员报道单位导入excel")
    @PostMapping(value = "/import", consumes = "multipart/*", headers = "content-type=multipart/form-date")
    public R downloadTemplate(@RequestParam MultipartFile file, HttpServletRequest request) {
        log.info("传入文件名字【{}】", file.getOriginalFilename());
        InputStream inputStream = null;
        try {
            inputStream = file.getInputStream();
            EasyExcel.read(inputStream, null,
                    new ComPbCheckUnitExcelListen(comPbCheckUnitService,this.getCommunityId(),this.getUserId(),stringRedisTemplate)).sheet().doRead();
        } catch (IOException e) {
            e.printStackTrace();
            log.error("导入模板失败【{}】", e.getMessage());
        }
        return R.ok();
    }

    @ApiOperation(value = "下载导入失败党员报道单位数据")
    @GetMapping("/download/error/populationDrug")
    public R downloadErrorDrugPopulation(@RequestParam(value = "key") String key) {
        List<ComPbCheckUnitErrorExcelVO> list = new ArrayList<>();
        Boolean isExits = stringRedisTemplate.hasKey(key);
        ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
        if (isExits) {
            String json = valueOperations.get(key);
            list = JSONArray.parseArray(json, ComPbCheckUnitErrorExcelVO.class);
        }
        String ftpUrl = "/mnt/data/web/excel/";
        String nowDate = DateUtils.getCurrentDateString();
        String name = "党员报道单位错误数据" + nowDate + ".xlsx";
        try {
            SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(), sftpConfig.getPort());
            sftp.login();
            boolean existDir = sftp.isExistDir(ftpUrl + name);
            if (!existDir) {
                String property = System.getProperty("user.dir");
                String fileName = property + File.separator + name;
                // 这里 需要指定写用哪个class去写
                ExcelWriter excelWriter = null;
                InputStream inputStream = null;
                try {
                    excelWriter = EasyExcel.write(fileName, ComPbCheckUnitErrorExcelVO.class)
                            .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                            .registerWriteHandler(new CustomSheetWriteHandler()).build();
                    WriteSheet writeSheet = EasyExcel.writerSheet("党员报道单位错误数据").build();
                    excelWriter.write(list, writeSheet);
                    excelWriter.finish();
                    File file = new File(fileName);
                    inputStream = new FileInputStream(file);
                    sftp.uploadMore(ftpUrl, name, inputStream);
                    sftp.logout();
                    inputStream.close();
                    String absolutePath = file.getAbsolutePath();
                    boolean delete = file.delete();
                    log.info("删除excel【{}】结果【{}】", absolutePath, delete);
                } finally {
                    // 千万别忘记finish 会帮忙关闭流
                    if (inputStream != null) {
                        inputStream.close();
                    }
                    if (excelWriter != null) {
                        excelWriter.finish();
                    }
                }
            }
            return R.ok(sftpConfig.getExcelUrl() + name);
        } catch (Exception e) {
            e.printStackTrace();
            log.error("文件传输失败【{}】", e.getMessage());
            return R.fail();
        }
    }

    @ApiOperation(value = "党员双报到单位-下载模板")
    @GetMapping("/export/elder")
    public R exportElder() {
        return R.ok(sftpConfig.getExcelUrl() + "党员双报到单位导入模板.xlsx");
    }
}

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

@@ -1071,7 +1071,7 @@

    @ApiOperation(value = "查询微心愿处理人列表接口")
    @GetMapping("wish/handle/list")
    @ApiImplicitParam(name = "type", value = "处理人类型（1.后台用户  2.党员  3.志愿者）", required = true)
    @ApiImplicitParam(name = "type", value = "处理人类型（1.后台用户  2.党员  3.志愿者 4.社工 5.四长四员）", required = true)
    public R wishHandleListAdmin(@RequestParam("type") Integer type) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        if (loginUserInfo == null) {

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

@@ -385,8 +385,13 @@
    @ApiOperation(value = "分页展示志愿者")
    @PutMapping("pagevolunteer")
    public R pageVolunteer(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO) {
        Long communityId = this.getCommunityId();
        comMngVolunteerMngVO.setCommunityId(communityId);
        if(this.getLoginUserInfo().getStreetId()!=null){
            comMngVolunteerMngVO.setStreetId(this.getLoginUserInfo().getStreetId());
        }
        else {
            comMngVolunteerMngVO.setCommunityId(this.getCommunityId());
        }

        return communityService.pageVolunteer(comMngVolunteerMngVO);
    }


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

@@ -11,10 +11,24 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import com.panzhihua.common.listen.ComPbCheckUnitExcelListen;
import com.panzhihua.common.listen.ComPbMemberRoleExcelListen;
import com.panzhihua.common.model.dtos.partybuilding.ComDataStatisticsOrgDto;
import com.panzhihua.common.model.dtos.partybuilding.PageComDataStatisticsMemberDto;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveMakeRightExcelAdminVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveMakeRightStatisticsAdminVO;
import com.panzhihua.common.model.vos.partybuilding.excel.ComDataStatisticsMemberExcelVo;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitErrorExcelVO;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbMemberRoleErrorExcelVo;
import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
import com.panzhihua.common.service.partybuilding.ComDataStatisticsFeign;
import com.panzhihua.community_backstage.config.MinioUtil;
import com.panzhihua.community_backstage.config.SFTPConfig;
import org.apache.commons.io.FilenameUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.data.redis.core.ValueOperations;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -92,9 +106,15 @@
    private int port;
    @Value("${ftp.url}")
    private String url;
    @Resource
    private SFTPConfig sftpConfig;
    @Resource
    private StringRedisTemplate stringRedisTemplate;

    @Resource
    private MinioUtil minioUtil;
    @Resource
    private ComDataStatisticsFeign dataStatisticsService;

    @ApiOperation(value = "社区所有启用的党组织列表", response = PartyOrganizationVO.class)
    @GetMapping("listpartyorganization")
@@ -104,13 +124,22 @@
        return partyBuildingService.listPartyOrganization(communityId);
    }

    @ApiOperation(value = "社区所有党组织列表", response = PartyOrganizationVO.class)
    @ApiOperation(value = "分页查询社区所有党组织列表", response = PartyOrganizationVO.class)
    @PostMapping("listpartyorganizationAll")
    public R listPartyOrganizationAll(@RequestBody PartyOrganizationVO partyOrganizationVO) {
        Long communityId = this.getCommunityId();
        partyOrganizationVO.setCommunityId(communityId);
        log.info("社区所有党组织社区id【{}】", communityId);
        return partyBuildingService.listPartyOrganizationAll(partyOrganizationVO);
    }

    @ApiOperation(value = "查询社区所有党组织列表", response = PartyOrganizationVO.class)
    @PostMapping("getPbOrgAllList")
    public R getPbOrgAllList(@RequestBody PartyOrganizationVO partyOrganizationVO) {
        Long communityId = this.getCommunityId();
        partyOrganizationVO.setCommunityId(communityId);
        log.info("社区所有党组织社区id【{}】", communityId);
        return partyBuildingService.getPbOrgAllList(partyOrganizationVO);
    }

    @OperLog(operModul = "党支部管理", operType = 1)
@@ -380,7 +409,11 @@
    public R addPartyCommittee(@RequestBody @Validated(AddGroup.class) PartyCommitteeVO partyCommitteeVO) {
        Long communityId = this.getCommunityId();
        partyCommitteeVO.setCommunityId(communityId);
        return partyBuildingService.addPartyCommittee(partyCommitteeVO);
        R r = partyBuildingService.addPartyCommittee(partyCommitteeVO);
        if (R.isOk(r)) {
            R r1 = userService.updateUserIsPartymember(partyCommitteeVO.getIdCard());
        }
        return r;
    }

    @OperLog(operModul = "党委管理", operType = 2)
@@ -768,4 +801,157 @@
        return R.ok(urlList);
    }


    @ApiOperation(value = "党员数据统计-分页查询党员数据",response = ComDataStatisticsMemberVo.class)
    @PostMapping("/dataStatistics/member/page")
    public R pageDataStatisticsMember(@RequestBody PageComDataStatisticsMemberDto statisticsMemberDto) {
        statisticsMemberDto.setCommunityId(this.getCommunityId());
        return partyBuildingService.pageDataStatisticsMember(statisticsMemberDto);
    }

    @ApiOperation(value = "党员数据统计-根据党组织统计数据",response = ComDataStatisticsOrgVo.class)
    @PostMapping("/dataStatistics/org")
    public R getOrgDataStatistics(@RequestBody ComDataStatisticsOrgDto statisticsOrgDto) {
        statisticsOrgDto.setCommunityId(this.getCommunityId());
        return partyBuildingService.getOrgDataStatistics(statisticsOrgDto);
    }

    @ApiOperation(value = "党支部表头数据统计",response = ComDataStatisticsHeaderOrgVo.class)
    @GetMapping("/dataStatistics/header/org")
    public R getHeaderOrgDataStatistics() {
        return partyBuildingService.getHeaderOrgDataStatistics(this.getCommunityId());
    }

    @ApiOperation(value = "党员数据统计-导出党员数据")
    @PostMapping("/dataStatistics/member/export")
    public R exportDataStatisticsMember(@RequestBody PageComDataStatisticsMemberDto statisticsMemberDto) {
        statisticsMemberDto.setCommunityId(this.getCommunityId());
        String url = sftpConfig.getExcelUrl();
        String name = "党员数据统计-党员导出数据.xlsx";
        String ftpUrl = "/mnt/data/web/excel/";
        R r = partyBuildingService.exportDataStatisticsMember(statisticsMemberDto);
        if (R.isOk(r)) {
            List<ComDataStatisticsMemberExcelVo> resultList = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComDataStatisticsMemberExcelVo.class);
            try {
                SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(), sftpConfig.getPort());
                sftp.login();
                boolean existDir = sftp.isExistDir(ftpUrl + name);
                if (!existDir) {
                    String property = System.getProperty("user.dir");
                    String fileName = property + File.separator + name;
                    // 这里 需要指定写用哪个class去写
                    ExcelWriter excelWriter = null;
                    InputStream inputStream = null;
                    try {
                        excelWriter = EasyExcel.write(fileName, ComActReserveMakeRightExcelAdminVO.class)
                                .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                                .registerWriteHandler(new CustomSheetWriteHandler()).build();
                        WriteSheet writeSheet = EasyExcel.writerSheet("党员导出数据").build();
                        excelWriter.write(resultList, writeSheet);
                        excelWriter.finish();
                        File file = new File(fileName);
                        inputStream = new FileInputStream(file);
                        sftp.uploadMore(ftpUrl, name, inputStream);
                        sftp.logout();
                        inputStream.close();
                        String absolutePath = file.getAbsolutePath();
                        boolean delete = file.delete();
                        log.info("删除excel【{}】结果【{}】", absolutePath, delete);
                    } finally {
                        // 千万别忘记finish 会帮忙关闭流
                        if (inputStream != null) {
                            inputStream.close();
                        }
                        if (excelWriter != null) {
                            excelWriter.finish();
                        }
                    }
                }
                return R.ok(url + name);
            } catch (Exception e) {
                e.printStackTrace();
                log.error("文件传输失败【{}】", e.getMessage());
                return R.fail();
            }
        }
        return r;
    }

    @ApiOperation(value = "批量新增党委导入excel")
    @PostMapping(value = "/importPbMemberRole", consumes = "multipart/*", headers = "content-type=multipart/form-date")
    public R importPbMemberRole(@RequestParam MultipartFile file, HttpServletRequest request) {
        log.info("传入文件名字【{}】", file.getOriginalFilename());
        InputStream inputStream = null;
        try {
            inputStream = file.getInputStream();
            EasyExcel.read(inputStream, null,
                    new ComPbMemberRoleExcelListen(partyBuildingService,this.getCommunityId(),this.getUserId(),stringRedisTemplate)).sheet().doRead();
        } catch (IOException e) {
            e.printStackTrace();
            log.error("导入模板失败【{}】", e.getMessage());
        }
        return R.ok();
    }

    @ApiOperation(value = "下载导入失败党委数据")
    @GetMapping("/download/error/pbMemberRole")
    public R downloadErrorPbMemberRole(@RequestParam(value = "key") String key) {
        List<ComPbMemberRoleErrorExcelVo> list = new ArrayList<>();
        Boolean isExits = stringRedisTemplate.hasKey(key);
        ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
        if (isExits) {
            String json = valueOperations.get(key);
            list = JSONArray.parseArray(json, ComPbMemberRoleErrorExcelVo.class);
        }
        String ftpUrl = "/mnt/data/web/excel/";
        String nowDate = DateUtils.getCurrentDateString();
        String name = "党委导入错误数据" + nowDate + ".xlsx";
        try {
            SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(), sftpConfig.getPort());
            sftp.login();
            boolean existDir = sftp.isExistDir(ftpUrl + name);
            if (!existDir) {
                String property = System.getProperty("user.dir");
                String fileName = property + File.separator + name;
                // 这里 需要指定写用哪个class去写
                ExcelWriter excelWriter = null;
                InputStream inputStream = null;
                try {
                    excelWriter = EasyExcel.write(fileName, ComPbMemberRoleErrorExcelVo.class)
                            .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                            .registerWriteHandler(new CustomSheetWriteHandler()).build();
                    WriteSheet writeSheet = EasyExcel.writerSheet("党委导入错误数据").build();
                    excelWriter.write(list, writeSheet);
                    excelWriter.finish();
                    File file = new File(fileName);
                    inputStream = new FileInputStream(file);
                    sftp.uploadMore(ftpUrl, name, inputStream);
                    sftp.logout();
                    inputStream.close();
                    String absolutePath = file.getAbsolutePath();
                    boolean delete = file.delete();
                    log.info("删除excel【{}】结果【{}】", absolutePath, delete);
                } finally {
                    // 千万别忘记finish 会帮忙关闭流
                    if (inputStream != null) {
                        inputStream.close();
                    }
                    if (excelWriter != null) {
                        excelWriter.finish();
                    }
                }
            }
            return R.ok(sftpConfig.getExcelUrl() + name);
        } catch (Exception e) {
            e.printStackTrace();
            log.error("文件传输失败【{}】", e.getMessage());
            return R.fail();
        }
    }

    @ApiOperation(value = "社区党委-下载导入模板")
    @GetMapping("/export/pbMemberRole")
    public R exportElder() {
        return R.ok(sftpConfig.getExcelUrl() + "社区党委导入模板.xlsx");
    }
}

 springcloud_k8s_panzhihuazhihuishequ/grid_app/grid_app.iml

File was deleted

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java

@@ -373,4 +373,124 @@
    public R projectType(@RequestParam("name") String name){
        return bigScreenStatisticsService.projectType(name);
    }

    /**
     * 金沙定制页面-党建引领基础数据
     * @param communityId
     * @return
     */
    @GetMapping("/partyBuildIng/base")
    public R getPartyBuildIngBaseData(@RequestParam("communityId") Long communityId) {
        return bigScreenStatisticsService.getPartyBuildIngBaseData(communityId);
    }

    /**
     * 党员活动展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/partyBuildIng/partyAct")
    public R pagePartyBuildIngAct(@RequestBody PageBaseDTO pageBaseDTO) {
        return bigScreenStatisticsService.pagePartyBuildIngAct(pageBaseDTO);
    }

    /**
     * 议事投票展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/partyBuildIng/discuss")
    public R pagePartyBuildIngDiscuss(@RequestBody PageBaseDTO pageBaseDTO) {
        return bigScreenStatisticsService.pagePartyBuildIngDiscuss(pageBaseDTO);
    }

    /**
     * 金沙定制页面-四长四员
     * @param communityId
     * @return
     */
    @GetMapping("/fourMember/base")
    public R getFourMemberBaseData(@RequestParam("communityId") Long communityId) {
        return bigScreenStatisticsService.getFourMemberBaseData(communityId);
    }

    /**
     * 杨家坪定制页面-五微服务
     * @param communityId
     * @return
     */
    @GetMapping("/fms/base")
    public R getFmsBaseData(@RequestParam("communityId") Long communityId) {
        return bigScreenStatisticsService.getFmsBaseData(communityId);
    }

    /**
     * 杨家坪定制页面-微团队展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/fms/team")
    public R pageFmsTeam(@RequestBody PageBaseDTO pageBaseDTO) {
        return bigScreenStatisticsService.pageFmsTeam(pageBaseDTO);
    }

    /**
     * 杨家坪定制页面-居家养老基础数据
     * @param communityId
     * @return
     */
    @GetMapping("/alarm/base")
    public R getAlarmBaseData(@RequestParam("communityId") Long communityId) {
        return bigScreenStatisticsService.getAlarmBaseData(communityId);
    }

    /**
     * 杨家坪定制页面-报警记录展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/alarm/record")
    public R pageAlarmRecord(@RequestBody PageBaseDTO pageBaseDTO) {
        return bigScreenStatisticsService.pageAlarmRecord(pageBaseDTO);
    }

    /**
     * 杨家坪定制页面-报警设备点位图
     * @param communityId
     * @return
     */
    @GetMapping("/alarm/pointMap")
    public R getAlarmPointMap(@RequestParam("communityId") Long communityId) {
        return bigScreenStatisticsService.getAlarmPointMap(communityId);
    }

    /**
     * 杨家坪定制页面-志愿服务
     * @param communityId
     * @return
     */
    @GetMapping("/volunteer/base")
    public R getVolunteerBaseData(@RequestParam("communityId") Long communityId) {
        return bigScreenStatisticsService.getVolunteerBaseData(communityId);
    }

    /**
     * 金沙定制页面-志愿线展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/partyBuildIng/microWish")
    public R pagePartyBuildIngMicroWish(@RequestBody PageBaseDTO pageBaseDTO) {
        return bigScreenStatisticsService.pagePartyBuildIngMicroWish(pageBaseDTO);
    }

    /**
     * 金沙定制页面-四长四员解决问题展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/fourMember/resolve")
    public R pageFourMemberResolve(@RequestBody PageBaseDTO pageBaseDTO) {
        return bigScreenStatisticsService.pageFourMemberResolve(pageBaseDTO);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BuildingApi.java

@@ -115,4 +115,14 @@
    public R deleteBuildingHousePopulationAdmin(@RequestBody DeleteBuildingHousePopulationDto housePopulationDto) {
        return comActBuildingService.deleteBuildingHousePopulationAdmin(housePopulationDto);
    }

    /**
     * 根据小区id查询楼栋列表
     * @param villageId 小区id
     * @return  查询楼栋列表
     */
    @GetMapping("/getBuildListByVillageId")
    public R getBuildListByVillageId(@RequestParam("villageId") Long villageId) {
        return comActBuildingService.getBuildListByVillageId(villageId);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActEasyPhotoEvaluateController.java

New file
@@ -0,0 +1,111 @@
package com.panzhihua.service_community.api;

import com.panzhihua.service_community.service.ComActEasyPhotoEvaluateService;
import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.vos.R;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 * title: 随手拍、微心愿评价表(ComActEasyPhotoEvaluate)  表控制层
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 随手拍、微心愿评价表
 *
 * @author lyq
 * @date 2022-03-01 13:44:22
 */
@RestController
@RequestMapping("/comActEasyPhotoEvaluate")
public class ComActEasyPhotoEvaluateController {

    @Resource
    private ComActEasyPhotoEvaluateService comActEasyPhotoEvaluateService;

    /**
     * description  queryByPage  分页查询
     *
     * @param comActEasyPhotoEvaluate 请求参数
     * @return 分页查询返回参数
     * @author lyq
     * @date 2022-03-01 13:44:22
     */
    @PostMapping("/page")
    public R queryByPage(@RequestBody PageComActEasyPhotoEvaluateDto comActEasyPhotoEvaluate) {
        return this.comActEasyPhotoEvaluateService.queryByPage(comActEasyPhotoEvaluate);
    }

    /**
     * description  add  新增数据
     *
     * @param comActEasyPhotoEvaluate 请求参数
     * @return 新增结果
     * @author lyq
     * @date 2022-03-01 13:44:22
     */
    @PostMapping("/add")
    public R add(@RequestBody AddComActEasyPhotoEvaluateDto comActEasyPhotoEvaluate) {
        return this.comActEasyPhotoEvaluateService.insert(comActEasyPhotoEvaluate);
    }

    /**
     * description  edit  编辑数据
     *
     * @param comActEasyPhotoEvaluate 请求参数
     * @return 编辑结果
     * @author lyq
     * @date 2022-03-01 13:44:22
     */
    @PutMapping("/edit")
    public R edit(@RequestBody EditComActEasyPhotoEvaluateDto comActEasyPhotoEvaluate) {
        return this.comActEasyPhotoEvaluateService.update(comActEasyPhotoEvaluate);
    }

    /**
     * description  deleteById  删除数据
     *
     * @param id 主键id
     * @return 删除结果
     * @author lyq
     * @date 2022-03-01 13:44:22
     */
    @GetMapping("/delete")
    public R deleteById(@RequestParam("id") Long id) {
        return this.comActEasyPhotoEvaluateService.deleteById(id);
    }

    /**
     * description  detailById  查询详情
     *
     * @param id 主键id
     * @return 详情数据
     * @author lyq
     * @date 2022-03-01 13:44:22
     */
    @GetMapping("/detail")
    public R detailById(@RequestParam("id") Long id) {
        return this.comActEasyPhotoEvaluateService.detailById(id);
    }

    /**
     * description  queryByPage  查询列表
     *
     * @param comActEasyPhotoEvaluate 请求参数
     * @return 列表数据
     * @author lyq
     * @date 2022-03-01 13:44:22
     */
    @PostMapping("/list")
    public R queryByList(@RequestBody PageComActEasyPhotoEvaluateDto comActEasyPhotoEvaluate) {
        return this.comActEasyPhotoEvaluateService.queryByList(comActEasyPhotoEvaluate);
    }

    @PostMapping("/easy/evaluate")
    public R evaluateEasyApplets(@RequestBody EvaluateEasyDto whistleDto){
        return this.comActEasyPhotoEvaluateService.evaluateEasyApplets(whistleDto);
    }

}


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActEasyPhotoHandlerController.java

New file
@@ -0,0 +1,106 @@
package com.panzhihua.service_community.api;

import com.panzhihua.service_community.service.ComActEasyPhotoHandlerService;
import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.vos.R;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 * title: 随手拍、微心愿处理人绑定表(ComActEasyPhotoHandler)  表控制层
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 随手拍、微心愿处理人绑定表
 *
 * @author lyq
 * @date 2022-03-01 13:45:10
 */
@RestController
@RequestMapping("/comActEasyPhotoHandler")
public class ComActEasyPhotoHandlerController {

    @Resource
    private ComActEasyPhotoHandlerService comActEasyPhotoHandlerService;

    /**
     * description  queryByPage  分页查询
     *
     * @param comActEasyPhotoHandler 请求参数
     * @return 分页查询返回参数
     * @author lyq
     * @date 2022-03-01 13:45:10
     */
    @PostMapping("/page")
    public R queryByPage(@RequestBody PageComActEasyPhotoHandlerDto comActEasyPhotoHandler) {
        return this.comActEasyPhotoHandlerService.queryByPage(comActEasyPhotoHandler);
    }

    /**
     * description  add  新增数据
     *
     * @param comActEasyPhotoHandler 请求参数
     * @return 新增结果
     * @author lyq
     * @date 2022-03-01 13:45:10
     */
    @PostMapping("/add")
    public R add(@RequestBody AddComActEasyPhotoHandlerDto comActEasyPhotoHandler) {
        return this.comActEasyPhotoHandlerService.insert(comActEasyPhotoHandler);
    }

    /**
     * description  edit  编辑数据
     *
     * @param comActEasyPhotoHandler 请求参数
     * @return 编辑结果
     * @author lyq
     * @date 2022-03-01 13:45:10
     */
    @PutMapping("/edit")
    public R edit(@RequestBody EditComActEasyPhotoHandlerDto comActEasyPhotoHandler) {
        return this.comActEasyPhotoHandlerService.update(comActEasyPhotoHandler);
    }

    /**
     * description  deleteById  删除数据
     *
     * @param id 主键id
     * @return 删除结果
     * @author lyq
     * @date 2022-03-01 13:45:10
     */
    @GetMapping("/delete")
    public R deleteById(@RequestParam("id") Long id) {
        return this.comActEasyPhotoHandlerService.deleteById(id);
    }

    /**
     * description  detailById  查询详情
     *
     * @param id 主键id
     * @return 详情数据
     * @author lyq
     * @date 2022-03-01 13:45:10
     */
    @GetMapping("/detail")
    public R detailById(@RequestParam("id") Long id) {
        return this.comActEasyPhotoHandlerService.detailById(id);
    }

    /**
     * description  queryByPage  查询列表
     *
     * @param comActEasyPhotoHandler 请求参数
     * @return 列表数据
     * @author lyq
     * @date 2022-03-01 13:45:10
     */
    @PostMapping("/list")
    public R queryByList(@RequestBody PageComActEasyPhotoHandlerDto comActEasyPhotoHandler) {
        return this.comActEasyPhotoHandlerService.queryByList(comActEasyPhotoHandler);
    }

}


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActRaffleRecordApi.java

@@ -69,7 +69,7 @@
     */
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return R.ok(this.comActRaffleRecordService.selectById(id));
        return this.comActRaffleRecordService.selectById(id);
    }

    /**
@@ -93,6 +93,10 @@
     */
    @PostMapping("/update")
    public R update(@RequestBody ComActRaffleRecordVO comActRaffleRecordVO) {
        ComActRaffleRecord comActRaffleRecord1=comActRaffleRecordService.getById(comActRaffleRecordVO.getId());
        if(comActRaffleRecord1.getStatus().equals(comActRaffleRecordVO.getStatus())){
            return R.fail("不可重复核销");
        }
        ComActRaffleRecord comActRaffleRecord=new ComActRaffleRecord();
        BeanUtils.copyProperties(comActRaffleRecordVO,comActRaffleRecord);
        return R.ok(this.comActRaffleRecordService.updateById(comActRaffleRecord));

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialProjectMemberApi.java

@@ -91,6 +91,6 @@

    @PostMapping("/batch")
    public R insertBatch(@RequestBody ComActSocialProjectMemberVO comActSocialProjectMemberVO){
        return R.ok(this.comActSocialProjectMemberService.insertBatch(comActSocialProjectMemberVO));
        return this.comActSocialProjectMemberService.insertBatch(comActSocialProjectMemberVO);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialWorkerApi.java

@@ -79,7 +79,7 @@
     * @return 查找结果
     */
    @PostMapping("/{id}")
    R<ComActSocialWorkerDetailsVO> comActSocialWorkerDetails(@PathVariable("id") Long id){
    R<ComActSocialWorkerVO> comActSocialWorkerDetails(@PathVariable("id") Long id){
        return comActSocialWorkerService.comActSocialWorkerDetails(id);
    }


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java

@@ -271,10 +271,12 @@
                    }
                    comActActivityVO1.setComActActPrizeVOList(comActActPrizeVOList);
                    Integer volunteerMax = comActActivityVO1.getVolunteerMax();
                    if (volunteerMax.intValue() != 0) {
                        comActActivityVO1.setType(1);
                    } else {
                        comActActivityVO1.setType(2);
                    if(comActActivityVO1.getType()==null){
                        if (volunteerMax.intValue() != 0) {
                            comActActivityVO1.setType(1);
                        } else {
                            comActActivityVO1.setType(2);
                        }
                    }
                    fillActivitySignList(id, comActActivityVO1);
                });
@@ -1398,8 +1400,8 @@
     */
    @PostMapping("listactivity")
    public R listActivity(@RequestParam("userId") Long userId,
                          @RequestParam(value = "status", required = false) Integer status) {
        return comActActivityService.listActivity(userId, status);
                          @RequestParam(value = "status", required = false) Integer status,@RequestParam(value = "type", required = false) Integer type) {
        return comActActivityService.listActivity(userId, status,type);
    }

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java

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

import com.panzhihua.common.model.vos.community.*;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -15,7 +14,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityListDTO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.ComActActivityStatisticsVO;
import com.panzhihua.common.model.vos.community.ComActActivityTypeVO;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.community.CommunityActivitiesVO;
import com.panzhihua.common.model.vos.community.PartyActivityStatics;
import com.panzhihua.common.model.vos.community.PartyActivityTypeChart;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import com.panzhihua.common.model.vos.community.screen.work.ActActivityListVO;
import com.panzhihua.common.model.vos.screen.CarouselInfoVO;
import com.panzhihua.service_community.model.dos.ComActActivityDO;
@@ -43,7 +48,7 @@
        + "a.`status`, " + "a.is_qr_code, " + "a.publish_at, " + "a.begin_at, " + "a.cover, " + "a.end_at, " + "a.volunteer_max, "
        + "count(if(s.is_volunteer=1,s.id,null))volunteer_now, "
        + "count(if(s.is_volunteer=0,s.id,null))participant_now, " + "a.participant_max, " + "a.sign_up_begin, "
        + "a.sign_up_end, " + "ca.name as communityName  " + "FROM " + "com_act_activity a  "
        + "a.sign_up_end, " + "ca.name as communityName,a.type  " + "FROM " + "com_act_activity a  "
        + "left join sys_user u on a.sponsor_id=u.user_id " + "left join (select * from com_act_act_sign where `status` = 1) s on a.id=s.activity_id  "
        + "left join com_act ca on a.community_id=ca.community_id  " + " where 1=1 " +

@@ -63,7 +68,7 @@
        + "AND a.begin_at <![CDATA[ >= ]]> #{comActActivityVO.beginAt} AND a.end_at <![CDATA[ <= ]]> #{comActActivityVO.endAt}  "
        + " </if> " + "<if test='comActActivityVO.type != null'>"
        + "AND a.type=#{comActActivityVO.type} " + " </if> "
        + " group by a.id " + " order by a.status asc,a.publish_at desc " + "</script>")
        + " group by a.id " + " ORDER BY a.status = 99 desc,a.publish_at DESC " + "</script>")
    IPage<ComActActivityVO> pageActivity(Page page, @Param("comActActivityVO") ComActActivityVO comActActivityVO);

//    @Select("SELECT  " + "u.name sponsorName, " + "ca.name communityName, "

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java

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

import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.vos.community.ComActDiscussVO;
import com.panzhihua.common.model.vos.community.ComSwPatrolRecordVO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenPartyBuildIngStatisticsInfo;
import com.panzhihua.common.model.vos.partybuilding.PartyBuildingActivityVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -85,4 +89,42 @@
    StatisticsCommVO getDynTotalPolylineDate(@Param("communityId") Long communityId, @Param("date") String date);

    IPage<ComActDynVO> indexDynList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);

    /**
     * 获取党建引领基础数据
     * @param communityId
     * @return
     */
    BigScreenPartyBuildIngStatisticsInfo getPartyBuildIngBaseData(@Param("communityId") Long communityId);

    /**
     * 分页获取党员活动
     * @param pageBaseDTO
     * @return
     */
    IPage<PartyBuildingActivityVO> pagePartyBuildIngAct(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);

    /**
     * 分页获取议事投票数据
     * @param page
     * @param pageBaseDTO
     * @return
     */
    IPage<ComActDiscussVO> pagePartyBuildIngDiscuss(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);

    /**
     * 获取居民宣传记录
     * @param communityId
     * @param pageSize
     * @return
     */
    List<ComActDynVO> getPartyBuildIngDynRecord(@Param("communityId") Long communityId, @Param("pageSize") Integer pageSize);

    /**
     * 获取巡查记录
     * @param communityId
     * @param pageSize
     * @return
     */
    List<ComSwPatrolRecordVO> getPartyBuildIngPatrolRecord(@Param("communityId") Long communityId, @Param("pageSize") Integer pageSize);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java

@@ -216,6 +216,9 @@
            "p.urban_status, " +
            "p.img_width, " +
            "p.img_height, " +
            "p.evaluate_date, " +
            "caepe.score," +
            "caepe.`content`, " +
            "p.handle_photo_list " +
            "FROM " +
            "com_act_easy_photo p " +
@@ -225,6 +228,7 @@
            "LEFT JOIN com_act_easy_photo_user pu on p.id=pu.easy_photo_id " +
            "LEFT JOIN com_act c on p.community_id=c.community_id " +
            "left join com_act_easy_photo_classify ca on ca.id = p.classify_id " +
            "left join com_act_easy_photo_evaluate as caepe on caepe.service_id = p.id and caepe.service_type = 1 " +
            "WHERE p.del_tag = 0 and p.id=#{id}")
    ComActEasyPhotoVO detailEasyPhoto(Long id);
    @Select("SELECT " +
@@ -409,4 +413,12 @@
     * @return
     */
    IPage<ComActEasyPhotoVO> indexEasyPhotoList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);

    /**
     * 随手拍治安防控记录列表
     * @param communityId
     * @param pageSize
     * @return
     */
    List<ComActEasyPhotoVO> getPartyBuildIngRecord(@Param("communityId") Long communityId, @Param("pageSize") Integer pageSize);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoEvaluateMapper.java

New file
@@ -0,0 +1,58 @@
package com.panzhihua.service_community.dao;

import com.panzhihua.service_community.entity.ComActEasyPhotoEvaluate;
import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.vos.common.*;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

import java.util.List;

/**
 * title: 随手拍、微心愿评价表表数据库访问层
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 随手拍、微心愿评价表表数据库访问层
 *
 * @author lyq
 * @date 2022-03-01 13:44:22
 */
@Mapper
public interface ComActEasyPhotoEvaluateMapper extends BaseMapper<ComActEasyPhotoEvaluate> {

    /**
     * description  detailById  查询详情
     *
     * @param id 主键id
     * @return 详情数据
     * @author lyq
     * @date 2022-03-01 13:44:22
     */
    ComActEasyPhotoEvaluateVo queryById(Long id);

    /**
     * description  queryAllByLimit  分页查询
     *
     * @param comActEasyPhotoEvaluate 请求参数
     * @param page                    分页参数
     * @return 分页查询列表数据
     * @author lyq
     * @date 2022-03-01 13:44:22
     */
    IPage<ComActEasyPhotoEvaluateVo> queryAllByLimit(@Param("dto") PageComActEasyPhotoEvaluateDto comActEasyPhotoEvaluate, Page page);

    /**
     * description  queryByPage  查询列表
     *
     * @param comActEasyPhotoEvaluate 请求参数
     * @return 列表数据
     * @author lyq
     * @date 2022-03-01 13:44:22
     */
    List<ComActEasyPhotoEvaluateVo> queryAllByList(@Param("dto") PageComActEasyPhotoEvaluateDto comActEasyPhotoEvaluate);
}


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoHandlerMapper.java

New file
@@ -0,0 +1,58 @@
package com.panzhihua.service_community.dao;

import com.panzhihua.service_community.entity.ComActEasyPhotoHandler;
import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.vos.common.*;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

import java.util.List;

/**
 * title: 随手拍、微心愿处理人绑定表表数据库访问层
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 随手拍、微心愿处理人绑定表表数据库访问层
 *
 * @author lyq
 * @date 2022-03-01 13:45:11
 */
@Mapper
public interface ComActEasyPhotoHandlerMapper extends BaseMapper<ComActEasyPhotoHandler> {

    /**
     * description  detailById  查询详情
     *
     * @param id 主键id
     * @return 详情数据
     * @author lyq
     * @date 2022-03-01 13:45:11
     */
    ComActEasyPhotoHandlerVo queryById(Long id);

    /**
     * description  queryAllByLimit  分页查询
     *
     * @param comActEasyPhotoHandler 请求参数
     * @param page                   分页参数
     * @return 分页查询列表数据
     * @author lyq
     * @date 2022-03-01 13:45:11
     */
    IPage<ComActEasyPhotoHandlerVo> queryAllByLimit(@Param("dto") PageComActEasyPhotoHandlerDto comActEasyPhotoHandler, Page page);

    /**
     * description  queryByPage  查询列表
     *
     * @param comActEasyPhotoHandler 请求参数
     * @return 列表数据
     * @author lyq
     * @date 2022-03-01 13:45:11
     */
    List<ComActEasyPhotoHandlerVo> queryAllByList(@Param("dto") PageComActEasyPhotoHandlerDto comActEasyPhotoHandler);
}


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActFourMemberDao.java

@@ -6,9 +6,13 @@
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.community.ComActCommiteeVO;
import com.panzhihua.common.model.vos.community.ComActFourMemberVO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenFourMemberStatisticsInfo;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComActFourMember;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * (ComActFourMember)表数据库访问层
@@ -27,4 +31,33 @@
    IPage<ComActFourMemberVO> pageList(Page page, @Param("commonPage")CommonPage commonPage);
    ComActFourMemberVO getById(Integer id);
    ComActFourMemberVO getByIdVillage(Integer id);

    /**
     * 获取四长四员基础数据
     * @param communityId
     * @return
     */
    BigScreenFourMemberStatisticsInfo getFourMemberBaseData(@Param("communityId") Long communityId);

    /**
     * 获取四长四员成员数据
     * @param communityId
     * @return
     */
    List<ComActFourMemberVO> getFourMembers(@Param("communityId") Long communityId);

    /**
     * 新增解决问题数统计
     * @param communityId
     * @return
     */
    List<StatisticsCommVO> retrieveJJWTAddPolylineData(@Param("communityId") Long communityId);

    /**
     * 累计解决问题数
     * @param communityId
     * @param date
     * @return
     */
    StatisticsCommVO retrieveJJWTTotalPolylineData(@Param("communityId") Long communityId, @Param("date") String date);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java

@@ -283,4 +283,20 @@
     * @return
     */
    IPage<ComActMicroWishVO> selectScreenDisplayList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);

    /**
     * 金沙定制页面-志愿线展示列表
     * @param page
     * @param pageBaseDTO
     * @return
     */
    IPage<ComActMicroWishVO> pagePartyBuildIngMicroWish(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);

    /**
     * 金沙定制页面-四长四员解决问题展示列表
     * @param page
     * @param pageBaseDTO
     * @return
     */
    IPage<ComActMicroWishVO> pageFourMemberResolve(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialWorkerDao.java

@@ -57,4 +57,10 @@
     */
    IPage<ComActSocialWorkerVO> selectActivity(Page page,@Param("id") Long id);

    /**
     * 查询社工详情
     * @param id
     * @return
     */
    ComActSocialWorkerVO selectOneById(Long id);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComFmsServiceDAO.java

@@ -5,10 +5,15 @@
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.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.fms.PageFmsServiceAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.PageFmsServiceAppletsDTO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenFmsStatisticsInfo;
import com.panzhihua.common.model.vos.community.fms.ComFmsServiceVO;
import com.panzhihua.common.model.vos.community.fms.ComFmsTeamVO;
import com.panzhihua.common.model.vos.community.fms.FmsServiceTopStatisticsVO;
import com.panzhihua.common.model.vos.grid.EventVO;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComFmsService;
@@ -94,4 +99,69 @@
     * @return
     */
    IPage<ComFmsServiceVO> pageDealFmsService(@Param("page") Page page, @Param("adminDTO") PageFmsServiceAppletsDTO adminDTO);

    /**
     * 获取五微服务基础数据
     * @param communityId
     * @return
     */
    BigScreenFmsStatisticsInfo getFmsBaseData(@Param("communityId") Long communityId);

    /**
     * 获取团队类型占比圆形图数据
     * @param communityId
     * @return
     */
    List<ComFmsTeamVO> retrieveTeamTypeCircleData(@Param("communityId") Long communityId);

    /**
     * 微服务新增折线数据
     * @param communityId
     * @return
     */
    List<StatisticsCommVO> retrieveServiceAddPolylineData(@Param("communityId") Long communityId);

    /**
     * 报事报修累计折线数据获取
     * @param communityId
     * @param date
     * @return
     */
    StatisticsCommVO retrieveServiceTotalPolylineData(@Param("communityId") Long communityId, @Param("date") String date);

    /**
     * 获取微调节矛盾类型占比圆形图数据
     * @param communityId
     * @return
     */
    List<EventVO> retrieveAdjustCircleData(@Param("communityId") Long communityId);

    /**
     * 新增解决矛盾折线数据
     * @param communityId
     * @return
     */
    List<StatisticsCommVO> retrieveAdjustAddPolylineData(@Param("communityId") Long communityId);

    /**
     * 累计解决矛盾折线数据
     * @param communityId
     * @param date
     * @return
     */
    StatisticsCommVO retrieveAdjustTotalPolylineData(@Param("communityId") Long communityId, @Param("date") String date);

    /**
     * 微防控防控类型占比圆形图数据
     * @param communityId
     * @return
     */
    List<EventVO> retrieveControlCircleData(@Param("communityId") Long communityId);

    /**
     * 杨家坪定制页面-微团队展示列表
     * @param pageBaseDTO
     * @return
     */
    IPage<ComFmsTeamVO> pageFmsTeam(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngBuildingDAO.java

@@ -92,4 +92,11 @@
                                                                @Param("relation") Integer relation, @Param("relationId") Integer relationId);

    List<ComMngVillageVO> buildingVillageListAdmin(@Param("communityId") Long communityId);

    /**
     * 根据小区id查询楼栋列表
     * @param villageId 小区id
     * @return  查询楼栋列表
     */
    List<PageBuildingListAdminVo> getBuildListByVillageId(Long villageId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java

@@ -434,7 +434,7 @@
    @Select("SELECT " + "(SELECT COUNT(aa.age) FROM "
        + "(SELECT (SELECT  TIMESTAMPDIFF(YEAR, cmp.birthday, CURDATE()) ) AS age FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE cmpct.community_id = ${communityId}) as aa where aa.age<= 18) as age16,"
        + "(SELECT COUNT(aa.age) FROM "
        + "(SELECT (SELECT  TIMESTAMPDIFF(YEAR, cmp.birthday, CURDATE()) ) AS age FROM com_mng_population_community_tags as capct left join com_mng_population as cmp on cmp.id = capct.population_id and capct.community_id =  #{communityId}) AS aa WHERE aa.age > 19 and aa.age<= 30) AS age27,"
        + "(SELECT (SELECT  TIMESTAMPDIFF(YEAR, cmp.birthday, CURDATE()) ) AS age FROM com_mng_population_community_tags as capct left join com_mng_population as cmp on cmp.id = capct.population_id and capct.community_id =  ${communityId}) AS aa WHERE aa.age > 19 and aa.age<= 30) AS age27,"
        + "(SELECT COUNT(aa.age) FROM "
        + "(SELECT (SELECT  TIMESTAMPDIFF(YEAR, cmp.birthday, CURDATE()) ) AS age FROM com_mng_population_community_tags as capct left join com_mng_population as cmp on cmp.id = capct.population_id and capct.community_id = ${communityId}) AS aa WHERE aa.age > 31 and aa.age<= 40) AS age35,"
        + "(SELECT COUNT(aa.age) FROM "

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVolunteerMngDAO.java

@@ -2,6 +2,8 @@

import java.util.List;

import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenVolunteerStatisticsInfo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -55,4 +57,45 @@
    @Select("select id_card from sys_user where type=1 and phone=#{idCard}")
    Long selectUserIdByIdCard(String idCard);

    /**
     * 志愿者-组织直方图数据
     * @param communityId
     * @return
     */
    List<StatisticsCommVO> retrieveVolunteerOrgHistogram(@Param("communityId") Long communityId);

    /**
     * 获取杨家坪定制页面-志愿服务基础数据
     * @param communityId
     * @return
     */
    BigScreenVolunteerStatisticsInfo getVolunteerBaseData(@Param("communityId") Long communityId);

    /**
     * 获取志愿者数据
     * @param communityId
     * @return
     */
    List<ComMngVolunteerMngVO> retrieveVolunteerServiceTypeCircleData(@Param("communityId") Long communityId);

    /**
     * 志愿者年龄段占比圆形图数据
     * @param communityId
     * @return
     */
    List<StatisticsCommVO> retrieveVolunteerAgeCircleData(@Param("communityId") Long communityId);

    /**
     * 志愿者技能占比圆形图
     * @param communityId
     * @return
     */
    List<ComMngVolunteerMngVO> retrieveVolunteerSkillCircleData(@Param("communityId") Long communityId);

    /**
     * 根据社区id查询志愿者
     * @param communityId
     * @return
     */
    List<ComMngVolunteerMngVO> selectVolunteerByCommunityId(@Param("communityId") Long communityId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPropertyDao.java

@@ -4,9 +4,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.community.ComActSocialOrgVO;
import com.panzhihua.common.model.vos.community.ComPropertyVO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenAlarmStatisticsInfo;
import com.panzhihua.common.model.vos.property.ComPropertyAlarmVO;
import com.panzhihua.common.model.vos.property.ComPropertyEquipmentVO;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComProperty;
import org.apache.ibatis.annotations.Param;
@@ -47,4 +49,59 @@
    List<StatisticsCommVO> getEventAddPolylineData(@Param("communityId") Long communityId);

    StatisticsCommVO getEventTotalPolylineDate(@Param("communityId") Long communityId, @Param("date") String date);

    /**
     * 杨家坪定制页面-居家养老基础数据
     * @param communityId
     * @return
     */
    BigScreenAlarmStatisticsInfo getAlarmBaseData(@Param("communityId") Long communityId);

    /**
     * 异常报警新增折线数据
     * @param communityId
     * @return
     */
    List<StatisticsCommVO> retrieveAbnormalAddPolylineData(@Param("communityId") Long communityId);

    /**
     * 异常报警累计折线数据
     * @param communityId
     * @param date
     * @return
     */
    StatisticsCommVO retrieveAbnormalTotalPolylineData(@Param("communityId") Long communityId, @Param("date") String date);

    /**
     * 一键求助服务新增折线数据
     * @param communityId
     * @return
     */
    List<StatisticsCommVO> retrieveServiceAddPolylineData(@Param("communityId") Long communityId);

    /**
     * 一键求助服务累计折线数据
     * @param communityId
     * @param date
     * @return
     */
    StatisticsCommVO retrieveServiceTotalPolylineData(@Param("communityId") Long communityId, @Param("date") String date);

    /**
     * 获取报警记录
     * @param page
     * @param type
     * @param status
     * @param communityId
     * @return
     */
    IPage<ComPropertyAlarmVO> getAbnormalList(@Param("page") Page page, @Param("type") Integer type,
                                              @Param("status") Integer status, @Param("communityId") Long communityId);

    /**
     * 获取报警设备点位图
     * @param communityId
     * @return
     */
    List<ComPropertyEquipmentVO> getAlarmPointMapData(@Param("communityId") Long communityId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActColumn.java

@@ -86,4 +86,6 @@

    private Long parentId;

    private Long streetId;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActEasyPhotoEvaluate.java

New file
@@ -0,0 +1,59 @@
package com.panzhihua.service_community.entity;

import java.util.Date;
import java.io.Serializable;

import lombok.Data;

/**
 * 随手拍、微心愿评价表(ComActEasyPhotoEvaluate)实体类
 *
 * @author lyq
 * @since 2022-03-01 13:44:23
 */
@Data
public class ComActEasyPhotoEvaluate implements Serializable {
    private static final long serialVersionUID = -10187231854376444L;
    /**
     * 主键id
     */
    private Long id;
    /**
     * 社区id
     */
    private Long communityId;
    /**
     * 业务记录id
     */
    private Long serviceId;
    /**
     * 用户id
     */
    private Long userId;
    /**
     * 评分
     */
    private Integer score;
    /**
     * 评价内容
     */
    private String content;
    /**
     * 创建时间
     */
    private Date createAt;
    /**
     * 业务分类（1.随手拍 2.微心愿）
     */
    private Integer serviceType;

    /**
     * 业务分类（1.随手拍 2.微心愿）
     */
    public interface ServiceType{
        int SSP = 1;
        int WXY = 2;
    }

}


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActEasyPhotoHandler.java

New file
@@ -0,0 +1,48 @@
package com.panzhihua.service_community.entity;

import java.io.Serializable;

import lombok.Data;

/**
 * 随手拍、微心愿处理人绑定表(ComActEasyPhotoHandler)实体类
 *
 * @author lyq
 * @since 2022-03-01 13:45:11
 */
@Data
public class ComActEasyPhotoHandler implements Serializable {
    private static final long serialVersionUID = -15137895736835383L;
    /**
     * 主键id
     */
    private Long id;
    /**
     * 社区id
     */
    private Long communityId;
    /**
     * 处理人id
     */
    private Long userId;
    /**
     * 业务id
     */
    private Long serviceId;
    /**
     * 人员类型（1.后台用户 2.党员 3.志愿者 4.社工 5.四长四员）
     */
    private Integer type;
    /**
     * 业务类型（1.随手拍 2.微心愿）
     */
    private Integer serviceType;
    /**
     * 业务分类（1.随手拍 2.微心愿）
     */
    public interface ServiceType{
        int SSP = 1;
        int WXY = 2;
    }
}


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java

@@ -243,4 +243,8 @@
     */
    private Integer activityTime;

    /**
     * 单次活动时长（小时）
     */
    private Integer duration;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussDO.java

@@ -158,6 +158,11 @@
    private Long publishBy;

    /**
     * 议事内容类型（1.社区议事 2.院落议事 3.党群议事）
     */
    private Integer contentType;

    /**
     * 类型 1 议事 2 投票
     */
    public interface type{

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java

@@ -36,7 +36,7 @@
    private String happenAddr;

    /**
     * 状态 1待审核 2进行中 3已驳回 4已完成
     * 状态 1待审核 2进行中 3已驳回 4待评价 5.已完成
     */
    private Integer status;

@@ -180,6 +180,10 @@
     * 单张图片高度
     */
    private BigDecimal imgHeight;
    /**
     * 评价时间
     */
    private Date evaluateDate;

    /**
     * 参加活动标签（1.优质 2.精良 3.普通 4.一般）
@@ -193,12 +197,13 @@
    }

    /**
     * 状态 1待审核 2进行中 3已驳回 4已完成
     * 状态 1待审核 2进行中 3已驳回 4待评价 5.已完成
     */
    public interface status {
        int dsh = 1;
        int dfk = 2;
        int ybh = 3;
        int ywc = 4;
        int ypj = 5;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishOperationRecordDO.java

@@ -74,7 +74,7 @@
                '}';
    }
    /**
     *操作类型 1已提交 2审核通过 3 驳回 4完成集心 5 分配 6 完成 7反馈 8系统自动确认
     *操作类型 1已提交 2审核通过 3 驳回 4完成集心 5 分配 6 完成 7反馈 8系统自动确认 9评价
     */
    public interface type{
        int ytj=1;
@@ -85,5 +85,6 @@
        int wc=6;
        int fk=7;
        int zd=8;
        int pj = 9;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/BigScreenStatisticsService.java

@@ -193,4 +193,88 @@
     * @return
     */
    R projectType(String name);

    /**
     * 金沙定制页面-党建引领基础数据
     * @param communityId
     * @return
     */
    R getPartyBuildIngBaseData(Long communityId);

    /**
     * 党员活动展示列表
     * @param pageBaseDTO
     * @return
     */
    R pagePartyBuildIngAct(PageBaseDTO pageBaseDTO);

    /**
     * 议事投票展示列表
     * @param pageBaseDTO
     * @return
     */
    R pagePartyBuildIngDiscuss(PageBaseDTO pageBaseDTO);

    /**
     * 金沙定制页面-四长四员
     * @param communityId
     * @return
     */
    R getFourMemberBaseData(Long communityId);

    /**
     * 杨家坪定制页面-五微服务
     * @param communityId
     * @return
     */
    R getFmsBaseData(Long communityId);

    /**
     * 杨家坪定制页面-微团队展示列表
     * @param pageBaseDTO
     * @return
     */
    R pageFmsTeam(PageBaseDTO pageBaseDTO);

    /**
     * 杨家坪定制页面-居家养老基础数据
     * @param communityId
     * @return
     */
    R getAlarmBaseData(Long communityId);

    /**
     * 杨家坪定制页面-报警记录展示列表
     * @param pageBaseDTO
     * @return
     */
    R pageAlarmRecord(PageBaseDTO pageBaseDTO);

    /**
     * 杨家坪定制页面-报警设备点位图
     * @param communityId
     * @return
     */
    R getAlarmPointMap(Long communityId);

    /**
     * 杨家坪定制页面-志愿服务
     * @param communityId
     * @return
     */
    R getVolunteerBaseData(Long communityId);

    /**
     * 金沙定制页面-志愿线展示列表
     * @param pageBaseDTO
     * @return
     */
    R pagePartyBuildIngMicroWish(PageBaseDTO pageBaseDTO);

    /**
     * 金沙定制页面-四长四员解决问题展示列表
     * @param pageBaseDTO
     * @return
     */
    R pageFourMemberResolve(PageBaseDTO pageBaseDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java

@@ -196,7 +196,7 @@
     * @param status
     * @return 活动列表
     */
    R listActivity(Long userId, Integer status);
    R listActivity(Long userId, Integer status,Integer type);

    /**
     * 查询志愿者参与的所有已经完成的活动

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActBuildingService.java

@@ -7,6 +7,7 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngBuildingExcelVO;
import com.panzhihua.service_community.model.dos.ComMngBuildingDO;
import org.springframework.web.bind.annotation.RequestParam;

/**
 * @author xyh
@@ -65,4 +66,11 @@
    R editBuildingHouseAdmin(EditBuildingHouseDto editBuildingHouseDto);

    R deleteBuildingHousePopulationAdmin(DeleteBuildingHousePopulationDto housePopulationDto);

    /**
     * 根据小区id查询楼栋列表
     * @param villageId 小区id
     * @return  查询楼栋列表
     */
    R getBuildListByVillageId(Long villageId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActEasyPhotoEvaluateService.java

New file
@@ -0,0 +1,94 @@
package com.panzhihua.service_community.service;

import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.vos.R;
import org.springframework.web.bind.annotation.RequestBody;

import java.util.Date;

/**
 * title: 随手拍、微心愿评价表表服务接口
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 随手拍、微心愿评价表表服务接口
 *
 * @author lyq
 * @date 2022-03-01 13:44:24
 */
public interface ComActEasyPhotoEvaluateService {

    /**
     * description  queryByPage  分页查询
     *
     * @param comActEasyPhotoEvaluate 请求参数
     * @return 分页查询列表数据
     * @author lyq
     * @date 2022-03-01 13:44:24
     */
    R queryByPage(PageComActEasyPhotoEvaluateDto comActEasyPhotoEvaluate);

    /**
     * description  insert  新增数据
     *
     * @param comActEasyPhotoEvaluate 请求参数
     * @return 新增结果
     * @author lyq
     * @date 2022-03-01 13:44:24
     */
    R insert(AddComActEasyPhotoEvaluateDto comActEasyPhotoEvaluate);

    /**
     * description  update  修改数据
     *
     * @param comActEasyPhotoEvaluate 请求参数
     * @return 修改结果
     * @author lyq
     * @date 2022-03-01 13:44:24
     */
    R update(EditComActEasyPhotoEvaluateDto comActEasyPhotoEvaluate);

    /**
     * description  deleteById  通过主键删除数据
     *
     * @param id 主键id
     * @return 删除结果
     * @author lyq
     * @date 2022-03-01 13:44:24
     */
    R deleteById(Long id);

    /**
     * description  detailById  查询详情
     *
     * @param id 主键id
     * @return 详情数据
     * @author lyq
     * @date 2022-03-01 13:44:24
     */
    R detailById(Long id);

    /**
     * description  queryByPage  查询列表
     *
     * @param comActEasyPhotoEvaluate 请求参数
     * @return 列表数据
     * @author lyq
     * @date 2022-03-01 13:44:24
     */
    R queryByList(PageComActEasyPhotoEvaluateDto comActEasyPhotoEvaluate);

    R evaluateEasyApplets(EvaluateEasyDto whistleDto);

    /**
     * 添加随手拍、微心愿评价记录
     * @param communityId   社区id
     * @param userId    用户id
     * @param serviceId 业务记录id
     * @param score     评价分数
     * @param content   评价内容
     * @param nowDate   评价时间
     * @param serviceType   业务类型（1.随手拍 2.微心愿）
     */
    void addEasyPhotoEvaluateRecord(Long communityId, Long userId, Long serviceId, Integer score, String content, Date nowDate,Integer serviceType);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActEasyPhotoHandlerService.java

New file
@@ -0,0 +1,88 @@
package com.panzhihua.service_community.service;

import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.vos.R;

/**
 * title: 随手拍、微心愿处理人绑定表表服务接口
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 随手拍、微心愿处理人绑定表表服务接口
 *
 * @author lyq
 * @date 2022-03-01 13:45:11
 */
public interface ComActEasyPhotoHandlerService {

    /**
     * description  queryByPage  分页查询
     *
     * @param comActEasyPhotoHandler 请求参数
     * @return 分页查询列表数据
     * @author lyq
     * @date 2022-03-01 13:45:11
     */
    R queryByPage(PageComActEasyPhotoHandlerDto comActEasyPhotoHandler);

    /**
     * description  insert  新增数据
     *
     * @param comActEasyPhotoHandler 请求参数
     * @return 新增结果
     * @author lyq
     * @date 2022-03-01 13:45:11
     */
    R insert(AddComActEasyPhotoHandlerDto comActEasyPhotoHandler);

    /**
     * description  update  修改数据
     *
     * @param comActEasyPhotoHandler 请求参数
     * @return 修改结果
     * @author lyq
     * @date 2022-03-01 13:45:11
     */
    R update(EditComActEasyPhotoHandlerDto comActEasyPhotoHandler);

    /**
     * description  deleteById  通过主键删除数据
     *
     * @param id 主键id
     * @return 删除结果
     * @author lyq
     * @date 2022-03-01 13:45:11
     */
    R deleteById(Long id);

    /**
     * description  detailById  查询详情
     *
     * @param id 主键id
     * @return 详情数据
     * @author lyq
     * @date 2022-03-01 13:45:11
     */
    R detailById(Long id);

    /**
     * description  queryByPage  查询列表
     *
     * @param comActEasyPhotoHandler 请求参数
     * @return 列表数据
     * @author lyq
     * @date 2022-03-01 13:45:11
     */
    R queryByList(PageComActEasyPhotoHandlerDto comActEasyPhotoHandler);

    /**
     * 添加随手拍、微心愿处理关联记录
     * @param communityId   社区id
     * @param userId    用户id
     * @param serviceId 业务id
     * @param type  人员类型（1.后台用户 2.党员 3.志愿者 4.社工 5.四长四员）
     * @param serviceType   业务类型（1.随手拍 2.微心愿）
     */
    void addHandleRecord(Long communityId,Long userId,Long serviceId,Integer type,Integer serviceType);

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialWorkerService.java

@@ -51,7 +51,7 @@
     * @param id 社工 id
     * @return 查找结果
     */
    R<ComActSocialWorkerDetailsVO> comActSocialWorkerDetails(Long id);
    R<ComActSocialWorkerVO> comActSocialWorkerDetails(Long id);

    /**
     * 导出

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java

@@ -3,7 +3,7 @@
import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;

import java.text.SimpleDateFormat;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
@@ -14,43 +14,71 @@

import javax.annotation.Resource;

import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.community.bigscreen.*;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.service_community.dao.*;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenAlarmStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenVolunteerStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.EquipmentPointMapDataVO;
import com.panzhihua.common.model.vos.community.bigscreen.VolunteerOrgRelationVO;
import com.panzhihua.common.model.vos.grid.EventVO;
import com.panzhihua.common.model.vos.property.ComPropertyAlarmVO;
import com.panzhihua.common.model.vos.property.ComPropertyEquipmentVO;
import com.panzhihua.service_community.dao.ComMngVolunteerMngDAO;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.community.ComActDynVO;
import com.panzhihua.common.model.vos.community.ComActFourMemberVO;
import com.panzhihua.common.model.vos.community.ComSwPatrolRecordVO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenActivityLine;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenCommunityStatisticsVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenDynStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenEasyPhotoStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenFmsStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenFourMemberStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkBaseInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkProjectInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkProjectTypeInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkSocialOrgInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkSocialWorkerInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenMerchantStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenMicroWishStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenNeighborStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenPartyBuildIngStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenQuestionnaireStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenResidentActStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenVolunteerActStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.FourMemberOrgRelationVO;
import com.panzhihua.common.model.vos.community.bigscreen.GridsGovernanceStatisticsVO;
import com.panzhihua.common.model.vos.community.bigscreen.ResidentAutonomyStatisticsVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import com.panzhihua.common.model.vos.community.fms.ComFmsTeamVO;
import com.panzhihua.common.model.vos.community.screen.civil.CivilVillageStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.event.EventGridIncidentStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.event.EventGridStatisticsVO;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.service_community.dao.ComActActivityDAO;
import com.panzhihua.service_community.dao.ComActCommitteeDao;
import com.panzhihua.service_community.dao.ComActDiscussDAO;
import com.panzhihua.service_community.dao.ComActDynDAO;
import com.panzhihua.service_community.dao.ComActEasyPhotoDAO;
import com.panzhihua.service_community.dao.ComActFourMemberDao;
import com.panzhihua.service_community.dao.ComActMicroWishDAO;
import com.panzhihua.service_community.dao.ComActNeighborCircleDAO;
import com.panzhihua.service_community.dao.ComActQuestnaireDAO;
import com.panzhihua.service_community.dao.ComActSocialOrgDao;
import com.panzhihua.service_community.dao.ComActSocialProjectDao;
import com.panzhihua.service_community.dao.ComActSocialWorkerDao;
import com.panzhihua.service_community.dao.ComActWarehouseDonatesDao;
import com.panzhihua.service_community.dao.ComFmsServiceDAO;
import com.panzhihua.service_community.dao.ComMngPopulationDAO;
import com.panzhihua.service_community.dao.ComPropertyDao;
import com.panzhihua.service_community.dao.ConvenientMerchantDAO;
@@ -115,7 +143,12 @@

    @Resource
    private ComActSocialWorkerDao comActSocialWorkerDao;

    @Resource
    private ComActFourMemberDao comActFourMemberDao;
    @Resource
    private ComFmsServiceDAO comFmsServiceDAO;
    @Resource
    private ComMngVolunteerMngDAO comMngVolunteerMngDAO;

    /**
     * 大数据分析平台-居民自治
@@ -564,6 +597,11 @@
     */
    @Override
    public R indexVolunteerAct(Long communityId) {
        BigScreenVolunteerActStatisticsInfo statisticsInfo = getBigScreenVolunteerActStatisticsInfo(communityId);
        return R.ok(statisticsInfo);
    }

    private BigScreenVolunteerActStatisticsInfo getBigScreenVolunteerActStatisticsInfo(Long communityId) {
        BigScreenVolunteerActStatisticsInfo statisticsInfo = new BigScreenVolunteerActStatisticsInfo();
        List<StatisticsCommVO> actCircleData = comActActivityDAO.getIndexResidentActBaseData(communityId, false);
        statisticsInfo.setActCircleData(actCircleData);
@@ -588,7 +626,7 @@
            actTotalPolylineData.add(temp);
        });
        statisticsInfo.setActTotalPolylineData(actTotalPolylineData);
        return R.ok(statisticsInfo);
        return statisticsInfo;
    }

    /**
@@ -747,6 +785,387 @@
        return R.ok(comActSocialProjectDao.selectType(name,null));
    }

    /**
     * 金沙定制页面-党建引领基础数据
     * @param communityId
     * @return
     */
    @Override
    public R getPartyBuildIngBaseData(Long communityId) {
        //基础统计数据查询
        BigScreenPartyBuildIngStatisticsInfo statisticsInfo = comActDynDAO.getPartyBuildIngBaseData(communityId);
        statisticsInfo.setAqxTotal(statisticsInfo.getJmxcTotal() + statisticsInfo.getShjdTotal() + statisticsInfo.getXqxcTotal());
        statisticsInfo.setZyxHelpTotal(statisticsInfo.getZyxServiceTotal());
        statisticsInfo.setZyfwTotal(statisticsInfo.getZyxServiceTotal());
        //随手拍治安防控记录列表
        List<ComActEasyPhotoVO> zafkList = comActEasyPhotoDAO.getPartyBuildIngRecord(communityId, pageSize);
        statisticsInfo.setZafkList(zafkList);
        //居民宣传记录列表
        List<ComActDynVO> JMXCList = comActDynDAO.getPartyBuildIngDynRecord(communityId, pageSize);
        statisticsInfo.setJmxcList(JMXCList);
        //商户监督记录列表

        //辖区巡查记录列表
        List<ComSwPatrolRecordVO> XQXCList = comActDynDAO.getPartyBuildIngPatrolRecord(communityId, pageSize);
        StringBuilder sb = new StringBuilder();
        XQXCList.forEach(e -> {
            String personName = e.getPersonName();
            if (StringUtils.isNotBlank(personName)) {
                String[] split = personName.split(",");
                for (int i = 0;i < split.length;i++) {
                    sb.append(split[i].substring(0, 1).concat(split[i].substring(1).replaceAll("\\S", "*")));
                    if (i != split.length - 1) {
                        sb.append(",");
                    }
                }
                e.setPersonName(sb.toString());
                sb.delete(0, sb.length());
            }
        });
        statisticsInfo.setXqxcList(XQXCList);
        return R.ok(statisticsInfo);
    }

    /**
     * 党员活动展示列表
     * @param pageBaseDTO
     * @return
     */
    @Override
    public R pagePartyBuildIngAct(PageBaseDTO pageBaseDTO) {
        Page page = retrievePage(pageBaseDTO);
        return R.ok(comActDynDAO.pagePartyBuildIngAct(page, pageBaseDTO));
    }

    /**
     * 议事投票展示列表
     * @param pageBaseDTO
     * @return
     */
    @Override
    public R pagePartyBuildIngDiscuss(PageBaseDTO pageBaseDTO) {
        Page page = retrievePage(pageBaseDTO);
        return R.ok(comActDynDAO.pagePartyBuildIngDiscuss(page, pageBaseDTO));
    }

    /**
     * 金沙定制页面-四长四员
     * @param communityId
     * @return
     */
    @Override
    public R getFourMemberBaseData(Long communityId) {
        //基础统计数据查询
        BigScreenFourMemberStatisticsInfo statisticsInfo = comActFourMemberDao.getFourMemberBaseData(communityId);
        //四长四员楼栋组织关系
        List<ComActFourMemberVO> members = comActFourMemberDao.getFourMembers(communityId);
        List<FourMemberOrgRelationVO> relations = new ArrayList<>();
        if (!members.isEmpty()) {
            members.forEach(e -> e.setJurisdictionContent(e.getJurisdictionContent().replaceAll("\\[|\"|]", "")));
            Map<String, List<ComActFourMemberVO>> collect = members.stream().collect(Collectors.groupingBy(ComActFourMemberVO::getJurisdictionContent));
            for (Map.Entry<String, List<ComActFourMemberVO>> entry : collect.entrySet()) {
                FourMemberOrgRelationVO relationVO = new FourMemberOrgRelationVO();
                relationVO.setRelation(entry.getKey());
                relationVO.setMembers(entry.getValue());
                relations.add(relationVO);
            }
        }
        statisticsInfo.setFourMemberOrgList(relations);
        //新增解决问题数
        List<StatisticsCommVO> jjwtAddPolylineData = comActFourMemberDao.retrieveJJWTAddPolylineData(communityId);
        statisticsInfo.setJjwtAddPolylineData(jjwtAddPolylineData);
        //累计解决问题数
        List<StatisticsCommVO> jjwtTotalPolylineData = new ArrayList<>();
        jjwtAddPolylineData.forEach(e -> {
            StatisticsCommVO temp = comActFourMemberDao.retrieveJJWTTotalPolylineData(communityId, e.getFiled());
            temp.setFiled(e.getFiled());
            jjwtTotalPolylineData.add(temp);
        });
        statisticsInfo.setJjwtTotalPolylineData(jjwtTotalPolylineData);
        return R.ok(statisticsInfo);
    }

    /**
     * 杨家坪定制页面-五微服务
     * @param communityId
     * @return
     */
    @Override
    public R getFmsBaseData(Long communityId) {
        BigScreenFmsStatisticsInfo statisticsInfo = comFmsServiceDAO.getFmsBaseData(communityId);
        //团队类型占比圆形图
        List<ComFmsTeamVO> preTeamTypeCircleData = comFmsServiceDAO.retrieveTeamTypeCircleData(communityId);
        List<StatisticsCommVO> teamTypeCircleData = new ArrayList<>();
        if (!preTeamTypeCircleData.isEmpty()) {
            Integer teamCount = preTeamTypeCircleData.size();
            Map<String, List<ComFmsTeamVO>> collect = preTeamTypeCircleData.stream().collect(Collectors.groupingBy(ComFmsTeamVO::getTeamTypeName));
            for (Map.Entry<String, List<ComFmsTeamVO>> entry : collect.entrySet()) {
                StatisticsCommVO temp = new StatisticsCommVO();
                int size = entry.getValue().size();
                temp.setFiled(entry.getKey());
                temp.setNum(size);
                temp.setPercent(new BigDecimal(size/teamCount).setScale(2));
                teamTypeCircleData.add(temp);
            }
        }
        statisticsInfo.setTeamTypeCircleData(teamTypeCircleData);
        //微服务新增折线数据
        List<StatisticsCommVO> serviceAddPolylineData = comFmsServiceDAO.retrieveServiceAddPolylineData(communityId);
        statisticsInfo.setServiceAddPolylineData(serviceAddPolylineData);
        //微服务累计折线数据
        List<StatisticsCommVO> serviceTotalPolylineData = new ArrayList<>();
        serviceAddPolylineData.forEach(e -> {
            StatisticsCommVO temp = comFmsServiceDAO.retrieveServiceTotalPolylineData(communityId, e.getFiled());
            temp.setFiled(e.getFiled());
            serviceTotalPolylineData.add(temp);
        });
        statisticsInfo.setServiceTotalPolylineData(serviceTotalPolylineData);
        //微调节矛盾类型占比圆形图
        List<EventVO> preAdjustCircleData = comFmsServiceDAO.retrieveAdjustCircleData(communityId);
        List<StatisticsCommVO> adjustCircleData = new ArrayList<>();
        if (!preAdjustCircleData.isEmpty()) {
            Integer adjustCount = preAdjustCircleData.size();
            Map<String, List<EventVO>> collect = preAdjustCircleData.stream().collect(Collectors.groupingBy(EventVO::getEventClazz));
            for (Map.Entry<String, List<EventVO>> entry : collect.entrySet()) {
                StatisticsCommVO temp = new StatisticsCommVO();
                int size = entry.getValue().size();
                temp.setFiled(entry.getKey());
                temp.setNum(size);
                temp.setPercent(new BigDecimal(size/adjustCount).setScale(2));
                adjustCircleData.add(temp);
            }
        }
        statisticsInfo.setAdjustCircleData(adjustCircleData);
        //新增解决矛盾折线数据
        List<StatisticsCommVO> adjustAddPolylineData = comFmsServiceDAO.retrieveAdjustAddPolylineData(communityId);
        statisticsInfo.setAdjustAddPolylineData(adjustAddPolylineData);
        //累计解决矛盾折线数据
        List<StatisticsCommVO> adjustTotalPolylineData = new ArrayList<>();
        adjustAddPolylineData.forEach(e -> {
            StatisticsCommVO temp = comFmsServiceDAO.retrieveAdjustTotalPolylineData(communityId, e.getFiled());
            temp.setFiled(e.getFiled());
            adjustTotalPolylineData.add(temp);
        });
        statisticsInfo.setAdjustTotalPolylineData(adjustTotalPolylineData);
        //微防控防控类型占比圆形图
        List<EventVO> preControlCircleData = comFmsServiceDAO.retrieveControlCircleData(communityId);
        List<StatisticsCommVO> controlCircleData = new ArrayList<>();
        if (!preControlCircleData.isEmpty()) {
            Integer controlCount = preControlCircleData.size();
            Map<String, List<EventVO>> collect = preControlCircleData.stream().collect(Collectors.groupingBy(EventVO::getEventClazz));
            for (Map.Entry<String, List<EventVO>> entry : collect.entrySet()) {
                StatisticsCommVO temp = new StatisticsCommVO();
                int size = entry.getValue().size();
                temp.setFiled(entry.getKey());
                temp.setNum(size);
                temp.setPercent(new BigDecimal(size/controlCount).setScale(2));
                controlCircleData.add(temp);
            }
        }
        statisticsInfo.setControlCircleData(controlCircleData);
        return R.ok(statisticsInfo);
    }

    /**
     * 杨家坪定制页面-微团队展示列表
     * @param pageBaseDTO
     * @return
     */
    @Override
    public R pageFmsTeam(PageBaseDTO pageBaseDTO) {
        Page page = retrievePage(pageBaseDTO);
        return R.ok(comFmsServiceDAO.pageFmsTeam(page, pageBaseDTO));
    }

    /**
     * 杨家坪定制页面-居家养老基础数据
     * @param communityId
     * @return
     */
    @Override
    public R getAlarmBaseData(Long communityId) {
        BigScreenAlarmStatisticsInfo statisticsInfo = comPropertyDao.getAlarmBaseData(communityId);
        //异常报警新增折线数据
        List<StatisticsCommVO> abnormalAddPolylineData = comPropertyDao.retrieveAbnormalAddPolylineData(communityId);
        statisticsInfo.setAbnormalAddPolylineData(abnormalAddPolylineData);
        //异常报警累计折线数据
        List<StatisticsCommVO> abnormalTotalPolylineData = new ArrayList<>();
        abnormalAddPolylineData.forEach(e -> {
            StatisticsCommVO temp = comPropertyDao.retrieveAbnormalTotalPolylineData(communityId, e.getFiled());
            temp.setFiled(e.getFiled());
            abnormalTotalPolylineData.add(temp);
        });
        statisticsInfo.setAbnormalTotalPolylineData(abnormalTotalPolylineData);
        //一键求助服务新增折线数据
        List<StatisticsCommVO> serviceAddPolylineData = comPropertyDao.retrieveServiceAddPolylineData(communityId);
        statisticsInfo.setServiceAddPolylineData(serviceAddPolylineData);
        //一键求助服务累计折线数据
        List<StatisticsCommVO> serviceTotalPolylineData = new ArrayList<>();
        serviceAddPolylineData.forEach(e -> {
            StatisticsCommVO temp = comPropertyDao.retrieveServiceTotalPolylineData(communityId, e.getFiled());
            temp.setFiled(e.getFiled());
            serviceTotalPolylineData.add(temp);
        });
        statisticsInfo.setServiceTotalPolylineData(serviceTotalPolylineData);
        return R.ok(statisticsInfo);
    }

    /**
     * 杨家坪定制页面-报警记录展示列表
     * @param pageBaseDTO
     * @return
     */
    @Override
    public R pageAlarmRecord(PageBaseDTO pageBaseDTO) {
        Page page = retrievePage(pageBaseDTO);
        Integer param3 = pageBaseDTO.getParam3();
        Long communityId = pageBaseDTO.getCommunityId();
        IPage<ComPropertyAlarmVO> abnormalList = null;
        switch (param3) {
            case 1:
                //待处理异常展示列表
                abnormalList = comPropertyDao.getAbnormalList(page,2, 0, communityId);
                break;
            case 2:
                //已处理异常展示列表
                abnormalList = comPropertyDao.getAbnormalList(page,2, 1, communityId);
                break;
            case 3:
                //待服务展示列表
                abnormalList = comPropertyDao.getAbnormalList(page,1, 0, communityId);
                break;
            case 4:
                //已服务展示列表
                abnormalList = comPropertyDao.getAbnormalList(page,1, 1, communityId);
                break;
            default:
                break;
        }
        return R.ok(abnormalList);
    }

    /**
     * 杨家坪定制页面-报警设备点位图
     * @param communityId
     * @return
     */
    @Override
    public R getAlarmPointMap(Long communityId) {
        List<ComPropertyEquipmentVO> list = comPropertyDao.getAlarmPointMapData(communityId);
        List<EquipmentPointMapDataVO> pointMapDataList = new ArrayList<>();
        if (!list.isEmpty()) {
            Map<String, List<ComPropertyEquipmentVO>> collect = list.stream().collect(Collectors.groupingBy(e -> "[" + e.getLatitude() + "," + e.getLongitude() + "]"));
            for (Map.Entry<String, List<ComPropertyEquipmentVO>> entry : collect.entrySet()) {
                EquipmentPointMapDataVO pointMapDataVO = new EquipmentPointMapDataVO();
                List<ComPropertyEquipmentVO> value = entry.getValue();
                pointMapDataVO.setPosition(entry.getKey());
                List<ComPropertyEquipmentVO> sortedList = value.stream()
                        .sorted(Comparator.comparing(ComPropertyEquipmentVO::getEquipmentStatus)).collect(Collectors.toList());
                pointMapDataVO.setEquipments(sortedList);
                pointMapDataVO.setEquipmentNum(value.size());
                boolean isRed = value.stream().anyMatch(e -> e.getEquipmentStatus().equals(1));
                boolean isYellow = value.stream().anyMatch(e -> e.getEquipmentStatus().equals(2));
                pointMapDataVO.setPointColor(isRed ? 1 : (isYellow ? 2 : 3));
                pointMapDataList.add(pointMapDataVO);
            }
        }
        return R.ok(pointMapDataList);
    }

    /**
     * 杨家坪定制页面-志愿服务
     * @param communityId
     * @return
     */
    @Override
    public R getVolunteerBaseData(Long communityId) {
        BigScreenVolunteerStatisticsInfo statisticsInfo = comMngVolunteerMngDAO.getVolunteerBaseData(communityId);
        BigScreenVolunteerActStatisticsInfo info = getBigScreenVolunteerActStatisticsInfo(communityId);
        BeanUtils.copyProperties(info, statisticsInfo);
        //志愿者统计-组织人数直方图
        statisticsInfo.setVolunteerOrgHistogram(comMngVolunteerMngDAO.retrieveVolunteerOrgHistogram(communityId));
        //志愿者服务类型占比圆形图
        List<ComMngVolunteerMngVO> preVolunteerServiceTypeCircleData = comMngVolunteerMngDAO.retrieveVolunteerServiceTypeCircleData(communityId);
        List<StatisticsCommVO> volunteerServiceTypeCircleData = new ArrayList<>();
        if (!preVolunteerServiceTypeCircleData.isEmpty()) {
            Integer count = preVolunteerServiceTypeCircleData.size();
            Map<String, List<ComMngVolunteerMngVO>> collect = preVolunteerServiceTypeCircleData.stream().collect(Collectors.groupingBy(ComMngVolunteerMngVO::getServiceTypeName));
            for (Map.Entry<String, List<ComMngVolunteerMngVO>> entry : collect.entrySet()) {
                StatisticsCommVO temp = new StatisticsCommVO();
                int size = entry.getValue().size();
                temp.setFiled(entry.getKey());
                temp.setNum(size);
                temp.setPercent(new BigDecimal(size/count).setScale(2));
                volunteerServiceTypeCircleData.add(temp);
            }
        }
        statisticsInfo.setVolunteerServiceTypeCircleData(volunteerServiceTypeCircleData);
        //志愿者年龄段占比圆形图
        List<StatisticsCommVO> volunteerAgeCircleData = comMngVolunteerMngDAO.retrieveVolunteerAgeCircleData(communityId);
        int sum = volunteerAgeCircleData.stream().mapToInt(StatisticsCommVO::getNum).sum();
        volunteerAgeCircleData.forEach(e -> {
            if (sum != 0) {
                e.setPercent(new BigDecimal(e.getNum()/sum).setScale(2));
            } else {
                e.setPercent(new BigDecimal(0));
            }
        });
        statisticsInfo.setVolunteerAgeCircleData(volunteerAgeCircleData);
        //志愿者技能占比圆形图
        List<ComMngVolunteerMngVO> preVolunteerSkillCircleData = comMngVolunteerMngDAO.retrieveVolunteerSkillCircleData(communityId);
        List<StatisticsCommVO> volunteerSkillCircleData = new ArrayList<>();
        if (!preVolunteerSkillCircleData.isEmpty()) {
            Integer count = preVolunteerSkillCircleData.size();
            Map<String, List<ComMngVolunteerMngVO>> collect = preVolunteerSkillCircleData.stream().collect(Collectors.groupingBy(ComMngVolunteerMngVO::getSkillName));
            for (Map.Entry<String, List<ComMngVolunteerMngVO>> entry : collect.entrySet()) {
                StatisticsCommVO temp = new StatisticsCommVO();
                int size = entry.getValue().size();
                temp.setFiled(entry.getKey());
                temp.setNum(size);
                temp.setPercent(new BigDecimal(size/count).setScale(2));
                volunteerSkillCircleData.add(temp);
            }
        }
        statisticsInfo.setVolunteerSkillCircleData(volunteerSkillCircleData);
        //志愿者组织数据
        List<VolunteerOrgRelationVO> volunteerOrgRelationList = new ArrayList<>();
        List<ComMngVolunteerMngVO> volunteerData = comMngVolunteerMngDAO.selectVolunteerByCommunityId(communityId);
        if (!volunteerData.isEmpty()) {
            Map<String, List<ComMngVolunteerMngVO>> collect = volunteerData.stream().collect(Collectors.groupingBy(ComMngVolunteerMngVO::getOrgName));
            for (Map.Entry<String, List<ComMngVolunteerMngVO>> entry : collect.entrySet()) {
                VolunteerOrgRelationVO relationVO = new VolunteerOrgRelationVO();
                relationVO.setOrg(entry.getKey());
                relationVO.setOrgPersonNum(entry.getValue().size());
                relationVO.setVolunteers(entry.getValue());
                volunteerOrgRelationList.add(relationVO);
            }
        }
        statisticsInfo.setVolunteerOrgRelationList(volunteerOrgRelationList);
        return R.ok(statisticsInfo);
    }

    /**
     * 金沙定制页面-志愿线展示列表
     * @param pageBaseDTO
     * @return
     */
    @Override
    public R pagePartyBuildIngMicroWish(PageBaseDTO pageBaseDTO) {
        Page page = retrievePage(pageBaseDTO);
        return R.ok(comActMicroWishDAO.pagePartyBuildIngMicroWish(page, pageBaseDTO));
    }

    /**
     * 金沙定制页面-四长四员解决问题展示列表
     * @param pageBaseDTO
     * @return
     */
    @Override
    public R pageFourMemberResolve(PageBaseDTO pageBaseDTO) {
        Page page = retrievePage(pageBaseDTO);
        return R.ok(comActMicroWishDAO.pageFourMemberResolve(page, pageBaseDTO));
    }

    private Page retrievePage(PageBaseDTO pageBaseDTO) {
        Long pageNum = pageBaseDTO.getPageNum();
        Long size = pageBaseDTO.getPageSize();

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java

@@ -303,10 +303,22 @@
                    comActActivityVO.setIsVolunteer(comActActSignDO.getIsVolunteer());
                }
                List<ComActActRegistDO> regList = comActActRegistDAO.selectList(new QueryWrapper<ComActActRegistDO>().lambda()
                        .eq(ComActActRegistDO::getUserId, userId).eq(ComActActRegistDO::getActivityId, id).eq(ComActActRegistDO::getType, 1));
                        .eq(ComActActRegistDO::getUserId, userId).eq(ComActActRegistDO::getActivityId, id));
                if (!regList.isEmpty()) {
                    List<ComActActRegistDO> collect = regList.stream().sorted(Comparator.comparing(ComActActRegistDO::getId).reversed()).collect(Collectors.toList());
                    comActActivityVO.setTimes(collect.get(0).getTimes());
                    ComActActRegistDO comActActRegistDO=collect.get(0);
                    if(comActActRegistDO.getType()==2){
                        if(comActActRegistDO.getEndTime()==null){
                            comActActivityVO.setSignType(2);
                        }
                        else {
                            comActActivityVO.setSignType(1);
                        }
                    }
                }
                else {
                    comActActivityVO.setSignType(1);
                }
            }
        }
@@ -468,6 +480,7 @@
                return R.fail("已经报名过了，请勿重复提交");
            }
            Integer volunteerMax = actActivityDO.getVolunteerMax();
            Integer activityType = actActivityDO.getType();
            Integer residentMax = actActivityDO.getParticipantMax();
            R<LoginUserInfoVO> userInfoR = userService.getUserInfoByUserId(String.valueOf(userId));
            LoginUserInfoVO loginUserInfoVO =
@@ -475,7 +488,7 @@
            // 查询当前活动下参与居民
            Integer residentCount = comActActSignDAO.selectCount(new QueryWrapper<ComActActSignDO>().lambda()
                    .eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getIsVolunteer, 0).eq(ComActActSignDO::getStatus, 1));
            if (volunteerMax != 0) {
            if (activityType.equals(2)) {
                //志愿者活动
                boolean userIsVolunteer = loginUserInfoVO.getIsVolunteer() == 1;
                // 查询当前活动下参与志愿者
@@ -585,7 +598,7 @@
     * @return 活动列表
     */
    @Override
    public R listActivity(Long userId, Integer status) {
    public R listActivity(Long userId, Integer status,Integer type) {
        List<ActivitySignVO> activitySignVOList = comActActSignDAO.selectList(userId);
        if (ObjectUtils.isEmpty(activitySignVOList)) {
            return R.ok();
@@ -603,6 +616,9 @@
                        .filter(activityDO -> activityDO.getStatus().equals(status)).collect(Collectors.toList());
            }
        }
        if(isNull(type)){
            comActActivityDOS=comActActivityDOS.stream().filter(comActActivityDO -> comActActivityDO.getType().equals(type)).collect(Collectors.toList());
        }
        if (!comActActivityDOS.isEmpty()) {
            comActActivityDOS.forEach(comActActivityDO -> {
                ComActActivityVO comActActivityVO = new ComActActivityVO();

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActBuildingServiceImpl.java

@@ -636,4 +636,14 @@
        }
        return R.ok();
    }

    /**
     * 根据小区id查询楼栋列表
     * @param villageId 小区id
     * @return  查询楼栋列表
     */
    @Override
    public R getBuildListByVillageId(Long villageId) {
        return R.ok(this.baseMapper.getBuildListByVillageId(villageId));
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoEvaluateServiceImpl.java

New file
@@ -0,0 +1,180 @@
package com.panzhihua.service_community.service.impl;

import com.panzhihua.service_community.dao.ComActEasyPhotoDAO;
import com.panzhihua.service_community.dao.ComActMicroWishDAO;
import com.panzhihua.service_community.entity.ComActEasyPhotoEvaluate;
import com.panzhihua.service_community.dao.ComActEasyPhotoEvaluateMapper;
import com.panzhihua.service_community.model.dos.ComActEasyPhotoDO;
import com.panzhihua.service_community.model.dos.ComActMicroWishDO;
import com.panzhihua.service_community.service.ComActEasyPhotoEvaluateService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.service_community.service.ComActMicroWishOperationRecordService;
import com.panzhihua.service_community.service.ComActMicroWishService;
import org.springframework.beans.BeanUtils;
import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.vos.R;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.util.Date;

/**
 * title: 随手拍、微心愿评价表表服务实现类
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 随手拍、微心愿评价表表服务实现类
 *
 * @author lyq
 * @date 2022-03-01 13:44:24
 */
@Service("comActEasyPhotoEvaluateService")
public class ComActEasyPhotoEvaluateServiceImpl extends ServiceImpl<ComActEasyPhotoEvaluateMapper, ComActEasyPhotoEvaluate> implements ComActEasyPhotoEvaluateService {

    @Resource
    private ComActEasyPhotoDAO easyPhotoDAO;
    @Resource
    private ComActMicroWishDAO microWishDAO;
    @Resource
    private ComActMicroWishOperationRecordService microWishOperationRecordService;

    /**
     * description  queryByPage  分页查询
     *
     * @param comActEasyPhotoEvaluate 请求参数
     * @return 分页查询列表数据
     * @author lyq
     * @date 2022-03-01 13:44:24
     */
    @Override
    public R queryByPage(PageComActEasyPhotoEvaluateDto comActEasyPhotoEvaluate) {
        return R.ok(this.baseMapper.queryAllByLimit(comActEasyPhotoEvaluate, new Page(comActEasyPhotoEvaluate.getPageNum(), comActEasyPhotoEvaluate.getPageSize())));
    }

    /**
     * description  insert  新增数据
     *
     * @param comActEasyPhotoEvaluate 请求参数
     * @return 新增结果
     * @author lyq
     * @date 2022-03-01 13:44:24
     */
    @Override
    public R insert(AddComActEasyPhotoEvaluateDto comActEasyPhotoEvaluate) {
        ComActEasyPhotoEvaluate entity = new ComActEasyPhotoEvaluate();
        BeanUtils.copyProperties(comActEasyPhotoEvaluate, entity);
        if (this.baseMapper.insert(entity) > 0) {
            return R.ok();
        }
        return R.fail("添加失败");
    }

    /**
     * description  update  修改数据
     *
     * @param editDto 请求参数
     * @return 修改结果
     * @author lyq
     * @date 2022-03-01 13:44:24
     */
    @Override
    public R update(EditComActEasyPhotoEvaluateDto editDto) {
        ComActEasyPhotoEvaluate entity = this.baseMapper.selectById(editDto.getId());
        if (entity == null) {
            return R.fail("未查询到该记录");
        }
        BeanUtils.copyProperties(editDto, entity);
        if (this.baseMapper.updateById(entity) > 0) {
            return R.ok();
        }
        return R.fail("修改失败");
    }

    /**
     * description  deleteById  通过主键删除数据
     *
     * @param id 主键id
     * @return 删除结果
     * @author lyq
     * @date 2022-03-01 13:44:24
     */
    @Override
    public R deleteById(Long id) {
        if (this.baseMapper.deleteById(id) > 0) {
            return R.ok();
        }
        return R.fail("删除失败");
    }

    /**
     * description  detailById  查询详情
     *
     * @param id 主键id
     * @return 详情数据
     * @author lyq
     * @date 2022-03-01 13:44:24
     */
    @Override
    public R detailById(Long id) {
        return R.ok(this.baseMapper.queryById(id));
    }

    /**
     * description  queryByPage  查询列表
     *
     * @param comActEasyPhotoEvaluate 请求参数
     * @return 列表数据
     * @author lyq
     * @date 2022-03-01 13:44:24
     */
    @Override
    public R queryByList(PageComActEasyPhotoEvaluateDto comActEasyPhotoEvaluate) {
        return R.ok(this.baseMapper.queryAllByList(comActEasyPhotoEvaluate));
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R evaluateEasyApplets(EvaluateEasyDto whistleDto) {
        ComActEasyPhotoDO easyPhotoDO = easyPhotoDAO.selectById(whistleDto.getId());
        if(easyPhotoDO == null){
            return R.fail("未查询到该记录");
        }
        if(!easyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.ywc)){
            return R.fail("当前状态不可进行评价");
        }
        Date nowDate = new Date();
        //新增评价记录
        this.addEasyPhotoEvaluateRecord(easyPhotoDO.getCommunityId(),whistleDto.getUserId(),easyPhotoDO.getId(),whistleDto.getScore()
                ,whistleDto.getContent(),nowDate,ComActEasyPhotoEvaluate.ServiceType.SSP);
        //更新随手拍状态
        easyPhotoDO.setStatus(ComActEasyPhotoDO.status.ypj);
        easyPhotoDO.setEvaluateDate(nowDate);
        easyPhotoDAO.updateById(easyPhotoDO);
        return R.ok();
    }

    /**
     * 添加随手拍、微心愿评价记录
     * @param communityId   社区id
     * @param userId    用户id
     * @param serviceId 业务记录id
     * @param score     评价分数
     * @param content   评价内容
     * @param nowDate   评价时间
     * @param serviceType   业务类型（1.随手拍 2.微心愿）
     */
    @Override
    public void addEasyPhotoEvaluateRecord(Long communityId, Long userId, Long serviceId, Integer score, String content, Date nowDate, Integer serviceType) {
        ComActEasyPhotoEvaluate easyPhotoEvaluate = new ComActEasyPhotoEvaluate();
        easyPhotoEvaluate.setCommunityId(communityId);
        easyPhotoEvaluate.setUserId(userId);
        easyPhotoEvaluate.setServiceId(serviceId);
        easyPhotoEvaluate.setScore(score);
        easyPhotoEvaluate.setContent(content);
        easyPhotoEvaluate.setCreateAt(nowDate);
        easyPhotoEvaluate.setServiceType(serviceType);
        this.baseMapper.insert(easyPhotoEvaluate);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoHandlerServiceImpl.java

New file
@@ -0,0 +1,138 @@
package com.panzhihua.service_community.service.impl;

import com.panzhihua.service_community.entity.ComActEasyPhotoHandler;
import com.panzhihua.service_community.dao.ComActEasyPhotoHandlerMapper;
import com.panzhihua.service_community.service.ComActEasyPhotoHandlerService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.BeanUtils;
import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.vos.R;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

/**
 * title: 随手拍、微心愿处理人绑定表表服务实现类
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 随手拍、微心愿处理人绑定表表服务实现类
 *
 * @author lyq
 * @date 2022-03-01 13:45:11
 */
@Service("comActEasyPhotoHandlerService")
public class ComActEasyPhotoHandlerServiceImpl extends ServiceImpl<ComActEasyPhotoHandlerMapper, ComActEasyPhotoHandler> implements ComActEasyPhotoHandlerService {

    /**
     * description  queryByPage  分页查询
     *
     * @param comActEasyPhotoHandler 请求参数
     * @return 分页查询列表数据
     * @author lyq
     * @date 2022-03-01 13:45:11
     */
    @Override
    public R queryByPage(PageComActEasyPhotoHandlerDto comActEasyPhotoHandler) {
        return R.ok(this.baseMapper.queryAllByLimit(comActEasyPhotoHandler, new Page(comActEasyPhotoHandler.getPageNum(), comActEasyPhotoHandler.getPageSize())));
    }

    /**
     * description  insert  新增数据
     *
     * @param comActEasyPhotoHandler 请求参数
     * @return 新增结果
     * @author lyq
     * @date 2022-03-01 13:45:11
     */
    @Override
    public R insert(AddComActEasyPhotoHandlerDto comActEasyPhotoHandler) {
        ComActEasyPhotoHandler entity = new ComActEasyPhotoHandler();
        BeanUtils.copyProperties(comActEasyPhotoHandler, entity);
        if (this.baseMapper.insert(entity) > 0) {
            return R.ok();
        }
        return R.fail("添加失败");
    }

    /**
     * description  update  修改数据
     *
     * @param editDto 请求参数
     * @return 修改结果
     * @author lyq
     * @date 2022-03-01 13:45:11
     */
    @Override
    public R update(EditComActEasyPhotoHandlerDto editDto) {
        ComActEasyPhotoHandler entity = this.baseMapper.selectById(editDto.getId());
        if (entity == null) {
            return R.fail("未查询到该记录");
        }
        BeanUtils.copyProperties(editDto, entity);
        if (this.baseMapper.updateById(entity) > 0) {
            return R.ok();
        }
        return R.fail("修改失败");
    }

    /**
     * description  deleteById  通过主键删除数据
     *
     * @param id 主键id
     * @return 删除结果
     * @author lyq
     * @date 2022-03-01 13:45:11
     */
    @Override
    public R deleteById(Long id) {
        if (this.baseMapper.deleteById(id) > 0) {
            return R.ok();
        }
        return R.fail("删除失败");
    }

    /**
     * description  detailById  查询详情
     *
     * @param id 主键id
     * @return 详情数据
     * @author lyq
     * @date 2022-03-01 13:45:11
     */
    @Override
    public R detailById(Long id) {
        return R.ok(this.baseMapper.queryById(id));
    }

    /**
     * description  queryByPage  查询列表
     *
     * @param comActEasyPhotoHandler 请求参数
     * @return 列表数据
     * @author lyq
     * @date 2022-03-01 13:45:11
     */
    @Override
    public R queryByList(PageComActEasyPhotoHandlerDto comActEasyPhotoHandler) {
        return R.ok(this.baseMapper.queryAllByList(comActEasyPhotoHandler));
    }

    /**
     * 添加随手拍、微心愿处理关联记录
     * @param communityId   社区id
     * @param userId    用户id
     * @param serviceId 业务id
     * @param type  人员类型（1.后台用户 2.党员 3.志愿者 4.社工 5.四长四员）
     * @param serviceType   业务类型（1.随手拍 2.微心愿）
     */
    @Override
    public void addHandleRecord(Long communityId, Long userId, Long serviceId, Integer type, Integer serviceType) {
        ComActEasyPhotoHandler easyPhotoHandler = new ComActEasyPhotoHandler();
        easyPhotoHandler.setCommunityId(communityId);
        easyPhotoHandler.setUserId(userId);
        easyPhotoHandler.setServiceId(serviceId);
        easyPhotoHandler.setType(type);
        easyPhotoHandler.setServiceType(serviceType);
        this.baseMapper.insert(easyPhotoHandler);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java

@@ -8,7 +8,9 @@
import javax.annotation.Resource;

import com.panzhihua.common.model.vos.community.easyPhoto.BannerVO;
import com.panzhihua.service_community.entity.ComActEasyPhotoHandler;
import com.panzhihua.service_community.entity.SysTemplateConfig;
import com.panzhihua.service_community.service.ComActEasyPhotoHandlerService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -73,6 +75,8 @@
    private ComActActivityDAO comActActivityDAO;
    @Resource
    private SysTemplateConfigDao sysTemplateConfigDao;
    @Resource
    private ComActEasyPhotoHandlerService easyPhotoHandlerService;
    /**
     * 分页查询随手拍
     *
@@ -312,6 +316,14 @@
                // 审核通过判断随手拍是否有活动并计算用户收益
                comActUserWalletService.examineAddMoney(comActEasyPhotoVO.getActivityType(), comActEasyPhotoVO.getId(),
                    comActEasyPhotoVO.getUserId(), BigDecimal.ZERO);

                //添加分配人员
                if(comActEasyPhotoVO.getHandleList() != null && comActEasyPhotoVO.getHandleList().size() > 0){
                    comActEasyPhotoVO.getHandleList().forEach(handle -> {
                        easyPhotoHandlerService.addHandleRecord(cmActEasyPhotoDO.getCommunityId(),comActEasyPhotoVO.getUserId()
                                ,cmActEasyPhotoDO.getId(),handle.getType(), ComActEasyPhotoHandler.ServiceType.SSP);
                    });
                }
                break;
            case 2:
                // if(!cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.dsh)){

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java

@@ -21,10 +21,12 @@
import com.panzhihua.service_community.dao.ComActMicroWishFeedbackMapper;
import com.panzhihua.service_community.dao.ComActMicroWishOperationRecordMapper;
import com.panzhihua.service_community.dao.ComActMicroWishUserDAO;
import com.panzhihua.service_community.entity.ComActEasyPhotoHandler;
import com.panzhihua.service_community.model.dos.ComActMicroWishDO;
import com.panzhihua.service_community.model.dos.ComActMicroWishFeedbackDO;
import com.panzhihua.service_community.model.dos.ComActMicroWishOperationRecordDO;
import com.panzhihua.service_community.model.dos.ComActMicroWishUserDO;
import com.panzhihua.service_community.service.ComActEasyPhotoHandlerService;
import com.panzhihua.service_community.service.ComActMicroWishOperationRecordService;
import com.panzhihua.service_community.service.ComActMicroWishService;
import lombok.extern.slf4j.Slf4j;
@@ -56,6 +58,8 @@
    private ComActMicroWishOperationRecordMapper comActMicroWishOperationRecordMapper;
    @Resource
    private ComActMicroWishOperationRecordService wishOperationRecordService;
    @Resource
    private ComActEasyPhotoHandlerService easyPhotoHandlerService;
    /**
     * 分页查询微心愿
     *
@@ -244,6 +248,14 @@
                comActMicroWishOperationRecordDO.setRemark("分配心愿");
                comActMicroWishOperationRecordDO.setUserId(responsibleId);
                comActMicroWishOperationRecordMapper.insert(comActMicroWishOperationRecordDO);

                //添加分配人员
                if(comActMicroWishVO.getHandleList() != null && comActMicroWishVO.getHandleList().size() > 0){
                    comActMicroWishVO.getHandleList().forEach(handle -> {
                        easyPhotoHandlerService.addHandleRecord(microWishDO.getCommunityId(),comActMicroWishVO.getUserId()
                                ,microWishDO.getId(),handle.getType(), ComActEasyPhotoHandler.ServiceType.WXY);
                    });
                }
                break;
            case 4:
                isUpdate = true;

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActRaffleRecordServiceImpl.java

@@ -62,6 +62,6 @@

    @Override
    public R selectById(Long id) {
        return R.ok(this.baseMapper.selectById(id));
        return R.ok(this.baseMapper.selectOneById(id));
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectMemberServiceImpl.java

@@ -87,7 +87,7 @@
                if(comActSocialProjectMemberVO.getType()==1){
                    ComActSocialWorker comActSocialWorker=comActSocialWorkerDao.selectById(id);
                    if(comActSocialWorker!=null){
                        List<ComActSocialProjectMember> list= comActSocialProjectMemberDao.selectList(new QueryWrapper<ComActSocialProjectMember>().lambda().eq(ComActSocialProjectMember::getPhone,comActSocialWorker.getTelephone()).eq(ComActSocialProjectMember::getType,comActSocialProjectMemberVO.getType()).eq(ComActSocialProjectMember::getProjectId,comActSocialProjectMemberVO.getProjectId()));
                        List<ComActSocialProjectMember> list= comActSocialProjectMemberDao.selectList(new QueryWrapper<ComActSocialProjectMember>().lambda().eq(ComActSocialProjectMember::getPhone,comActSocialWorker.getTelephone()).eq(ComActSocialProjectMember::getType,comActSocialProjectMemberVO.getType()).eq(ComActSocialProjectMember::getProjectId,comActSocialProjectMemberVO.getParamId()));
                        if(CollectionUtils.isEmpty(list)){
                            ComActSocialProjectMember comActSocialProjectMember=new ComActSocialProjectMember();
                            BeanUtils.copyProperties(comActSocialProjectMemberVO,comActSocialProjectMember);

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectServiceImpl.java

@@ -7,9 +7,11 @@
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.social.SocialProjectVO;
import com.panzhihua.service_community.dao.ComActDAO;
import com.panzhihua.service_community.entity.ComActSocialProject;
import com.panzhihua.service_community.dao.ComActSocialProjectDao;
import com.panzhihua.service_community.entity.ProjectRelationVO;
import com.panzhihua.service_community.model.dos.ComActDO;
import com.panzhihua.service_community.service.ComActSocialProjectService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -29,8 +31,16 @@

    @Resource
    private ComActSocialProjectDao comActSocialProjectDao;
    @Resource
    private ComActDAO comActDAO;
    @Override
    public R pageList(CommonPage commonPage) {
        if(commonPage.getParamId2()!=null){
           ComActDO comActDO=comActDAO.selectById(commonPage.getCommunityId());
           if(comActDO!=null){
               commonPage.setStreetId(comActDO.getStreetId());
           }
        }
        return R.ok(comActSocialProjectDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
    }


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialWorkerServiceImpl.java

@@ -23,6 +23,7 @@

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

/**
@@ -54,6 +55,7 @@
        ComActSocialWorker comActSocialWorkerDO = new ComActSocialWorker();
        BeanUtils.copyProperties(comActSocialWorkerAddDTO, comActSocialWorkerDO);
        comActSocialWorkerDO.setCreateBy(comActSocialWorkerAddDTO.getUserId());
        comActSocialWorkerDO.setCreateAt(new Date());
        if(comActSocialWorkerMapper.insert(comActSocialWorkerDO)>0){
            return R.ok();
        }
@@ -109,14 +111,9 @@
     * @return 查找结果
     */
    @Override
    public R<ComActSocialWorkerDetailsVO> comActSocialWorkerDetails(Long id){
        ComActSocialWorker comActSocialWorkerDO = comActSocialWorkerMapper.selectById(id);
        if(comActSocialWorkerDO!=null) {
            ComActSocialWorkerDetailsVO comActSocialWorkerDetailsVO = new ComActSocialWorkerDetailsVO();
            BeanUtils.copyProperties(comActSocialWorkerDO, comActSocialWorkerDetailsVO);
            return R.ok(comActSocialWorkerDetailsVO);
        }
        return R.fail();
    public R<ComActSocialWorkerVO> comActSocialWorkerDetails(Long id){
        ComActSocialWorkerVO comActSocialWorkerDO = comActSocialWorkerMapper.selectOneById(id);
        return R.ok(comActSocialWorkerDO);
    }

    @Override

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComFmsTeamMemberServiceImpl.java

@@ -2,7 +2,6 @@

import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;
import static org.apache.commons.lang3.StringUtils.isBlank;
import static org.apache.commons.lang3.StringUtils.isNotBlank;
import static org.apache.commons.lang3.StringUtils.isNotEmpty;

@@ -18,6 +17,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -33,6 +33,7 @@
import com.panzhihua.common.model.vos.community.fms.ComFmsTeamMemberImportExcelVO;
import com.panzhihua.common.model.vos.community.fms.ComFmsTeamMemberImportMistakeExcelVO;
import com.panzhihua.common.model.vos.community.fms.ComFmsTeamMemberVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_community.dao.ComFmsTeamDAO;
import com.panzhihua.service_community.dao.ComFmsTeamMemberDAO;
import com.panzhihua.service_community.dao.ComFmsTeamMemberRelationDAO;
@@ -61,6 +62,8 @@
    private ComFmsTeamMemberRelationDAO comFmsTeamMemberRelationDAO;
    @Resource
    private ComFmsTeamTypeDAO comFmsTeamTypeDAO;
    @Resource
    private UserService userService;

    /**
     * 新增团队成员
@@ -193,7 +196,18 @@
                .eq(ComFmsTeamMemberRelation::getMemberId, deleteTeamMemberDTO.getId()).eq(ComFmsTeamMemberRelation::getTeamId, deleteTeamMemberDTO.getTeamId()));
        if (num > 0) {
            if (count == 1) {
                //只存在一个团队中直接删除
                this.baseMapper.deleteById(deleteTeamMemberDTO.getId());
                // 删除用户信息缓存
                userService.deleteUserCashByPhone(comFmsTeamMember.getPhone());
            } else {
                //存在多个团队中，删除与该团队关联
                ComFmsTeam fmsTeam = comFmsTeamDAO.selectById(deleteTeamMemberDTO.getTeamId());
                String cascadeIds = comFmsTeamMember.getCascadeIds();
                List<List> lists = JSONArray.parseArray(cascadeIds, List.class);
                List<List> collect = lists.stream().filter(e -> !e.toString().equals(Arrays.asList(fmsTeam.getTeamType(), fmsTeam.getId()).toString())).collect(Collectors.toList());
                comFmsTeamMember.setCascadeIds(collect.toString());
                this.baseMapper.updateById(comFmsTeamMember);
            }
            return R.ok();
        }

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActivityMapper.xml

@@ -73,7 +73,7 @@
        SELECT  a.id, a.activity_name, u.`name` sponsorName, a.activity_addr, a.participant_max, a.contact_name,
        COUNT(if(s.is_volunteer=1,NULL,s.id))participant_now, a.volunteer_max,
        COUNT(if(s.is_volunteer=1,s.id,NULL))volunteer_now, a.`status`, a.publish_at,
        a.is_qr_code, a.begin_at, a.end_at, a.sign_up_begin, a.sign_up_end, a.reward_way, a.activity_type, a.have_integral_reward ,a.cover<if test='comActActivityVO.type != null and comActActivityVO.type == 4'>,so.socialCount</if>
        a.is_qr_code, a.begin_at, a.end_at, a.sign_up_begin, a.sign_up_end, a.reward_way, a.activity_type, a.have_integral_reward ,a.cover,a.type,a.duration<if test='comActActivityVO.type != null and comActActivityVO.type == 4'>,so.socialCount</if>
        FROM  com_act_activity a
        LEFT JOIN sys_user u ON a.sponsor_id=u.user_id
        LEFT JOIN (SELECT * FROM com_act_act_sign WHERE `status` = 1) s ON a.id=s.activity_id
@@ -158,10 +158,10 @@
            FROM com_act_activity
            WHERE community_id = ${communityId}
            <if test="isResidentAct">
                AND volunteer_max = 0
                AND `type` = 2
            </if>
            <if test="!isResidentAct">
                AND volunteer_max != 0
                AND `type` = 1
            </if>
            AND DATE_FORMAT( publish_at, '%Y-%m' ) &gt; DATE_FORMAT(date_sub(curdate(), interval 12 month),'%Y-%m') GROUP BY filed
            UNION ALL SELECT * FROM
@@ -187,10 +187,10 @@
        FROM com_act_activity
        WHERE community_id = ${communityId}
        <if test="isResidentAct">
            AND volunteer_max = 0
            AND `type` = 2
        </if>
        <if test="!isResidentAct">
            AND volunteer_max != 0
            AND `type` = 1
        </if>
        AND DATE_FORMAT( publish_at, '%Y-%m' ) &lt;= #{date}
    </select>
@@ -208,10 +208,10 @@
            AND community_id = ${pageBaseDTO.communityId}
        </if>
        <if test="isResidentAct">
            AND volunteer_max = 0
            AND `type` = 2
        </if>
        <if test="!isResidentAct">
            AND volunteer_max != 0
            AND `type` = 1
        </if>
        <if test="pageBaseDTO.param2 != null and pageBaseDTO.param2 != &quot;&quot;">
            AND activity_type = #{pageBaseDTO.param2}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActColumnMapper.xml

@@ -23,11 +23,17 @@
            <if test="commonPage.communityId!=null">
                and community_id = ${commonPage.communityId}
            </if>
            <if test="commonPage.streetId!=null">
                and street_id = #{commonPage.streetId}
            </if>
            <if test="commonPage.status!=null">
                and status =#{commonPage.status}
            </if>
            <if test="commonPage.keyword!=null and commonPage.keyword!=''">
                and name like concat('%',#{commonPage.keyword},'%')
            </if>
            <if test="commonPage.name!=null and commonPage.name!=''">
                and name like concat('%',#{commonPage.name},'%')
            </if>
            <if test="commonPage.paramId !=null">
                and parent_id = #{commonPage.paramId}
@@ -51,6 +57,9 @@
            <if test="communityId !=null ">
                and t.community_id =#{communityId}
            </if>
            <if test="streetId !=null ">
                and t.street_id =#{streetId}
            </if>
            <if test="type !=null ">
                and t.type =#{type}
            </if>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDiscussDOMapper.xml

@@ -76,6 +76,7 @@
        d.id,
        d.`discuss_subject`,
        d.type,
        d.content_type,
        COUNT( DISTINCT c.id ) commentNum,
        u.NAME userName,
        u.nick_name userNickName,
@@ -97,6 +98,9 @@
        <if test="pageComActDiscussDTO.status != null">
            and d.status = #{pageComActDiscussDTO.status}
        </if>
        <if test="pageComActDiscussDTO.contentType != null">
            and d.content_type = #{pageComActDiscussDTO.contentType}
        </if>
        GROUP BY   d.id  )t
        order by t.create_at desc
    </select>
@@ -111,6 +115,7 @@
        d.fabulous_num as signNum,
        d.views_num,
        d.status,
        d.content_type,
        u.NAME userName,
        u.nick_name userNickName,
        d.create_at
@@ -132,6 +137,9 @@
        <if test="pageComActDiscussDTO.keyWord != null and pageComActDiscussDTO.keyWord != &quot;&quot;">
            and (d.`discuss_subject` LIKE concat(#{pageComActDiscussDTO.keyWord}, '%' ) or
            u.`name` LIKE concat(#{pageComActDiscussDTO.keyWord}, '%' ))
        </if>
        <if test="pageComActDiscussDTO.contentType != null">
            and d.content_type = #{pageComActDiscussDTO.contentType}
        </if>
        order by d.create_at desc
    </select>
@@ -158,7 +166,7 @@
    </select>
    <select id="pageDiscussApplets" resultType="com.panzhihua.common.model.vos.community.ComActDiscussVO">
        SELECT t.* FROM (
            SELECT d.id, d.vote_title, if(d.address IS NULL OR d.address='null',a.name,d.address )address, d.photo_pah,
            SELECT d.id, d.vote_title, if(d.address IS NULL OR d.address='null',a.name,d.address )address, d.photo_pah,d.content_type,
                d.`discuss_subject`, d.type, d.end_time, d.status, d.views_num, d.join_num, d.fabulous_num AS signNum,
                d.comment_num AS commentNum, d.release_at, d.img_width, d.img_height, d.is_repeat, d.count, u.type AS userType, if(u.type=1,u.name,a.name) userName,
                if(u.type=1,u.nick_name,a.name) userNickName,
@@ -193,6 +201,9 @@
                <if test='pageComActDiscussDTO.displayStatus != null and pageComActDiscussDTO.displayStatus == 2'>
                    AND d.`end_time` &lt; now()
                </if>
                <if test="pageComActDiscussDTO.contentType != null">
                    and d.content_type = #{pageComActDiscussDTO.contentType}
                </if>
            GROUP BY d.id
        ) t ORDER BY t.create_at DESC
    </select>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDynDOMapper.xml

@@ -81,4 +81,59 @@
        </if>
        ORDER BY t1.id DESC
    </select>
    <select id="getPartyBuildIngBaseData"
            resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenPartyBuildIngStatisticsInfo">
        SELECT
        (SELECT COUNT( d.id ) FROM com_pb_dyn d LEFT JOIN com_pb_dyn_user u ON d.id = u.dyn_id LEFT JOIN com_act t ON d.community_id = t.community_id WHERE d.type = 1 AND d.community_id = #{communityId}) AS djdtTotal,
        (SELECT COUNT( a.id ) FROM com_pb_activity a LEFT JOIN sys_user u ON a.create_by = u.user_id WHERE a.community_id = #{communityId} AND a.`status` IN ( 3, 4, 5 )) AS djhdTotal,
        (SELECT COUNT(id) FROM com_act_discuss WHERE community_id = #{communityId} AND is_del = 2) AS ystpTotal,
        (SELECT COUNT(DISTINCT d2.user_id) FROM com_act_discuss d1 INNER JOIN com_act_discuss_comment d2 ON d1.id = d2.discuss_id WHERE d1.community_id = #{communityId} AND d1.is_del = 2) AS ystpcyTotal,
        (SELECT COUNT(id) FROM com_act_discuss WHERE community_id = #{communityId} AND is_del = 2 AND `type` = 1) AS ysTotal,
        (SELECT COUNT(id) FROM com_act_discuss WHERE community_id = #{communityId} AND is_del = 2 AND `type` = 2) AS tpTotal,
        (SELECT COUNT(id) FROM com_pb_member WHERE community_id = #{communityId} AND audit_result = 1) AS dyTotal,
        (SELECT COUNT(id) FROM com_act_four_member WHERE community_id = #{communityId}) AS szsyTotal,
        (SELECT COUNT(id) FROM com_act_four_member WHERE community_id = #{communityId} AND (position LIKE CONCAT('%','居民小组长','%') OR position = '全部')) AS jmxzzTotal,
        (SELECT COUNT(id) FROM com_act_four_member WHERE community_id = #{communityId} AND (position LIKE CONCAT('%','妇女小组长','%') OR position = '全部')) AS fnxzzTotal,
        (SELECT COUNT(id) FROM com_act_four_member WHERE community_id = #{communityId} AND (position LIKE CONCAT('%','党小组长','%') OR position = '全部')) AS dxzzTotal,
        (SELECT COUNT(id) FROM com_act_four_member WHERE community_id = #{communityId} AND (position LIKE CONCAT('%','楼栋长','%') OR position = '全部')) AS ldzTotal,
        (SELECT COUNT(id) FROM com_act_four_member WHERE community_id = #{communityId} AND (position LIKE CONCAT('%','调解员','%') OR position = '全部')) AS tjyTotal,
        (SELECT COUNT(id) FROM com_act_four_member WHERE community_id = #{communityId} AND (position LIKE CONCAT('%','安全员','%') OR position = '全部')) AS aqyTotal,
        (SELECT COUNT(id) FROM com_act_four_member WHERE community_id = #{communityId} AND (position LIKE CONCAT('%','宣传员','%') OR position = '全部')) AS xcyTotal,
        (SELECT COUNT(id) FROM com_act_four_member WHERE community_id = #{communityId} AND (position LIKE CONCAT('%','监督员','%') OR position = '全部')) AS jdyTotal,
        (SELECT COUNT(t1.id) FROM com_act_easy_photo_handler t1 INNER JOIN com_act_micro_wish t2 ON t1.service_id = t2.id
        WHERE t1.community_id = #{communityId} AND t1.`type` = 2 AND t1.service_type = 2 AND t2.`status` = 6) AS zyxServiceTotal,
        (SELECT COUNT(id) FROM com_act_dyn WHERE community_id = #{communityId} AND `status` = 1) AS jmxcTotal,
        (SELECT COUNT(id) FROM com_sw_patrol_record WHERE community_id = #{communityId}) AS xqxcTotal,
        (SELECT IF(AVG(score) IS NULL,0,ROUND(AVG(score),1)) FROM com_act_easy_photo_evaluate WHERE community_id = #{communityId} AND service_type = 1) AS qzmydStar
    </select>
    <select id="pagePartyBuildIngAct"
            resultType="com.panzhihua.common.model.vos.partybuilding.PartyBuildingActivityVO">
        SELECT
            a.id,
            a.NAME,
            a.release_time,
            a.cover
        FROM com_pb_activity a
        LEFT JOIN sys_user u ON a.create_by = u.user_id
        WHERE a.community_id = #{pageBaseDTO.communityId} AND a.`status` IN ( 3, 4, 5 )
        ORDER BY a.release_time desc
    </select>
    <select id="pagePartyBuildIngDiscuss"
            resultType="com.panzhihua.common.model.vos.community.ComActDiscussVO">
        SELECT
            id,
            discuss_subject,
            `type`,
            photo_pah
        FROM com_act_discuss
        WHERE community_id = #{pageBaseDTO.communityId} AND is_del = 2
        ORDER BY create_at DESC
    </select>
    <select id="getPartyBuildIngDynRecord" resultType="com.panzhihua.common.model.vos.community.ComActDynVO">
        SELECT id,title,publish_at FROM com_act_dyn WHERE community_id = #{communityId} AND `status` = 1 LIMIT #{pageSize}
    </select>
    <select id="getPartyBuildIngPatrolRecord"
            resultType="com.panzhihua.common.model.vos.community.ComSwPatrolRecordVO">
        SELECT id,person_name,patrol_type,patrol_time FROM com_sw_patrol_record WHERE community_id = #{communityId} LIMIT #{pageSize}
    </select>
</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoDOMapper.xml

@@ -477,5 +477,14 @@

                IFNULL((SELECT  count(id) FROM  com_sw_patrol_record WHERE  community_id = ${communityId}), 0) AS safety
    </select>
    <select id="getPartyBuildIngRecord"
            resultType="com.panzhihua.common.model.vos.community.ComActEasyPhotoVO">
        SELECT t1.id, t1.create_at, t2.`name` AS classifyName, t3.nick_name AS userNickName, t4.score
        FROM com_act_easy_photo t1
        LEFT JOIN com_act_easy_photo_classify t2 ON t1.classify_id = t2.id
        LEFT JOIN sys_user t3 ON t1.sponsor_id = t3.user_id
        LEFT JOIN (SELECT * FROM com_act_easy_photo_evaluate WHERE service_type = 1) t4 ON t1.id = t4.service_id
        WHERE t1.community_id = #{communityId} AND t1.`status` = 5 LIMIT #{pageSize}
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoEvaluateMapper.xml

New file
@@ -0,0 +1,93 @@
<?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_community.dao.ComActEasyPhotoEvaluateMapper">

    <resultMap type="com.panzhihua.service_community.entity.ComActEasyPhotoEvaluate" id="ComActEasyPhotoEvaluateMap">
        <result property="id" column="id" jdbcType="INTEGER"/>
        <result property="communityId" column="community_id" jdbcType="INTEGER"/>
        <result property="serviceId" column="service_id" jdbcType="INTEGER"/>
        <result property="userId" column="user_id" jdbcType="INTEGER"/>
        <result property="score" column="score" jdbcType="INTEGER"/>
        <result property="content" column="content" jdbcType="VARCHAR"/>
        <result property="createAt" column="create_at" jdbcType="TIMESTAMP"/>
        <result property="serviceType" column="service_type" jdbcType="INTEGER"/>
    </resultMap>

    <!--查询单个-->
    <select id="queryById" resultMap="ComActEasyPhotoEvaluateMap">
        select
          id, community_id, service_id, user_id, score, content, create_at, service_type
        from com_act_easy_photo_evaluate
        where id = #{id}
    </select>

    <!--查询指定行数据-->
    <select id="queryAllByLimit" resultMap="ComActEasyPhotoEvaluateMap">
        select
        id, community_id, service_id, user_id, score, content, create_at, service_type
        from com_act_easy_photo_evaluate
        <where>
            <if test="dto.id != null">
                and id = #{dto.id}
            </if>
            <if test="dto.communityId != null">
                and community_id = #{dto.communityId}
            </if>
            <if test="dto.serviceId != null">
                and service_id = #{dto.serviceId}
            </if>
            <if test="dto.userId != null">
                and user_id = #{dto.userId}
            </if>
            <if test="dto.score != null">
                and score = #{dto.score}
            </if>
            <if test="dto.content != null and dto.content != ''">
                and content = #{dto.content}
            </if>
            <if test="dto.createAt != null">
                and create_at = #{dto.createAt}
            </if>
            <if test="dto.serviceType != null">
                and service_type = #{dto.serviceType}
            </if>
        </where>
        order by create_at desc
    </select>

    <!--查询所有数据-->
    <select id="queryAllByList" resultMap="ComActEasyPhotoEvaluateMap">
        select
        id, community_id, service_id, user_id, score, content, create_at, service_type
        from com_act_easy_photo_evaluate
        <where>
            <if test="dto.id != null">
                and id = #{dto.id}
            </if>
            <if test="dto.communityId != null">
                and community_id = #{dto.communityId}
            </if>
            <if test="dto.serviceId != null">
                and service_id = #{dto.serviceId}
            </if>
            <if test="dto.userId != null">
                and user_id = #{dto.userId}
            </if>
            <if test="dto.score != null">
                and score = #{dto.score}
            </if>
            <if test="dto.content != null and dto.content != ''">
                and content = #{dto.content}
            </if>
            <if test="dto.createAt != null">
                and create_at = #{dto.createAt}
            </if>
            <if test="dto.serviceType != null">
                and service_type = #{dto.serviceType}
            </if>
        </where>
        order by create_at desc
    </select>

</mapper>


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoHandlerMapper.xml

New file
@@ -0,0 +1,79 @@
<?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_community.dao.ComActEasyPhotoHandlerMapper">

    <resultMap type="com.panzhihua.service_community.entity.ComActEasyPhotoHandler" id="ComActEasyPhotoHandlerMap">
        <result property="id" column="id" jdbcType="INTEGER"/>
        <result property="communityId" column="community_id" jdbcType="INTEGER"/>
        <result property="userId" column="user_id" jdbcType="INTEGER"/>
        <result property="serviceId" column="service_id" jdbcType="INTEGER"/>
        <result property="type" column="type" jdbcType="INTEGER"/>
        <result property="serviceType" column="service_type" jdbcType="INTEGER"/>
    </resultMap>

    <!--查询单个-->
    <select id="queryById" resultMap="ComActEasyPhotoHandlerMap">
        select
          id, community_id, user_id, service_id, type, service_type
        from com_act_easy_photo_handler
        where id = #{id}
    </select>

    <!--查询指定行数据-->
    <select id="queryAllByLimit" resultMap="ComActEasyPhotoHandlerMap">
        select
        id, community_id, user_id, service_id, type, service_type
        from com_act_easy_photo_handler
        <where>
            <if test="dto.id != null">
                and id = #{dto.id}
            </if>
            <if test="dto.communityId != null">
                and community_id = #{dto.communityId}
            </if>
            <if test="dto.userId != null">
                and user_id = #{dto.userId}
            </if>
            <if test="dto.serviceId != null">
                and service_id = #{dto.serviceId}
            </if>
            <if test="dto.type != null">
                and type = #{dto.type}
            </if>
            <if test="dto.serviceType != null">
                and service_type = #{dto.serviceType}
            </if>
        </where>
        order by create_at desc
    </select>

    <!--查询所有数据-->
    <select id="queryAllByList" resultMap="ComActEasyPhotoHandlerMap">
        select
        id, community_id, user_id, service_id, type, service_type
        from com_act_easy_photo_handler
        <where>
            <if test="dto.id != null">
                and id = #{dto.id}
            </if>
            <if test="dto.communityId != null">
                and community_id = #{dto.communityId}
            </if>
            <if test="dto.userId != null">
                and user_id = #{dto.userId}
            </if>
            <if test="dto.serviceId != null">
                and service_id = #{dto.serviceId}
            </if>
            <if test="dto.type != null">
                and type = #{dto.type}
            </if>
            <if test="dto.serviceType != null">
                and service_type = #{dto.serviceType}
            </if>
        </where>
        order by create_at desc
    </select>

</mapper>


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActFourMemberMapper.xml

@@ -48,5 +48,92 @@
    <select id="getById" resultMap="baseResultMap">
        select t.*,t1.*,t2.role_id from com_act_four_member t left join sys_user t1 on t.user_id = t1.user_id left join sys_user_role t2 on t.user_id =t2.user_id where t.id =#{id}
    </select>
    <select id="getFourMemberBaseData"
            resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenFourMemberStatisticsInfo">
        SELECT
        (SELECT COUNT(id) FROM com_act_four_member WHERE community_id = #{communityId}) AS szsyTotal,
        (SELECT COUNT(id) FROM com_act_four_member WHERE community_id = #{communityId} AND (position LIKE CONCAT('%','居民小组长','%') OR position = '全部')) AS jmxzzTotal,
        (SELECT COUNT(id) FROM com_act_four_member WHERE community_id = #{communityId} AND (position LIKE CONCAT('%','妇女小组长','%') OR position = '全部')) AS fnxzzTotal,
        (SELECT COUNT(id) FROM com_act_four_member WHERE community_id = #{communityId} AND (position LIKE CONCAT('%','党小组长','%') OR position = '全部')) AS dxzzTotal,
        (SELECT COUNT(id) FROM com_act_four_member WHERE community_id = #{communityId} AND (position LIKE CONCAT('%','楼栋长','%') OR position = '全部')) AS ldzTotal,
        (SELECT COUNT(id) FROM com_act_four_member WHERE community_id = #{communityId} AND (position LIKE CONCAT('%','调解员','%') OR position = '全部')) AS tjyTotal,
        (SELECT COUNT(id) FROM com_act_four_member WHERE community_id = #{communityId} AND (position LIKE CONCAT('%','安全员','%') OR position = '全部')) AS aqyTotal,
        (SELECT COUNT(id) FROM com_act_four_member WHERE community_id = #{communityId} AND (position LIKE CONCAT('%','宣传员','%') OR position = '全部')) AS xcyTotal,
        (SELECT COUNT(id) FROM com_act_four_member WHERE community_id = #{communityId} AND (position LIKE CONCAT('%','监督员','%') OR position = '全部')) AS jdyTotal,
        (SELECT
            (SELECT COUNT(t1.id)
            FROM com_act_easy_photo_handler t1
            INNER JOIN com_act_easy_photo t2 ON t1.service_id = t2.id
            WHERE t1.community_id = #{communityId} AND t1.`type` = 5 AND t1.service_type = 1 AND t2.`status` = 5
            ) +
            (SELECT COUNT(t1.id)
            FROM com_act_easy_photo_handler t1
            INNER JOIN com_act_micro_wish t2 ON t1.service_id = t2.id
            WHERE t1.community_id = #{communityId} AND t1.`type` = 5 AND t1.service_type = 2 AND t2.`status` = 6
            )
        ) AS jjwtTotal
    </select>
    <select id="getFourMembers" resultType="com.panzhihua.common.model.vos.community.ComActFourMemberVO">
        SELECT
        a.id,
        su.`name`,
        a.position,
        a.url,
        substring_index( substring_index( a.jurisdiction_content, ',', b.help_topic_id + 1 ), ',',- 1 ) AS jurisdiction_content
        FROM
        com_act_four_member a
        LEFT JOIN sys_user su ON a.user_id = su.user_id
        JOIN mysql.help_topic b ON b.help_topic_id &lt; ( length( a.jurisdiction_content ) - length( REPLACE ( a.jurisdiction_content, ',', '' ))+ 1 )
        WHERE
        a.community_id = #{communityId}
    </select>
    <select id="retrieveJJWTAddPolylineData"
            resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT filed, SUM(num) AS num FROM (
            SELECT DATE_FORMAT( create_at, '%Y-%m' ) AS filed, COUNT(1) AS num
            FROM com_act_easy_photo_handler t1
            INNER JOIN com_act_easy_photo t2 ON t1.service_id = t2.id
            WHERE t1.community_id = #{communityId} AND t1.`type` = 5 AND t1.service_type = 1 AND t2.`status` = 5 AND DATE_FORMAT( create_at, '%Y-%m' ) &gt; DATE_FORMAT(date_sub(curdate(), interval 12 month),'%Y-%m'
            ) GROUP BY filed
            UNION ALL
            SELECT DATE_FORMAT( create_at, '%Y-%m' ) AS filed, COUNT(1) AS num
            FROM com_act_easy_photo_handler t1
            INNER JOIN com_act_micro_wish t2 ON t1.service_id = t2.id
            WHERE t1.community_id = #{communityId} AND t1.`type` = 5 AND t1.service_type = 2 AND t2.`status` = 6 AND DATE_FORMAT( create_at, '%Y-%m' ) &gt; DATE_FORMAT(date_sub(curdate(), interval 12 month),'%Y-%m'
            ) GROUP BY filed
            UNION ALL SELECT * FROM
            (
                    SELECT DATE_FORMAT(curdate(),'%Y-%m') AS filed, 0 AS num union
                    SELECT DATE_FORMAT(date_sub(curdate(), interval 1 month),'%Y-%m') AS filed, 0 AS num union
                    SELECT DATE_FORMAT(date_sub(curdate(), interval 2 month),'%Y-%m') AS filed, 0 AS num union
                    SELECT DATE_FORMAT(date_sub(curdate(), interval 3 month),'%Y-%m') AS filed, 0 AS num union
                    SELECT DATE_FORMAT(date_sub(curdate(), interval 4 month),'%Y-%m') AS filed, 0 AS num union
                    SELECT DATE_FORMAT(date_sub(curdate(), interval 5 month),'%Y-%m') AS filed, 0 AS num union
                    SELECT DATE_FORMAT(date_sub(curdate(), interval 6 month),'%Y-%m') AS filed, 0 AS num union
                    SELECT DATE_FORMAT(date_sub(curdate(), interval 7 month),'%Y-%m') AS filed, 0 AS num union
                    SELECT DATE_FORMAT(date_sub(curdate(), interval 8 month),'%Y-%m') AS filed, 0 AS num union
                    SELECT DATE_FORMAT(date_sub(curdate(), interval 9 month),'%Y-%m') AS filed, 0 AS num union
                    SELECT DATE_FORMAT(date_sub(curdate(), interval 10 month),'%Y-%m') AS filed, 0 AS num union
                    SELECT DATE_FORMAT(date_sub(curdate(), interval 11 month),'%Y-%m') AS filed, 0 AS num
            ) temT
        ) temp GROUP BY filed ORDER BY filed ASC
    </select>
    <select id="retrieveJJWTTotalPolylineData"
            resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT
        (SELECT COUNT(1) AS num
        FROM com_act_easy_photo_handler t1
        INNER JOIN com_act_easy_photo t2 ON t1.service_id = t2.id
        WHERE t1.community_id = #{communityId} AND t1.`type` = 5
        AND t1.service_type = 1 AND t2.`status` = 5 AND DATE_FORMAT( t2.create_at, '%Y-%m' ) &lt;= #{date}
        )
        +
        (SELECT COUNT(1) AS num
        FROM com_act_easy_photo_handler t1
        INNER JOIN com_act_micro_wish t2 ON t1.service_id = t2.id
        WHERE t1.community_id = #{communityId} AND t1.`type` = 5
        AND t1.service_type = 2 AND t2.`status` = 6 AND DATE_FORMAT( t2.create_at, '%Y-%m' ) &lt;= #{date}
        ) AS num
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActMicroWishDOMapper.xml

@@ -102,6 +102,9 @@
        <if test="type != null and type == 3">
            select user_id,IFNULL(`name`,nick_name) as `name` from sys_user where `type` = 1 and community_id = ${communityId} and status = 1 and is_volunteer = 1
        </if>
        <if test="type != null and type == 5">
            select user_id,IFNULL(`name`,nick_name) as `name` from sys_user where user_id in (select user_id from com_act_four_member where community_id = ${communityId})
        </if>
    </select>

    <select id="getUserByUserId" resultType="com.panzhihua.common.model.vos.user.SysUserVO">
@@ -217,5 +220,25 @@
        FROM com_act_micro_wish
        WHERE community_id = ${pageBaseDTO.communityId} AND `status` NOT IN(1,4) ORDER BY create_at DESC
    </select>
    <select id="pagePartyBuildIngMicroWish"
            resultType="com.panzhihua.common.model.vos.community.ComActMicroWishVO">
        SELECT t2.id, t2.photo_path_list
        FROM com_act_easy_photo_handler t1
        INNER JOIN com_act_micro_wish t2 ON t1.service_id = t2.id
        WHERE t1.community_id = #{pageBaseDTO.communityId} AND t1.`type` = 2 AND t1.service_type = 2 AND t2.`status` = 6 AND t2.photo_path_list IS NOT NULL
    </select>
    <select id="pageFourMemberResolve" resultType="com.panzhihua.common.model.vos.community.ComActMicroWishVO">
        SELECT * FROM(
            SELECT t2.id, t2.photo_path_list
            FROM com_act_easy_photo_handler t1
            INNER JOIN com_act_micro_wish t2 ON t1.service_id = t2.id
            WHERE t1.community_id = #{pageBaseDTO.communityId} AND t1.`type` = 5 AND t1.service_type = 2 AND t2.`status` = 6 AND t2.photo_path_list IS NOT NULL
            UNION ALL
            SELECT t2.id, t2.photo_path_list
            FROM com_act_easy_photo_handler t1
            INNER JOIN com_act_easy_photo t2 ON t1.service_id = t2.id
            WHERE t1.community_id = #{pageBaseDTO.communityId} AND t1.`type` = 5 AND t1.service_type = 1 AND t2.`status` = 5 AND t2.photo_path_list IS NOT NULL
        ) temp
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActRaffleMapper.xml

@@ -23,12 +23,14 @@
    </resultMap>

    <select id="pageList" resultType="com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO">
         select t.*,t2.waitRaffleCount,t3.joinCount,t4.name as createName,t5.raffleCount,t6.prizeCount from com_act_raffle t
         LEFT JOIN (select sum(surplus) as waitRaffleCount,raffle_id from com_act_raffle_prize GROUP BY raffle_id) t2 on t.id = t2.raffle_id
        select t.*,t2.waitRaffleCount,t3.joinCount,t4.name as createName,t5.raffleCount,t6.prizeCount,ISNULL(t7.isJoin) as isJoin from com_act_raffle t
         LEFT JOIN (select count(*) waitRaffleCount,raffle_id from com_act_raffle_record where status = 1 group by raffle_id) t2 on t.id = t2.raffle_id
         LEFT JOIN (select count(*) as joinCount,raffle_id from com_act_raffle_record GROUP BY raffle_id) t3 on t.id = t3.raffle_id
         LEFT JOIN sys_user t4 on t.create_by = t4.user_id
         LEFT JOIN (select count(*) as raffleCount,raffle_id from com_act_raffle_record where status >0 GROUP BY raffle_id) t5 on t.id = t5.raffle_id
         LEFT JOIN (select sum(total) as prizeCount,raffle_id from com_act_raffle_prize GROUP BY raffle_id) t6 on t.id = t6.raffle_id
         LEFT JOIN (select count(*)  as isJoin,raffle_id from com_act_raffle_record <if test="commonPage.userId !=null"> where user_id = ${commonPage.userId} </if> group by raffle_id) t7 on t.id = t7.raffle_id

         <where>
             <if test="commonPage.communityId!=null">
                 and t.community_id = #{commonPage.communityId}
@@ -39,6 +41,9 @@
             <if test="commonPage.keyword !=null">
                 and t.name like concat('%',#{commonPage.keyword},'%')
             </if>
             <if test="commonPage.type!=null">
                 and t.status > 0
             </if>
         </where>
         order by t.create_time desc
    </select>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActRaffleRecordMapper.xml

@@ -13,9 +13,11 @@
    </resultMap>

    <select id="selectByUserId" resultType="com.panzhihua.common.model.vos.community.raffle.ComActRaffleRecordVO">
        select t.*, t1.`name`, t1.image
        select t.*, t1.image, t1.name as prizeName, t2.nick_name, t2.phone, t2.`name` as username, t3.name as staffName
        from com_act_raffle_record t
                 LEFT JOIN com_act_raffle_prize t1 on t.prize_id = t1.id
        left join com_act_raffle_prize t1 on t.prize_id = t1.id
        left join sys_user t2 on t.user_id = t2.user_id
        left join sys_user t3 on t.staff_id = t3.user_id
        where 1=1 <if test="userId !=null and userId !=0"> and t.user_id = #{userId} </if>
          and t.raffle_id = #{raffleId}
    </select>
@@ -74,9 +76,11 @@
    </select>

    <select id="selectOneById" resultType="com.panzhihua.common.model.vos.community.raffle.ComActRaffleRecordVO">
        select t.*, t1.`name`, t1.image
        select t.*, t1.`name` as prizeName, t1.image,t2.phone, t2.`name` as username, t3.name as staffName
        from com_act_raffle_record t
        LEFT JOIN com_act_raffle_prize t1 on t.prize_id = t1.id
        left join sys_user t2 on t.user_id = t2.user_id
        left join sys_user t3 on t.staff_id = t3.user_id
        where t.id=#{id}
    </select>


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialMemberMapper.xml

@@ -18,7 +18,9 @@
    </resultMap>

    <select id="pageList" resultType="com.panzhihua.common.model.vos.ComActSocialMemberVO">
        select t.*,t1.name as orgName from com_act_social_member t left join com_act_social_org t1 on t.org_id = t1.id
        select t.*,t1.name as orgName from com_act_social_member t
        left join com_act_social_org t1 on t.org_id = t1.id
        left join com_act t2 on t.community_id = t2.community_id
        <where>
            1=1
            <if test="commonPage.keyword!=null and commonPage.keyword !=''">
@@ -31,7 +33,10 @@
                and t.org_id = #{commonPage.paramId}
            </if>
            <if test="commonPage.streetId!=null ">
                and t.street_id = #{commonPage.streetId}
                and t2.street_id = #{commonPage.streetId}
            </if>
            <if test="commonPage.communityId!=null ">
                and t2.community_id = #{commonPage.communityId}
            </if>
        </where>
        order by t.create_time desc

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialProjectMapper.xml

@@ -23,11 +23,16 @@
        left join com_act_column t2 on t.second_column_id = t2.id
        <where>
            1=1
            <if test="commonPage.communityId !=0 and commonPage.communityId !=null">
                and t.community_id =#{commonPage.communityId}
            <if test="commonPage.paramId2==null">
                <if test="commonPage.communityId !=0 and commonPage.communityId !=null">
                    and (t.community_id =#{commonPage.communityId} or t.responsibility_id =#{commonPage.communityId})
                </if>
                <if test="commonPage.streetId !=0 and commonPage.streetId !=null">
                    and t.street_id =#{commonPage.streetId}
                </if>
            </if>
            <if test="commonPage.streetId !=0 and commonPage.streetId !=null">
                and t.street_id =#{commonPage.streetId}
            <if test="commonPage.paramId2!=null">
                and (t.street_id = #{commonPage.streetId} or t.community_id =#{commonPage.communityId})
            </if>
            <if test="commonPage.status !=null">
                and t.status =#{commonPage.status}
@@ -45,19 +50,32 @@
            <if test="commonPage.endTime !=null">
                and #{commonPage.endTime} >= t.create_time
            </if>
            <if test="commonPage.paramId !=null">
            <if test="commonPage.paramId!=null and commonPage.paramId !=0">
                and t.parent_id = #{commonPage.paramId}
            </if>
            <if test="commonPage.paramId ==0 and commonPage.streetId!=null">
                and t.parent_id = #{commonPage.paramId}
            </if>
            <if test="commonPage.columnId !=null">
                and t.column_id = #{commonPage.columnId}
            </if>
            <if test="commonPage.columnId !=null">
                and t.column_id = #{commonPage.columnId}
            </if>
            <if test="commonPage.secondColumnId !=null">
                and t.second_column_id = #{commonPage.secondColumnId}
            </if>
        </where>
        order by t.create_time desc
    </select>

    <select id="getByApplet" resultType="com.panzhihua.common.model.vos.community.social.SocialProjectVO">
        select t.*, t1.phone as streetPhone, t2.name as columnName, t3.name as secondColumnName
        select t.*, t1.phone as streetPhone, t2.name as columnName, t3.name as secondColumnName,t1.name as streetName,t4.name as communityName,t4.contacts_phone as communityPhone
        from com_act_social_project t
                 LEFT JOIN com_street t1 on t.street_id = t1.street_id
                 LEFT JOIN com_act_column t2 on t.column_id = t2.id
                 LEFT JOIN com_act_column t3 on t.second_column_id = t3.id
                 LEFT JOIN com_act  t4 on t.community_id = t4.community_id
        where t.id = #{id}
    </select>

@@ -114,7 +132,7 @@
               #{year}, '-',
               #{date}, '-00')), '%Y-%m-%d 23:59:59') >=publish_at) y,
            (
        select count (id)
        select count(id)
        from com_act_activity
        where status!=6
          and is_project = 1

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialProjectPublicityMapper.xml

@@ -19,6 +19,9 @@
            <if test="commonPage.paramId !=null">
                and t.project_id =#{commonPage.paramId}
            </if>
            <if test="commonPage.communityId !=null">
                and t1.community_id =#{commonPage.communityId}
            </if>
        </where>
        order by is_top desc,create_time desc
    </select>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialWorkerMapper.xml

@@ -27,7 +27,7 @@
        SELECT a.*,b.name as socialOrgId,c.name as communityName,e.name as streetId
        FROM com_act_social_worker a left join com_act_social_org b on a.social_org_id = b.id
        left join com_act c on a.community_id = c.community_id
        left join com_street e on a.street_id = e.street_id
        left join com_street e on c.street_id = e.street_id
        <where>
            <if test="pageComActSocialWorkerDTO.id!=null">
                AND a.id = #{pageComActSocialWorkerDTO.id}
@@ -39,7 +39,8 @@
                AND a.name like concat('%',#{pageComActSocialWorkerDTO.name},'%')
            </if>
            <if test="pageComActSocialWorkerDTO.keyword!=null and pageComActSocialWorkerDTO.keyword!=''">
                AND (a.name like concat('%',#{pageComActSocialWorkerDTO.keyword},'%') or  a.telephone like concat('%',#{pageComActSocialWorkerDTO.keyword},'%') )
                AND (a.name like concat('%',#{pageComActSocialWorkerDTO.keyword},'%') or a.telephone like
                concat('%',#{pageComActSocialWorkerDTO.keyword},'%') )
            </if>
            <if test="pageComActSocialWorkerDTO.ageBegin!=null">
                AND a.age>=#{pageComActSocialWorkerDTO.ageBegin}
@@ -54,7 +55,7 @@
                AND a.gen = #{pageComActSocialWorkerDTO.gen}
            </if>
            <if test="pageComActSocialWorkerDTO.streetId!=null">
                AND a.street_id = #{pageComActSocialWorkerDTO.streetId}
                AND e.street_id = #{pageComActSocialWorkerDTO.streetId}
            </if>
            <if test="pageComActSocialWorkerDTO.communityId!=null and pageComActSocialWorkerDTO.communityId!=0">
                AND a.community_id = #{pageComActSocialWorkerDTO.communityId}
@@ -70,7 +71,9 @@
    </select>

    <select id="queryAll" resultType="com.panzhihua.common.model.dtos.civil.ComActSocialWorkerExcelVO">
        SELECT a.social_org_id,a.name as name,a.birthday,a.telephone,a.gen,a.social_worker_code,a.skill_field,a.business_scope,b.name as socialOrgId,c.name as communityId,e.name as streetId
        SELECT a.social_org_id,a.name as
        name,a.birthday,a.telephone,a.gen,a.social_worker_code,a.skill_field,a.business_scope,b.name as
        socialOrgId,c.name as communityId,e.name as streetId
        FROM com_act_social_worker a left join com_act_social_org b on a.social_org_id = b.id
        left join com_act c on a.community_id = c.community_id
        left join com_street e on a.street_id = e.street_id
@@ -89,7 +92,7 @@
            </if>
        </where>
    </select>
    

    <select id="selectType" resultType="Integer">
        select count(id) from com_act_social_worker where street_id = 15
        <if test="type ==1">
@@ -106,11 +109,25 @@
        </if>
    </select>

    <select id="selectSkillType" resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkProjectTypeInfo">
        select count(*) count,t1.name from com_act_social_worker t INNER JOIN com_act_column t1 on t.skill_type = t1.id  where t.street_id = 15 <if test="communityId!=null"> and t.community_id = #{communityId}</if> GROUP BY t1.id
    <select id="selectSkillType"
            resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkProjectTypeInfo">
        select count(*) count,t1.name from com_act_social_worker t INNER JOIN com_act_column t1 on t.skill_type = t1.id
        where t.street_id = 15 <if test="communityId!=null">and t.community_id = #{communityId}</if> GROUP BY t1.id
    </select>

    <select id="selectActivity" resultType="com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO">
        select t.* from com_act_social_worker t LEFT JOIN sys_user t1 on t.telephone = t1.phone where t1.user_id in (select distinct user_id from com_act_act_regist where activity_id =#{id} )
        select t.*
        from com_act_social_worker t
                 LEFT JOIN sys_user t1 on t.telephone = t1.phone
        where t1.user_id in (select distinct user_id from com_act_act_regist where activity_id = #{id})
    </select>

    <select id="selectOneById" resultType="com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO">
        SELECT a.*, b.name as socialOrgId, c.name as communityName, e.name as streetId
        FROM com_act_social_worker a
                 left join com_act_social_org b on a.social_org_id = b.id
                 left join com_act c on a.community_id = c.community_id
                 left join com_street e on c.street_id = e.street_id
        where a.id =#{id}
    </select>
</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComFmsServiceMapper.xml

@@ -73,7 +73,8 @@
    </select>
    <select id="pageFmsServiceAdminApplets"
            resultType="com.panzhihua.common.model.vos.community.fms.ComFmsServiceVO">
        SELECT t1.id, t1.service_content, t1.service_image, IF(t2.nick_name IS NULL,'匿名用户',t2.nick_name) AS nickName, t2.image_url
        SELECT t1.id, t1.service_content, t1.service_image,
        IF(t2.nick_name IS NULL,IF(t1.user_name IS NULL,'匿名用户',t1.user_name),t2.nick_name) AS nickName, t2.image_url
        FROM com_fms_service t1
        LEFT JOIN sys_user t2 ON t1.user_id = t2.user_id
        WHERE t1.community_id = #{adminDTO.communityId}
@@ -88,7 +89,7 @@
    <select id="detailFmsServiceApplets"
            resultType="com.panzhihua.common.model.vos.community.fms.ComFmsServiceVO">
        SELECT t1.id, t1.service_content, t1.service_image, t1.phone, t1.service_status,
        t1.created_at, IF(t2.nick_name IS NULL,'匿名用户',t2.nick_name) AS nickName, t2.image_url
        t1.created_at, IF(t2.nick_name IS NULL,IF(t1.user_name IS NULL,'匿名用户',t1.user_name),t2.nick_name) AS nickName, t2.image_url
        FROM com_fms_service t1
        LEFT JOIN sys_user t2 ON t1.user_id = t2.user_id
        WHERE t1.id = #{serviceId}
@@ -99,21 +100,170 @@
        ORDER BY created_at DESC
    </select>
    <select id="pageDealFmsService" resultType="com.panzhihua.common.model.vos.community.fms.ComFmsServiceVO">
        SELECT t1.id, t1.service_content, t1.service_image, t1.service_status, t1.created_at, IF(t2.nick_name IS NULL,'匿名用户',t2.nick_name) AS nickName, t2.image_url
        SELECT t1.id, t1.service_content, t1.service_image, t1.service_status, t1.created_at,
        IF(t2.nick_name IS NULL,IF(t1.user_name IS NULL,'匿名用户',t1.user_name),t2.nick_name) AS nickName, t2.image_url
        FROM com_fms_service t1
        LEFT JOIN sys_user t2 ON t1.user_id = t2.user_id
        WHERE t1.community_id = #{adminDTO.communityId}
        <if test="adminDTO.dealStatus != null and adminDTO.dealStatus == 1">
            AND t1.member_id = #{adminDTO.memberId}
            AND t1.member_id = #{adminDTO.memberId} AND t1.service_status = 2
        </if>
        <if test="adminDTO.dealStatus != null and adminDTO.dealStatus == 2">
            AND t1.service_status = 1
        </if>
        <if test="adminDTO.dealStatus != null and adminDTO.dealStatus == 3">
            AND t1.service_status = 4
            AND t1.service_status IN (3,4)
        </if>
        ORDER BY t1.created_at DESC
    </select>
    <select id="getFmsBaseData"
            resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenFmsStatisticsInfo">
        SELECT
        (SELECT COUNT(id) FROM com_fms_team WHERE community_id = #{communityId}) AS teamTotal,
        (SELECT COUNT(id) FROM com_fms_team_member WHERE community_id = #{communityId}) AS memberTotal,
        (SELECT COUNT(id) FROM com_fms_service WHERE community_id = #{communityId}) AS serviceTotal,
        (SELECT COUNT(id) FROM com_fms_service WHERE community_id = #{communityId} AND service_status = 4) AS completeServiceTotal,
        (SELECT COUNT(id) FROM com_fms_classroom WHERE community_id = #{communityId}) AS classroomTotal,
        (SELECT COUNT(e.id) FROM `event` AS e LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id
        WHERE e.event_category = 1 AND e.event_status = 2 AND e.event_process_status = 2 AND egd.grid_community_id = #{communityId} AND e.event_type = 3) AS adjustTotal,
        (SELECT COUNT(e.id) FROM `event` AS e LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id
        WHERE e.event_category = 1 AND e.event_status = 2 AND e.event_process_status IN(1,2) AND egd.grid_community_id = #{communityId} AND e.event_type = 1) AS controlTotal,
        (SELECT IF(SUM(scholars) IS NULL,0,SUM(scholars)) FROM com_fms_classroom WHERE community_id = #{communityId}) AS learnTotal,
        (SELECT COUNT(e.id) FROM `event` AS e LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id
        WHERE e.event_category = 1 AND e.event_status = 2 AND e.event_process_status IN(1,2) AND egd.grid_community_id = #{communityId} AND e.event_type = 1 AND e.danger_level > 0) AS fxyhTotal,
        (SELECT COUNT(e.id) FROM `event` AS e LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id
        WHERE e.event_category = 1 AND e.event_status = 2 AND e.event_process_status = 2 AND egd.grid_community_id = #{communityId} AND e.event_type = 1 AND e.danger_level > 0) AS jjyhTotal
    </select>
    <select id="retrieveTeamTypeCircleData"
            resultType="com.panzhihua.common.model.vos.community.fms.ComFmsTeamVO">
        SELECT
            t1.id,
            t1.`name`,
            t2.`name` AS teamTypeName
        FROM
            com_fms_team t1
            LEFT JOIN com_fms_team_type t2 ON t1.team_type = t2.id
        WHERE
            t1.community_id = #{communityId}
    </select>
    <select id="retrieveServiceAddPolylineData"
            resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT filed, SUM(num) AS num FROM (
            SELECT DATE_FORMAT( created_at, '%Y-%m' ) AS filed, COUNT(1) AS num
            FROM com_fms_service
            WHERE community_id = #{communityId} AND DATE_FORMAT( created_at, '%Y-%m' ) &gt; DATE_FORMAT(date_sub(curdate(), interval 12 month),'%Y-%m'
            ) GROUP BY filed
            UNION ALL SELECT * FROM
            (
                SELECT DATE_FORMAT(curdate(),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 1 month),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 2 month),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 3 month),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 4 month),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 5 month),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 6 month),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 7 month),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 8 month),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 9 month),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 10 month),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 11 month),'%Y-%m') AS filed, 0 AS num
            ) temT
        ) temp GROUP BY filed ORDER BY filed ASC
    </select>
    <select id="retrieveServiceTotalPolylineData"
            resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT
            COUNT( 1 ) AS num
        FROM
            com_fms_service
        WHERE
            community_id = #{communityId}
            AND DATE_FORMAT( created_at, '%Y-%m' ) &lt;= #{date}
    </select>
    <select id="retrieveAdjustCircleData" resultType="com.panzhihua.common.model.vos.grid.EventVO">
        SELECT
        e.id,
        substring_index( substring_index( e.event_clazz, ',', b.help_topic_id + 1 ), ',',- 1 ) AS event_clazz
        FROM
        `event` AS e
        LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id
        JOIN mysql.help_topic b ON b.help_topic_id &lt; ( length( e.event_clazz ) - length( REPLACE ( e.event_clazz, ',', '' ))+ 1 )
        WHERE
        e.event_category = 1
        AND e.event_status = 2
        AND e.event_process_status = 2
        AND egd.grid_community_id = #{communityId}
        AND e.event_type = 3
    </select>
    <select id="retrieveAdjustAddPolylineData"
            resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT filed, SUM(num) AS num FROM (
            SELECT DATE_FORMAT( e.create_at, '%Y-%m' ) AS filed, COUNT(1) AS num
            FROM `event` AS e
                        LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id
            WHERE e.event_category = 1
                        AND e.event_status = 2
                        AND e.event_process_status = 2
                        AND egd.grid_community_id = #{communityId}
                        AND e.event_type = 3 AND DATE_FORMAT( e.create_at, '%Y-%m' ) &gt; DATE_FORMAT(date_sub(curdate(), interval 12 month),'%Y-%m'
            ) GROUP BY filed
            UNION ALL SELECT * FROM
            (
                SELECT DATE_FORMAT(curdate(),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 1 month),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 2 month),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 3 month),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 4 month),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 5 month),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 6 month),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 7 month),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 8 month),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 9 month),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 10 month),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 11 month),'%Y-%m') AS filed, 0 AS num
            ) temT
        ) temp GROUP BY filed ORDER BY filed ASC
    </select>
    <select id="retrieveAdjustTotalPolylineData"
            resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT
            COUNT( e.id ) AS num
        FROM `event` AS e
        LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id
        WHERE e.event_category = 1
        AND e.event_status = 2
        AND e.event_process_status = 2
        AND egd.grid_community_id = #{communityId}
        AND e.event_type = 3
        AND DATE_FORMAT( e.create_at, '%Y-%m' ) &lt;= #{date}
    </select>
    <select id="retrieveControlCircleData" resultType="com.panzhihua.common.model.vos.grid.EventVO">
        SELECT
        e.id,
        substring_index( substring_index( e.event_clazz, ',', b.help_topic_id + 1 ), ',',- 1 ) AS event_clazz
        FROM
        `event` AS e
        LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id
        JOIN mysql.help_topic b ON b.help_topic_id &lt; ( length( e.event_clazz ) - length( REPLACE ( e.event_clazz, ',', '' ))+ 1 )
        WHERE
        e.event_category = 1
        AND e.event_status = 2
        AND e.event_process_status = 2
        AND egd.grid_community_id = #{communityId}
        AND e.event_type = 1
    </select>
    <select id="pageFmsTeam" resultType="com.panzhihua.common.model.vos.community.fms.ComFmsTeamVO">
        SELECT
            t1.id,
            t1.`name`,
            t2.`name` AS teamTypeName,
            COUNT(t3.team_id) AS teamMemberTotal
        FROM com_fms_team t1
        LEFT JOIN com_fms_team_type t2 ON t1.team_type = t2.id
        LEFT JOIN com_fms_team_member_relation t3 ON t1.id = t3.team_id
        WHERE t1.community_id = #{pageBaseDTO.communityId}
        GROUP BY t1.id
    </select>

</mapper>


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComFmsTeamMemberMapper.xml

@@ -74,7 +74,7 @@
    </select>
    <select id="exportTeamMember"
            resultType="com.panzhihua.common.model.vos.community.fms.ComFmsTeamMemberExportExcelVO">
        SELECT t4.`name` AS teamTypeName, t3.`name` AS teamName, t2.`name` AS teamMember, t2.id_card, t2.phone,
        SELECT t4.`name` AS teamType, t3.`name` AS teamName, t2.`name` AS teamMember, t2.id_card, t2.phone,
        CASE
        WHEN t2.gender = 1 THEN
        '男'

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngBuildingMapper.xml

@@ -205,4 +205,14 @@
            community_id = ${communityId}
    </select>

    <select id="getBuildListByVillageId" resultType="com.panzhihua.common.model.vos.community.building.admin.PageBuildingListAdminVo">
        SELECT
            cmb.id,
            cmb.`name`
        FROM
            com_mng_building AS cmb
        WHERE
            cmb.village_id = #{villageId}
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngVolunteerMngDOMapper.xml

@@ -48,18 +48,22 @@
        cmvot1.`service_type_id`,
        cmvst.`name` as serviceTypeName,
        cmvs.`name` as skillName,
        cmvm.create_at
        cmvm.create_at,
        t.name as communityName
        FROM
        com_mng_volunteer_mng as cmvm
        left join com_mng_volunteer_org_team as cmvot on cmvot.id = cmvm.org_id
        left join com_mng_volunteer_org_team as cmvot1 on cmvot1.id = cmvm.team_id
        left join com_mng_volunteer_skill as cmvs on cmvs.id = cmvm.skill_id
        left join com_mng_volunteer_service_type as cmvst on cmvst.id = cmvot1.service_type_id
        left join com_act t on cmvm.community_id = t.community_id
        WHERE
        cmvm.state = 2
        AND
        <if test="comMngVolunteerMngVO.communityId !=null">
         and   cmvm.community_id = #{comMngVolunteerMngVO.communityId}
        </if>
        <if test="comMngVolunteerMngVO.streetId !=null">
            and   t.street_id = #{comMngVolunteerMngVO.streetId}
        </if>
        <if test='comMngVolunteerMngVO.name != null and comMngVolunteerMngVO.name != &quot;&quot;'>
            and cmvm.name like concat(#{comMngVolunteerMngVO.name},'%')
@@ -94,5 +98,83 @@
        integral DESC,
        cmvm.create_at DESC
    </select>
    <select id="retrieveVolunteerOrgHistogram"
            resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT
            t2.`name` AS filed,
            COUNT( 1 ) AS num
        FROM
            com_mng_volunteer_mng t1
            JOIN com_mng_volunteer_org_team t2 ON t1.org_id = t2.id
        WHERE
            t1.community_id = #{communityId}
        GROUP BY
            filed
    </select>
    <select id="getVolunteerBaseData"
            resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenVolunteerStatisticsInfo">
        SELECT
        (SELECT COUNT(id) FROM com_mng_volunteer_mng WHERE community_id = #{communityId} AND state = 2) AS volunteerNum,
        (SELECT COUNT(id) FROM com_mng_volunteer_org_team WHERE community_id = #{communityId} AND parent_id = 0) AS volunteerOrgNum,
        (SELECT COUNT(id) FROM com_mng_volunteer_org_team WHERE community_id = #{communityId} AND parent_id != 0) AS volunteerTeamNum
    </select>
    <select id="retrieveVolunteerServiceTypeCircleData"
            resultType="com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO">
        SELECT t1.id, t3.`name` AS serviceTypeName
        FROM com_mng_volunteer_mng t1
        JOIN com_mng_volunteer_org_team t2 ON t1.team_id = t2.id
        LEFT JOIN com_mng_volunteer_service_type t3 ON t2.service_type_id = t3.id
        WHERE t1.community_id = #{communityId} AND t1.state = 2
    </select>
    <select id="retrieveVolunteerAgeCircleData"
            resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT filed, SUM(num) AS num FROM (
            SELECT filed, COUNT(filed) AS num FROM (
            SELECT
            CASE
            WHEN TIMESTAMPDIFF(YEAR, SUBSTRING(id_card, 7, 8), NOW()) BETWEEN 0 AND 18 THEN '0-18岁'
            WHEN TIMESTAMPDIFF(YEAR, SUBSTRING(id_card, 7, 8), NOW()) BETWEEN 19 AND 30 THEN '19-30岁'
            WHEN TIMESTAMPDIFF(YEAR, SUBSTRING(id_card, 7, 8), NOW()) BETWEEN 31 AND 40 THEN '31-40岁'
            WHEN TIMESTAMPDIFF(YEAR, SUBSTRING(id_card, 7, 8), NOW()) BETWEEN 41 AND 50 THEN '41-50岁'
            WHEN TIMESTAMPDIFF(YEAR, SUBSTRING(id_card, 7, 8), NOW()) BETWEEN 51 AND 60 THEN '51-60岁'
            WHEN TIMESTAMPDIFF(YEAR, SUBSTRING(id_card, 7, 8), NOW()) BETWEEN 61 AND 79 THEN '61-79岁'
            WHEN TIMESTAMPDIFF(YEAR, SUBSTRING(id_card, 7, 8), NOW()) BETWEEN 80 AND 89 THEN '80-89岁'
            WHEN TIMESTAMPDIFF(YEAR, SUBSTRING(id_card, 7, 8), NOW()) > 89 THEN '89岁以上'
            END filed
            FROM com_mng_volunteer_mng WHERE community_id = #{communityId}
            ) temp WHERE filed is not null GROUP BY filed
            UNION ALL
            (SELECT '0-18岁' AS filed, 0 AS num)
            UNION ALL
            (SELECT '19-30岁' AS filed, 0 AS num)
            UNION ALL
            (SELECT '31-40岁' AS filed, 0 AS num)
            UNION ALL
            (SELECT '41-50岁' AS filed, 0 AS num)
            UNION ALL
            (SELECT '51-60岁' AS filed, 0 AS num)
            UNION ALL
            (SELECT '61-79岁' AS filed, 0 AS num)
            UNION ALL
            (SELECT '80-89岁' AS filed, 0 AS num)
            UNION ALL
            (SELECT '89岁以上' AS filed, 0 AS num)
        ) t GROUP BY filed
    </select>
    <select id="retrieveVolunteerSkillCircleData"
            resultType="com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO">
        SELECT t1.id, t2.`name` AS skillName
        FROM com_mng_volunteer_mng t1
        JOIN com_mng_volunteer_skill t2 ON t1.skill_id = t2.id
        WHERE t1.community_id = #{communityId} AND t1.state = 2
    </select>
    <select id="selectVolunteerByCommunityId"
            resultType="com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO">
        SELECT t1.id, t1.`name`, t1.photo_path, t2.`name` AS teamName, t3.`name` AS orgName
        FROM com_mng_volunteer_mng t1
        INNER JOIN com_mng_volunteer_org_team t2 ON t1.team_id = t2.id
        INNER JOIN com_mng_volunteer_org_team t3 ON t1.org_id = t2.id
        WHERE t1.community_id = #{communityId}
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPropertyMapper.xml

@@ -110,5 +110,140 @@
        FROM com_act_easy_photo WHERE community_id = ${communityId} AND `status` IN (1,2,4) AND del_tag = 0 AND classify_id IN (1,3,4,5,6,7,8) AND DATE_FORMAT( create_at, '%Y-%m' ) &lt;= #{date}
        ) temp
    </select>
    <select id="getAlarmBaseData"
            resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenAlarmStatisticsInfo">
        SELECT
        (SELECT COUNT(id) FROM com_property_equipment WHERE community_id = #{communityId} AND `type` = 1) AS abnormalAlarmTotal,
        (SELECT COUNT(id) FROM com_property_equipment WHERE community_id = #{communityId} AND `type` = 2) AS oneKeyAlarmTotal,
        (SELECT COUNT(t1.id) FROM com_property_alarm t1 LEFT JOIN com_property_equipment t2 ON t1.serial_no = t2.serial_no
        WHERE t2.community_id = #{communityId} AND t2.`type` = 1) AS abnormalTotal,
        (SELECT COUNT(t1.id) FROM com_property_alarm t1 LEFT JOIN com_property_equipment t2 ON t1.serial_no = t2.serial_no
        WHERE t2.community_id = #{communityId} AND t2.`type` = 2) AS oneKeyTotal,
        (SELECT COUNT(t1.id) FROM com_property_alarm t1 LEFT JOIN com_property_equipment t2 ON t1.serial_no = t2.serial_no
        WHERE t2.community_id = #{communityId} AND t1.`status` = 0 AND t1.`type` = 2) AS pendingAbnormalTotal,
        (SELECT COUNT(t1.id) FROM com_property_alarm t1 LEFT JOIN com_property_equipment t2 ON t1.serial_no = t2.serial_no
        WHERE t2.community_id = #{communityId} AND t1.`status` = 1 AND t1.`type` = 2) AS completeAbnormalTotal,
        (SELECT COUNT(t1.id) FROM com_property_alarm t1 LEFT JOIN com_property_equipment t2 ON t1.serial_no = t2.serial_no
        WHERE t2.community_id = #{communityId} AND t1.`status` = 0 AND t1.`type` = 1) AS pendingServiceTotal,
        (SELECT COUNT(t1.id) FROM com_property_alarm t1 LEFT JOIN com_property_equipment t2 ON t1.serial_no = t2.serial_no
        WHERE t2.community_id = #{communityId} AND t1.`status` = 1 AND t1.`type` = 1) AS completeServiceTotal
    </select>
    <select id="retrieveAbnormalAddPolylineData"
            resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT filed, SUM(num) AS num FROM (
            SELECT DATE_FORMAT( t.create_time, '%Y-%m' ) AS filed, COUNT(1) AS num
            FROM com_property_alarm t
            LEFT JOIN com_property_equipment t1 ON t.serial_no = t1.serial_no
            WHERE t1.community_id = #{communityId} AND t.`type` = 2 AND DATE_FORMAT( t.create_time, '%Y-%m' ) &gt; DATE_FORMAT(date_sub(curdate(), interval 12 month),'%Y-%m'
            ) GROUP BY filed
            UNION ALL SELECT * FROM
            (
                SELECT DATE_FORMAT(curdate(),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 1 month),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 2 month),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 3 month),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 4 month),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 5 month),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 6 month),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 7 month),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 8 month),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 9 month),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 10 month),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 11 month),'%Y-%m') AS filed, 0 AS num
            ) temT
        ) temp GROUP BY filed ORDER BY filed ASC
    </select>
    <select id="retrieveAbnormalTotalPolylineData"
            resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT COUNT( 1 ) AS num
        FROM com_property_alarm t
        LEFT JOIN com_property_equipment t1 ON t.serial_no = t1.serial_no
        WHERE t1.community_id = #{communityId} AND t.`type` = 2 AND DATE_FORMAT( t.create_time, '%Y-%m' ) &lt;= #{date}
    </select>
    <select id="retrieveServiceAddPolylineData"
            resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT filed, SUM(num) AS num FROM (
            SELECT DATE_FORMAT( t.create_time, '%Y-%m' ) AS filed, COUNT(1) AS num
            FROM com_property_alarm t
            LEFT JOIN com_property_equipment t1 ON t.serial_no = t1.serial_no
            WHERE t1.community_id = #{communityId} AND t.`type` = 1 AND DATE_FORMAT( t.create_time, '%Y-%m' ) &gt; DATE_FORMAT(date_sub(curdate(), interval 12 month),'%Y-%m'
            ) GROUP BY filed
            UNION ALL SELECT * FROM
            (
                SELECT DATE_FORMAT(curdate(),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 1 month),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 2 month),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 3 month),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 4 month),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 5 month),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 6 month),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 7 month),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 8 month),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 9 month),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 10 month),'%Y-%m') AS filed, 0 AS num union
                SELECT DATE_FORMAT(date_sub(curdate(), interval 11 month),'%Y-%m') AS filed, 0 AS num
            ) temT
        ) temp GROUP BY filed ORDER BY filed ASC
    </select>
    <select id="retrieveServiceTotalPolylineData"
            resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT COUNT( 1 ) AS num
        FROM com_property_alarm t
        LEFT JOIN com_property_equipment t1 ON t.serial_no = t1.serial_no
        WHERE t1.community_id = #{communityId} AND t.`type` = 1 AND DATE_FORMAT( t.create_time, '%Y-%m' ) &lt;= #{date}
    </select>
    <select id="getAbnormalList" resultType="com.panzhihua.common.model.vos.property.ComPropertyAlarmVO">
        SELECT
        t.id,
        t.create_time,
        t1.phone,
        t1.username AS NAME,
        t3.address AS position
        FROM
        com_property_alarm t
        LEFT JOIN com_property_equipment t1 ON t.serial_no = t1.serial_no
        LEFT JOIN com_mng_population_house t3 ON t1.village_id = t3.id
        WHERE t1.community_id = #{communityId} AND t.`type` = #{type} AND t.`status` = #{status}
        ORDER BY t.create_time DESC
    </select>
    <select id="getAlarmPointMapData"
            resultType="com.panzhihua.common.model.vos.property.ComPropertyEquipmentVO">
        SELECT
            id,
            phone,
            username,
            latitude,
            longitude,
            `type`,
            `position`,
            CASE `type`
            WHEN 1 THEN 2
            WHEN 2 THEN 1
            END AS equipmentStatus
        FROM com_property_equipment
        WHERE serial_no IN(
            SELECT DISTINCT(t1.serial_no)
            FROM com_property_alarm t1
            LEFT JOIN com_property_equipment t2 ON t1.serial_no = t2.serial_no
            WHERE t2.community_id = #{communityId} AND t1.`status` = 0
        )
        UNION ALL
        SELECT
            id,
            phone,
            username,
            latitude,
            longitude,
            `type`,
            `position`,
            3 AS equipmentStatus
        FROM com_property_equipment
        WHERE serial_no NOT IN(
            SELECT DISTINCT(t1.serial_no)
            FROM com_property_alarm t1
            LEFT JOIN com_property_equipment t2 ON t1.serial_no = t2.serial_no
            WHERE t2.community_id = #{communityId} AND t1.`status` = 0
        )
    </select>

</mapper>

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

New file
@@ -0,0 +1,121 @@
package com.panzhihua.service_dangjian.api;

import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitExcelVO;
import com.panzhihua.service_dangjian.service.ComPbCheckUnitService;
import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.vos.R;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;

/**
 * title: 党建-报到单位(ComPbCheckUnit)  表控制层
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 党建-报到单位
 *
 * @author lyq
 * @date 2022-02-16 16:22:18
 */
@RestController
@RequestMapping("/comPbCheckUnit")
public class ComPbCheckUnitController {

    @Resource
    private ComPbCheckUnitService comPbCheckUnitService;

    /**
     * description  queryByPage  分页查询
     *
     * @param comPbCheckUnit 请求参数
     * @return 分页查询返回参数
     * @author lyq
     * @date 2022-02-16 16:22:18
     */
    @PostMapping("/page")
    public R queryByPage(@RequestBody PageComPbCheckUnitDto comPbCheckUnit) {
        return this.comPbCheckUnitService.queryByPage(comPbCheckUnit);
    }

    /**
     * description  add  新增数据
     *
     * @param comPbCheckUnit 请求参数
     * @return 新增结果
     * @author lyq
     * @date 2022-02-16 16:22:18
     */
    @PostMapping("/add")
    public R add(@RequestBody AddComPbCheckUnitDto comPbCheckUnit) {
        return this.comPbCheckUnitService.insert(comPbCheckUnit);
    }

    /**
     * description  edit  编辑数据
     *
     * @param comPbCheckUnit 请求参数
     * @return 编辑结果
     * @author lyq
     * @date 2022-02-16 16:22:18
     */
    @PutMapping("/edit")
    public R edit(@RequestBody EditComPbCheckUnitDto comPbCheckUnit) {
        return this.comPbCheckUnitService.update(comPbCheckUnit);
    }

    /**
     * description  deleteById  删除数据
     *
     * @param id 主键id
     * @return 删除结果
     * @author lyq
     * @date 2022-02-16 16:22:18
     */
    @GetMapping("/delete")
    public R deleteById(@RequestParam("id") Long id) {
        return this.comPbCheckUnitService.deleteById(id);
    }

    /**
     * description  detailById  查询详情
     *
     * @param id 主键id
     * @return 详情数据
     * @author lyq
     * @date 2022-02-16 16:22:18
     */
    @GetMapping("/detail")
    public R detailById(@RequestParam("id") Long id) {
        return this.comPbCheckUnitService.detailById(id);
    }

    /**
     * description  queryByPage  查询列表
     *
     * @param comPbCheckUnit 请求参数
     * @return 列表数据
     * @author lyq
     * @date 2022-02-16 16:22:18
     */
    @PostMapping("/list")
    public R queryByList(@RequestBody PageComPbCheckUnitDto comPbCheckUnit) {
        return this.comPbCheckUnitService.queryByList(comPbCheckUnit);
    }

    /**
     * 批量导入报道单位
     * @param list  导入数据
     * @param communityId   社区id
     * @param userId    用户id
     * @return  导入结果
     */
    @PostMapping("/importCheckUnit")
    public R importCheckUnit(@RequestBody List<ComPbCheckUnitExcelVO> list, @RequestParam(value = "communityId") Long communityId
            ,@RequestParam(value = "userId") Long userId){
        return this.comPbCheckUnitService.importCheckUnit(list,communityId,userId);
    }

}


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

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

import javax.annotation.Resource;

import com.panzhihua.common.model.vos.partybuilding.excel.ComPbMemberRoleExcelVo;
import org.springframework.beans.BeanUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
@@ -47,7 +48,7 @@

    /**
     * 社区所有启用的党组织列表
     * 
     *
     * @return 党组织集合
     */
    @PostMapping("listpartyorganization")
@@ -57,8 +58,8 @@
    }

    /**
     * 社区所有党组织列表
     * 
     * 分页查询社区所有党组织列表
     *
     * @return 党组织集合
     */
    @PostMapping("listpartyorganizationAll")
@@ -67,8 +68,18 @@
    }

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

    /**
     * 新增党支部
     * 
     *
     * @param partyOrganizationVO
     *            党支部基本信息
     * @return 新增结果
@@ -81,7 +92,7 @@

    /**
     * 编辑党支部
     * 
     *
     * @param partyOrganizationVO
     *            党支部基本信息
     * @return 编辑结果
@@ -94,7 +105,7 @@

    /**
     * 启用，禁用党支部
     * 
     *
     * @param partyOrganizationVO
     *            党支部基本信息
     * @return 编辑结果
@@ -107,7 +118,7 @@

    /**
     * 删除党支部
     * 
     *
     * @param partyOrganizationVO
     *            党支部基本信息
     * @return 编辑结果
@@ -120,7 +131,7 @@

    /**
     * 新增党员
     * 
     *
     * @param partyBuildingMemberVO
     *            党员基本信息
     * @return 新增结果
@@ -133,7 +144,7 @@

    /**
     * 批量新增党员
     * 
     *
     * @param list
     *            党员集合
     */
@@ -158,7 +169,7 @@

    /**
     * 分页查询党员信息
     * 
     *
     * @param pagePartyOrganizationVO
     *            查询信息
     * @return 分页数据
@@ -171,7 +182,7 @@

    /**
     * 党员活动查询
     * 
     *
     * @param partyBuildingActivityVO
     *            查询参数
     * @return 参加的所有活动
@@ -188,7 +199,7 @@

    /**
     * 活动报名名单分页查询
     * 
     *
     * @param pageActivityMembersVO
     *            查询参数 手机号 名字
     * @return 分页数据
@@ -201,7 +212,7 @@

    /**
     * 编辑党员信息 新增字段均可编辑
     * 
     *
     * @param partyBuildingMemberVO
     *            编辑字段
     * @return 编辑结果
@@ -213,7 +224,7 @@

    /**
     * 党员活动详情
     * 
     *
     * @param id
     *            活动id
     * @return 活动详情内容
@@ -226,7 +237,7 @@

    /**
     * 查询指定社区的所有党员
     * 
     *
     * @param communityId
     *            社区id
     * @return 党员列表
@@ -239,7 +250,7 @@

    /**
     * 新增党委
     * 
     *
     * @param partyCommitteeVO
     *            新增信息
     * @return 新增结果
@@ -252,7 +263,7 @@

    /**
     * 编辑党委
     * 
     *
     * @param partyCommitteeVO
     *            编辑信息
     * @return 编辑结果
@@ -265,7 +276,7 @@

    /**
     * 删除党委
     * 
     *
     * @param partyCommitteeVO
     *            删除id
     * @return 删除结果
@@ -278,7 +289,7 @@

    /**
     * 分页社区党委查询
     * 
     *
     * @param partyCommitteeVO
     *            查询参数
     * @return 分页集合
@@ -291,7 +302,7 @@

    /**
     * 新建党建动态
     * 
     *
     * @param partyCommitteeVO
     *            动态内容
     * @return 新增结果
@@ -304,7 +315,7 @@

    /**
     * 编辑动态
     * 
     *
     * @param partyCommitteeVO
     *            编辑内容
     * @return 编辑结果
@@ -317,7 +328,7 @@

    /**
     * 动态详情
     * 
     *
     * @param id
     *            动态主键
     * @return 详情
@@ -330,7 +341,7 @@

    /**
     * 分页查询党员动态/政策文件
     * 
     *
     * @param partyBuildingComPbDynVO
     *            查询参数
     * @return 分页数据
@@ -343,7 +354,7 @@

    /**
     * 删除动态
     * 
     *
     * @param id
     *            动态主键
     * @return 删除结果
@@ -356,7 +367,7 @@

    /**
     * 新增党员活动
     * 
     *
     * @param partyBuildingActivityVO
     *            参数
     * @return 新增结果
@@ -369,7 +380,7 @@

    /**
     * 编辑党员活动
     * 
     *
     * @param partyBuildingActivityVO
     *            编辑内容
     * @return 编辑结果
@@ -382,7 +393,7 @@

    /**
     * 发布党员活动
     * 
     *
     * @param id
     *            主键id
     * @return 发布结果
@@ -395,7 +406,7 @@

    /**
     * 删除党员活动
     * 
     *
     * @param id
     *            主键id
     * @return 删除结果
@@ -408,7 +419,7 @@

    /**
     * 分页查询党员活动
     * 
     *
     * @param partyBuildingActivityVO
     *            查询条件
     * @return 查询结果
@@ -421,7 +432,7 @@

    /**
     * 增加阅读记录
     * 
     *
     * @param comPbDynUserVO
     *            记录内容
     * @return 增加结果
@@ -434,7 +445,7 @@

    /**
     * 删除党员
     * 
     *
     * @param id
     *            党员主键
     * @return 删除结果
@@ -447,7 +458,7 @@

    /**
     * 取消活动
     * 
     *
     * @param partyBuildingActivityVO
     *            取消原因
     * @return 操作结果
@@ -460,7 +471,7 @@

    /**
     * 用户的所有党建活动
     * 
     *
     * @param userId
     *            用户id
     * @param communityId
@@ -477,7 +488,7 @@

    /**
     * 党员活动人员参入列表
     * 
     *
     * @param id
     *            活动id
     * @return 党员集合
@@ -489,7 +500,7 @@

    /**
     * 报名、取消报名党员活动
     * 
     *
     * @param activitySignUpDTO
     *            操作参数
     * @return 操作结果
@@ -501,7 +512,7 @@

    /**
     * 获取党建活动所有参入人员的id集合
     * 
     *
     * @param id
     *            党建活动id
     * @return 人员id集合
@@ -513,7 +524,7 @@

    /**
     * 定时任务刷新党建动态发布状态
     * 
     *
     * @return 刷新数据数量
     */
    @PostMapping("timedtaskpartybuildingstatus")
@@ -523,7 +534,7 @@

    /**
     * 定时任务取消党建活动
     * 
     *
     * @return 党建活动集合
     */
    @PostMapping("timedtaskpartybuildingactivity")
@@ -533,7 +544,7 @@

    /**
     * 定时任务刷新党建活动的各个状态 除取消外
     * 
     *
     * @return 修改结果
     */
    @PostMapping("timedtaskpartybuildingactivityall")
@@ -543,7 +554,7 @@

    /**
     * 新增服务团队人员
     * 
     *
     * @param comPbServiceTeamDTO
     *            新增内容
     * @return 新增结果
@@ -555,7 +566,7 @@

    /**
     * 编辑团队人员
     * 
     *
     * @param comPbServiceTeamDTO
     *            编辑内容
     * @return 编辑结果
@@ -567,7 +578,7 @@

    /**
     * 分页查询服务团队成员
     * 
     *
     * @param pageComPbServiceTeamDTO
     *            查询参数
     * @return 查询结果
@@ -579,7 +590,7 @@

    /**
     * 删除服务团队人员
     * 
     *
     * @param comPbServiceTeamDTO
     *            删除主键
     * @return 删除结果
@@ -591,7 +602,7 @@

    /**
     * 创建党员活动 小程序创建党员活动
     * 
     *
     * @param comPbActivityDTO
     *            创建内容
     * @return 创建结果
@@ -603,7 +614,7 @@

    /**
     * 查询用户认证信息
     * 
     *
     * @param id
     *            用户id
     * @return 查询结果
@@ -625,7 +636,7 @@

    /**
     * 查询用户认证信息
     * 
     *
     * @param pagePartyBuildingMemberVO
     *            查询参数
     * @return 查询结果
@@ -637,7 +648,7 @@

    /**
     * 社区所有启用的党组织列表
     * 
     *
     * @return 党组织集合
     */
    @PostMapping("listpartyorganizationByApp")
@@ -649,7 +660,7 @@

    /**
     * 根据党员认证id删除
     * 
     *
     * @param id
     *            党员认证id
     * @return 删除结果
@@ -661,7 +672,7 @@

    /**
     * 导出党员信息
     * 
     *
     * @param organizationVO
     *            请求参数
     * @return 党员信息列表
@@ -673,7 +684,7 @@

    /**
     * 选择人员
     * 
     *
     * @param param
     *            查询条件
     * @return 查询结果
@@ -686,7 +697,7 @@

    /**
     * 根据党员活动id查询活动下报名人员
     * 
     *
     * @param activityId
     *            党员活动id
     * @return 活动下报名人员
@@ -695,4 +706,57 @@
    public R getTaskPbActivityPeopleList(@RequestParam("activityId") Long activityId) {
        return comBpActivityService.getTaskPbActivityPeopleList(activityId);
    }

    /**
     * 分页查询党员数据统计
     * @param statisticsMemberDto   请求参数
     * @return  党员数据统计
     */
    @PostMapping("/pageDataStatisticsMember")
    public R pageDataStatisticsMember(@RequestBody PageComDataStatisticsMemberDto statisticsMemberDto) {
        return comPbMemberService.pageDataStatisticsMember(statisticsMemberDto);
    }

    /**
     * 根据组织id查询组织下统计数据
     * @param statisticsOrgDto  请求参数
     * @return  组织下统计数据
     */
    @PostMapping("/getOrgDataStatistics")
    public R getOrgDataStatistics(@RequestBody ComDataStatisticsOrgDto statisticsOrgDto) {
        return comPbMemberService.getOrgDataStatistics(statisticsOrgDto);
    }

    /**
     * 查询党组织表头统计数据
     * @param communityId
     *            社区id
     * @return  党组织表头统计数据
     */
    @GetMapping("/getHeaderOrgDataStatistics")
    public R getHeaderOrgDataStatistics(@RequestParam("communityId") Long communityId) {
        return comPbMemberService.getHeaderOrgDataStatistics(communityId);
    }

    /**
     * 党员数据统计-党员导出数据查询
     * @param statisticsMemberDto   请求参数
     * @return  党员导出数据
     */
    @PostMapping("/exportDataStatisticsMember")
    public R exportDataStatisticsMember(@RequestBody PageComDataStatisticsMemberDto statisticsMemberDto) {
        return comPbMemberService.exportDataStatisticsMember(statisticsMemberDto);
    }

    /**
     * 党委导入接口
     * @param memberRoleExcelVoList 数据列表
     * @param communityId   社区id
     * @param userId    用户id
     * @return  导入结果
     */
    @PostMapping("/importPbMemberRole")
    public R importPbMemberRole(@RequestBody List<ComPbMemberRoleExcelVo> memberRoleExcelVoList,@RequestParam("communityId") Long communityId,@RequestParam("userId") Long userId){
        return comPbMemberService.importPbMemberRole(memberRoleExcelVoList,communityId,userId);
    }
}

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

New file
@@ -0,0 +1,58 @@
package com.panzhihua.service_dangjian.dao;

import com.panzhihua.service_dangjian.entity.ComPbCheckUnit;
import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.vos.common.*;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

import java.util.List;

/**
 * title: 党建-报到单位表数据库访问层
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 党建-报到单位表数据库访问层
 *
 * @author lyq
 * @date 2022-02-16 16:22:18
 */
@Mapper
public interface ComPbCheckUnitMapper extends BaseMapper<ComPbCheckUnit> {

    /**
     * description  detailById  查询详情
     *
     * @param id 主键id
     * @return 详情数据
     * @author lyq
     * @date 2022-02-16 16:22:18
     */
    ComPbCheckUnitVo queryById(Long id);

    /**
     * description  queryAllByLimit  分页查询
     *
     * @param comPbCheckUnit 请求参数
     * @param page           分页参数
     * @return 分页查询列表数据
     * @author lyq
     * @date 2022-02-16 16:22:18
     */
    IPage<ComPbCheckUnitVo> queryAllByLimit(@Param("dto") PageComPbCheckUnitDto comPbCheckUnit, Page page);

    /**
     * description  queryByPage  查询列表
     *
     * @param comPbCheckUnit 请求参数
     * @return 列表数据
     * @author lyq
     * @date 2022-02-16 16:22:18
     */
    List<ComPbCheckUnitVo> queryAllByList(@Param("dto") PageComPbCheckUnitDto comPbCheckUnit);
}


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

@@ -57,7 +57,7 @@
    int timedTaskPartyBuildingStatus();

    @Select("<script> " + "SELECT\n" + " distinct COUNT( u.id ) readingVolume,\n"
        + " d.community_id, d.content, d.cover, d.cover_mode, d.create_at, d.create_by, d.dyn_type, d.id, d.publish_at, d.status, d.title, d.type,a.policy_type, \n"
        + " d.community_id, d.content, d.cover, d.cover_mode, d.create_at, d.create_by, d.dyn_type, d.id, d.publish_at, d.status, d.title, d.type,d.policy_type, \n"
        + " act.name as createByName,d.jump_type,d.jump_url " + "FROM\n"
        + "com_pb_dyn d LEFT JOIN com_act act ON d.community_id = act.community_id  \n"
        + "LEFT JOIN com_pb_dyn_user u ON d.id = u.dyn_id " + "where d.id = #{id} " + " group by d.id " + "</script>")

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

@@ -1,7 +1,11 @@
package com.panzhihua.service_dangjian.dao;

import java.util.List;
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.excel.ComDataStatisticsMemberExcelVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -10,10 +14,6 @@
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.ComPbMemberExcelVO;
import com.panzhihua.common.model.vos.partybuilding.PagePartyBuildingMemberVO;
import com.panzhihua.common.model.vos.partybuilding.PagePartyOrganizationVO;
import com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO;
import com.panzhihua.service_dangjian.model.dos.ComPbMemberDO;

/**
@@ -24,17 +24,6 @@
 **/
@Mapper
public interface ComPbMemberDAO extends BaseMapper<ComPbMemberDO> {
    // -------------------动态模板-------------
    // @Select("<script> " +
    // " <where>" +
    // "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
    // " </if> " +
    // "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
    // " </if> " +
    // "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
    // " </if> " +
    // " </where>" +
    // "</script>")

    @Select("<script> " + "SELECT\n" + "o.`name` orgName,\n" + "m.org_id,\n" + "m.id_card,\n" + "m.`id`,\n"
        + "u.phone,\n" + "m.`name`,\n" + "m.photo_path,\n" + "TIMESTAMPDIFF(\n" + "YEAR,\n" + "m.employment_time,\n"
@@ -79,21 +68,12 @@
    IPage<PartyBuildingMemberVO> pagePartyBuildingMemberVO(Page page,
        @Param("pagePartyBuildingMemberVO") PagePartyBuildingMemberVO pagePartyBuildingMemberVO);

    @Select("<script> " + "SELECT\n" + "o.`name` orgName,\n" + "m.org_id,\n" + "m.id_card,\n" + "m.`id`,\n"
        + "u.phone,\n" + "m.`name`,\n" + "m.photo_path,\n" + "TIMESTAMPDIFF(\n" + "YEAR,\n" + "m.employment_time,\n"
        + "DATE_FORMAT( NOW(), '%Y-%m-%d' )) partyAge,\n" + "m.join_time,\n" + "m.audit_result, \n"
        + "m.employment_time,\n" + "CASE\n" + "WHEN u.id_card IS NULL THEN\n" + "'未注册' ELSE '已注册' \n" + "END STATUS,"
        + " m.create_at \n" + "FROM\n" + "com_pb_member m\n" + "LEFT JOIN sys_user u ON m.id_card = u.id_card\n"
        + "LEFT JOIN com_pb_org o ON m.org_id = o.id" + " where m.audit_result in (0,3)  "
        + "<if test='pagePartyBuildingMemberVO.phone != null and pagePartyBuildingMemberVO.phone != &quot;&quot;'>"
        + " and u.phone LIKE CONCAT('%',#{pagePartyBuildingMemberVO.phone},'%') " + " </if> "
        + "<if test='pagePartyBuildingMemberVO.name != null and pagePartyBuildingMemberVO.name != &quot;&quot;'>"
        + " and u.name like concat ('%',#{pagePartyBuildingMemberVO.name},'%')" + " </if> "
        + "<if test='pagePartyBuildingMemberVO.auditStatus != null'>"
        + " and m.audit_result = #{pagePartyBuildingMemberVO.auditStatus}" + " </if> "
        + "<if test='pagePartyBuildingMemberVO.communityId != null'>"
        + " and m.community_id = ${pagePartyBuildingMemberVO.communityId}" + " </if> " + " order by m.join_time desc "
        + "</script>")
    /**
     * 分页查询待认证党员列表
     * @param page  分页参数
     * @param pagePartyBuildingMemberVO 请求参数
     * @return  待认证党员列表
     */
    IPage<PartyBuildingMemberVO> pagePartyBuildingMembersVO(Page page,
        @Param("pagePartyBuildingMemberVO") PagePartyBuildingMemberVO pagePartyBuildingMemberVO);

@@ -108,4 +88,87 @@
        + "<if test='organizationVO.name != null and organizationVO.name != &quot;&quot;'>"
        + " and cpm.name like concat (#{organizationVO.name},'%')" + " </if> " + "</script>")
    List<ComPbMemberExcelVO> exportPbMember(@Param("organizationVO") PagePartyOrganizationVO organizationVO);

    /**
     * 分页查询党员列表
     * @param page  分页参数
     * @param buildingMemberVO 请求参数
     * @return  党员列表
     */
    IPage<PartyBuildingMemberVO> queryAllByLimit(Page page,@Param("dto") PagePartyOrganizationVO buildingMemberVO);

    /**
     * 根据id查询党员信息
     * @param id    主键id
     * @return  党员信息
     */
    PartyBuildingMemberVO queryById(@Param("id") Long id);

    /**
     * 分页查询党员数据统计
     * @param statisticsMemberDto   请求参数
     * @return  党员数据统计
     */
    IPage<ComDataStatisticsMemberVo> pageDataStatisticsMember(Page page, @Param("dto") PageComDataStatisticsMemberDto statisticsMemberDto);

    /**
     * 查询人口活动统计数据
     * @param userId    用户id
     * @param communityId   社区id
     * @return  人口活动统计数据
     */
    ComDataStatisticsMemberVo getMemberStatistics(@Param("userId") Long userId,@Param("communityId") Long communityId);

    /**
     * 查询社区党组织下的统计数据
     * @param communityId   社区id
     * @param orgIds    党组织id集合
     * @return  社区党组织下统计数据
     */
    ComDataStatisticsOrgVo getOrgDataStatistics(@Param("communityId") Long communityId,@Param("orgIds") List<Long> orgIds);

    /**
     * 查询社区党组织左下统计数据
     * @param communityId   社区id
     * @param orgIds    党组织id集合
     * @param startTime 查询开始时间
     * @param endTime   查询结束时间
     * @return  社区党组织左下统计数据
     */
    ComDataStatisticsOrgVo getOrgDataStatisticsLeftDown(@Param("communityId") Long communityId,@Param("orgIds") List<Long> orgIds
            ,@Param("startTime") String startTime,@Param("endTime") String endTime);

    /**
     * 分页查询社区党组织下党员
     * @param page   分页参数
     * @param communityId   社区id
     * @param orgIds    党组织id集合
     * @return  党员列表
     */
    IPage<PartyBuildingMemberVO> getOrgDataStatisticsMember(Page page,@Param("communityId") Long communityId,@Param("orgIds") List<Long> orgIds);

    /**
     * 查询社区党组织下某个时间段统计数据
     * @param communityId   社区id
     * @param orgIds    党组织id集合
     * @param startDate  查询开始时间
     * @param endDate  查询结束时间
     * @return  社区党组织下某个时间段统计数据
     */
    Map<String,Object> getOrgDataStatisticsRightDown(@Param("communityId") Long communityId,@Param("orgIds") List<Long> orgIds,@Param("startDate") String startDate,@Param("endDate") String endDate);

    /**
     * 查询党组织表头统计数据
     * @param communityId
     *            社区id
     * @return  党组织表头统计数据
     */
    ComDataStatisticsHeaderOrgVo getHeaderOrgDataStatistics(@Param("communityId") Long communityId);

    /**
     * 党员数据统计-党员导出数据查询
     * @param statisticsMemberDto   请求参数
     * @return  党员导出数据
     */
    List<ComDataStatisticsMemberExcelVo> exportDataStatisticsMember(@Param("dto") PageComDataStatisticsMemberDto statisticsMemberDto);
}

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

@@ -20,24 +20,25 @@
 **/
@Mapper
public interface ComPbMemberRoleDAO extends BaseMapper<ComPbMemberRoleDO> {
    // @Select("<script> " +
    // " <where>" +
    // "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
    // " </if> " +
    // "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
    // " </if> " +
    // "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
    // " </if> " +
    // " </where>" +
    // "</script>")
    @Select("<script> " + "SELECT\n" + "*,\n" + "TIMESTAMPDIFF(\n" + "YEAR,\n" + "t.birth_time,\n"
        + "DATE_FORMAT( NOW(), '%Y-%m-%d' )) age\n" + "FROM\n" + "com_pb_member_role t\n" + "WHERE\n"
        + "t.community_id = ${partyCommitteeVO.communityId} \n" + "</script>")

    /**
     * 分页查询党委列表
     * @param page  分页参数
     * @param partyCommitteeVO  请求参数
     * @return  党委列表
     */
    IPage<PartyCommitteeVO> pagePartyOrganization(Page page,
        @Param("partyCommitteeVO") PartyCommitteeVO partyCommitteeVO);

    @Select("select * from sys_user where phone=#{phone} and type=1")
    SysUserVO getSysUserByPhone(@Param("phone") String phone);

    /**
     * 根据身份证查询小程序用户id
     * @param idCard 身份证
     * @return  小程序用户id
     */
    Long getUserIdByIdCard(@Param("idCard") String idCard);

    /**
     * 根据手机号查询小程序用户id
@@ -51,4 +52,11 @@

    @Select("select * from com_pb_member_role where id=#{id}")
    PartyCommitteeVO selectPartyCommitteeById(@Param("id") Long id);

    /**
     * 根据身份证查询用户数量
     * @param idCard    身份证号码
     * @return  用户数量
     */
    Integer getSysUserByIdCardCount(@Param("idCard") String idCard);
}

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

@@ -10,6 +10,8 @@
import com.panzhihua.common.model.vos.partybuilding.PartyOrganizationVO;
import com.panzhihua.service_dangjian.model.dos.ComPbOrgDO;

import java.util.List;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 党组织
@@ -19,8 +21,27 @@
@Mapper
public interface ComPbOrgDAO extends BaseMapper<ComPbOrgDO> {

    @Select("select id,`name`,`status` from com_pb_org where community_id = ${partyOrganizationVO.communityId}")
    /**
     * 分页查询党组织列表
     * @param page  分页参数
     * @param partyOrganizationVO   请求参数
     * @return  党组织列表
     */
    IPage<PartyOrganizationVO> listPartyOrganizationAll(Page page,
        @Param("partyOrganizationVO") PartyOrganizationVO partyOrganizationVO);

    /**
     * 查询党组织下子组织列表
     * @param partyOrganizationVO   请求参数
     * @return  党组织下子组织列表
     */
    List<PartyOrganizationVO> getChildOrgList(@Param("partyOrganizationVO") PartyOrganizationVO partyOrganizationVO);

    /**
     * 查询1级党组织列表
     * @param partyOrganizationVO   请求参数
     * @return  1级党组织列表
     */
    List<PartyOrganizationVO> getPbOrgAllList(@Param("partyOrganizationVO") PartyOrganizationVO partyOrganizationVO);

}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/entity/ComPbCheckUnit.java

New file
@@ -0,0 +1,63 @@
package com.panzhihua.service_dangjian.entity;

import java.util.Date;
import java.io.Serializable;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;

/**
 * 党建-报到单位(ComPbCheckUnit)实体类
 *
 * @author lyq
 * @since 2022-02-16 16:22:18
 */
@Data
public class ComPbCheckUnit implements Serializable {
    private static final long serialVersionUID = 877551680973276301L;
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    private Long id;
    /**
     * 社区id
     */
    private Long communityId;
    /**
     * 单位名称
     */
    private String name;
    /**
     * 单位类别（1.国有企业 2.国有控股企业 3.外资企业 4.合资企业 5.私营企业 6.事业单位 7.国家行政机关 8.政府）
     */
    private Integer type;
    /**
     * 负责人
     */
    private String contacts;
    /**
     * 负责人联系电话
     */
    private String phone;
    /**
     * 创建时间
     */
    private Date createAt;
    /**
     * 创建人id
     */
    private Long createBy;
    /**
     * 修改时间
     */
    private Date updateAt;
    /**
     * 修改人id
     */
    private Long updateBy;


}


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

@@ -86,4 +86,60 @@
     */
    private String refuseReason;

    /**
     * 手机号
     */
    private String phone;

    /**
     * 党员类型（1.预备党员 2.正式党员）
     */
    private Integer type;

    /**
     * 职位
     */
    private String position;

    /**
     * 报道单位id
     */
    private Long checkUnitId;

    /**
     * 职能
     */
    private String function;

    /**
     * 特长类别（1.体育类 2.舞蹈类 3.音乐类 4.美术类 5.其他）
     */
    private Integer specialtyCategory;

    /**
     * 特长描述
     */
    private String specialtyName;

    /**
     * 职位2
     */
    private String positionTwo;

    /**
     * 党员审查结果 0待审核 1 审核通过 3审核失败
     */
    public interface AuditResult{
        int DSH = 0;
        int SHTG = 1;
        int SHBH = 3;
    }

    /**
     * 党员类型（1.预备党员 2.正式党员）
     */
    public interface Type{
        int YBDY = 1;
        int ZSDY = 2;
    }
}

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

@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;

/**
@@ -87,4 +88,50 @@
     */
    private Long communityId;

    /**
     * 党委标签（1.社区党委 2.区域党委委员）
     */
    private Integer type;

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

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

    /**
     * 职能
     */
    private String function;

    /**
     * 特长类别（1.体育类 2.舞蹈类 3.音乐类 4.美术类 5.其他）
     */
    private Integer specialtyCategory;

    /**
     * 特长描述
     */
    private String specialtyName;

    /**
     * 报道单位id
     */
    private Long checkUnitId;

    /**
     * 负责党组织id
     */
    private Long orgId;

    /**
     * 身份证
     */
    private String idCard;
}

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

@@ -47,4 +47,83 @@
     * 状态 1 启用 2 禁用
     */
    private Integer status;

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

    /**
     * 组织类别（1.基层党委 2.二级基层党委 3.党总支 4.党支部 5.党小组）
     */
    public interface Type{
        int JCDW = 1;
        int EJJCDW = 2;
        int DZZ = 3;
        int DZB = 4;
        int DXZ = 5;
    }

    /**
     * 组织隶属（1.乡镇 2.机关 3.域市街道 4.域市社区（居委会） 5.农村社区居委会 6.建制村 7.国有经济控制 8.集体经济控制
     * 9.非公有经济控制 10.事业单位 11.社会组织 12.其他）
     */
    public interface Subjection{
        int XZ = 1;
        int JG = 2;
        int YSJD = 3;
        int YSSQ = 4;
        int NCSQJWH = 5;
        int JZC = 6;
        int GYJJKZ = 7;
        int JTJJKZ = 8;
        int FGYJJKZ = 9;
        int SYDW = 10;
        int SHZZ = 11;
        int QT = 12;
    }
}

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

New file
@@ -0,0 +1,90 @@
package com.panzhihua.service_dangjian.service;

import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitExcelVO;

import java.util.List;

/**
 * title: 党建-报到单位表服务接口
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 党建-报到单位表服务接口
 *
 * @author lyq
 * @date 2022-02-16 16:22:26
 */
public interface ComPbCheckUnitService {

    /**
     * description  queryByPage  分页查询
     *
     * @param comPbCheckUnit 请求参数
     * @return 分页查询列表数据
     * @author lyq
     * @date 2022-02-16 16:22:26
     */
    R queryByPage(PageComPbCheckUnitDto comPbCheckUnit);

    /**
     * description  insert  新增数据
     *
     * @param comPbCheckUnit 请求参数
     * @return 新增结果
     * @author lyq
     * @date 2022-02-16 16:22:26
     */
    R insert(AddComPbCheckUnitDto comPbCheckUnit);

    /**
     * description  update  修改数据
     *
     * @param comPbCheckUnit 请求参数
     * @return 修改结果
     * @author lyq
     * @date 2022-02-16 16:22:26
     */
    R update(EditComPbCheckUnitDto comPbCheckUnit);

    /**
     * description  deleteById  通过主键删除数据
     *
     * @param id 主键id
     * @return 删除结果
     * @author lyq
     * @date 2022-02-16 16:22:26
     */
    R deleteById(Long id);

    /**
     * description  detailById  查询详情
     *
     * @param id 主键id
     * @return 详情数据
     * @author lyq
     * @date 2022-02-16 16:22:26
     */
    R detailById(Long id);

    /**
     * description  queryByPage  查询列表
     *
     * @param comPbCheckUnit 请求参数
     * @return 列表数据
     * @author lyq
     * @date 2022-02-16 16:22:26
     */
    R queryByList(PageComPbCheckUnitDto comPbCheckUnit);

    /**
     * 批量导入报道单位
     * @param list  导入数据
     * @param communityId   社区id
     * @param userId    用户id
     * @return  导入结果
     */
    R importCheckUnit(List<ComPbCheckUnitExcelVO> list, Long communityId, Long userId);

}

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

@@ -3,9 +3,14 @@
import java.util.List;

import com.baomidou.mybatisplus.extension.service.IService;
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.excel.ComPbMemberRoleExcelVo;
import com.panzhihua.service_dangjian.model.dos.ComPbMemberDO;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -191,4 +196,42 @@
     * @return 党员信息列表
     */
    R exportPbMember(PagePartyOrganizationVO organizationVO);

    /**
     * 分页查询党员数据统计
     * @param statisticsMemberDto   请求参数
     * @return  党员数据统计
     */
    R pageDataStatisticsMember(PageComDataStatisticsMemberDto statisticsMemberDto);

    /**
     * 根据组织id查询组织下统计数据
     * @param statisticsOrgDto  请求参数
     * @return  组织下统计数据
     */
    R getOrgDataStatistics(ComDataStatisticsOrgDto statisticsOrgDto);

    /**
     * 查询党组织表头统计数据
     * @param communityId
     *            社区id
     * @return  党组织表头统计数据
     */
    R getHeaderOrgDataStatistics(Long communityId);

    /**
     * 党员数据统计-党员导出数据查询
     * @param statisticsMemberDto   请求参数
     * @return  党员导出数据
     */
    R exportDataStatisticsMember(PageComDataStatisticsMemberDto statisticsMemberDto);

    /**
     * 党委导入接口
     * @param list 数据列表
     * @param communityId   社区id
     * @param userId    用户id
     * @return  导入结果
     */
    R importPbMemberRole(List<ComPbMemberRoleExcelVo> list, Long communityId, Long userId);
}

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

@@ -15,21 +15,21 @@
public interface PartyOrganizationService {
    /**
     * 平台所有启用的党组织
     * 
     *
     * @return 党组织集合
     */
    List<PartyOrganizationVO> listPartyOrganization(Long communityId);

    /**
     * 平台所有的党组织
     * 
     *
     * @return 党组织集合
     */
    R listPartyOrganizationAll(PartyOrganizationVO partyOrganizationVO);

    /**
     * 新增党支部
     * 
     *
     * @param partyOrganizationVO
     *            党支部基本信息
     * @return 新增结果
@@ -38,7 +38,7 @@

    /**
     * 编辑党支部
     * 
     *
     * @param partyOrganizationVO
     *            党支部基本信息
     * @return 编辑结果
@@ -47,7 +47,7 @@

    /**
     * 启用，禁用党支部
     * 
     *
     * @param partyOrganizationVO
     *            党支部基本信息
     * @return 编辑结果
@@ -56,7 +56,7 @@

    /**
     * 删除党支部
     * 
     *
     * @param partyOrganizationVO
     *            党支部基本信息
     * @return 编辑结果
@@ -65,8 +65,15 @@

    /**
     * 平台所有启用的党组织
     * 
     *
     * @return 党组织集合
     */
    List<PartyOrganizationVO> listPartyOrganizationByApp(ComListPartyDTO comListPartyDTO);

    /**
     * 查询所有党组织
     * @param partyOrganizationVO   请求参数
     * @return  党组织列表
     */
    R getPbOrgAllList(PartyOrganizationVO partyOrganizationVO);
}

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

New file
@@ -0,0 +1,191 @@
package com.panzhihua.service_dangjian.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.common.collect.Lists;
import com.panzhihua.common.enums.ComPbCheckUnitTypeEnum;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitErrorExcelVO;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitExcelVO;
import com.panzhihua.service_dangjian.dao.ComPbMemberDAO;
import com.panzhihua.service_dangjian.dao.ComPbMemberRoleDAO;
import com.panzhihua.service_dangjian.entity.ComPbCheckUnit;
import com.panzhihua.service_dangjian.dao.ComPbCheckUnitMapper;
import com.panzhihua.service_dangjian.model.dos.ComPbMemberDO;
import com.panzhihua.service_dangjian.model.dos.ComPbMemberRoleDO;
import com.panzhihua.service_dangjian.service.ComPbCheckUnitService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.BeanUtils;
import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.vos.R;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

/**
 * title: 党建-报到单位表服务实现类
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 党建-报到单位表服务实现类
 *
 * @author lyq
 * @date 2022-02-16 16:22:26
 */
@Service("comPbCheckUnitService")
public class ComPbCheckUnitServiceImpl extends ServiceImpl<ComPbCheckUnitMapper, ComPbCheckUnit> implements ComPbCheckUnitService {

    @Resource
    private ComPbMemberDAO comPbMemberDAO;
    @Resource
    private ComPbMemberRoleDAO comPbMemberRoleDAO;

    /**
     * description  queryByPage  分页查询
     *
     * @param comPbCheckUnit 请求参数
     * @return 分页查询列表数据
     * @author lyq
     * @date 2022-02-16 16:22:26
     */
    @Override
    public R queryByPage(PageComPbCheckUnitDto comPbCheckUnit) {
        return R.ok(this.baseMapper.queryAllByLimit(comPbCheckUnit, new Page(comPbCheckUnit.getPageNum(), comPbCheckUnit.getPageSize())));
    }

    /**
     * description  insert  新增数据
     *
     * @param comPbCheckUnit 请求参数
     * @return 新增结果
     * @author lyq
     * @date 2022-02-16 16:22:26
     */
    @Override
    public R insert(AddComPbCheckUnitDto comPbCheckUnit) {
        ComPbCheckUnit entity = new ComPbCheckUnit();
        BeanUtils.copyProperties(comPbCheckUnit, entity);
        if (this.baseMapper.insert(entity) > 0) {
            return R.ok();
        }
        return R.fail("添加失败");
    }

    /**
     * description  update  修改数据
     *
     * @param editDto 请求参数
     * @return 修改结果
     * @author lyq
     * @date 2022-02-16 16:22:26
     */
    @Override
    public R update(EditComPbCheckUnitDto editDto) {
        ComPbCheckUnit entity = this.baseMapper.selectById(editDto.getId());
        if (entity == null) {
            return R.fail("未查询到该记录");
        }
        BeanUtils.copyProperties(editDto, entity);
        if (this.baseMapper.updateById(entity) > 0) {
            return R.ok();
        }
        return R.fail("修改失败");
    }

    /**
     * description  deleteById  通过主键删除数据
     *
     * @param id 主键id
     * @return 删除结果
     * @author lyq
     * @date 2022-02-16 16:22:26
     */
    @Override
    public R deleteById(Long id) {
        Integer memberCount = comPbMemberDAO.selectCount(new QueryWrapper<ComPbMemberDO>().lambda()
                .eq(ComPbMemberDO::getCheckUnitId,id));
        if(memberCount > 0){
            return R.fail("该数据已被引用，无法删除！");
        }
        Integer memberRoleCount = comPbMemberRoleDAO.selectCount(new QueryWrapper<ComPbMemberRoleDO>().lambda()
                .eq(ComPbMemberRoleDO::getCheckUnitId,id));
        if(memberRoleCount > 0){
            return R.fail("该数据已被引用，无法删除！");
        }
        if (this.baseMapper.deleteById(id) > 0) {
            return R.ok();
        }
        return R.fail("删除失败");
    }

    /**
     * description  detailById  查询详情
     *
     * @param id 主键id
     * @return 详情数据
     * @author lyq
     * @date 2022-02-16 16:22:26
     */
    @Override
    public R detailById(Long id) {
        return R.ok(this.baseMapper.queryById(id));
    }

    /**
     * description  queryByPage  查询列表
     *
     * @param comPbCheckUnit 请求参数
     * @return 列表数据
     * @author lyq
     * @date 2022-02-16 16:22:26
     */
    @Override
    public R queryByList(PageComPbCheckUnitDto comPbCheckUnit) {
        return R.ok(this.baseMapper.queryAllByList(comPbCheckUnit));
    }

    /**
     * 批量导入报道单位
     * @param list  导入数据
     * @param communityId   社区id
     * @param userId    用户id
     * @return  导入结果
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R importCheckUnit(List<ComPbCheckUnitExcelVO> list, Long communityId, Long userId){
        ArrayList<ComPbCheckUnitErrorExcelVO> mistakes = Lists.newArrayList();
        ArrayList<ComPbCheckUnit> saveList = Lists.newArrayList();
        Date nowDate = new Date();
        if(list != null && list.size() > 0){
            list.forEach(checkUnit -> {
                ComPbCheckUnit comPbCheckUnit = this.baseMapper.selectOne(new QueryWrapper<ComPbCheckUnit>().lambda()
                        .eq(ComPbCheckUnit::getCommunityId,communityId).eq(ComPbCheckUnit::getName,checkUnit.getName()));
                if(comPbCheckUnit != null){
                    ComPbCheckUnitErrorExcelVO checkUnitError = new ComPbCheckUnitErrorExcelVO();
                    BeanUtils.copyProperties(checkUnit,checkUnitError);
                    checkUnitError.setError("该单位已存在，不可重复导入");
                    mistakes.add(checkUnitError);
                }else{
                    comPbCheckUnit = new ComPbCheckUnit();
                    BeanUtils.copyProperties(checkUnit,comPbCheckUnit);
                    comPbCheckUnit.setType(ComPbCheckUnitTypeEnum.getCodeByName(checkUnit.getType()));
                    comPbCheckUnit.setCommunityId(communityId);
                    comPbCheckUnit.setCreateAt(nowDate);
                    comPbCheckUnit.setCreateBy(userId);
                    saveList.add(comPbCheckUnit);
                }
            });
        }
        if(saveList.size() > 0){
            this.saveBatch(saveList);
        }
        if(mistakes.size() > 0){
            return R.fail(mistakes);
        }
        return R.ok();
    }
}

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

@@ -1,12 +1,25 @@
package com.panzhihua.service_dangjian.service.impl;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

import javax.annotation.Resource;

import cn.hutool.core.util.IdcardUtil;
import com.google.common.collect.Lists;
import com.panzhihua.common.enums.ComPbMemberRoleTypeEnum;
import com.panzhihua.common.model.dtos.partybuilding.ComDataStatisticsOrgDto;
import com.panzhihua.common.model.dtos.partybuilding.PageComDataStatisticsMemberDto;
import com.panzhihua.common.model.vos.partybuilding.excel.ComDataStatisticsMemberExcelVo;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitErrorExcelVO;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbMemberRoleErrorExcelVo;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbMemberRoleExcelVo;
import com.panzhihua.service_dangjian.entity.ComPbCheckUnit;
import io.swagger.annotations.ApiModelProperty;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
@@ -226,7 +239,7 @@
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<PartyBuildingMemberVO> iPage = comPbMemberDAO.pagePartyOrganization(page, pagePartyOrganizationVO);
        IPage<PartyBuildingMemberVO> iPage = comPbMemberDAO.queryAllByLimit(page, pagePartyOrganizationVO);
        iPage.getRecords().forEach(record -> {
            record.setIdCard(SensitiveUtil.desensitizedIdNumber(record.getIdCard()));
        });
@@ -290,15 +303,38 @@
     * @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);
        SysUserVO sysUser = comPbMemberRoleDAO.getSysUserByPhone(partyCommitteeVO.getPhone());
        if (!ObjectUtils.isEmpty(sysUser)) {
        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);
        }else{
            //存在则更新党委党员信息
            BeanUtils.copyProperties(partyCommitteeVO, pbMemberDO);
            pbMemberDO.setUpdateAt(nowDate);
            pbMemberDO.setType(ComPbMemberDO.Type.ZSDY);
            comPbMemberDAO.updateById(pbMemberDO);
        }
        int insert = comPbMemberRoleDAO.insert(comPbMemberRoleDO);
        if (insert > 0) {
@@ -315,24 +351,27 @@
     * @return 编辑结果
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R updatePartyCommittee(PartyCommitteeVO partyCommitteeVO) {
        ComPbMemberRoleDO comPbMemberRoleDO = new ComPbMemberRoleDO();
        Date nowDate = new Date();
        BeanUtils.copyProperties(partyCommitteeVO, comPbMemberRoleDO);
        ComPbMemberRoleDO comPbMemberRoleDOOld = comPbMemberRoleDAO.selectById(partyCommitteeVO.getId());
        comPbMemberRoleDO.setCreateAt(comPbMemberRoleDOOld.getCreateAt());
        comPbMemberRoleDO.setUpdateAt(new Date());
        comPbMemberRoleDO.setPositionTwo(partyCommitteeVO.getPositionTwo());
        comPbMemberRoleDO.setUpdateAt(nowDate);
        comPbMemberRoleDO.setIsReg(2);
        PartyCommitteeVO oldPartyCommitteeVO = comPbMemberRoleDAO.selectPartyCommitteeById(partyCommitteeVO.getId());
        String oldphone = oldPartyCommitteeVO.getPhone();
        SysUserVO sysUserOld = comPbMemberRoleDAO.getSysUserByPhone(oldphone);
        String newphone = partyCommitteeVO.getPhone();
        SysUserVO sysUserNew = comPbMemberRoleDAO.getSysUserByPhone(newphone);
        if (!ObjectUtils.isEmpty(sysUserOld) || !ObjectUtils.isEmpty(sysUserNew)) {
        Integer userCount = comPbMemberRoleDAO.getSysUserByIdCardCount(partyCommitteeVO.getIdCard());
        if (userCount > 0) {
            comPbMemberRoleDO.setIsReg(1);
        }
        if (!newphone.equals(oldphone)) {
            comPbMemberRoleDAO.updateUserPhone(newphone, oldphone);
        //查询党员信息并更新
        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){
            BeanUtils.copyProperties(partyCommitteeVO, pbMemberDO);
            pbMemberDO.setUpdateAt(nowDate);
            pbMemberDO.setType(ComPbMemberDO.Type.ZSDY);
            comPbMemberDAO.updateById(pbMemberDO);
        }
        int update = comPbMemberRoleDAO.updateById(comPbMemberRoleDO);
        if (update > 0) {
@@ -356,10 +395,9 @@
        }
        int delete = comPbMemberRoleDAO.deleteById(partyCommitteeVO.getId());
        if (delete > 0) {
            SysUserVO sysUserVO = comPbMemberRoleDAO.getSysUserByPhone(comPbMemberRoleDO.getPhone());
            Long userId = comPbMemberRoleDAO.getUserIdByIdCard(comPbMemberRoleDO.getIdCard());
            // 删除用户信息缓存
            if (sysUserVO != null) {
                Long userId = sysUserVO.getUserId();
            if (userId != null) {
                String userKey = UserConstants.LOGIN_USER_INFO + userId;
                stringRedisTemplate.delete(userKey);
                return R.ok();
@@ -591,6 +629,7 @@
        if (comPbMemberDO == null) {
            return R.fail("未找到党员认证信息");
        }
//        BeanUtils.copyProperties(partyBuildingMemberVO, comPbMemberDO);
        comPbMemberDO.setAuditResult(partyBuildingMemberVO.getAuditResult());
        if (partyBuildingMemberVO.getAuditResult() != null && partyBuildingMemberVO.getAuditResult().equals(3)) {
            comPbMemberDO.setRefuseReason(partyBuildingMemberVO.getRefuseReason());
@@ -632,4 +671,241 @@
        return R.ok(comPbMemberDAO.exportPbMember(organizationVO));
    }

    /**
     * 分页查询党员数据统计
     * @param statisticsMemberDto   请求参数
     * @return  党员数据统计
     */
    @Override
    public R pageDataStatisticsMember(PageComDataStatisticsMemberDto statisticsMemberDto) {
        IPage<ComDataStatisticsMemberVo> memberPage = comPbMemberDAO.pageDataStatisticsMember(new Page(statisticsMemberDto.getPageNum()
                ,statisticsMemberDto.getPageSize()),statisticsMemberDto);
        memberPage.getRecords().forEach(member -> {
            if(member.getIsRole() > 0){
                member.setIsRole(1);
            }else{
                member.setIsRole(2);
            }
            try {
                member.setAge(IdcardUtil.getAgeByIdCard(member.getIdCard()));
            } catch (Exception e) {
                log.error("年龄转义失败");
            }
            //查询党员统计数据
            ComDataStatisticsMemberVo statisticsMemberVo = comPbMemberDAO.getMemberStatistics(member.getUserId(),member.getCommunityId());
            if(statisticsMemberVo != null){
                member.setPartyActivityCount(statisticsMemberVo.getPartyActivityCount());
                member.setPartyActivityDuration(statisticsMemberVo.getPartyActivityDuration());
                member.setVolunteerActivityCount(statisticsMemberVo.getVolunteerActivityCount());
                member.setVolunteerActivityDuration(statisticsMemberVo.getVolunteerActivityDuration());
                member.setVolunteerActivityIntegral(statisticsMemberVo.getVolunteerActivityIntegral());
                member.setWishCount(statisticsMemberVo.getWishCount());
                member.setEasyCount(statisticsMemberVo.getEasyCount());
                member.setActivityCount(member.getPartyActivityCount() + member.getVolunteerActivityCount());
                member.setActivityDuration(member.getPartyActivityDuration() + member.getVolunteerActivityDuration());
            }
        });
        return R.ok(memberPage);
    }

    /**
     * 根据组织id查询组织下统计数据
     * @param statisticsOrgDto  请求参数
     * @return  组织下统计数据
     */
    @Override
    public R getOrgDataStatistics(ComDataStatisticsOrgDto statisticsOrgDto) {
        List<Long> orgIds = new ArrayList<>();
        Long communityId = statisticsOrgDto.getCommunityId();
        ComDataStatisticsOrgVo statisticsOrgVo = new ComDataStatisticsOrgVo();
        if(statisticsOrgDto.getOrgId() != null){
            ComPbOrgDO pbOrgDO = comPbOrgDAO.selectById(statisticsOrgDto.getOrgId());
            if(pbOrgDO == null){
                return R.fail("未查询到党组织");
            }
            //拼接党组织id
            if(pbOrgDO.getOneId() != null){
                orgIds.add(pbOrgDO.getOneId());
            }
            if(pbOrgDO.getTwoId() != null){
                orgIds.add(pbOrgDO.getTwoId());
            }
            if(pbOrgDO.getThirdId() != null){
                orgIds.add(pbOrgDO.getThirdId());
            }
            if(pbOrgDO.getFourId() != null){
                orgIds.add(pbOrgDO.getFourId());
            }
            if(pbOrgDO.getFiveId() != null){
                orgIds.add(pbOrgDO.getFiveId());
            }
        }
        //拼接查询开始结束时间
        String startTime = statisticsOrgDto.getYear() + "-01-01 00:00:00";
        String endTime = statisticsOrgDto.getYear() + "-12-31 23:59:59";

        ComDataStatisticsOrgVo statisticsVo = new ComDataStatisticsOrgVo();
        //查询统计左上数据
        statisticsVo = comPbMemberDAO.getOrgDataStatistics(communityId,orgIds);
        if(statisticsVo != null){
            BeanUtils.copyProperties(statisticsVo,statisticsOrgVo);
        }

        //查询左下数据
        statisticsVo = comPbMemberDAO.getOrgDataStatisticsLeftDown(communityId,orgIds,startTime,endTime);
        if(statisticsVo != null){
            statisticsOrgVo.setParticipateVolunteerActivityDuration(statisticsVo.getParticipateVolunteerActivityDuration());
            statisticsOrgVo.setParticipateVolunteerActivityNum(statisticsVo.getParticipateVolunteerActivityNum());
            statisticsOrgVo.setParticipatePartyActivityNum(statisticsVo.getParticipatePartyActivityNum());
        }

        //查询党员数据
        IPage<PartyBuildingMemberVO> partyMemberPage = comPbMemberDAO.getOrgDataStatisticsMember(new Page(statisticsOrgDto.getPageNum()
                ,statisticsOrgDto.getPageSize()),communityId,orgIds);
        if(partyMemberPage.getRecords() != null && !partyMemberPage.getRecords().isEmpty()){
            statisticsOrgVo.setPartyMemberList(partyMemberPage.getRecords());
        }

        List<String> startDateList = DateUtils.getYearFirstMonths(statisticsOrgDto.getYear());
        List<String> endDateList = DateUtils.getYearLastMonths(statisticsOrgDto.getYear());
        List<String> completeWishList = new ArrayList<>();
        List<String> cumulativeWishList = new ArrayList<>();
        List<String> completeEasyList = new ArrayList<>();
        List<String> cumulativeEasyList = new ArrayList<>();
        for (int i = 0; i < startDateList.size(); i++) {
            Map<String,Object> statisticsMap = comPbMemberDAO.getOrgDataStatisticsRightDown(communityId,orgIds, startDateList.get(i) + " 00:00:00", endDateList.get(i) + " 23:59:59");
            if(statisticsMap != null){
                completeWishList.add(statisticsMap.get("completeWishNum").toString());
                cumulativeWishList.add(statisticsMap.get("cumulativeWishNum").toString());
                completeEasyList.add(statisticsMap.get("completeEasyNum").toString());
                cumulativeEasyList.add(statisticsMap.get("cumulativeEasyNum").toString());
                if(i == startDateList.size() - 1){
                    statisticsOrgVo.setWishNum(statisticsMap.get("cumulativeWishNum").toString());
                    statisticsOrgVo.setEasyNum(statisticsMap.get("cumulativeEasyNum").toString());
                }
            }
        }
        statisticsOrgVo.setCompleteEasyList(completeEasyList);
        statisticsOrgVo.setCompleteWishList(completeWishList);
        statisticsOrgVo.setCumulativeWishList(cumulativeWishList);
        statisticsOrgVo.setCumulativeEasyList(cumulativeEasyList);
        return R.ok(statisticsOrgVo);
    }

    /**
     * 查询党组织表头统计数据
     * @param communityId
     *            社区id
     * @return  党组织表头统计数据
     */
    @Override
    public R getHeaderOrgDataStatistics(Long communityId) {
        ComDataStatisticsHeaderOrgVo headerOrgVo = comPbMemberDAO.getHeaderOrgDataStatistics(communityId);
        if(headerOrgVo != null){
            if(headerOrgVo.getVillageNum() == null || headerOrgVo.getVillageNum().equals(0)){
                headerOrgVo.setVillageRate(BigDecimal.ZERO);
            }else{
                headerOrgVo.setVillageRate(BigDecimal.valueOf(headerOrgVo.getAreaNum()).divide(BigDecimal.valueOf(headerOrgVo.getVillageNum())
                        ,4,BigDecimal.ROUND_HALF_UP).multiply(BigDecimal.valueOf(100)));
            }
        }
        return R.ok(headerOrgVo);
    }

    /**
     * 党员数据统计-党员导出数据查询
     * @param statisticsMemberDto   请求参数
     * @return  党员导出数据
     */
    @Override
    public R exportDataStatisticsMember(PageComDataStatisticsMemberDto statisticsMemberDto) {
        List<ComDataStatisticsMemberExcelVo> memberList = comPbMemberDAO.exportDataStatisticsMember(statisticsMemberDto);
        memberList.forEach(member -> {
            //查询党员统计数据
            ComDataStatisticsMemberVo statisticsMemberVo = comPbMemberDAO.getMemberStatistics(member.getUserId(),member.getCommunityId());
            if(statisticsMemberVo != null){
                member.setPartyActivityCount(statisticsMemberVo.getPartyActivityCount());
                member.setPartyActivityDuration(statisticsMemberVo.getPartyActivityDuration());
                member.setVolunteerActivityCount(statisticsMemberVo.getVolunteerActivityCount());
                member.setVolunteerActivityDuration(statisticsMemberVo.getVolunteerActivityDuration());
                member.setVolunteerActivityIntegral(statisticsMemberVo.getVolunteerActivityIntegral());
                member.setWishCount(statisticsMemberVo.getWishCount());
                member.setEasyCount(statisticsMemberVo.getEasyCount());
                member.setActivityCount(member.getPartyActivityCount() + member.getVolunteerActivityCount());
                member.setActivityDuration(member.getPartyActivityDuration() + member.getVolunteerActivityDuration());
            }
        });
        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;
                    }

                    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;
                    }
                }
            });
        }

        if(saveList.size() > 0){
            saveList.forEach(save -> {
                comPbMemberRoleDAO.insert(save);
            });
        }
        if(mistakes.size() > 0){
            return R.fail(mistakes);
        }
        return R.ok();
    }
}

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

@@ -2,9 +2,11 @@

import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;

import javax.annotation.Resource;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -49,9 +51,7 @@
        if (!ObjectUtils.isEmpty(comPbOrgDOS)) {
            comPbOrgDOS.forEach(comPbOrgDO -> {
                PartyOrganizationVO partyOrganizationVO = new PartyOrganizationVO();
                partyOrganizationVO.setId(comPbOrgDO.getId());
                partyOrganizationVO.setName(comPbOrgDO.getName());
                partyOrganizationVO.setStatus(comPbOrgDO.getStatus());
                BeanUtils.copyProperties(comPbOrgDO,partyOrganizationVO);
                partyOrganizationVOS.add(partyOrganizationVO);
            });
        }
@@ -65,21 +65,49 @@
     */
    @Override
    public R listPartyOrganizationAll(PartyOrganizationVO partyOrganizationVO) {
        IPage<PartyOrganizationVO> orgPgaeList = this.comPbOrgDAO.listPartyOrganizationAll(
        IPage<PartyOrganizationVO> orgPage = this.comPbOrgDAO.listPartyOrganizationAll(
            new Page(partyOrganizationVO.getPageNum(), partyOrganizationVO.getPageSize()), partyOrganizationVO);
        if (!ObjectUtils.isEmpty(orgPgaeList.getRecords())) {
            orgPgaeList.getRecords().forEach(comPbOrgDO -> {
                List<ComPbMemberDO> comPbMemberDOs = comPbMemberDAO.selectList(
                    new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getOrgId, comPbOrgDO.getId()));
                comPbOrgDO.setCountPerson(comPbMemberDOs.size());
        if (!ObjectUtils.isEmpty(orgPage.getRecords()) && StringUtils.isEmpty(partyOrganizationVO.getKeyWord())) {
            //遍历第一级党组织列表
            orgPage.getRecords().forEach(org -> {
                partyOrganizationVO.setParentId(org.getId());
                List<PartyOrganizationVO> twoChildList = comPbOrgDAO.getChildOrgList(partyOrganizationVO);
                if(!ObjectUtils.isEmpty(twoChildList)){
                    //遍历第二级党组织列表
                    twoChildList.forEach(twoChild -> {
                        partyOrganizationVO.setParentId(twoChild.getId());
                        List<PartyOrganizationVO> thirdChildList = comPbOrgDAO.getChildOrgList(partyOrganizationVO);
                        if(!ObjectUtils.isEmpty(thirdChildList)){
                            //遍历第三级党组织列表
                            thirdChildList.forEach(thirdChild -> {
                                partyOrganizationVO.setParentId(thirdChild.getId());
                                List<PartyOrganizationVO> fourChildList = comPbOrgDAO.getChildOrgList(partyOrganizationVO);
                                if(!ObjectUtils.isEmpty(fourChildList)){
                                    fourChildList.forEach(fourChild -> {
                                        partyOrganizationVO.setParentId(fourChild.getId());
                                        List<PartyOrganizationVO> fiveChildList = comPbOrgDAO.getChildOrgList(partyOrganizationVO);
                                        fourChild.setCountPerson(fourChild.getCountPerson() + fiveChildList.stream().mapToInt(five -> five.getCountPerson()).sum());
                                        fourChild.setChildList(fiveChildList);
                                    });
                                }
                                thirdChild.setCountPerson(thirdChild.getCountPerson() + fourChildList.stream().mapToInt(four -> four.getCountPerson()).sum());
                                thirdChild.setChildList(fourChildList);
                            });
                        }
                        twoChild.setCountPerson(twoChild.getCountPerson() + thirdChildList.stream().mapToInt(third -> third.getCountPerson()).sum());
                        twoChild.setChildList(thirdChildList);
                    });
                }
                org.setCountPerson(org.getCountPerson() + twoChildList.stream().mapToInt(two -> two.getCountPerson()).sum());
                org.setChildList(twoChildList);
            });
        }
        return R.ok(orgPgaeList);
        return R.ok(orgPage);
    }

    /**
     * 新增党支部
     * 
     *
     * @param partyOrganizationVO
     *            党支部基本信息
     * @return 新增结果
@@ -88,10 +116,53 @@
    public R addPartyOrganization(PartyOrganizationVO partyOrganizationVO) {
        ComPbOrgDO comPbOrgDO = new ComPbOrgDO();
        BeanUtils.copyProperties(partyOrganizationVO, comPbOrgDO);
        comPbOrgDO.setLevel(1);
        comPbOrgDO.setParentId(0L);
        comPbOrgDO.setLevel(partyOrganizationVO.getType());
        if(partyOrganizationVO.getType().equals(ComPbOrgDO.Type.JCDW)){
            comPbOrgDO.setParentId(0L);
        }
        ComPbOrgDO oldComPbOrgDO = null;
        int insert = comPbOrgDAO.insert(comPbOrgDO);
        if (insert > 0) {
            switch (partyOrganizationVO.getType()){
                case ComPbOrgDO.Type.JCDW:
                    comPbOrgDO.setParentId(0L);
                    comPbOrgDO.setOneId(comPbOrgDO.getId());
                    break;
                case ComPbOrgDO.Type.EJJCDW:
                    comPbOrgDO.setOneId(partyOrganizationVO.getParentId());
                    comPbOrgDO.setTwoId(comPbOrgDO.getId());
                    break;
                case ComPbOrgDO.Type.DZZ:
                    oldComPbOrgDO = this.comPbOrgDAO.selectById(partyOrganizationVO.getParentId());
                    if(oldComPbOrgDO != null){
                        comPbOrgDO.setOneId(oldComPbOrgDO.getOneId());
                        comPbOrgDO.setTwoId(oldComPbOrgDO.getTwoId());
                    }
                    comPbOrgDO.setThirdId(comPbOrgDO.getId());
                    break;
                case ComPbOrgDO.Type.DZB:
                    oldComPbOrgDO = this.comPbOrgDAO.selectById(partyOrganizationVO.getParentId());
                    if(oldComPbOrgDO != null){
                        comPbOrgDO.setOneId(oldComPbOrgDO.getOneId());
                        comPbOrgDO.setTwoId(oldComPbOrgDO.getTwoId());
                        comPbOrgDO.setThirdId(oldComPbOrgDO.getThirdId());
                    }
                    comPbOrgDO.setFourId(comPbOrgDO.getId());
                    break;
                case ComPbOrgDO.Type.DXZ:
                    oldComPbOrgDO = this.comPbOrgDAO.selectById(partyOrganizationVO.getParentId());
                    if(oldComPbOrgDO != null){
                        comPbOrgDO.setOneId(oldComPbOrgDO.getOneId());
                        comPbOrgDO.setTwoId(oldComPbOrgDO.getTwoId());
                        comPbOrgDO.setThirdId(oldComPbOrgDO.getThirdId());
                        comPbOrgDO.setFourId(oldComPbOrgDO.getFourId());
                    }
                    comPbOrgDO.setFiveId(comPbOrgDO.getId());
                    break;
                default:
                    break;
            }
            this.comPbOrgDAO.updateById(comPbOrgDO);
            return R.ok();
        }
        return R.fail();
@@ -99,7 +170,7 @@

    /**
     * 编辑党支部
     * 
     *
     * @param partyOrganizationVO
     *            党支部基本信息
     * @return 编辑结果
@@ -108,10 +179,49 @@
    public R updatePartyOrganization(PartyOrganizationVO partyOrganizationVO) {
        ComPbOrgDO comPbOrgDO = new ComPbOrgDO();
        BeanUtils.copyProperties(partyOrganizationVO, comPbOrgDO);
        comPbOrgDO.setLevel(1);
        comPbOrgDO.setParentId(0L);
        comPbOrgDO.setLevel(partyOrganizationVO.getType());
        ComPbOrgDO oldComPbOrgDO = null;
        int insert = comPbOrgDAO.updateById(comPbOrgDO);
        if (insert > 0) {
            switch (partyOrganizationVO.getType()){
                case ComPbOrgDO.Type.JCDW:
                    comPbOrgDO.setParentId(0L);
                    comPbOrgDO.setOneId(comPbOrgDO.getId());
                    break;
                case ComPbOrgDO.Type.EJJCDW:
                    comPbOrgDO.setOneId(partyOrganizationVO.getParentId());
                    comPbOrgDO.setTwoId(comPbOrgDO.getId());
                    break;
                case ComPbOrgDO.Type.DZZ:
                    oldComPbOrgDO = this.comPbOrgDAO.selectById(partyOrganizationVO.getParentId());
                    if(oldComPbOrgDO != null){
                        comPbOrgDO.setOneId(oldComPbOrgDO.getOneId());
                        comPbOrgDO.setTwoId(oldComPbOrgDO.getTwoId());
                    }
                    comPbOrgDO.setThirdId(comPbOrgDO.getId());
                    break;
                case ComPbOrgDO.Type.DZB:
                    oldComPbOrgDO = this.comPbOrgDAO.selectById(partyOrganizationVO.getParentId());
                    if(oldComPbOrgDO != null){
                        comPbOrgDO.setOneId(oldComPbOrgDO.getOneId());
                        comPbOrgDO.setTwoId(oldComPbOrgDO.getTwoId());
                        comPbOrgDO.setThirdId(oldComPbOrgDO.getThirdId());
                    }
                    comPbOrgDO.setFourId(comPbOrgDO.getId());
                    break;
                case ComPbOrgDO.Type.DXZ:
                    oldComPbOrgDO = this.comPbOrgDAO.selectById(partyOrganizationVO.getParentId());
                    if(oldComPbOrgDO != null){
                        comPbOrgDO.setOneId(oldComPbOrgDO.getOneId());
                        comPbOrgDO.setTwoId(oldComPbOrgDO.getTwoId());
                        comPbOrgDO.setThirdId(oldComPbOrgDO.getThirdId());
                        comPbOrgDO.setFourId(oldComPbOrgDO.getFourId());
                    }
                    comPbOrgDO.setFiveId(comPbOrgDO.getId());
                    break;
                default:
                    break;
            }
            return R.ok();
        }
        return R.fail();
@@ -119,7 +229,7 @@

    /**
     * 启用，禁用党支部
     * 
     *
     * @param partyOrganizationVO
     *            党支部基本信息
     * @return 编辑结果
@@ -140,16 +250,20 @@

    /**
     * 删除党支部
     * 
     *
     * @param partyOrganizationVO
     *            党支部基本信息
     * @return 编辑结果
     */
    @Override
    public R deletePartyOrganization(PartyOrganizationVO partyOrganizationVO) {
        List<ComPbMemberDO> comPbMemberDOs = comPbMemberDAO.selectList(
        Integer count = comPbOrgDAO.selectCount(new QueryWrapper<ComPbOrgDO>().lambda().eq(ComPbOrgDO::getParentId,partyOrganizationVO.getId()));
        if(count > 0){
            return R.fail("该组织下已有子组织，不能删除！");
        }
        List<ComPbMemberDO> comPbMemberList = comPbMemberDAO.selectList(
            new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getOrgId, partyOrganizationVO.getId()));
        if (!CollectionUtils.isEmpty(comPbMemberDOs) && comPbMemberDOs.size() > 0) {
        if (!CollectionUtils.isEmpty(comPbMemberList) && comPbMemberList.size() > 0) {
            return R.fail("该党组织下已有党员，不能删除！");
        }
        int insert = comPbOrgDAO.deleteById(partyOrganizationVO.getId());
@@ -159,6 +273,7 @@
        return R.fail();
    }

    @Override
    public List<PartyOrganizationVO> listPartyOrganizationByApp(ComListPartyDTO comListPartyDTO) {
        List<PartyOrganizationVO> partyOrganizationVOS = new ArrayList<>();
        QueryWrapper<ComPbOrgDO> queryWrapper = new QueryWrapper<>();
@@ -181,4 +296,50 @@
        }
        return partyOrganizationVOS;
    }

    /**
     * 查询所有党组织列表
     * @param partyOrganizationVO   请求参数
     * @return  党组织列表
     */
    @Override
    public R getPbOrgAllList(PartyOrganizationVO partyOrganizationVO){
        List<PartyOrganizationVO> orgList = this.comPbOrgDAO.getPbOrgAllList(partyOrganizationVO);
        if (!ObjectUtils.isEmpty(orgList) && StringUtils.isEmpty(partyOrganizationVO.getKeyWord())) {
            //遍历第一级党组织列表
            orgList.forEach(org -> {
                partyOrganizationVO.setParentId(org.getId());
                List<PartyOrganizationVO> twoChildList = comPbOrgDAO.getChildOrgList(partyOrganizationVO);
                if(!ObjectUtils.isEmpty(twoChildList)){
                    //遍历第二级党组织列表
                    twoChildList.forEach(twoChild -> {
                        partyOrganizationVO.setParentId(twoChild.getId());
                        List<PartyOrganizationVO> thirdChildList = comPbOrgDAO.getChildOrgList(partyOrganizationVO);
                        if(!ObjectUtils.isEmpty(thirdChildList)){
                            //遍历第三级党组织列表
                            thirdChildList.forEach(thirdChild -> {
                                partyOrganizationVO.setParentId(thirdChild.getId());
                                List<PartyOrganizationVO> fourChildList = comPbOrgDAO.getChildOrgList(partyOrganizationVO);
                                if(!ObjectUtils.isEmpty(fourChildList)){
                                    fourChildList.forEach(fourChild -> {
                                        partyOrganizationVO.setParentId(fourChild.getId());
                                        List<PartyOrganizationVO> fiveChildList = comPbOrgDAO.getChildOrgList(partyOrganizationVO);
                                        fourChild.setCountPerson(fourChild.getCountPerson() + fiveChildList.stream().mapToInt(five -> five.getCountPerson()).sum());
                                        fourChild.setChildList(fiveChildList);
                                    });
                                }
                                thirdChild.setCountPerson(thirdChild.getCountPerson() + fourChildList.stream().mapToInt(four -> four.getCountPerson()).sum());
                                thirdChild.setChildList(fourChildList);
                            });
                        }
                        twoChild.setCountPerson(twoChild.getCountPerson() + thirdChildList.stream().mapToInt(third -> third.getCountPerson()).sum());
                        twoChild.setChildList(thirdChildList);
                    });
                }
                org.setCountPerson(org.getCountPerson() + twoChildList.stream().mapToInt(two -> two.getCountPerson()).sum());
                org.setChildList(twoChildList);
            });
        }
        return R.ok(orgList);
    }
}

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

New file
@@ -0,0 +1,75 @@
<?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.ComPbCheckUnitMapper">

    <resultMap type="com.panzhihua.service_dangjian.entity.ComPbCheckUnit" id="ComPbCheckUnitMap">
        <result property="id" column="id" jdbcType="INTEGER"/>
        <result property="communityId" column="community_id" jdbcType="INTEGER"/>
        <result property="name" column="name" jdbcType="VARCHAR"/>
        <result property="type" column="type" jdbcType="INTEGER"/>
        <result property="contacts" column="contacts" jdbcType="VARCHAR"/>
        <result property="phone" column="phone" jdbcType="VARCHAR"/>
        <result property="createAt" column="create_at" jdbcType="TIMESTAMP"/>
        <result property="createBy" column="create_by" jdbcType="INTEGER"/>
        <result property="updateAt" column="update_at" jdbcType="TIMESTAMP"/>
        <result property="updateBy" column="update_by" jdbcType="INTEGER"/>
    </resultMap>

    <!--查询单个-->
    <select id="queryById" resultType="com.panzhihua.common.model.vos.common.ComPbCheckUnitVo">
        select
          id, name, type, contacts, phone, create_at, create_by, update_at, update_by, community_id
        from com_pb_check_unit
        where id = #{id}
    </select>

    <!--查询指定行数据-->
    <select id="queryAllByLimit" resultType="com.panzhihua.common.model.vos.common.ComPbCheckUnitVo">
        select
        id, name, type, contacts, phone, create_at, create_by, update_at, update_by, community_id
        from com_pb_check_unit
        <where>
            <if test="dto.type != null">
                and type = #{dto.type}
            </if>
            <if test="dto.communityId != null">
                and community_id = #{dto.communityId}
            </if>
            <if test="dto.keyWord != null and dto.keyWord != ''">
                and (`name` like concat(#{dto.keyWord},'%') or
                `contacts` like concat(#{dto.keyWord},'%'))
            </if>
        </where>
        order by create_at desc
    </select>

    <!--查询所有数据-->
    <select id="queryAllByList" resultType="com.panzhihua.common.model.vos.common.ComPbCheckUnitVo">
        select
        id, name, type, contacts, phone, create_at, create_by, update_at, update_by
        from com_pb_check_unit
        <where>
            <if test="dto.id != null">
                and id = #{dto.id}
            </if>
            <if test="dto.name != null and dto.name != ''">
                and name = #{dto.name}
            </if>
            <if test="dto.type != null">
                and type = #{dto.type}
            </if>
            <if test="dto.contacts != null and dto.contacts != ''">
                and contacts = #{dto.contacts}
            </if>
            <if test="dto.phone != null and dto.phone != ''">
                and phone = #{dto.phone}
            </if>
            <if test="dto.communityId != null">
                and community_id = #{dto.communityId}
            </if>
        </where>
        order by create_at desc
    </select>

</mapper>


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

New file
@@ -0,0 +1,546 @@
<?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">

    <resultMap type="com.panzhihua.service_dangjian.model.dos.ComPbMemberDO" id="ComPbMemberMap">
        <result property="id" column="id" jdbcType="INTEGER"/>
        <result property="orgId" column="org_id" jdbcType="INTEGER"/>
        <result property="name" column="name" jdbcType="VARCHAR"/>
        <result property="idCard" column="id_card" jdbcType="VARCHAR"/>
        <result property="photoPath" column="photo_path" jdbcType="VARCHAR"/>
        <result property="joinTime" column="join_time" jdbcType="TIMESTAMP"/>
        <result property="employmentTime" column="employment_time" jdbcType="TIMESTAMP"/>
        <result property="auditResult" column="audit_result" jdbcType="INTEGER"/>
        <result property="createAt" column="create_at" jdbcType="TIMESTAMP"/>
        <result property="updateAt" column="update_at" jdbcType="TIMESTAMP"/>
        <result property="communityId" column="community_id" jdbcType="INTEGER"/>
        <result property="userId" column="user_id" jdbcType="INTEGER"/>
        <result property="refuseReason" column="refuse_reason" jdbcType="VARCHAR"/>
        <result property="phone" column="phone" jdbcType="VARCHAR"/>
        <result property="type" column="type" jdbcType="INTEGER"/>
        <result property="position" column="position" jdbcType="VARCHAR"/>
        <result property="checkUnitId" column="check_unit_id" jdbcType="INTEGER"/>
        <result property="function" column="function" jdbcType="VARCHAR"/>
        <result property="specialtyCategory" column="specialty_category" jdbcType="INTEGER"/>
        <result property="specialtyName" column="specialty_name" jdbcType="VARCHAR"/>
        <result property="positionTwo" column="position_two" jdbcType="VARCHAR"/>
    </resultMap>

    <!--查询单个-->
    <select id="queryById" 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, o.`name` orgName,cpcu.name as checkUnitName,
        TIMESTAMPDIFF(
        YEAR,
        m.employment_time,
        DATE_FORMAT( NOW(), '%Y-%m-%d' )) as partyAge,
        CASE

        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
        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
        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, o.`name` orgName,cpcu.name as checkUnitName,
        TIMESTAMPDIFF(
        YEAR,
        m.employment_time,
        DATE_FORMAT( NOW(), '%Y-%m-%d' )) as partyAge,
        CASE

        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
        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>
            and m.audit_result = 1
            <if test='dto.orgName != null and dto.orgName != &quot;&quot;'>
                and o.name like concat(#{dto.orgName},'%')
            </if>
            <if test='dto.orgId != null'>
               and o.id = #{dto.orgId}
            </if>
            <if test='dto.account != null and dto.account != &quot;&quot;'>
                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},'%')
            </if>
            <if test="dto.orgId != null">
                and m.org_id = #{dto.orgId}
            </if>
            <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
                u.phone like concat (#{dto.keyWord},'%') or
                cpcu.name like concat (#{dto.keyWord},'%')
                )
            </if>
            <if test="dto.type != null">
                and m.type = #{dto.type}
            </if>
            <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>
        </where>
        order by m.create_at desc
    </select>

    <select id="pagePartyBuildingMembersVO" 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, o.`name` orgName,cpcu.name as checkUnitName,
        TIMESTAMPDIFF(
        YEAR,
        m.employment_time,
        DATE_FORMAT( NOW(), '%Y-%m-%d' )) as partyAge,
        CASE

        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
        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
            m.audit_result IN ( 0, 3 )
        <if test='pagePartyBuildingMemberVO.phone != null and pagePartyBuildingMemberVO.phone != &quot;&quot;'>
            and u.phone LIKE CONCAT('%',#{pagePartyBuildingMemberVO.phone},'%')
        </if>
        <if test='pagePartyBuildingMemberVO.name != null and pagePartyBuildingMemberVO.name != &quot;&quot;'>
            and u.name like concat ('%',#{pagePartyBuildingMemberVO.name},'%')
        </if>
        <if test='pagePartyBuildingMemberVO.auditStatus != null'>
            and m.audit_result = #{pagePartyBuildingMemberVO.auditStatus}
        </if>
        <if test='pagePartyBuildingMemberVO.communityId != null'>
            and m.community_id = ${pagePartyBuildingMemberVO.communityId}
        </if>
    </select>

    <select id="pageDataStatisticsMember" resultType="com.panzhihua.common.model.vos.partybuilding.ComDataStatisticsMemberVo">
        SELECT
            cpm.id,
            cpm.`name`,
            cpm.photo_path,
            cpm.type,
            cpm.`function`,
            cpm.specialty_category,
            cpm.specialty_name,
            cpm.position,
            cpm.position_two,
            cpm.id_card,
            cpm.phone,
            cpm.check_unit_id,
            cpm.user_id,
            cpcu.`name` AS checkUnitName,
            cpm.org_id,
            cpm.community_id,
            cpo.`name` AS orgName,
            YEAR (
                from_days(
                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
            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>
                and cpm.audit_result = 1
                <if test="dto.communityId != null">
                    and cpm.community_id = #{dto.communityId}
                </if>

                <if test="dto.keyWord != null and dto.keyWord !=''">
                    and (
                    cpm.`name` like concat (#{dto.keyWord},'%') or
                    cpm.`id_card` = #{dto.keyWord} or
                    cpm.`phone` like concat (#{dto.keyWord},'%') or
                    cpcu.`name` like concat (#{dto.keyWord},'%') or
                    cpo.`name` like concat (#{dto.keyWord},'%')
                    )
                </if>
            </where>
            order by cpm.create_at desc
    </select>

    <select id="getMemberStatistics" resultType="com.panzhihua.common.model.vos.partybuilding.ComDataStatisticsMemberVo">
        SELECT
            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_sign AS caas
            LEFT JOIN com_act_activity AS caa ON caa.id = caas.activity_id
            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_sign AS caas
                    LEFT JOIN com_act_activity AS caa ON caa.id = caas.activity_id
                WHERE
                    caas.user_id = #{userId} and caas.status = 1 and caa.type = 1 and caa.community_id = #{communityId}
                    ),
                0
            ) AS volunteerActivityDuration,
            ( 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_pb_activity_member AS cpam
            LEFT JOIN com_pb_member AS cpm ON cpm.id = cpam.member_id
        WHERE
            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
                <if test="orgIds != null and orgIds.size > 0">
                    AND org_id in
                    <foreach collection="orgIds" item="item" open="(" separator="," close=")">
                        #{item}
                    </foreach>
                </if>
            ) AS wdNum,
            ( SELECT count( id ) FROM com_pb_member 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=")">
                        #{item}
                    </foreach>
                </if>
            ) AS yyNum,
            ( SELECT count( id ) FROM com_pb_member 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=")">
                #{item}
            </foreach>
        </if>
            ) AS msNum,
            ( SELECT count( id ) FROM com_pb_member 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=")">
                #{item}
            </foreach>
        </if>
            ) AS qtNum,
            ( SELECT count( id ) FROM com_pb_member 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=")">
                #{item}
            </foreach>
        </if>
            ) AS wuNum,
            ( SELECT count( id ) FROM com_pb_member 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=")">
                #{item}
            </foreach>
        </if>
            ) AS preparePartyMemberNum,
            ( SELECT count( id ) FROM com_pb_member 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=")">
                #{item}
            </foreach>
        </if>
            ) AS formalPartyMemberNum,
            ( SELECT count( id ) FROM com_pb_member 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=")">
                #{item}
            </foreach>
        </if>
            ) AS partyMemberNum
        FROM
            com_pb_member
        WHERE
            audit_result = 1
            AND community_id = #{communityId}
            AND specialty_category = 1
        <if test="orgIds != null and orgIds.size > 0">
            AND org_id in
            <foreach collection="orgIds" item="item" open="(" separator="," close=")">
                #{item}
            </foreach>
        </if>
    </select>

    <select id="getOrgDataStatisticsLeftDown" resultType="com.panzhihua.common.model.vos.partybuilding.ComDataStatisticsOrgVo">
        SELECT
            count( caas1.id ) AS participateVolunteerActivityNum,
            (
            SELECT
                IFNULL( sum( caa.duration ), 0 )
            FROM
                com_act_act_sign AS caas
                LEFT JOIN com_act_activity AS caa ON caa.id = caas.activity_id
            WHERE
                caas.`status` = 1
                AND caas.is_volunteer = 1 and caa.type = 1
                AND caas.user_id IN ( SELECT user_id FROM com_pb_member WHERE audit_result = 1 AND community_id = #{communityId} AND user_id IS NOT NULL
        <if test="orgIds != null and orgIds.size > 0">
            AND org_id in
            <foreach collection="orgIds" item="item" open="(" separator="," close=")">
                #{item}
            </foreach>
        </if>
                )
                AND caas.create_at BETWEEN #{startTime}
                AND #{endTime}
            ) AS participateVolunteerActivityDuration,
            (
            SELECT
                count( cpam.id )
            FROM
                com_pb_activity_member AS cpam
                LEFT JOIN com_pb_member AS cpm ON cpm.id = cpam.member_id
            WHERE
                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>
            ) 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.is_volunteer = 1
            AND caas1.user_id IN ( SELECT user_id FROM com_pb_member WHERE audit_result = 1 AND community_id = #{communityId} AND user_id IS NOT NULL
        <if test="orgIds != null and orgIds.size > 0">
            AND caas1.org_id in
            <foreach collection="orgIds" item="item" open="(" separator="," close=")">
                #{item}
            </foreach>
        </if>
            )
            AND caas1.create_at BETWEEN #{startTime}
            AND #{endTime}
    </select>

    <select id="getOrgDataStatisticsMember" 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, o.`name` orgName,cpcu.name as checkUnitName,
        TIMESTAMPDIFF(
        YEAR,
        m.employment_time,
        DATE_FORMAT( NOW(), '%Y-%m-%d' )) as partyAge,
        CASE

        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
        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>
            and m.audit_result = 1
            and m.community_id = #{communityId}
            <if test="orgIds != null and orgIds.size > 0">
                AND m.org_id in
                <foreach collection="orgIds" item="item" open="(" separator="," close=")">
                    #{item}
                </foreach>
            </if>
        </where>
    </select>

    <select id="getOrgDataStatisticsRightDown" resultType="map">
        SELECT
            count( camw.id ) AS completeWishNum,(
            SELECT
                count( camw.id )
            FROM
                com_act_micro_wish AS camw
            WHERE
                camw.community_id = #{communityId}
                AND camw.`status` = 6
                AND camw.evaluate_at <![CDATA[ <= ]]> #{endDate}
                AND sponsor_id IN (
                SELECT
                    user_id
                FROM
                    com_pb_member
                WHERE
                    community_id = #{communityId}
                    AND audit_result = 1
                    AND user_id IS NOT NULL
        <if test="orgIds != null and orgIds.size > 0">
            AND org_id in
            <foreach collection="orgIds" item="item" open="(" separator="," close=")">
                #{item}
            </foreach>
        </if>
                )) AS cumulativeWishNum,
            (SELECT
                count( caep.id )
            FROM
                com_act_easy_photo AS caep
            WHERE
                caep.community_id = #{communityId}
                AND caep.`status` >= 4
                AND caep.feedback_at <![CDATA[ <= ]]> #{endDate}
                AND caep.feedback_at <![CDATA[ >= ]]> #{startDate}
                AND caep.sponsor_id IN (
                SELECT
                    user_id
                FROM
                    com_pb_member
                WHERE
                    community_id = #{communityId}
                    AND audit_result = 1
                    AND user_id IS NOT NULL
        <if test="orgIds != null and orgIds.size > 0">
            AND org_id in
            <foreach collection="orgIds" item="item" open="(" separator="," close=")">
                #{item}
            </foreach>
        </if>
                ) )    as completeEasyNum,
                (SELECT
                count( caep.id )
            FROM
                com_act_easy_photo AS caep
            WHERE
                caep.community_id = #{communityId}
                AND caep.`status` >= 4
                AND caep.feedback_at <![CDATA[ <= ]]> #{endDate}
                AND caep.sponsor_id IN (
                SELECT
                    user_id
                FROM
                    com_pb_member
                WHERE
                    community_id = #{communityId}
                    AND audit_result = 1
                    AND user_id IS NOT NULL
        <if test="orgIds != null and orgIds.size > 0">
            AND org_id in
            <foreach collection="orgIds" item="item" open="(" separator="," close=")">
                #{item}
            </foreach>
        </if>
                ) ) as cumulativeEasyNum
        FROM
            com_act_micro_wish AS camw
        WHERE
            camw.community_id = #{communityId}
            AND camw.`status` = 6
            AND camw.evaluate_at <![CDATA[ <= ]]> #{endDate}
            AND camw.evaluate_at <![CDATA[ >= ]]> #{startDate}
            AND sponsor_id IN (
            SELECT
                user_id
            FROM
                com_pb_member
            WHERE
                community_id = #{communityId}
                AND audit_result = 1
            AND user_id IS NOT NULL
        <if test="orgIds != null and orgIds.size > 0">
            AND org_id in
            <foreach collection="orgIds" item="item" open="(" separator="," close=")">
                #{item}
            </foreach>
        </if>
            )
    </select>

    <select id="getHeaderOrgDataStatistics" resultType="com.panzhihua.common.model.vos.partybuilding.ComDataStatisticsHeaderOrgVo">
        SELECT
            count( id ) AS orgNum,
            ( SELECT count( id ) FROM com_pb_org WHERE community_id = #{communityId} AND area_id IS NOT NULL ) AS areaNum,
            (select count(village_id) from com_mng_village where community_id = #{communityId}) as villageNum
        FROM
            com_pb_org
        WHERE
            community_id = #{communityId}
    </select>

    <select id="exportDataStatisticsMember" resultType="com.panzhihua.common.model.vos.partybuilding.excel.ComDataStatisticsMemberExcelVo">
        SELECT
        cpm.id,
        cpm.`name`,
        cpm.photo_path,
        cpm.type,
        cpm.`function`,
        cpm.specialty_category,
        cpm.specialty_name,
        cpm.position,
        cpm.position_two,
        cpm.id_card,
        cpm.phone,
        cpm.check_unit_id,
        cpm.user_id,
        cpcu.`name` AS checkUnitName,
        cpm.org_id,
        cpm.community_id,
        cpo.`name` AS orgName,
        YEAR (
        from_days(
        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
        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>
            and cpm.audit_result = 1
            <if test="dto.communityId != null">
                and cpm.community_id = #{dto.communityId}
            </if>

            <if test="dto.keyWord != null and dto.keyWord !=''">
                and (
                cpm.`name` like concat (#{dto.keyWord},'%') or
                cpm.`id_card` = #{dto.keyWord} or
                cpm.`phone` like concat (#{dto.keyWord},'%') or
                cpcu.`name` like concat (#{dto.keyWord},'%') or
                cpo.`name` like concat (#{dto.keyWord},'%')
                )
            </if>
        </where>
        order by cpm.create_at desc
    </select>
</mapper>


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

@@ -17,15 +17,65 @@
        <result column="create_at" property="createAt" />
        <result column="update_at" property="updateAt" />
        <result column="community_id" property="communityId" />
        <result column="org_id" property="orgId" />
        <result column="check_unit_id" property="checkUnitId" />
        <result column="id_card" property="idCard" />
        <result column="type" property="type" />
        <result column="join_time" property="joinTime" />
        <result column="employment_time" property="employmentTime" />
        <result column="function" property="function" />
        <result column="specialty_category" property="specialtyCategory" />
        <result column="specialty_name" property="specialtyName" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, phone, is_reg, name, sex, birth_time, position, position_two, job_responsibilities, photo_path, create_at, update_at, community_id
        id, phone, is_reg, name, sex, birth_time, position, position_two, job_responsibilities, photo_path, create_at, update_at, community_id, org_id
        , check_unit_id, id_card, type, join_time, employment_time, function, specialty_category, specialty_name
    </sql>

    <select id="getSysUserIdByPhone" resultType="long">
        SELECT user_id FROM sys_user WHERE phone = #{phone} AND `type` = 1
    </select>

    <select id="getSysUserByIdCardCount" resultType="integer">
        SELECT count(user_id) FROM sys_user WHERE id_card = #{idCard} AND `type` = 1
    </select>

    <select id="getUserIdByIdCard" resultType="long">
        select user_id from sys_user  WHERE id_card = #{idCard} AND `type` = 1
    </select>

    <select id="pagePartyOrganization" resultType="com.panzhihua.common.model.vos.partybuilding.PartyCommitteeVO">
        select cpmr.id,cpmr.community_id,cpmr.`name`,cpmr.id_card,cpmr.org_id,cpmr.check_unit_id
        , cpmr.phone,cpmr.is_reg,cpmr.sex,cpmr.birth_time,cpmr.position,cpmr.position_two
        , cpmr.job_responsibilities,cpmr.photo_path,cpmr.type,cpmr.join_time,cpmr.employment_time
        , cpmr.create_at,cpmr.update_at,cpmr.function,cpmr.specialty_category,cpmr.specialty_name
        ,TIMESTAMPDIFF(
        YEAR,
        cpmr.birth_time,
    DATE_FORMAT( NOW(), '%Y-%m-%d' )) age,cpo.`name` as orgName,cpcu.`name` as checkUnitName
        from com_pb_member_role as cpmr
        left join com_pb_org as cpo on cpo.id = cpmr.org_id
        left join com_pb_check_unit as cpcu on cpcu.id = cpmr.check_unit_id
        <where>
            <if test="partyCommitteeVO.communityId != null">
                and cpmr.community_id = #{partyCommitteeVO.communityId}
            </if>
            <if test="partyCommitteeVO.type != null">
                and cpmr.type = #{partyCommitteeVO.type}
            </if>
            <if test="partyCommitteeVO.sex != null">
                and cpmr.sex = #{partyCommitteeVO.sex}
            </if>
            <if test="partyCommitteeVO.keyWord != null and partyCommitteeVO.keyWord != ''">
                and (cpmr.name like concat (#{partyCommitteeVO.keyWord},'%') or
                cpmr.phone like concat (#{partyCommitteeVO.keyWord},'%') or
                cpmr.id_card = #{partyCommitteeVO.keyWord}
                )
            </if>
        </where>
        order by cpmr.create_at desc
    </select>

</mapper>

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

New file
@@ -0,0 +1,162 @@
<?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.ComPbOrgDAO">

    <resultMap type="com.panzhihua.service_dangjian.model.dos.ComPbOrgDO" id="ComPbOrgMap">
        <result property="id" column="id" jdbcType="INTEGER"/>
        <result property="level" column="level" jdbcType="INTEGER"/>
        <result property="parentId" column="parent_id" jdbcType="INTEGER"/>
        <result property="name" column="name" jdbcType="VARCHAR"/>
        <result property="communityId" column="community_id" jdbcType="INTEGER"/>
        <result property="status" column="status" jdbcType="INTEGER"/>
        <result property="type" column="type" jdbcType="INTEGER"/>
        <result property="subjection" column="subjection" jdbcType="INTEGER"/>
        <result property="areaId" column="area_id" jdbcType="INTEGER"/>
        <result property="address" column="address" jdbcType="VARCHAR"/>
        <result property="longitude" column="longitude" jdbcType="VARCHAR"/>
        <result property="latitude" column="latitude" jdbcType="VARCHAR"/>
        <result property="oneId" column="one_id" jdbcType="INTEGER"/>
        <result property="twoId" column="two_id" jdbcType="INTEGER"/>
        <result property="thirdId" column="third_id" jdbcType="INTEGER"/>
        <result property="fourId" column="four_id" jdbcType="INTEGER"/>
        <result property="fiveId" column="five_id" jdbcType="INTEGER"/>
        <result property="buildId" column="build_id" jdbcType="INTEGER"/>
    </resultMap>

    <select id="listPartyOrganizationAll" resultType="com.panzhihua.common.model.vos.partybuilding.PartyOrganizationVO">
        SELECT
            cpo.id,
            cpo.`name`,
            cpo.`status`,
            cpo.parent_id,
            cpo.subjection,
            cpo.area_id,
            cpo.build_id,
            cpo.address,
            cpo.longitude,
            cpo.latitude,
            cpo.type,
            cmv.`name` AS areaName,
            cmb.`name` AS buildName,
            cpmr.`name` AS userName,
            cpmr.phone AS phone,
            (select count(id) from com_pb_member where org_id = cpo.id and audit_result = 1) as countPerson
        FROM
            com_pb_org AS cpo
            LEFT JOIN com_mng_village AS cmv ON cmv.village_id = cpo.area_id
            LEFT JOIN com_pb_member_role AS cpmr ON cpmr.org_id = cpo.id
            left join com_mng_building as cmb on cmb.id = cpo.build_id
        <where>
            <if test="partyOrganizationVO.communityId != null">
                and cpo.community_id = ${partyOrganizationVO.communityId}
            </if>
            <if test="partyOrganizationVO.keyWord == null or partyOrganizationVO.keyWord == ''">
                AND cpo.parent_id = 0
            </if>
            <if test="partyOrganizationVO.keyWord != null and partyOrganizationVO.keyWord != ''">
                and cpo.`name` like CONCAT(#{partyOrganizationVO.keyword}, '%')
            </if>
            <if test="partyOrganizationVO.subjection != null">
                and cpo.subjection = #{partyOrganizationVO.subjection}
            </if>
            <if test="partyOrganizationVO.areaId != null">
                and cpo.area_id = #{partyOrganizationVO.areaId}
            </if>
            <if test="partyOrganizationVO.buildId != null">
                and cpo.build_id = #{partyOrganizationVO.buildId}
            </if>
        </where>
        ORDER BY cpo.id desc
    </select>

    <select id="getChildOrgList" resultType="com.panzhihua.common.model.vos.partybuilding.PartyOrganizationVO">
        SELECT
            cpo.id,
            cpo.`name`,
            cpo.`status`,
            cpo.parent_id,
            cpo.subjection,
            cpo.area_id,
            cpo.build_id,
            cpo.address,
            cpo.longitude,
            cpo.latitude,
            cpo.type,
            cmv.`name` AS areaName,
            cmb.`name` AS buildName,
            cpmr.`name` AS userName,
            cpmr.phone AS phone,
            (select count(id) from com_pb_member where org_id = cpo.id and audit_result = 1) as countPerson
        FROM
            com_pb_org AS cpo
            LEFT JOIN com_mng_village AS cmv ON cmv.village_id = cpo.area_id
            LEFT JOIN com_pb_member_role AS cpmr ON cpmr.org_id = cpo.id
            left join com_mng_building as cmb on cmb.id = cpo.build_id
        <where>
            <if test="partyOrganizationVO.parentId != null">
                AND cpo.parent_id = ${partyOrganizationVO.parentId}
            </if>
            <if test="partyOrganizationVO.communityId != null">
                and cpo.community_id = ${partyOrganizationVO.communityId}
            </if>
            <if test="partyOrganizationVO.subjection != null">
                and cpo.subjection = #{partyOrganizationVO.subjection}
            </if>
            <if test="partyOrganizationVO.areaId != null">
                and cpo.area_id = #{partyOrganizationVO.areaId}
            </if>
            <if test="partyOrganizationVO.buildId != null">
                and cpo.build_id = #{partyOrganizationVO.buildId}
            </if>
        </where>
        ORDER BY cpo.id desc
    </select>

    <select id="getPbOrgAllList" resultType="com.panzhihua.common.model.vos.partybuilding.PartyOrganizationVO">
        SELECT
        cpo.id,
        cpo.`name`,
        cpo.`status`,
        cpo.parent_id,
        cpo.subjection,
        cpo.area_id,
        cpo.build_id,
        cpo.address,
        cpo.longitude,
        cpo.latitude,
        cpo.type,
        cmv.`name` AS areaName,
        cmb.`name` AS buildName,
        cpmr.`name` AS userName,
        cpmr.phone AS phone,
        (select count(id) from com_pb_member where org_id = cpo.id and audit_result = 1) as countPerson
        FROM
        com_pb_org AS cpo
        LEFT JOIN com_mng_village AS cmv ON cmv.village_id = cpo.area_id
        LEFT JOIN com_pb_member_role AS cpmr ON cpmr.org_id = cpo.id
        left join com_mng_building as cmb on cmb.id = cpo.build_id
        <where>
            <if test="partyOrganizationVO.communityId != null">
                and cpo.community_id = ${partyOrganizationVO.communityId}
            </if>
            <if test="partyOrganizationVO.keyWord == null or partyOrganizationVO.keyWord == ''">
                AND cpo.parent_id = 0
            </if>
            <if test="partyOrganizationVO.keyWord != null and partyOrganizationVO.keyWord != ''">
                and cpo.`name` like CONCAT(#{partyOrganizationVO.keyword}, '%')
            </if>
            <if test="partyOrganizationVO.subjection != null">
                and cpo.subjection = #{partyOrganizationVO.subjection}
            </if>
            <if test="partyOrganizationVO.areaId != null">
                and cpo.area_id = #{partyOrganizationVO.areaId}
            </if>
            <if test="partyOrganizationVO.buildId != null">
                and cpo.build_id = #{partyOrganizationVO.buildId}
            </if>
        </where>
        ORDER BY cpo.id desc
    </select>

</mapper>


 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java

@@ -1332,4 +1332,13 @@
        return userService.bindOrAddMcsUser(bindUserPhoneDTO);
    }

    /**
     * 删除用户信息缓存
     * @param phone
     */
    @DeleteMapping("/deleteUserCashByPhone")
    public R deleteUserCashByPhone(@RequestParam("phone") String phone) {
        return userService.deleteUserCashByPhone(phone);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java

@@ -820,4 +820,10 @@
     * @return
     */
    R updateStreetId(AdministratorsUserVO administratorsUserVO);

    /**
     * 删除用户信息缓存
     * @param phone
     */
    R deleteUserCashByPhone(String phone);
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -710,6 +710,7 @@
        }
        ComActVO comActVO = userDao.selectCommunity(loginUserInfoVO.getCommunityId());
        if (!ObjectUtils.isEmpty(comActVO)) {
            loginUserInfoVO.setComActVO(comActVO);
            loginUserInfoVO.setCommunityName(comActVO.getName());
            loginUserInfoVO.setAreaCode(comActVO.getAreaCode());
        }
@@ -2954,6 +2955,20 @@
    }

    /**
     * 删除用户信息缓存
     * @param phone
     */
    @Override
    public R deleteUserCashByPhone(String phone) {
        SysUserDO sysUserDO = this.userDao.selectOne(new LambdaQueryWrapper<SysUserDO>().eq(SysUserDO::getPhone, phone).eq(SysUserDO::getType, 1));
        if (nonNull(sysUserDO)) {
            String userKey = UserConstants.LOGIN_USER_INFO + sysUserDO.getUserId();
            stringRedisTemplate.delete(userKey);
        }
        return R.ok();
    }

    /**
     * 微商业街新增商家账号
     * @param mcsMerchantDTO
     * @return 商家用户id

 springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java

@@ -274,6 +274,7 @@
                noLoginUrl.add("/api/applets/renting/houses/nearby");
                noLoginUrl.add("/api/applets/renting/houses/houseList");
                noLoginUrl.add("/api/applets/renting/houses/getConfig");
                noLoginUrl.add("/api/applets/comActRaffle/queryAll");
                noLoginUrl.add("/api/communitybackstage/screen/comprehensive/street/list");
                noLoginUrl.add("/api/communitybackstage/screen/comprehensive/population");
                noLoginUrl.add("/api/communitybackstage/screen/getWestScreenStatics");