Merge branch 'renhequ' into dev

101captain

2022-01-14 6fc1e7f179acaeec4df755f72895b3b4fb50d4bb

Merge branch 'renhequ' into dev

# Conflicts:
#	springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java
#	springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/WxMaConfiguration.java
#	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
#	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/RentingHourseRegisterDao.java
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseRegisterServiceImpl.java
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActSignMapper.xml
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/RentingHourseOrderMapper.xml
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/RentingHoursePreOrderMapper.xml
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/RentingHourseRegisterMapper.xml
#	springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
#	springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
#	springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java

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

@@ -51,6 +51,7 @@
            comSwPatrolRecordPageDTO.setPatrolPerson(String.valueOf(this.getLoginUserInfo().getPhone()));
        }
        comSwPatrolRecordPageDTO.setCommunityId(communityId);
        comSwPatrolRecordPageDTO.setAreaCode(this.getAreaCode());
        return communityService.pagePatrolRecord(comSwPatrolRecordPageDTO);
    }

@@ -124,6 +125,7 @@
    public R pageDangerReport(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO) {
        Long communityId = this.getCommunityId();
        comSwPatrolRecordPageDTO.setCommunityId(communityId);
        comSwPatrolRecordPageDTO.setAreaCode(this.getAreaCode());
        return communityService.pageDangerReport(comSwPatrolRecordPageDTO);
    }


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

@@ -14,6 +14,7 @@
import javax.servlet.http.HttpServletRequest;

import com.panzhihua.applets.config.MinioUtil;
import com.panzhihua.common.controller.BaseController;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.RandomUtils;
import org.springframework.beans.factory.annotation.Value;
@@ -50,7 +51,7 @@
@RestController
@RequestMapping("/common/")
@Api(tags = {"公共接口"})
public class CommonApi {
public class CommonApi extends BaseController {
    /**
     * 允许的图片文件后缀
     */
@@ -96,7 +97,7 @@
    @PostMapping(value = "uploadimage", consumes = "multipart/*", headers = "content-type=multipart/form-date")
    public R uploadImage(@RequestParam MultipartFile file, HttpServletRequest request) throws IOException {
        // 微信图片内容校验
        WxMaSecCheckService wxMaSecCheckService = wxMaConfiguration.getMaService().getSecCheckService();
        WxMaSecCheckService wxMaSecCheckService = wxMaConfiguration.getMaService(this.getAppId()).getSecCheckService();
        String property = System.getProperty("user.dir");

        String fileExtension = ".jpg";

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

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

import javax.annotation.Resource;

import com.panzhihua.common.controller.BaseController;
import org.springframework.web.bind.annotation.*;

import com.panzhihua.common.model.dtos.community.switchs.SearchCommunityDTO;
@@ -18,7 +19,7 @@
@RestController
@RequestMapping("/switch/")
@Api(tags = {"切换社区模块"})
public class CommunitySwitchApi {
public class CommunitySwitchApi extends BaseController {

    @Resource
    private CommunityService communityService;
@@ -26,18 +27,19 @@
    @ApiOperation(value = "查询所有社区", response = StreetAllAppletsVO.class)
    @GetMapping("/list/noToken")
    public R list() {
        return communityService.communitySwitchList();
        return communityService.communitySwitchList(this.getAreaCode());
    }

    @ApiOperation(value = "根据名字搜索社区", response = CommunitySwitchAllAppletsVO.class)
    @GetMapping("/search/noToken")
    public R search(@RequestParam(value = "name") String name) {
        return communityService.communitySwitchSearchList(name);
        return communityService.communitySwitchSearchList(name,this.getAreaCode());
    }

    @ApiOperation(value = "根据距离搜索社区", response = CommunitySwitchAllAppletsVO.class)
    @PostMapping("/distance/noToken")
    public R searchDistance(@RequestBody SearchCommunityDTO communityDTO) {
        communityDTO.setAreaCode(this.getAreaCode());
        return communityService.communitySwitchSearchDistanceList(communityDTO);
    }


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

@@ -63,6 +63,7 @@
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        addIdentityAuthDTO.setSubmitUserId(loginUserInfo.getUserId());
        addIdentityAuthDTO.setCommunityId(loginUserInfo.getCommunityId());
        addIdentityAuthDTO.setAreaCode(this.getAreaCode());
        return communityService.addIdentityAuth(addIdentityAuthDTO);
    }


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

@@ -64,7 +64,7 @@
            return R.fail("缺少登录参数");
        }
        log.info(code);
        WxMaService maService = wxMaConfiguration.getMaService();
        WxMaService maService = wxMaConfiguration.getMaService(loginRequest.getAppid());
        WxMaJscode2SessionResult sessionInfo = null;
        try {
            sessionInfo = maService.getUserService().getSessionInfo(code);
@@ -132,6 +132,40 @@
        return r1;
    }

    @ApiOperation(value = "仁和区登录", response = LoginReturnVO.class)
    @PostMapping("/renHe/login")
    public R renHeLogin(@RequestBody LoginRequest loginRequest) {
        String code = loginRequest.getCode();
        if (ObjectUtils.isEmpty(code)) {
            return R.fail("缺少登录参数");
        }
        log.info(code);
        WxMaService maService = wxMaConfiguration.getMaRhService();
        WxMaJscode2SessionResult sessionInfo = null;
        try {
            sessionInfo = maService.getUserService().getSessionInfo(code);
        } catch (Exception e) {
            log.error("微信登录失败【{}】", e.getMessage());
            if (code.equals("22")) {
                sessionInfo = new WxMaJscode2SessionResult();
                sessionInfo.setOpenid("88888888");
                sessionInfo.setSessionKey("9999999");
            } else {
                return R.fail("微信登录失败");
            }
        }
        log.info("微信登录成功【{}】", JSONObject.toJSONString(sessionInfo));
        log.info("loginRequest参数【{}】", JSONObject.toJSONString(loginRequest));
        String openid = sessionInfo.getOpenid();
        String sessionKey = sessionInfo.getSessionKey();
        String unionid = sessionInfo.getUnionid();
        if (ObjectUtils.isEmpty(unionid)) {
            unionid = "无";
        }
        userService.addOrUpdate(openid, sessionKey, unionid);
        return tokenService.loginApplets(openid);
    }

    @ApiOperation(value = "维护用户基本信息（昵称、性别、头像）")
    @PostMapping("updateUserWeiXinInfo")
    public R updateUserWeiXinInfo(@RequestBody LoginRequest loginRequest) {
@@ -163,7 +197,7 @@
        if (empty || empty1) {
            return R.fail("微信用户参数不全");
        }
        WxMaService maService = wxMaConfiguration.getMaService();
        WxMaService maService = wxMaConfiguration.getMaService(this.getAppId());
        Long userId = this.getUserId();
        R<LoginUserInfoVO> r = userService.getUserInfoByUserId(userId + "");
        LoginUserInfoVO loginUserInfoVO = r.getData();
@@ -184,7 +218,7 @@
            return R.fail("缺少登录参数");
        }
        log.info(code);
        WxMaService maService = wxMaConfiguration.getMaService();
        WxMaService maService = wxMaConfiguration.getMaService(this.getAppId());
        WxMaJscode2SessionResult sessionInfo = null;
        try {
            sessionInfo = maService.getUserService().getSessionInfo(code);

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

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

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/WxMaConfiguration.java

@@ -2,6 +2,11 @@

import javax.annotation.Resource;

import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.user.SysAppConfigVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.StringUtils;
import org.springframework.stereotype.Component;

import cn.binarywang.wx.miniapp.api.WxMaService;
@@ -25,11 +30,28 @@
    @Resource
    private WxH5Properties wxH5Properties;

    public WxMaService getMaService() {
    @Resource
    private WxMaRHProperties wxMaRHProperties;

    @Resource
    private UserService userService;

    public WxMaService getMaService(String appid) {
        WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
        config.setAppid(properties.getAppid());
        config.setSecret(properties.getSecret());
        config.setMsgDataFormat(properties.getMsgDataFormat());
        if(StringUtils.isNotEmpty(appid)){
            R<SysAppConfigVO> r=userService.selectByAppid(appid);
            if(R.isOk(r)){
                SysAppConfigVO sysAppConfigVO= r.getData();
                config.setAppid(sysAppConfigVO.getAppId());
                config.setSecret(sysAppConfigVO.getSecret());
                config.setMsgDataFormat(properties.getMsgDataFormat());
            }
        }
        else{
            config.setAppid(properties.getAppid());
            config.setSecret(properties.getSecret());
            config.setMsgDataFormat(properties.getMsgDataFormat());
        }
        WxMaService wxMaService = new WxMaServiceImpl();
        wxMaService.setWxMaConfig(config);
        return wxMaService;
@@ -44,4 +66,14 @@
        wxMaService.setWxMaConfig(config);
        return wxMaService;
    }

    public WxMaService getMaRhService() {
        WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
        config.setAppid(wxMaRHProperties.getAppid());
        config.setSecret(wxMaRHProperties.getSecret());
        config.setMsgDataFormat(wxMaRHProperties.getMsgDataFormat());
        WxMaService wxMaService = new WxMaServiceImpl();
        wxMaService.setWxMaConfig(config);
        return wxMaService;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/WxMaRHProperties.java

New file
@@ -0,0 +1,57 @@
package com.panzhihua.applets.config;

import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 微信配置
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-11-23 14:52
 **/
@Data
@Component
@ConfigurationProperties(prefix = "wx.rh")
public class WxMaRHProperties {

    /**
     * 设置微信小程序的appid
     */
    private String appid;

    /**
     * 设置微信小程序的Secret
     */
    private String secret;

    /**
     * 设置微信小程序消息服务器配置的token
     */
    private String token;

    /**
     * 设置微信小程序消息服务器配置的EncodingAESKey
     */
    private String aesKey;

    /**
     * 消息格式，XML或者JSON
     */
    private String msgDataFormat;

    /**
     * 商户号
     */
    private String mchId;

    /**
     * 微信支付密钥
     */
    private String payKey;

    /**
     * 微信支付回调地址
     */
    private String notifyUrl;
}

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/model/vos/LoginRequest.java

@@ -33,4 +33,6 @@
    @ApiModelProperty(name = "userInfo", value = "用户基本信息")
    WxMaUserInfo userInfo;

    @ApiModelProperty("appid")
    String appid;
}

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/weixin/CheckService.java

@@ -23,7 +23,7 @@
    private WxMaConfiguration wxMaConfiguration;

    public boolean checkMessage(String msg) {
        WxMaSecCheckService wxMaSecCheckService = wxMaConfiguration.getMaService().getSecCheckService();
        WxMaSecCheckService wxMaSecCheckService = wxMaConfiguration.getMaService("").getSecCheckService();
        try {
            boolean b = wxMaSecCheckService.checkMessage(msg);
            return b;

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

@@ -89,6 +89,7 @@
    @ApiOperation(value = "分页查询社区", response = ComActVO.class)
    @PostMapping("pagecommunity")
    public R pageCommunity(@RequestBody PageComActDTO pageComActDTO) {
        pageComActDTO.setAreaCode(this.getAreaCode());
        return communityService.pageCommunity(pageComActDTO);
    }


 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityConvenientApi.java

@@ -272,6 +272,7 @@
    @PostMapping("/service-category/add")
    public R addServiceCategory(@RequestBody @Validated(AddGroup.class) ConvenientServiceCategoryDTO convenientServiceCategoryDTO) {
        convenientServiceCategoryDTO.setCreatedBy(this.getUserId());
        convenientServiceCategoryDTO.setAreaCode(this.getAreaCode());
        return communityService.addServiceCategory(convenientServiceCategoryDTO);
    }

@@ -301,6 +302,7 @@
    @ApiOperation(value = "分页查询便民服务分类", response = ConvenientServiceCategoryVO.class)
    @PostMapping("/service-category/page")
    public R pageServiceCategory(@RequestBody PageConvenientServiceCategoryDTO pageConvenientServiceCategoryDTO) {
        pageConvenientServiceCategoryDTO.setAreaCode(this.getAreaCode());
        return communityService.pageServiceCategory(pageConvenientServiceCategoryDTO);
    }

@@ -354,7 +356,7 @@
    @ApiOperation(value = "社区下拉列表", response = ComActVO.class)
    @GetMapping("/community")
    public R listCommunity() {
        return communityService.listCommunityAll();
        return communityService.listCommunityAll(this.getAreaCode());
    }

    @ApiOperation(value = "所有服务分类", response = ConvenientServiceCategoryVO.class)

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/EasyPhotoClassifyApi.java

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

import javax.annotation.Resource;

import com.panzhihua.common.controller.BaseController;
import org.springframework.web.bind.annotation.*;

import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoClassifyDTO;
@@ -16,7 +17,7 @@
@Api(tags = {"随手拍分类"})
@RestController
@RequestMapping("/classify")
public class EasyPhotoClassifyApi {
public class EasyPhotoClassifyApi extends BaseController {

    @Resource
    private CommunityService communityService;
@@ -24,6 +25,7 @@
    @ApiOperation(value = "随手拍分类-新增")
    @PostMapping("/add")
    public R addPhotoClassify(@RequestBody AddEasyPhotoClassifyDTO addPhotoClassify) {
        addPhotoClassify.setAreaCode(this.getAreaCode());
        return communityService.addPhotoClassify(addPhotoClassify);
    }

@@ -36,6 +38,7 @@
    @ApiOperation(value = "随手拍分类-分页")
    @PostMapping("/page")
    public R pagePhotoClassify(@RequestBody AddEasyPhotoClassifyDTO addPhotoClassify) {
        addPhotoClassify.setAreaCode(this.getAreaCode());
        return communityService.pagePhotoClassify(addPhotoClassify);
    }


 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/HouseApi.java

@@ -70,6 +70,7 @@
    @ApiOperation(value = "房屋租售-分页查询", response = ComOpsHouseVO.class)
    @PostMapping("pagehouse")
    public R pageHouse(@RequestBody PageComOpsHouseDTO pageComOpsHouseDTO) {
        pageComOpsHouseDTO.setAreaCode(this.getAreaCode());
        return communityService.pageOpsHouse(pageComOpsHouseDTO);
    }


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

@@ -8,6 +8,7 @@
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.alibaba.fastjson.JSONArray;
import com.panzhihua.applets_backstage.config.SFTPConfig;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.excel.CustomSheetWriteHandler;
import com.panzhihua.common.model.dtos.DataKanBansDto;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
@@ -41,7 +42,7 @@
@Api(tags = {"首页接口"})
@RestController
@RequestMapping("/index/")
public class IndexApi {
public class IndexApi extends BaseController {
    @Resource
    private UserService userService;

@@ -51,19 +52,20 @@
    @ApiOperation(value = "数据看板", response = IndexDataKanbanVO.class)
    @GetMapping("datakanban")
    public R dataKanban() {
        return userService.dataKanban();
        return userService.dataKanban(this.getAreaCode());
    }

    @ApiOperation(value = "数据看板", response = IndexDataKanbanVO.class)
    @PostMapping("datakanbans")
    public R dataKanBans(@RequestBody DataKanBansDto dataKanBansDto) {
        dataKanBansDto.setAreaCode(this.getAreaCode());
        return userService.dataKanBans(dataKanBansDto);
    }

    @ApiOperation(value = "社区通统计数据汇总", response = IndexUserStatisticsVo.class)
    @GetMapping("statistics")
    public R communityStatistics() {
        return userService.communityStatistics();
        return userService.communityStatistics(this.getAreaCode());
    }

    @ApiOperation(value = "社区通统计数据导出")
@@ -72,7 +74,7 @@
        String url = sftpConfig.getExcelUrl();
        String name = "社区通用户统计导出数据.xlsx";
        String ftpUrl = "/mnt/data/web/excel/";
        R r = userService.communityStatisticsExport();
        R r = userService.communityStatisticsExport(this.getAreaCode());
        if (R.isOk(r)) {
            List<IndexUserStreetExcelExportVo> resultList = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), IndexUserStreetExcelExportVo.class);
            try {

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/StreetApi.java

@@ -36,6 +36,7 @@
    @ApiOperation(value = "分页查询街道", response = PageComStreetDTO.class)
    @PostMapping("pagestreet")
    public R pageStreet(@RequestBody PageComStreetDTO pageComStreetDTO) {
        pageComStreetDTO.setAreaCode(this.getAreaCode());
        return communityService.pageStreet(pageComStreetDTO);
    }


 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/SystemManagementApi.java

@@ -86,13 +86,13 @@
    @GetMapping("listrolebackstage")
    public R listRoleBackstage(@RequestParam("pageNum")Integer pageNum,@RequestParam("pageSize")Integer pageSize) {
        Long communityId = 0L;
        return userService.listRoleBackstage(communityId,pageNum,pageSize);
        return userService.listRoleBackstage(communityId,pageNum,pageSize,this.getAreaCode());
    }

    @ApiOperation(value = "分页查询后台用户", response = AdministratorsUserVO.class)
    @PostMapping("pageuser")
    public R pageUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO) {
        administratorsUserVO.setCommunityId(0l);
        administratorsUserVO.setAreaCode(this.getAreaCode());
        return userService.pageUserBackstage(administratorsUserVO);
    }


 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/UserManagementApi.java

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

import javax.annotation.Resource;

import com.panzhihua.common.controller.BaseController;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

@@ -27,7 +28,7 @@
@RestController
@RequestMapping("/usermanagement/")
@Api(tags = {"居民用户管理"})
public class UserManagementApi {
public class UserManagementApi extends BaseController {
    @Resource
    private UserService userService;
    @Resource
@@ -37,6 +38,7 @@
    @PostMapping("pageuser")
    public R pageUserAppletsBackstage(
        @RequestBody @Validated(PageGroup.class) PageUserAppletsBackstageDTO pageUserAppletsBackstageDTO) {
        pageUserAppletsBackstageDTO.setAreaCode(this.getAreaCode());
        return userService.pageUserAppletsBackstage(pageUserAppletsBackstageDTO);
    }

@@ -51,6 +53,6 @@
    @ApiOperation(value = "社区下拉列表", response = ComActVO.class)
    @GetMapping("listcommunity")
    public R listCommunity() {
        return communityService.listCommunityAll();
        return communityService.listCommunityAll(this.getAreaCode());
    }
}

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/VaccinesApi.java

@@ -26,6 +26,7 @@
    @ApiOperation(value = "疫苗分类列表", response = VaccinesByAppVO.class)
    @PostMapping("list")
    public R getVaccinesListByAdmin(@RequestBody VaccinesByAdminDTO vaccinesByAdminDTO) {
        vaccinesByAdminDTO.setAreaCode(this.getAreaCode());
        return communityService.getVaccinesListByAdmin(vaccinesByAdminDTO);
    }

@@ -38,6 +39,7 @@
    @ApiOperation(value = "添加疫苗信息")
    @PostMapping("add")
    public R addVaccinesByAdmin(@RequestBody VaccinesByAdminDTO vaccinesByAdminDTO) {
        vaccinesByAdminDTO.setAreaCode(this.getAreaCode());
        return communityService.addVaccinesByAdmin(vaccinesByAdminDTO);
    }


 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/WorkGuideApi.java

@@ -32,6 +32,7 @@
    @PostMapping("addworkguide")
    public R addStreet(@RequestBody @Validated(AddGroup.class) ComActWorkGuideVO workGuideVO) {
        LoginUserInfoVO loginUserInfo = getLoginUserInfo();
        workGuideVO.setAreaCode(this.getAreaCode());
        return communityService.addWorkGuide(workGuideVO, loginUserInfo.getUserId());
    }

@@ -52,6 +53,7 @@
    @ApiOperation(value = "办事指南_分页", response = ComActWorkGuideVO.class)
    @PostMapping("pageworkguide")
    public R detailWorkGuide(@RequestBody PageActWorkGuideDTO pageActWorkGuideDTO) {
        pageActWorkGuideDTO.setAreaCode(this.getAreaCode());
        return communityService.pageWorkGuide(pageActWorkGuideDTO);
    }


 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java

@@ -227,4 +227,16 @@
        LoginReturnVO loginReturnVO = loginService.loginMerchantBackStage(account, password);
        return R.ok(loginReturnVO);
    }

    /**
     * 西区大屏登录
     * @param account   账号
     * @param password  密码
     * @return  登录结果
     */
    @PostMapping("/loginXQDP")
    public R loginXQDP(@RequestParam("account") String account, @RequestParam("password") String password) {
        LoginReturnVO loginReturnVO = loginService.loginXQDP(account, password);
        return R.ok(loginReturnVO);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/LoginService.java

@@ -122,4 +122,12 @@
     * @return 登录结果
     */
    LoginReturnVO loginMerchantBackStage(String account, String password);

    /**
     * 西区大屏登录
     * @param account   账号
     * @param password  密码
     * @return  登录结果
     */
    LoginReturnVO loginXQDP(String account, String password);
}

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

@@ -111,6 +111,7 @@
        LoginReturnVO loginReturnVO = new LoginReturnVO();
        loginReturnVO.setToken(token);
        loginReturnVO.setRefreshToken(refeshToken);
        loginReturnVO.setCommunityId(loginUser.getCommunityId());
        return loginReturnVO;
    }

@@ -255,4 +256,22 @@
        loginReturnVO.setRefreshToken(refeshToken);
        return loginReturnVO;
    }

    /**
     * 西区大屏登录
     * @param account   账号
     * @param password  密码
     * @return  登录结果
     */
    @Override
    public LoginReturnVO loginXQDP(String account, String password){
        Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_15", password));
        LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
        String token = JWTTokenUtil.generateToken(loginUser);
        String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
        LoginReturnVO loginReturnVO = new LoginReturnVO();
        loginReturnVO.setToken(token);
        loginReturnVO.setRefreshToken(refeshToken);
        return loginReturnVO;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java

@@ -2,6 +2,8 @@

import javax.servlet.http.HttpServletRequest;

import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.utlis.StringUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
@@ -94,6 +96,34 @@
        }
        return areaId;
    }
    /**
     * 获取登录对象所在区域编码
     *
     * @return
     */
    public String getAreaCode() {
        String appid = this.getRequest().getHeader("appid");
        if(StringUtils.isNotEmpty(appid)){
            if(appid.equals("wx08932ba29546ff82")){
                return "510411";
            }
            else if(appid.equals("wx50d8c395af50481b")){
                return "510402";
            }
            else {
                return "510423";
            }
        }
        else {
            LoginUserInfoVO loginUserInfoVO=this.getLoginUserInfo();
            ComActVO comActVO=loginUserInfoVO.getComActVO();
            if(comActVO!=null){
                return comActVO.getAreaCode();
            }
            return "510423";
        }
    }


    /**
     * 获取登录token
@@ -106,6 +136,15 @@
        return header;
    }

    public String getAppId(){
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        return loginUserInfo.getAppId();
    }

    public String getAppSecret(){
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        return loginUserInfo.getAppSecret();
    }
    /**
     * 获取登录对象所有信息
     *

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

@@ -15,6 +15,7 @@
    @ApiModelProperty("社区用户量统计类型（1.累计用户  2.本月新增）")
    private Integer type;

    private String areaCode;
    /**
     * 社区用户量统计类型（1.累计用户  2.本月新增）
     */

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

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

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

import java.util.List;

/**
 * @title: PageBaseDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 分页基础数据DTO
 * @author: hans
 * @date: 2021/12/21 14:22
 */
@Data
@ApiModel(value = "分页基础数据DTO")
public class PageBaseDTO {

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

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

    @ApiModelProperty(value = "查询参数id", example = "10")
    private Long paramId;

    @ApiModelProperty(value = "字符串类型查询参数", example = "10")
    private String param2;

    @ApiModelProperty(value = "数字类型查询参数", example = "10")
    private Integer param3;

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

    @ApiModelProperty(value = "社区id列表")
    private List<Long> communityIds;
}

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

@@ -72,4 +72,6 @@

    @ApiModelProperty("认证期数")
    private String authPeriod;

    private String areaCode;
}

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

@@ -73,4 +73,7 @@
    @ApiModelProperty("查看人（1.全部 2.只看我的）")
    private Integer selectPerson;

    @ApiModelProperty("区域编码")
    private String areaCode;

}

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

@@ -32,4 +32,6 @@
    @ApiModelProperty(value = "用户ID", hidden = true, example = "")
    private Long userId;

    private String areaCode;

}

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

@@ -29,4 +29,6 @@

    @ApiModelProperty(value = "操作人", hidden = true)
    private Long userId;

    private String areaCode;
}

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

@@ -23,4 +23,6 @@

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

    private String areaCode;
}

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

@@ -17,7 +17,7 @@
    @ApiModelProperty("关键词")
    private String keyWord;

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

}

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

@@ -65,4 +65,6 @@
    @ApiModelProperty(value = "联系方式")
    private String mobile;

    private String areaCode;

}

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

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

    @ApiModelProperty("areaCode")
    private String areaCode;
}

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

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

    @ApiModelProperty(value = "事件状态(1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群上报、7随手拍处理)", required = true)
    private Integer type;

    @ApiModelProperty("事件类型(1、网格事件 2、随手拍事件)")
    private Integer eventType;
}

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

@@ -52,7 +52,6 @@
    private String idCard;

    @ApiModelProperty("咨询电话")
    @Pattern(groups = {AddGroup.class}, 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("商家地址")
@@ -112,6 +111,8 @@
    @ApiModelProperty(value = "更新人", hidden = true)
    private Long updatedBy;

    private String areaCode;

    public String getPeriod() {
        return period.name();
    }

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

@@ -45,4 +45,6 @@

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

    private String areaCode;
}

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

@@ -23,4 +23,6 @@

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

    private String areaCode;
}

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

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

    private String areaCode;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/admin/AddComActIntegralUserDTO.java

@@ -11,7 +11,7 @@
    @ApiModelProperty("业务id")
    private Long serviceId;

    @ApiModelProperty("积分任务类型（1.发布随手拍 2.发布微心愿 3.参与议事投票 4.参与志愿者活动 5.参与社区活动 6.参与党员活动 7.参与调查问卷）8活动签到")
    @ApiModelProperty("积分任务类型（1.发布随手拍 2.发布微心愿 3.参与议事投票 4.参加居民活动 5.参加志愿者活动 6.参与党员活动 7.参与调查问卷 8.取消活动 ）")
    private Integer integralType;

    @ApiModelProperty(value = "社区id")
@@ -26,6 +26,9 @@
    @ApiModelProperty(value = "签到类型 1居民 志愿者签到 2党员签到")
    private Integer activityType;

    @ApiModelProperty(value = "是否是志愿者 0 不是 1 是")
    private Integer isVolunteer;

    public AddComActIntegralUserDTO(Long serviceId, Integer integralType, Long communityId, Long userId) {
        this.serviceId = serviceId;
        this.integralType = integralType;
@@ -36,15 +39,16 @@
    public AddComActIntegralUserDTO() {}

    /**
     * 积分任务类型（1.发布随手拍 2.发布微心愿 3.参与议事投票 4.参与志愿者活动 5.参与社区活动 6.参与党员活动 7.参与调查问卷）
     * 积分任务类型（1.发布随手拍 2.发布微心愿 3.参与议事投票 4.参加居民活动 5.参加志愿者活动 6.参与党员活动 7.参与调查问卷 8.取消活动 ）
     */
    public interface integralType {
        int fbssp = 1;
        int fbwxy = 2;
        int cyystp = 3;
        int cyzyzhd = 4;
        int cysqhd = 5;
        int cyjmhd = 4;
        int cyzyzhd = 5;
        int cydyhd = 6;
        int cydcwj = 7;
        int qxhd = 8;
    }
}

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

@@ -25,6 +25,8 @@
    @ApiModelProperty(value = "用户id",hidden = true)
    private Long userId;

    private String areaCode;

    /**
     * 预约状态（1.同意 2.拒绝）
     */

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

@@ -36,4 +36,6 @@

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

    private String areaCode;
}

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

@@ -16,4 +16,6 @@

    @ApiModelProperty(value = "距离(千米)", required = true)
    private Integer distance;

    private String areaCode;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/PageUserAppletsBackstageDTO.java

@@ -64,4 +64,6 @@
    @NotNull(groups = {PutGroup.class}, message = "用户主键不能为空")
    @Min(value = 1, groups = {PutGroup.class}, message = "用户主键不能为空")
    private Long userId;

    private String areaCode;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/vaccines/VaccinesByAdminDTO.java

@@ -22,4 +22,6 @@

    @ApiModelProperty("疫苗描述")
    private String describe;

    private String areaCode;
}

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

@@ -17,4 +17,6 @@
    private String token;
    @ApiModelProperty("刷新token有效期长")
    private String refreshToken;
    @ApiModelProperty("communityId")
    private Long communityId;
}

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

@@ -189,4 +189,11 @@

    @ApiModelProperty("是否物业工作人员 1.是 2.否")
    private Integer isPropertyWorker;

    @ApiModelProperty("appid")
    private String appId;
    @ApiModelProperty("appSecret")
    private String appSecret;
    @ApiModelProperty("areaCode")
    private String areaCode;
}

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

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

import lombok.Data;

/**
 * @author zzj
 */
@Data
public class Base64File {
    private String file;
}

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

@@ -33,7 +33,7 @@
    @ExcelProperty(value = "评价时间", index = 0)
    private Date createAt;

    @ExcelProperty(value = "评价星级", index = 4)
    @ExcelProperty(value = "评分星级", index = 4)
    private String starLevel;

    @ExcelProperty(value = "评价详情", index = 5)

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

@@ -19,18 +19,24 @@
@ApiModel("社区活动签到表")
public class ComActActRegistExcelVO {

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

    @ExcelProperty(value = "身份", index = 2)
    @ExcelProperty(value = "身份", index = 4)
    private String identity;

    @ExcelProperty(value = "电话", index = 4)
    @ExcelProperty(value = "电话", index = 6)
    private String phone;

    @ExcelProperty(value = "签到时间（未签到就是报名时间）", index = 0)
    @ExcelProperty(value = "签到时间", index = 0)
    private Date createAt;

    @ExcelProperty(value = "人群标签", index = 3)
    @ExcelProperty(value = "人群标签", index = 5)
    private String tags;

    @ExcelProperty(value = "签到地点", index = 1)
    private String position;

    @ExcelProperty(value = "签到次数", index = 2)
    private Integer times;
}

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

@@ -80,4 +80,12 @@

    @ApiModelProperty(value = "活动类型 1居民，志愿者 2党员")
    private Integer activityType;

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

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

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

@@ -32,11 +32,11 @@
    @ExcelProperty(value = "报名时间", index = 0)
    private Date createAt;

    @ExcelProperty(value = "人群标签", index = 3)
    @ExcelProperty(value = "人员标签", index = 3)
    private String tags;

    @ExcelProperty(value = "报名状态",index = 5)
    private Integer status;
    private String status;

    @ExcelProperty(value = "取消原因", index = 6)
    private String reason;
@@ -44,17 +44,16 @@
    @ExcelProperty(value = "参与情况", index = 7)
    private String condition;

    @ExcelProperty(value = "获得奖励", index = 7)
    @ExcelProperty(value = "获得奖励", index = 8)
    private String award;
    @ExcelIgnore
    private Integer times;
    @ExcelIgnore
    private Integer limit;

    public void setCondition(String condition) {
    public void generateCondition() {
        if(this.times!=null&&this.limit!=null){
            this.condition = "("+times+"/"+limit+")";
            this.condition = "("+times+"/"+ (limit.equals(-1) ? "无限" : limit) +")";
        }

    }
}

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

New file
@@ -0,0 +1,20 @@
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 ComActPasswordVo {

    @ApiModelProperty("账号")
    private String account;

    @ApiModelProperty("密码")
    private String password;
}

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

@@ -57,5 +57,7 @@
    @ApiModelProperty("纬度")
    private String lat;

    private String areaCode;

    private List<ComActWorkGuideMaterialVO> materials = Lists.newArrayList();
}

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

@@ -126,4 +126,6 @@

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

    private String areaCode;
}

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

@@ -117,4 +117,6 @@
    private List<String> nextIds;

    private Long communityId;

    private String areaCode;
}

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

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

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

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

/**
 * @title: StatisticsCommVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description:
 * @author: hans
 * @date: 2021/12/06 10:51
 */
@Data
@ApiModel("统计通用信息")
public class StatisticsCommVO {

    @ApiModelProperty(value = "统计日期")
    private String statisticsDate;

    @ApiModelProperty(value = "统计项")
    private String filed;

    @ApiModelProperty(value = "数量")
    private Integer num;

    @ApiModelProperty("统计项占比")
    private BigDecimal percent;

    @ApiModelProperty("统计数据列表")
    private List<StatisticsCommVO> statisticsCommVOS;
}

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

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

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

/**
 * @author zzj
 */
@Data
@ApiModel("基础数据")
public class BaseInfo {
    @ApiModelProperty("人口数")
    private Integer population;
    @ApiModelProperty("注册用户量")
    private Integer user;
    @ApiModelProperty("入住小区")
    private Integer village;
    @ApiModelProperty("实有房屋")
    private Integer house;
    @ApiModelProperty("实有单位")
    private Integer company;
    @ApiModelProperty("党员数")
    private Integer partyMember;
    @ApiModelProperty("志愿者")
    private Integer volunteer;
    @ApiModelProperty("党组织")
    private Integer partyOrg;
}


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

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

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

/**
 * @author zzj
 */
@Data
@ApiModel("大屏党建活动折线图")
public class BigScreenActivityLine {
    @ApiModelProperty("月份")
    private String x;
    @ApiModelProperty("新增数")
    private Integer y;
    @ApiModelProperty("累计数")
    private Integer countY;

    private String year;
}

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

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

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

/**
 * @author zzj
 */
@Data
@ApiModel("党员积分排名")
public class BigScreenActivityTop {
    @ApiModelProperty("姓名")
    private String name;
    @ApiModelProperty("党组织名")
    private String orgName;
    @ApiModelProperty("党员分数")
    private Integer score;
    @ApiModelProperty("头像")
    private String url;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenCommunityStatisticsVO.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.convenient.ConvenientMerchantVO;
import com.panzhihua.common.model.vos.community.screen.civil.CivilVillageStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.event.EventGridStatisticsVO;

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

/**
 * @title: BigScreenCommunityStatisticsVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 大屏社区服务统计信息
 * @author: hans
 * @date: 2021/12/10 13:16
 */
@Data
@ApiModel("大屏社区服务统计信息")
public class BigScreenCommunityStatisticsVO {

    @ApiModelProperty("大屏网格数据")
    private List<EventGridStatisticsVO> gridStatisticsList;

    @ApiModelProperty("小区列表数据")
    private List<CivilVillageStatisticsVO> villageStatisticsList;

    @ApiModelProperty("商家地图点位数据")
    private List<ConvenientMerchantVO> merchantMapDataList;
}

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

New file
@@ -0,0 +1,33 @@
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: BigScreenDynStatisticsInfo
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 社区动态大屏统计数据
 * @author: hans
 * @date: 2021/12/17 10:19
 */
@Data
@ApiModel("社区动态大屏统计数据")
public class BigScreenDynStatisticsInfo {

    @ApiModelProperty("社区动态总数")
    private Integer dynNum = 0;

    @ApiModelProperty(value = "社区动态饼图数据")
    private List<StatisticsCommVO> dynCircleData;

    @ApiModelProperty(value = "社区动态新增折线数据")
    private List<StatisticsCommVO> dynAddPolylineData;

    @ApiModelProperty(value = "社区动态累计折线数据")
    private List<StatisticsCommVO> dynTotalPolylineData;
}

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

New file
@@ -0,0 +1,51 @@
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: BigScreenEasyPhotoStatisticsInfo
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 随手拍大屏统计数据
 * @author: hans
 * @date: 2021/12/16 13:31
 */
@Data
@ApiModel("随手拍大屏统计数据")
public class BigScreenEasyPhotoStatisticsInfo {

    @ApiModelProperty("随手拍累计解决数量")
    private Integer eventDealTotal = 0;

    @ApiModelProperty("突发事件报告解决数")
    private Integer eventTFDeal = 0;

    @ApiModelProperty("治安防控事件解决数")
    private Integer eventZADeal = 0;

    @ApiModelProperty("矛盾劝解事件解决数")
    private Integer eventMDDeal = 0;

    @ApiModelProperty("特殊人群服务事件解决数")
    private Integer eventTSDeal = 0;

    @ApiModelProperty("民生服务事件解决数")
    private Integer eventMSDeal = 0;

    @ApiModelProperty("防灾减灾事件解决数")
    private Integer eventFJDeal = 0;

    @ApiModelProperty("其他事件解决数")
    private Integer otherDeal = 0;

    @ApiModelProperty(value = "随手拍新增折线数据")
    private List<StatisticsCommVO> easyPhotoAddPolylineData;

    @ApiModelProperty(value = "随手拍累计折线数据")
    private List<StatisticsCommVO> easyPhotoTotalPolylineData;
}

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

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

import lombok.Data;

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

/**
 * @author zzj
 */
@Data
public class BigScreenGridStaticsReturn {
    private Integer count;
    private Integer num;
    private BigDecimal percent;
    private String title;
    private List<BigScreenGridStaticsReturn> bigScreenGridStaticsReturnList;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenMerchantStatisticsInfo.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: BigScreenMerchantStatisticsInfo
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 便民商家大屏统计数据
 * @author: hans
 * @date: 2021/12/17 15:05
 */
@Data
@ApiModel("便民商家大屏统计数据")
public class BigScreenMerchantStatisticsInfo {

    @ApiModelProperty("资源类型数")
    private Integer resourceTypeNum = 0;

    @ApiModelProperty("服务类型数")
    private Integer serviceTypeNum = 0;

    @ApiModelProperty("商家数量")
    private Integer merchantNum = 0;

    @ApiModelProperty("已提供服务次数")
    private Integer serviceTimes = 0;

    @ApiModelProperty(value = "资源类型饼图数据")
    private List<StatisticsCommVO> resourceTypeCircleData;

    @ApiModelProperty(value = "服务类型饼图数据")
    private List<StatisticsCommVO> serviceTypeCircleData;

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

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

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

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

import java.util.List;

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

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

/**
 * @title: BigScreenMicroWishStatisticsInfo
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 微心愿大屏统计数据
 * @author: hans
 * @date: 2021/12/15 16:56
 */
@Data
@ApiModel("微心愿大屏统计数据")
public class BigScreenMicroWishStatisticsInfo {

    @ApiModelProperty("心愿总数量")
    private Integer microWishTotal;

    @ApiModelProperty("心愿已实现数量")
    private Integer microWishRealized;

    @ApiModelProperty("心愿未实现数量")
    private Integer microWishUnrealized;

    @ApiModelProperty(value = "微心愿新增折线数据")
    private List<StatisticsCommVO> microWishAddPolylineData;

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

    @ApiModelProperty(value = "微心愿展示列表")
    private List<ComActMicroWishVO> microWishDisplayList;
}

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

New file
@@ -0,0 +1,36 @@
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: BigScreenNeighborStatisticsInfo
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 邻里圈大屏统计数据
 * @author: hans
 * @date: 2021/12/17 13:19
 */
@Data
@ApiModel("邻里圈大屏统计数据")
public class BigScreenNeighborStatisticsInfo {

    @ApiModelProperty("邻里圈发布内容数")
    private Integer publishContentNum = 0;

    @ApiModelProperty("邻里圈发布话题数")
    private Integer publishTopicNum = 0;

    @ApiModelProperty(value = "邻里圈饼图数据")
    private List<StatisticsCommVO> neighborCircleData;

    @ApiModelProperty(value = "邻里圈新增折线数据")
    private List<StatisticsCommVO> neighborAddPolylineData;

    @ApiModelProperty(value = "邻里圈累计折线数据")
    private List<StatisticsCommVO> neighborTotalPolylineData;
}

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

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

import java.util.List;

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

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

/**
 * @title: BigScreenQuestionnaireStatisticsInfo
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 社区问卷大屏统计数据
 * @author: hans
 * @date: 2021/12/16 16:11
 */
@Data
@ApiModel("社区问卷大屏统计数据")
public class BigScreenQuestionnaireStatisticsInfo {

    @ApiModelProperty("社区问卷发起总数")
    private Integer questionnaireNum = 0;

    @ApiModelProperty("社区问卷参与人数")
    private Integer joinNum = 0;

    @ApiModelProperty(value = "社区问卷新增折线数据")
    private List<StatisticsCommVO> questionnaireAddPolylineData;

    @ApiModelProperty(value = "社区问卷累计折线数据")
    private List<StatisticsCommVO> questionnaireTotalPolylineData;

    @ApiModelProperty(value = "社区问卷展示列表")
    private List<ComActQuestnaireVO> questionnaireDisplayList;
}

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

New file
@@ -0,0 +1,36 @@
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: BigScreenResidentActStatisticsInfo
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 居民活动大屏统计数据
 * @author: hans
 * @date: 2021/12/24 15:06
 */
@Data
@ApiModel("居民活动大屏统计数据")
public class BigScreenResidentActStatisticsInfo {

    @ApiModelProperty("居民活动发布次数")
    private Integer publishNum = 0;

    @ApiModelProperty("居民活动参与人数")
    private Integer joinNum = 0;

    @ApiModelProperty(value = "居民活动饼图数据")
    private List<StatisticsCommVO> actCircleData;

    @ApiModelProperty(value = "居民活动新增折线数据")
    private List<StatisticsCommVO> actAddPolylineData;

    @ApiModelProperty(value = "居民活动累计折线数据")
    private List<StatisticsCommVO> actTotalPolylineData;
}

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

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

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

/**
 * @author zzj
 */
@Data
@ApiModel("服务数据")
public class BigScreenServiceData {
    @ApiModelProperty("办事指南")
    private Integer guide;
    @ApiModelProperty("通知公告")
    private Integer announcement;
    @ApiModelProperty("高龄认证")
    private Integer eldersAuth;
    @ApiModelProperty("便民商家")
    private Integer convenient;
    @ApiModelProperty("房屋租赁")
    private Integer rentingHouse;
    @ApiModelProperty("一键服务")
    private Integer oneButton;
    @ApiModelProperty("社区工作者")
    private Integer socialWorker = 0;
    @ApiModelProperty("养老认证")
    private Integer pensionAuth;
    @ApiModelProperty("逝世申报")
    private Integer death=0;
    @ApiModelProperty("高龄补贴")
    private Integer eldersAllowance=0;
    @ApiModelProperty("服务咨询")
    private Integer serviceConsultation=0;
    @ApiModelProperty("政策文件")
    private Integer partyDyn;
    @ApiModelProperty("便民设施")
    private Integer equipment=0;
    @ApiModelProperty("物业公司")
    private Integer property;
}

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

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

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

/**
 * @author zzj
 */
@Data
@ApiModel("服务居民")
public class BigScreenServiceUser {
    @ApiModelProperty("小区名")
    private String villageName;
    @ApiModelProperty("人数")
    private Integer num;
}

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

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

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

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

/**
 * @author zzj
 */
@Data
@ApiModel("安全防控")
public class BigScreenStaticsReserve {
    @ApiModelProperty("总数")
    private Integer count;
    @ApiModelProperty("防疫管控")
    private Integer epidemicCount;
    @ApiModelProperty("燃气登记")
    private Integer gasCount;
    @ApiModelProperty("防火登记")
    private Integer fireCount;
    @ApiModelProperty("返攀登记")
    private Integer reserveCount;
    @ApiModelProperty("居家隔离登记")
    private Integer homeCount;
    @ApiModelProperty("返攀登记百分比")
    private BigDecimal reservePercent;
    @ApiModelProperty("居家隔离百分比")
    private BigDecimal homePercent;
    @ApiModelProperty("燃气登记百分比")
    private BigDecimal gasPercent;
    @ApiModelProperty("防火登记百分比")
    private BigDecimal firePercent;
    @ApiModelProperty("折线图数据")
    private List<BigScreenStaticsReserveMonth> bigScreenStaticsReserveMonthList;
}

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

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

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

/**
 * @author zzj
 */
@Data
@ApiModel("每月安全防空数据")
public class BigScreenStaticsReserveMonth {
    @ApiModelProperty("x轴")
    private String x;
    @ApiModelProperty("燃气登记")
    private Integer gasCount;
    @ApiModelProperty("防火登记")
    private Integer fireCount;
    @ApiModelProperty("返攀登记")
    private Integer reserveCount;
    @ApiModelProperty("居家隔离登记")
    private Integer homeCount;
    @ApiModelProperty("总量")
    private Integer count;

    private String year;
}

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

@@ -21,5 +21,10 @@
    private Integer activityCount;
    @ApiModelProperty(value = "党建宣传数")
    private Integer dynCount;// 党建动态

    @ApiModelProperty(value = "社区党委")
    private Integer committeeCount;
    @ApiModelProperty("覆盖率")
    private Integer coverPercent=0;
    @ApiModelProperty("单位党组织")
    private Integer orgPartyCount=0;
}

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

New file
@@ -0,0 +1,36 @@
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: BigScreenVolunteerActStatisticsInfo
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 志愿者活动大屏统计数据
 * @author: hans
 * @date: 2021/12/24 16:25
 */
@Data
@ApiModel("志愿者活动大屏统计数据")
public class BigScreenVolunteerActStatisticsInfo {

    @ApiModelProperty("志愿者活动发布次数")
    private Integer publishNum = 0;

    @ApiModelProperty("志愿者活动参与人数")
    private Integer joinNum = 0;

    @ApiModelProperty(value = "志愿者活动饼图数据")
    private List<StatisticsCommVO> actCircleData;

    @ApiModelProperty(value = "志愿者活动新增折线数据")
    private List<StatisticsCommVO> actAddPolylineData;

    @ApiModelProperty(value = "志愿者活动累计折线数据")
    private List<StatisticsCommVO> actTotalPolylineData;
}

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

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

import com.panzhihua.common.model.vos.community.StatisticsCommVO;
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.model.vos.screen.ScreenDrawEventPopulationTotalVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * @title: GridsGovernanceStatisticsVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 清网治格统计信息
 * @author: hans
 * @date: 2021/12/08 14:38
 */
@Data
@ApiModel("清网治格统计信息")
public class BigscreenGridsGovernanceStatisticsVO {

    @ApiModelProperty("事件总数")
    private Integer eventTotal = 0;

    @ApiModelProperty("突发事件报告总数")
    private Integer eventTFTotal = 0;

    @ApiModelProperty("治安防控事件总数")
    private Integer eventZATotal = 0;

    @ApiModelProperty("矛盾劝解事件总数")
    private Integer eventMDTotal = 0;

    @ApiModelProperty("特殊人群服务事件总数")
    private Integer eventTSTotal = 0;

    @ApiModelProperty("民生服务事件总数")
    private Integer eventMSTotal = 0;

    @ApiModelProperty("防灾减灾事件总数")
    private Integer eventFJTotal = 0;

    @ApiModelProperty("法规宣传事件总数")
    private Integer eventFGTotal = 0;

    @ApiModelProperty("安全巡查")
    private Integer safety=0;

    @ApiModelProperty("其他事件总数")
    private Integer otherTotal = 0;

}

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

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

import java.util.List;

import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import com.panzhihua.common.model.vos.community.screen.civil.CivilVillageStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.event.EventGridStatisticsVO;
import com.panzhihua.common.model.vos.screen.ScreenDrawEventPopulationTotalVO;

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

/**
 * @title: GridsGovernanceStatisticsVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 清网治格统计信息
 * @author: hans
 * @date: 2021/12/08 14:38
 */
@Data
@ApiModel("清网治格统计信息")
public class GridsGovernanceStatisticsVO {

    @ApiModelProperty("事件总数")
    private Integer eventTotal = 0;

    @ApiModelProperty("已处理事件总数")
    private Integer dealTotal = 0;

    @ApiModelProperty("待处理事件总数")
    private Integer unDealTotal = 0;

    @ApiModelProperty("突发事件报告总数")
    private Integer eventTFTotal = 0;

    @ApiModelProperty("治安防控事件总数")
    private Integer eventZATotal = 0;

    @ApiModelProperty("矛盾劝解事件总数")
    private Integer eventMDTotal = 0;

    @ApiModelProperty("特殊人群服务事件总数")
    private Integer eventTSTotal = 0;

    @ApiModelProperty("民生服务事件总数")
    private Integer eventMSTotal = 0;

    @ApiModelProperty("防灾减灾事件总数")
    private Integer eventFJTotal = 0;

    @ApiModelProperty("其他事件总数")
    private Integer otherTotal = 0;

    @ApiModelProperty("突发事件报告完成数")
    private Integer eventTFDeal = 0;

    @ApiModelProperty("治安防控事件完成数")
    private Integer eventZADeal = 0;

    @ApiModelProperty("矛盾劝解事件完成数")
    private Integer eventMDDeal = 0;

    @ApiModelProperty("特殊人群服务事件完成数")
    private Integer eventTSDeal = 0;

    @ApiModelProperty("民生服务事件完成数")
    private Integer eventMSDeal = 0;

    @ApiModelProperty("防灾减灾事件完成数")
    private Integer eventFJDeal = 0;

    @ApiModelProperty("其他事件完成数")
    private Integer otherDeal = 0;

    @ApiModelProperty("网格数")
    private Integer gridTotal = 0;

    @ApiModelProperty("调解员")
    private Integer gridMemberTotal = 0;

    @ApiModelProperty("大屏网格数据")
    private List<EventGridStatisticsVO> gridStatisticsList;

    @ApiModelProperty("小区列表数据")
    private List<CivilVillageStatisticsVO> villageStatisticsList;

    @ApiModelProperty("人口统计")
    private ScreenDrawEventPopulationTotalVO drawEventPopulationTotalVO;

    @ApiModelProperty("年龄段统计")
    private List<StatisticsCommVO> ageGroupStatistics;

    @ApiModelProperty("事件分析新增折线数据")
    private List<StatisticsCommVO> eventAddPolylineData;

    @ApiModelProperty("事件分析累计折线数据")
    private List<StatisticsCommVO> eventTotalPolylineData;

    @ApiModelProperty("绘制事件类型统计圆形图")
    private List<StatisticsCommVO> eventTypeCircleDrawData;

    public void generateStatisticsData() {
        this.eventTotal = this.eventTFTotal + this.eventZATotal + this.eventMDTotal +
                this.eventTSTotal + this.eventMSTotal + this.eventFJTotal + this.otherTotal;
        this.dealTotal = this.eventTFDeal + this.eventZADeal + this.eventMDDeal +
                this.eventTSDeal + this.eventMSDeal + this.eventFJDeal + this.otherDeal;
        this.unDealTotal = this.eventTotal - this.dealTotal;
    }
}

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

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

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

import java.util.List;

/**
 * @author zzj
 */
@Data
@ApiModel("返攀登记数据")
public class IndexBackReserve {
    @ApiModelProperty("总数")
    private Integer count;
    @ApiModelProperty("标题数量")
    private List<IndexReserveSub> indexReserveSubList;
}

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

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

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

/**
 * @author zzj
 */
@Data
@ApiModel("首页业务模块统计")
public class IndexDynamic {
    @ApiModelProperty("微心愿")
    private Integer microWish;
    @ApiModelProperty("随手拍")
    private Integer easyPhoto;
    @ApiModelProperty("居民活动")
    private Integer residentActivity=0;
    @ApiModelProperty("志愿服务")
    private Integer volunteerActivity=0;
    @ApiModelProperty("党员活动")
    private Integer partyActivity;
    @ApiModelProperty("社区问卷")
    private Integer questionnaire;
    @ApiModelProperty("社区动态")
    private Integer dynamic;
    @ApiModelProperty("邻里圈")
    private Integer neighbor;
    @ApiModelProperty("便民商家")
    private Integer convenient;
}

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

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

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

import java.util.List;

/**
 * @author zzj
 */
@Data
@ApiModel("居家隔离数据")
public class IndexHomeQuarantine {
    @ApiModelProperty("总数")
    private Integer count;
    @ApiModelProperty("标题数量")
    private List<IndexReserveSub> indexReserveSubList;
}

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

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

import com.panzhihua.common.model.vos.community.screen.index.IndexEventGridStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.index.IndexPopulationStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.index.IndexSpecialStatisticsVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * @author zzj
 */
@Data
@ApiModel("大屏首页返回数据")
public class IndexInfo {
    @ApiModelProperty("基础数据")
    private BaseInfo baseInfo;
    @ApiModelProperty("实有人口数据")
    private IndexPopulationStatisticsVO indexPopulationStatisticsVO;
    @ApiModelProperty("特殊人群统计模块数据")
    private List<IndexSpecialStatisticsVO> specialStatisticsVOList;
    @ApiModelProperty("网格化治理模块数据")
    private IndexEventGridStatisticsVO eventGridStatisticsVO;
    @ApiModelProperty("返攀登记居家隔离数据统计")
    private IndexReserve indexReserve;
    @ApiModelProperty("业务统计")
    private IndexDynamic indexDynamic;
    @ApiModelProperty("杨戬要求修改")
    private BigScreenGridStaticsReturn bigScreenGridStaticsReturn;
}

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

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

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

/**
 * @author zzj
 */
@Data
@ApiModel("返攀登记居家隔离数据")
public class IndexReserve {
    @ApiModelProperty("返攀登记数据")
    private IndexBackReserve indexBackReserve;
    @ApiModelProperty("居家隔离数据")
    private IndexHomeQuarantine indexHomeQuarantine;
}

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

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

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

import java.math.BigDecimal;

/**
 * @author zzj
 */
@Data
@ApiModel("返攀登记居家隔离数据标题数量")
public class IndexReserveSub {
    @ApiModelProperty("标题值")
    private Integer key;
    @ApiModelProperty("数量")
    private Integer num;
    @ApiModelProperty("总数")
    private Integer allCount;
    @ApiModelProperty("占比")
    private BigDecimal percent;
}

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

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

import java.math.BigDecimal;
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: ResidentAutonomyStatisticsVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 居民自治统计信息
 * @author: hans
 * @date: 2021/12/06 14:27
 */
@Data
@ApiModel("居民自治统计信息")
public class ResidentAutonomyStatisticsVO {

    @ApiModelProperty(value = "随手拍本月总数")
    private Integer easyPhotoCurrentMonCount;

    @ApiModelProperty(value = "随手拍总数")
    private Integer easyPhotoTotalCount;

    @ApiModelProperty(value = "随手拍分类柱状统计")
    private List<StatisticsCommVO> easyPhotoHistogram;

    @ApiModelProperty(value = "微心愿本月总数")
    private Integer microWishCurrentMonCount;

    @ApiModelProperty(value = "集心池")
    private Integer aimNum;

    @ApiModelProperty(value = "微心愿总数")
    private Integer microWishTotal;

    @ApiModelProperty(value = "微心愿待实现&已实现数目及占比")
    private List<StatisticsCommVO> microWishRealizePercent;

    @ApiModelProperty(value = "微心愿图片")
    private List<String> microWishImages;

    @ApiModelProperty(value = "业主委员会本月总数")
    private Integer committeeCurrentMonCount;

    @ApiModelProperty(value = "业主委员会总数")
    private Integer committeeTotal;

    @ApiModelProperty(value = "业主委员会小区覆盖率")
    private BigDecimal areaCoverPercent;

    @ApiModelProperty(value = "业主委员会党员占比大于50%数量")
    private Integer committeeMostlyTotal = 0;

    @ApiModelProperty(value = "业主委员会党员占比")
    private List<StatisticsCommVO> committeePartyPercent;

    @ApiModelProperty(value = "议事投票本月总数")
    private Integer discussCurrentMonCount;

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

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

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

    @ApiModelProperty(value = "议事标题")
    private List<String> discussTitles;

    @ApiModelProperty(value = "投票标题")
    private List<String> voteTitles;

    @ApiModelProperty(value = "议事投票类型占比")
    private List<StatisticsCommVO> discussTypePercent;

    @ApiModelProperty(value = "邻里圈本月总数")
    private Integer neighborCurrentMonCount;

    @ApiModelProperty(value = "邻里圈总数")
    private Integer neighborTotal;

    @ApiModelProperty(value = "邻里圈点赞量")
    private Integer neighborFabulousNum;

    @ApiModelProperty(value = "邻里圈分享量")
    private Integer neighborForwardNum;

    @ApiModelProperty(value = "邻里圈评论量")
    private Integer neighborCommentNum;

    @ApiModelProperty(value = "邻里圈图片")
    private List<String> neighborImages;

    @ApiModelProperty(value = "邻里圈文本内容")
    private List<String> neighborContents;

    @ApiModelProperty(value = "报事报修本月总数")
    private Integer repairCurrentMonCount;

    @ApiModelProperty(value = "报事报修总数")
    private Integer repairTotal;

    @ApiModelProperty(value = "报事报修新增折线数据")
    private List<StatisticsCommVO> repairAddPolylineData;

    @ApiModelProperty(value = "报事报修累计折线数据")
    private List<StatisticsCommVO> repairTotalPolylineData;

    @ApiModelProperty(value = "爱心义仓本月总数")
    private Integer warehouseCurrentMonCount;

    @ApiModelProperty(value = "爱心义仓总捐赠数")
    private Integer warehouseTotal;

    @ApiModelProperty(value = "爱心义仓剩余物品数")
    private Integer warehouseSurplusTotal;

    @ApiModelProperty(value = "爱心义仓已领取物品数")
    private Integer warehouseApplyTotal;

    @ApiModelProperty(value = "爱心义仓捐赠记录")
    private List<String> warehouseDonateRecords;

    @ApiModelProperty(value = "爱心义仓爱心传递")
    private List<String> warehouseLoveTransfer;

    @ApiModelProperty(value = "爱心义仓捐赠物品图片")
    private List<String> warehouseImages;

    @ApiModelProperty(value = "居民活动本月总数")
    private Integer residentActCurrentMonCount;

    @ApiModelProperty(value = "居民活动总数")
    private Integer residentActTotalCount;

    @ApiModelProperty(value = "居民活动分类柱状统计")
    private List<StatisticsCommVO> residentActHistogram;

    @ApiModelProperty(value = "居民自治组织数")
    private Integer residentAutonomyOrgCount = 0;
}

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

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

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

/**
 * @author zzj
 */
@Data
@ApiModel("西区大屏治理数据")
public class WestScreenStatics {
    @ApiModelProperty("注册人数")
    private Integer user;
    @ApiModelProperty("党组织")
    private Integer partyOrg;
    @ApiModelProperty("党员")
    private Integer partyMember;
    @ApiModelProperty("志愿者")
    private Integer volunteer;
    @ApiModelProperty("微心愿")
    private Integer microWish;
    @ApiModelProperty("安全巡查")
    private Integer safety;
    @ApiModelProperty("社区活动")
    private Integer activity;
    @ApiModelProperty("疫情防控")
    private Integer reserve;
    @ApiModelProperty("邻里圈")
    private Integer neighbor;
    @ApiModelProperty("一起议")
    private Integer discuss;
    @ApiModelProperty("日活跃")
    private Integer dayUser;
    @ApiModelProperty("累计用户")
    private Integer countUser;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilConvenienceStatisticsVO.java

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

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

@Data
@ApiModel("民生统计便民服务返回参数")
public class CivilConvenienceStatisticsVO {

    @ApiModelProperty("办事指南")
    private Integer guideNum;

    @ApiModelProperty("疫情防控")
    private Integer situationNum;

    @ApiModelProperty("房屋租赁")
    private Integer leaseNum;

    @ApiModelProperty("报事报修")
    private Integer repairNum;

    @ApiModelProperty("养老认证")
    private Integer pensionNum;

    @ApiModelProperty("高龄认证")
    private Integer eldersNum;

    @ApiModelProperty("低保认证")
    private Integer subsistenceNum;

    @ApiModelProperty("高龄补贴")
    private Integer allowanceNum;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilGovernmentStatisticsVO.java

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

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

@Data
@ApiModel("民生统计社区治理返回参数")
public class CivilGovernmentStatisticsVO {

    @ApiModelProperty("通知公告")
    private Integer noticeNum;

    @ApiModelProperty("议事投票")
    private Integer discussNum;

    @ApiModelProperty("随手拍")
    private Integer easyNum;

    @ApiModelProperty("邻里圈")
    private Integer neighborNum;

    @ApiModelProperty("居民活动")
    private Integer activityNum;

    @ApiModelProperty("社区动态")
    private Integer dynNum;

    @ApiModelProperty("爱心义仓")
    private Integer loveNum;

    @ApiModelProperty("居民留言板")
    private Integer messageNum;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilGridStatisticsVO.java

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

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

@Data
@ApiModel("民生统计社区治理返回参数")
public class CivilGridStatisticsVO {

    @ApiModelProperty("今日突发事件")
    private Integer tfTodayNum;

    @ApiModelProperty("今日治安防控")
    private Integer zaTodayNum;

    @ApiModelProperty("今日民生服务")
    private Integer msTodayNum;

    @ApiModelProperty("今日矛盾劝解")
    private Integer mdTodayNum;

    @ApiModelProperty("今日特殊人群服务")
    private Integer tsTodayNum;

    @ApiModelProperty("累计事件")
    private Integer eventNum;

    @ApiModelProperty("电子巡查统计")
    private Integer xcNum;

    @ApiModelProperty("安全巡查")
    private Integer securityNum;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilPartyStatisticsVO.java

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

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

@Data
@ApiModel("民生统计党建返回参数")
public class CivilPartyStatisticsVO {

    @ApiModelProperty("社区两委")
    private Integer committeeNum;

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

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

    @ApiModelProperty("微心愿")
    private Integer wishNum;

    @ApiModelProperty("双报道党员")
    private Integer partyNum;

    @ApiModelProperty("党组织")
    private Integer organizationNum;

    @ApiModelProperty("志愿者团队")
    private Integer volunteerNum;

    @ApiModelProperty("问卷调查")
    private Integer questionnaireNum;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilStatisticsVO.java

@@ -29,4 +29,16 @@
    @ApiModelProperty("环比上月增长率")
    private BigDecimal rate;

    @ApiModelProperty("党建引领数据")
    private CivilPartyStatisticsVO civilPartyStatisticsVO;

    @ApiModelProperty("社区治理数据")
    private CivilGovernmentStatisticsVO civilGovernmentStatisticsVO;

    @ApiModelProperty("网格管理数据")
    private CivilGridStatisticsVO civilGridStatisticsVO;

    @ApiModelProperty("便民服务数据")
    private CivilConvenienceStatisticsVO civilConvenienceStatisticsVO;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilVillageStatisticsVO.java

@@ -3,9 +3,12 @@
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

import com.panzhihua.common.model.vos.community.screen.index.IndexSpecialStatisticsVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

@Data
@ApiModel("民生统计小区列表返回参数")
@@ -66,4 +69,7 @@
    @ApiModelProperty("其他人员")
    private Integer otherPeopleNum;

    @ApiModelProperty("特殊人群统计模块数据")
    private List<IndexSpecialStatisticsVO> specialStatisticsList;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventComprehensiveGovernanceStatisticsVO.java

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

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

/**
 * @title: EventComprehensiveGovernanceStatisticsVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 西区大数据分析平台-综合治理信息
 * @author: hans
 * @date: 2021/12/14 9:16
 */
@Data
@ApiModel("西区大数据分析平台-综合治理信息")
public class EventComprehensiveGovernanceStatisticsVO {

    @ApiModelProperty("综合治理总数")
    private Integer governanceTotal = 0;

    @ApiModelProperty("突发事件报告总数")
    private Integer eventTFTotal = 0;

    @ApiModelProperty("治安防控总数")
    private Integer eventZATotal = 0;

    @ApiModelProperty("矛盾劝解总数")
    private Integer eventMDTotal = 0;

    @ApiModelProperty("特殊人群服务总数")
    private Integer eventTSTotal = 0;

    @ApiModelProperty("民生服务总数")
    private Integer eventMSTotal = 0;

    @ApiModelProperty("居民随手拍总数")
    private Integer eventSSPTotal = 0;

    public void generateGovernanceTotal() {
        this.governanceTotal = this.eventTFTotal + this.eventZATotal + this.eventMDTotal +
                this.eventTSTotal + this.eventMSTotal + this.eventSSPTotal;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventGridIncidentStatisticsVO.java

@@ -1,11 +1,14 @@
package com.panzhihua.common.model.vos.community.screen.event;

import com.fasterxml.jackson.annotation.JsonFormat;
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.Date;

@Data
@ApiModel("大屏网格下事件统计返回参数")
@@ -15,13 +18,30 @@
    @JsonSerialize(using = ToStringSerializer.class)
    private Long eventId;

    @ApiModelProperty("事件状态(1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群上报、7随手拍处理)")
//    旧版参照@ApiModelProperty("事件状态(1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群上报、7随手拍处理)")
    /**
     * type不代表网格类型
     */
    @ApiModelProperty("事件状态(1治安防控、2民生服务、3矛盾劝解、4不稳定因素、5突发事件报告、6特殊人群服务、9防灾减灾、10其他)")
    private Integer type;

    @ApiModelProperty("事件类型(1、网格事件 2、随手拍事件)")
    private Integer eventType;

    @ApiModelProperty("事件发生经纬度")
    private String latLng;

    @ApiModelProperty("处理状态")
    @ApiModelProperty("事件内容")
    private String content;

    @ApiModelProperty("事件封面")
    private String cover;

    @ApiModelProperty("处理状态（1.已处理 2.待处理）")
    private Integer status;

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

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventListVO.java

@@ -69,6 +69,9 @@
    @ApiModelProperty("发生区域")
    private String gridName;

    @ApiModelProperty("处理意见")
    private String processDesc;

    @ApiModelProperty(value = "音频")
    private List<EventResourceVO> audios;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventNewStatisticsVO.java

@@ -66,6 +66,9 @@
    @ApiModelProperty("发生区域")
    private String gridName;

    @ApiModelProperty("处理意见")
    private String processDesc;

    @ApiModelProperty(value = "音频")
    private List<EventResourceVO> audios;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventPopulationBasicsStatisticsVO.java

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

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

/**
 * @title: EventComprehensiveGovernanceStatisticsVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 西区大数据分析平台-综合治理信息
 * @author: lyq
 * @date: 2021/12/14 10:53
 */
@Data
@ApiModel("西区大数据分析平台-一标三实基础信息")
public class EventPopulationBasicsStatisticsVO {

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

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

    @ApiModelProperty("人口数量")
    private Integer populationNum = 0;

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

    @ApiModelProperty("房屋数量")
    private Integer houseNum = 0;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventPopulationSpecialStatisticsVO.java

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

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

/**
 * @title: EventComprehensiveGovernanceStatisticsVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 西区大数据分析平台-综合治理信息
 * @author: lyq
 * @date: 2021/12/14 10:53
 */
@Data
@ApiModel("西区大数据分析平台-一标三实特殊人群信息")
public class EventPopulationSpecialStatisticsVO {

    @ApiModelProperty("残疾人")
    private Integer cjTotal = 0;

    @ApiModelProperty("低保户")
    private Integer dbTotal = 0;

    @ApiModelProperty("高龄老人")
    private Integer glTotal = 0;

    @ApiModelProperty("特殊情况")
    private Integer tsTotal = 0;

    @ApiModelProperty("特扶家庭")
    private Integer tfTotal = 0;

    @ApiModelProperty("退役军人")
    private Integer tyTotal = 0;

    @ApiModelProperty(value = "吸毒人员",hidden = true)
    private Integer xdTotal = 0;

    @ApiModelProperty(value = "社区矫正人员",hidden = true)
    private Integer jzTotal = 0;

    @ApiModelProperty(value = "邪教人员",hidden = true)
    private Integer xjTotal = 0;

    @ApiModelProperty(value = "刑释人员",hidden = true)
    private Integer xsTotal = 0;

    @ApiModelProperty(value = "上访人员",hidden = true)
    private Integer sfTotal = 0;

    @ApiModelProperty(value = "重精人员",hidden = true)
    private Integer zjTotal = 0;

    @ApiModelProperty("老年人（》=60）")
    private Integer lnTotal = 0;

    @ApiModelProperty("其他")
    private Integer otherTotal = 0;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventPopulationStatisticsVO.java

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

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

import java.util.List;

/**
 * @title: EventComprehensiveGovernanceStatisticsVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 西区大数据分析平台-综合治理信息
 * @author: lyq
 * @date: 2021/12/14 10:53
 */
@Data
@ApiModel("西区大数据分析平台-一标三实信息")
public class EventPopulationStatisticsVO {

    @ApiModelProperty("人口数据")
    private List<EventPopulationBasicsStatisticsVO> basicsList;

    @ApiModelProperty("特殊人口数据")
    private EventPopulationSpecialStatisticsVO specialStatisticsVo;

    @ApiModelProperty("人口数量")
    private Integer populationNum = 0;

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

    @ApiModelProperty("房屋数量")
    private Integer houseNum = 0;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventPopulationStreetVO.java

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

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

import java.util.List;

/**
 * @title: EventComprehensiveGovernanceStatisticsVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 西区大数据分析平台-综合治理信息
 * @author: lyq
 * @date: 2021/12/14 10:53
 */
@Data
@ApiModel("西区大数据分析平台-街道列表信息")
public class EventPopulationStreetVO {

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

    @ApiModelProperty("街道名称")
    private String name;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexGridEventStatisticsVO.java

@@ -4,26 +4,37 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

@Data
@ApiModel("大屏首页网格化治理事件数据统计返回参数")
public class IndexGridEventStatisticsVO {

    @ApiModelProperty("突发事件数量")
    private Integer eventTFTotal;

    @ApiModelProperty("突发事件占比")
    private BigDecimal tfPercent;
    @ApiModelProperty("治安隐患事件数量")
    private Integer eventZATotal;
    @ApiModelProperty("治安隐患事件占比")
    private BigDecimal zaPercent;

    @ApiModelProperty("矛盾纠纷事件数量")
    private Integer eventMDTotal;
    @ApiModelProperty("矛盾纠纷事件占比")
    private BigDecimal mdPercent;

    @ApiModelProperty("特殊人员上报数量")
    private Integer eventTSTotal;
    @ApiModelProperty("特殊人员上报占比")
    private BigDecimal tsPercent;

    @ApiModelProperty("不稳定因素事件数量")
    private Integer eventBWDTotal;

    @ApiModelProperty("不稳定因素事件占比")
    private BigDecimal bwdPercent;
    @ApiModelProperty("公共服务数量")
    private Integer eventGGTotal;

    @ApiModelProperty("公共服务占比")
    private BigDecimal ggPercent;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexPopulationAgeStatisticsVO.java

@@ -4,14 +4,19 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

@Data
@ApiModel("大屏首页实有人口年龄段数据统计返回参数")
public class IndexPopulationAgeStatisticsVO {

    @ApiModelProperty("年龄段（1、0-16  2、16-27 3、27-35 4、35-45 5、45-55 6、55以上）")
    @ApiModelProperty("年龄段（1、0-18  2、19-30 3、31-40 4、41-50 5、51-59 7、60-79 8.80-89 6.89以上）")
    private Integer type;

    @ApiModelProperty("数量")
    private Integer sum = 0;

    @ApiModelProperty("占比")
    private BigDecimal percent;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexPopulationSexStatisticsVO.java

@@ -14,4 +14,7 @@
    @ApiModelProperty("数量")
    private Integer sum;

    @ApiModelProperty("占比")
    private Integer percent;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexSpecialStatisticsVO.java

@@ -4,6 +4,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

@Data
@ApiModel("大屏首页特殊人群统计数据返回参数")
public class IndexSpecialStatisticsVO {
@@ -14,4 +16,7 @@
    @ApiModelProperty("人口数量")
    private Integer sum;

    @ApiModelProperty("占比")
    private BigDecimal percent;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridCommunityAdminVO.java

@@ -14,6 +14,13 @@
    @ApiModelProperty(value = "社区id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long communityId;

    @ApiModelProperty(value = "社区名称")
    private String name;

    @ApiModelProperty(value = "经度")
    private String lng;

    @ApiModelProperty(value = "维度")
    private String lat;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/DetailNeighborCircleAdminVO.java

@@ -58,4 +58,7 @@
    @ApiModelProperty("话题名称")
    private String topicName;

    @ApiModelProperty("头像")
    private String imageUrl;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ScreenDrawEventPopulationTotalVO.java

@@ -53,4 +53,46 @@
    @ApiModelProperty("网格员")
    private Integer WGYTotal = 6;

    @ApiModelProperty("总户数")
    private Integer houseTotal = 0;

    @ApiModelProperty("残疾人")
    private Integer disabilityTotal = 0;

    @ApiModelProperty("低保户")
    private Integer lowSecurityTotal = 0;

    @ApiModelProperty("高龄老人")
    private Integer elderTotal = 0;

    @ApiModelProperty("特殊情况")
    private Integer specialSituationTotal = 0;

    @ApiModelProperty("其他")
    private Integer otherTotal = 0;

    @ApiModelProperty("特扶家庭")
    private Integer specialHelpTotal = 0;

    @ApiModelProperty("退役军人")
    private Integer veteransTotal = 0;

    @ApiModelProperty("老年人")
    private Integer oldTotal = 0;

    @ApiModelProperty("养老人员")
    private Integer pensionTotal = 0;

    @ApiModelProperty("出租房源")
    private Integer rentingHouseTotal = 0;

    @ApiModelProperty("社会工作者")
    private Integer socialWorkerTotal = 0;

    @ApiModelProperty("志愿者")
    private Integer volunteerTotal = 0;

    @ApiModelProperty("平均年龄")
    private Integer averageAge = 0;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java

@@ -88,4 +88,9 @@
    @ApiModelProperty(value = "身份证")
    private String idCard;

    @ApiModelProperty("头像")
    private String imageUrl;

    private String areaCode;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysAppConfigVO.java

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

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.io.Serializable;


/**
 * (SysAppConfig)表实体类
 *
 * @author makejava
 * @since 2022-01-13 10:10:15
 */
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("")
public class SysAppConfigVO implements Serializable {

    private static final long serialVersionUID = -90981038076389842L;

    private Long id;

    /**
     * appid
     */
    @ApiModelProperty(value = "appid")
    private String appId;

    /**
     * secret
     */
    @ApiModelProperty(value = "secret")
    private String secret;

    /**
     * 小程序名字
     */
    @ApiModelProperty(value = "小程序名字")
    private String name;

    private String areaCode;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysTemplateConfigVO.java

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

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.io.Serializable;


/**
 * (SysTemplateConfig)表实体类
 *
 * @author makejava
 * @since 2022-01-13 14:29:55
 */
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("")
public class SysTemplateConfigVO implements Serializable {

    private static final long serialVersionUID = -29178409799302189L;

    private Long id;

    /**
     * 模板id
     */
    @ApiModelProperty(value = "模板id")
    private String templateId;

    /**
     * 模板类型 1活动变更 2留言回复 3活动取消 4审核状态 5认证审核 6调研问卷 7奖励发放 8报名成功 9活动即将开始 10预约提醒
     */
    @ApiModelProperty(value = "模板类型 1活动变更 2留言回复 3活动取消 4审核状态 5认证审核 6调研问卷 7奖励发放 8报名成功 9活动即将开始 10预约提醒 ")
    private Integer type;

    /**
     * 区域编码
     */
    @ApiModelProperty(value = "区域编码")
    private String areaCode;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java

@@ -133,4 +133,13 @@
     */
    @PostMapping("/loginMerchantBackStage")
    R loginMerchantBackStage(@RequestParam("account") String account, @RequestParam("password") String password);

    /**
     * 西区大屏登录
     * @param account   账号
     * @param password  密码
     * @return  登录结果
     */
    @PostMapping("/loginXQDP")
    R loginXQDP(@RequestParam("account") String account, @RequestParam("password") String password);
}

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

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

import java.util.List;

import com.panzhihua.common.model.dtos.PageBaseDTO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.scheduling.annotation.Async;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -1069,10 +1070,11 @@
     *
     * @param userId
     *            用户id
     * @param status
     * @return 活动列表
     */
    @PostMapping("listactivity")
    R listActivity(@RequestParam("userId") Long userId);
    R listActivity(@RequestParam("userId") Long userId, @RequestParam(value = "status", required = false) Integer status);

    /**
     * 用户确认心愿
@@ -1168,7 +1170,7 @@
     * @return 社区集合 按照创建顺序倒序排列
     */
    @PostMapping("listcommunityall")
    R listCommunityAll();
    R listCommunityAll(@RequestParam("areaCode")String areaCode);

    /**
     * 首页广告banner
@@ -4939,7 +4941,7 @@
     * @return 社区列表
     */
    @GetMapping("/eventgrid/community/westList")
    R getWestCommunityLists();
    R getWestCommunityLists(String areaCode);

    /**
     * 综治app-小区列表
@@ -5302,11 +5304,11 @@
    R addIntegralTradeAdmin(@RequestBody AddComActIntegralUserDTO integralUserDTO);

    /**
     * 根据社区活动id查询社区活动报名人员列表
     * 根据社区活动id查询社区活动报名且未参与人员列表
     *
     * @param activityId
     *            活动id
     * @return 社区活动报名人员列表
     * @return 社区活动报名且未参与人员列表
     */
    @PostMapping("/integral/act/activity/admin")
    R getTaskActivityPeopleList(@RequestParam("activityId") Long activityId);
@@ -5394,7 +5396,7 @@
     * @return 社区列表
     */
    @GetMapping("/switch/community/all/list")
    R communitySwitchList();
    R communitySwitchList(@RequestParam("areaCode") String areaCode);

    /**
     * 根据名字查询所有社区列表
@@ -5404,7 +5406,7 @@
     * @return 社区列表
     */
    @GetMapping("/switch/community/search/list")
    R communitySwitchSearchList(@RequestParam(value = "name") String name);
    R communitySwitchSearchList(@RequestParam(value = "name") String name,@RequestParam(value = "areaCode") String areaCode);

    /**
     * 根据经纬度以及距离搜索附近社区列表
@@ -7206,6 +7208,14 @@
    R pageRegisterHomeQuarantine(PageReserveRegisterDetailedAdminDTO detailedAdminDTO);

    /**
     * 居家隔离导出
     * @param pageReserveRegisterDetailedAdminDTO
     * @return
     */
    @PostMapping("/reserve/admin/homeQuarantine/export")
    R exportHomeQuarantine(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO);

    /**
     * 分页查询物业宣传
     * @param pageComPropertyPublicityDTO
     * @return
@@ -7270,14 +7280,6 @@
     */
    @GetMapping("/property/publicity/incr-view")
    R incrPropertyPublicityView(@RequestParam("id") Long id);

    /**
     * 居家隔离导出
     * @param pageReserveRegisterDetailedAdminDTO
     * @return
     */
    @PostMapping("/reserve/admin/homeQuarantine/export")
    R exportHomeQuarantine(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO);

    /**
     * 获取预设图片
@@ -7490,4 +7492,241 @@
    @GetMapping("/rentingHourseRegister/updateAllHouseUnionAppCode")
    @Async
    void updateAllHouseUnionAppCode();

    /**
     * 西区大屏治理数据
     */
    @GetMapping("/screen/getWestScreenStatics")
    R westScreenStatics();

    /**
     * 西区大屏一标三实数据
     * @return  西区大屏一标三实数据
     */
    @GetMapping("/screen/getComprehensivePopulationStatics")
    R getComprehensivePopulationStatics(@RequestParam("streetId") Long streetId);

    @GetMapping("/screen/getComprehensiveStreetList")
    R getComprehensiveStreetList();

    /**
     * 通过社区id查询社区账号密码
     * @param communityId   社区id
     * @return  查询社区账号密码
     */
    @GetMapping("/screen/getCommunityPassword")
    R getCommunityPassword(@RequestParam("communityId") Long communityId);

    @GetMapping("/reserve/bigScreenStaticsReserve")
    R bigScreenStaticsReserve(@RequestParam("communityId") Long communityId);

    /**
     * 党员活动折线图
     * @param communityId
     * @return
     */
    @GetMapping("/bigscreen/party/partyActivityLine")
    R partyActivityLine(@RequestParam("communityId")Long communityId);

    /**
     * 党员积分前3
     * @param pageBigScreenStatisticPartyOrg
     * @return
     */
    @PostMapping("/bigscreen/party/partyActivityTop")
    R partyActivityTop(@RequestBody PageBigScreenStatisticPartyOrg pageBigScreenStatisticPartyOrg);

    /**
     * 社区服务大屏数据分析接口
     */
    @GetMapping("/screen/serviceData")
    R serviceData(@RequestParam("communityId")Long communityId);

    /**
     * 服务居民接口
     */
    @GetMapping("/screen/serviceUser")
    R serviceUser(@RequestParam("communityId") Long communityId);

    /**
     * 大数据分析平台-居民自治
     * @param communityId
     * @return
     */
    @GetMapping("/screen/resident/autonomy")
    R getResidentAutonomy(@RequestParam("communityId") Long communityId);

    /**
     * 大数据分析平台-清网治格
     * @param communityId
     * @return
     */
    @GetMapping("/screen/grids/governance")
    R getGridsGovernance(@RequestParam("communityId") Long communityId);

    /**
     * 大数据分析平台-社区服务
     * @param communityId
     * @return
     */
    @GetMapping("/screen/community/service")
    R getCommunityServiceStatistics(@RequestParam("communityId") Long communityId);

    /**
     * 分页获取热度排行商家
     * @param pagePopularMerchantDTO
     * @return
     */
    @PostMapping("/screen/merchant/popular")
    R getScreenPopularMerchants(@RequestBody PagePopularMerchantDTO pagePopularMerchantDTO);

    /**
     * 新版大屏首页接口
     */
    @GetMapping("/screen/indexInfo")
    R indexInfo(@RequestParam("communityId") Long communityId);

    /**
     * 首页二级页面-微心愿
     * @param communityId
     * @return
     */
    @GetMapping("/screen/index/microWish")
    R indexMicroWish(@RequestParam("communityId") Long communityId);

    /**
     * 首页二级页面-随手拍
     * @param communityId
     * @return
     */
    @GetMapping("/screen/index/easyPhoto")
    R indexEasyPhoto(@RequestParam("communityId") Long communityId);

    /**
     * 首页二级页面-随手拍展示列表
     * @return
     */
    @PostMapping("/screen/index/easyPhotoList")
    R indexEasyPhotoList(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 首页二级页面-社区问卷
     * @param communityId
     * @return
     */
    @GetMapping("/screen/index/questionnaire")
    R indexQuestionnaire(@RequestParam("communityId") Long communityId);

    /**
     * 首页二级页面-社区动态
     * @param communityId
     * @return
     */
    @GetMapping("/screen/index/dyn")
    R indexDyn(@RequestParam("communityId") Long communityId);

    /**
     * 首页二级页面-社区动态展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/index/dynList")
    R indexDynList(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 首页二级页面-邻里圈
     * @param communityId
     * @return
     */
    @GetMapping("/screen/index/neighbor")
    R indexNeighbor(@RequestParam("communityId") Long communityId);

    /**
     * 首页二级页面-邻里圈展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/index/neighborList")
    R indexNeighborList(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 首页二级页面-便民商家
     * @param communityId
     * @return
     */
    @GetMapping("/screen/index/merchant")
    R indexMerchant(@RequestParam("communityId") Long communityId);

    /**
     * 首页二级页面-商家展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/index/merchantList")
    R indexMerchantList(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 首页二级页面-微心愿展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/index/microWishList")
    R indexMicroWishList(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 首页二级页面-社区问卷展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/index/questionnaireList")
    R indexQuestionnaireList(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 首页二级页面-居民活动
     * @param communityId
     * @return
     */
    @GetMapping("/screen/index/residentAct")
    R indexResidentAct(@RequestParam("communityId") Long communityId);

    /**
     * 首页二级页面-居民活动展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/index/residentActList")
    R indexResidentActList(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 首页二级页面-志愿者活动
     * @param communityId
     * @return
     */
    @GetMapping("/screen/index/volunteerAct")
    R indexVolunteerAct(@RequestParam("communityId") Long communityId);

    /**
     * 首页二级页面-志愿者活动展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/index/volunteerActList")
    R indexVolunteerActList(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 清网治格-根据事件分类获取近1月的社区事件数据
     * @param type
     * @param communityId
     * @return
     */
    @GetMapping("/screen/event/list")
    R getEventList(@RequestParam(value = "type") Integer type, @RequestParam(value = "communityId") Long communityId);

    /**
     * 清网治格-社区事件数据分页
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/event/page")
    R pageEventList(@RequestBody PageBaseDTO pageBaseDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java

@@ -1320,6 +1320,14 @@
    R getCivilDrawList(@RequestBody ScreenDrawEventListDTO eventListDTO);

    /**
     * 新版绘制多边形统计数据
     * @param eventListDTO
     * @return
     */
    @PostMapping("/screen/getCivilDrawListNew")
    R getCivilDrawListNew(@RequestBody ScreenDrawEventListDTO eventListDTO);

    /**
     * 大屏-根据小区id查询小区统计人数
     * 
     * @param villageId
@@ -1353,4 +1361,21 @@
     */
    @GetMapping("/screen/member/trajectory")
    R getGridsMemberTrajectory(@RequestParam("communityId") Long communityId);

    /**
     * 西区大数据分析平台-综合治理栏
     * @return
     */
    @GetMapping("/screen/comprehensive/governance")
    R getComprehensiveGovernanceStatics();

    /**
     * 大屏-新根据小区id查询小区统计人数
     *
     * @param villageId
     *            小区id
     * @return 小区统计数据
     */
    @GetMapping("/screen/village/statistics-new")
    R civilVillageStatisticsNew(@RequestParam("villageId") Long villageId);
}

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

@@ -372,7 +372,7 @@
     * @return 角色集合
     */
    @PostMapping("/role/listrolebackstage")
    R listRoleBackstage(@RequestParam("communityId") Long communityId,@RequestParam("pageNum")Integer pageNum,@RequestParam("pageSize")Integer pageSize);
    R listRoleBackstage(@RequestParam("communityId") Long communityId,@RequestParam("pageNum")Integer pageNum,@RequestParam("pageSize")Integer pageSize,@RequestParam("areaCode")String areaCode);

    /**
     * 分页查询后台用户
@@ -588,7 +588,7 @@
     * @return 运营后台数据看板
     */
    @PostMapping("datakanban")
    R dataKanban();
    R dataKanban(@RequestParam("areaCode")String areaCode);

    /**
     * 用户菜单获取
@@ -1076,14 +1076,14 @@
     * @return  用户数据统计汇总
     */
    @GetMapping("community/statistics")
    R communityStatistics();
    R communityStatistics(@RequestParam("areaCode") String areaCode);

    /**
     * 运营后台-用户数据统计导出
     * @return  用户数据
     */
    @GetMapping("community/statistics/export")
    R communityStatisticsExport();
    R communityStatisticsExport(@RequestParam("areaCode") String areaCode);

    /**
     * 通过UnionId获取用户信息
@@ -1092,4 +1092,21 @@
     */
    @GetMapping("/getByUnionId")
    R getUserInfoByUnionId(@RequestParam("unionId") String unionId);

    /**
     * 小程序id获取相关信息
     * @param appId
     * @return
     */
    @GetMapping("/sysAppConfig/selectByAppid")
    R<SysAppConfigVO> selectByAppid(@RequestParam("appId")String appId);

    /**
     * 通过区域编码 类型获取动态模板id
     * @param areaCode
     * @param type
     * @return
     */
    @GetMapping("/sysTemplateConfig/selectTemplate")
    R<SysTemplateConfigVO> selectTemplate(@RequestParam("areaCode")String areaCode,@RequestParam("type")Integer type);
}

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

@@ -848,6 +848,21 @@
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
        return sdf.format(calendar.getTime()) + " 23:59:59";
    }
    /**
     * 获取当前月最后一天
     *
     * @return
     */
    public static Date getLastDayOfMonth() {
        Calendar calendar = Calendar.getInstance();

        calendar.add(Calendar.MONTH, 1);

        calendar.set(Calendar.DAY_OF_MONTH, 0);
        // 格式化日期

        return calendar.getTime();
    }

    /**
     * 获取当前时间（年月日）

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

@@ -5,7 +5,7 @@
import lombok.extern.slf4j.Slf4j;

/**
 * 应用模块名称
 * FileType 应用模块名称
 * <p>
 * 代码描述 文件类型判断工具类
 * <p>
@@ -19,9 +19,10 @@
 */
@Slf4j
public class FileType {
    public static final String NOT_IMAGE_FILE_TYPE = "0000";

    public static String bytesToHexString(byte[] src) {
    private static final String NOT_IMAGE_FILE_TYPE = "0000";

    private static String bytesToHexString(byte[] src) {
        StringBuilder stringBuilder = new StringBuilder();
        if (src == null || src.length <= 0) {
            return null;
@@ -77,14 +78,14 @@
     * 
     * @param args
     */
    // public static void main(String[] args) throws Exception {
    // FileInputStream is = new FileInputStream("D:\\Pictures\\11.png");
    // byte[] b = new byte[3];
    // is.read(b, 0, b.length);
    // String photo = bytesToHexString(b);
    // photo = photo.toUpperCase();
    // System.out.println("头文件是：" + photo);
    // String ooo = TypeDict.checkType(photo);
    // System.out.println("后缀名是：" + ooo);
    // }
//     public static void main(String[] args) throws Exception {
//     FileInputStream is = new FileInputStream("D:\\Pictures\\3.mp4");
//     byte[] b = new byte[3];
//     is.read(b, 0, b.length);
//     String photo = bytesToHexString(b);
//     photo = photo.toUpperCase();
//     System.out.println("头文件是：" + photo);
//    String ooo = TypeDict.checkFileType(photo);
//     System.out.println("后缀名是：" + ooo);
//     }
}

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

@@ -1,5 +1,8 @@
package com.panzhihua.common.utlis;

import java.util.regex.Matcher;
import java.util.regex.Pattern;

/**
 * @description: 身份证手机号脱敏处理
 * @author: Null
@@ -38,4 +41,16 @@
        return idNumber;
    }


    public static String replaceName(String str) {
        if(StringUtils.isNotEmpty(str)){
            if(str.length()==2){
                str=str.replace(str.substring(1),"*");
            }
            if(str.length()>2) {
                str=str.replace(str.substring(1,str.length()-1),"*");
            }
        }
        return str;
    }
}

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

@@ -24,7 +24,7 @@
     * Windows Password (pwl)，文件头：E3828596 ZIP Archive (zip)，文件头：504B0304 RAR Archive (rar)，文件头：52617221 Wave
     * (wav)，文件头：57415645 AVI (avi)，文件头：41564920 Real Audio (ram)，文件头：2E7261FD Real Media (rm)，文件头：2E524D46 MPEG
     * (mpg)，文件头：000001BA MPEG (mpg)，文件头：000001B3 Quicktime (mov)，文件头：6D6F6F76 Windows Media (asf)，文件头：3026B2758E66CF11
     * MIDI (mid)，文件头：4D546864
     * MIDI (mid)，文件头：4D546864,文件头：FFF328（满添加mp3），文件头：000000（满添加mp4）
     */
    public static String checkImageType(String type) {

@@ -53,6 +53,10 @@
                return "wav";
            case "415649":
                return "avi";
            case "FFF328":
                return "mp3";
            case "000000":
                return "mp4";
            default:
                return "0000";
        }

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

@@ -95,10 +95,10 @@
     *            备注说明
     */
    public static void sendSubscribeJLDZ(String openId, String accessToken, String name, BigDecimal amount,
        String remark) {
        String remark,String templateId) {
        WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
        subscribeDTO.setTouser(openId);
        subscribeDTO.setTemplate_id(WxSubscribeConstants.JLFF_ID);
        subscribeDTO.setTemplate_id(templateId);
        List<TemplateParam> paras = new ArrayList<TemplateParam>();
        paras.add(new TemplateParam("thing1", name));// 活动名称
        paras.add(new TemplateParam("amount3", amount.toString()));// 奖励金额
@@ -187,10 +187,10 @@
     *            审核结果
     */
    public static void sendSubscribeRZSH(String openId, String accessToken, String name, String applyTime,
        String result) {
        String result,String templateId) {
        WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
        subscribeDTO.setTouser(openId);
        subscribeDTO.setTemplate_id(WxSubscribeConstants.EZSH_ID);
        subscribeDTO.setTemplate_id(templateId);
        List<TemplateParam> paras = new ArrayList<TemplateParam>();
        paras.add(new TemplateParam("thing2", name));// 认证内容
        paras.add(new TemplateParam("phrase1", result));// 审核结果
@@ -218,10 +218,10 @@
     *            审核时间
     */
    public static void sendSubscribeSHZT(String openId, String accessToken, String name, String applyTime,
        String result) {
        String result,String templateId) {
        WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
        subscribeDTO.setTouser(openId);
        subscribeDTO.setTemplate_id(WxSubscribeConstants.SHZT_ID);
        subscribeDTO.setTemplate_id(templateId);
        List<TemplateParam> paras = new ArrayList<TemplateParam>();
        paras.add(new TemplateParam("thing1", name));// 审核项目
        paras.add(new TemplateParam("phrase2", result));// 审核状态
@@ -246,10 +246,10 @@
     * @param time
     *            活动时间
     */
    public static void sendSubscribeHDQX(String openId, String accessToken, String name, String time) {
    public static void sendSubscribeHDQX(String openId, String accessToken, String name, String time,String templateId) {
        WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
        subscribeDTO.setTouser(openId);
        subscribeDTO.setTemplate_id(WxSubscribeConstants.HDQX_ID);
        subscribeDTO.setTemplate_id(templateId);
        List<TemplateParam> paras = new ArrayList<TemplateParam>();
        paras.add(new TemplateParam("thing1", name));// 活动标题
        paras.add(new TemplateParam("date2", time));// 活动时间
@@ -275,10 +275,10 @@
     * @param content
     *            回复内容
     */
    public static void sendSubscribeLYHF(String openId, String accessToken, String name, String time, String content) {
    public static void sendSubscribeLYHF(String openId, String accessToken, String name, String time, String content,String templateId) {
        WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
        subscribeDTO.setTouser(openId);
        subscribeDTO.setTemplate_id(WxSubscribeConstants.LYHF_ID);
        subscribeDTO.setTemplate_id(templateId);
        List<TemplateParam> paras = new ArrayList<TemplateParam>();
        paras.add(new TemplateParam("thing3", content));// 回复内容
        paras.add(new TemplateParam("name1", name));// 回复者
@@ -310,10 +310,10 @@
     *            活动地点
     */
    public static void sendSubscribeHDBG(String openId, String accessToken, String name, String changeTime,
        String changeAddress, String time, String address) {
        String changeAddress, String time, String address,String templateId) {
        WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
        subscribeDTO.setTouser(openId);
        subscribeDTO.setTemplate_id(WxSubscribeConstants.HDBG_ID);
        subscribeDTO.setTemplate_id(templateId);
        List<TemplateParam> paras = new ArrayList<TemplateParam>();
        paras.add(new TemplateParam("thing1", name));// 活动名称
        paras.add(new TemplateParam("time2", changeTime));// 活动时间变更
@@ -345,10 +345,10 @@
     *            活动参加人数
     */
    public static void sendSubscribeHDJJKS(String openId, String accessToken, String name, String time, String address,
        String num) {
        String num,String templateId) {
        WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
        subscribeDTO.setTouser(openId);
        subscribeDTO.setTemplate_id(WxSubscribeConstants.HDJJKS_ID);
        subscribeDTO.setTemplate_id(templateId);
        List<TemplateParam> paras = new ArrayList<TemplateParam>();
        paras.add(new TemplateParam("thing1", name));// 活动名称
        paras.add(new TemplateParam("date2", time));// 活动时间
@@ -371,10 +371,10 @@
     * @param name      预约人
     * @param time      预约时间
     */
    public static void sendSubscribeYYTX(String openId, String accessToken, String result, String title, String name,String time){
    public static void sendSubscribeYYTX(String openId, String accessToken, String result, String title, String name,String time,String templateId){
        WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
        subscribeDTO.setTouser(openId);
        subscribeDTO.setTemplate_id(WxSubscribeConstants.YYTX_ID);
        subscribeDTO.setTemplate_id(templateId);
        List<TemplateParam> paras=new ArrayList<TemplateParam>();
        paras.add(new TemplateParam("phrase8",result));//预约结果
        paras.add(new TemplateParam("thing23",title));//预约主题

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

@@ -6,6 +6,7 @@
import java.nio.charset.StandardCharsets;
import java.util.Map;

import com.panzhihua.common.controller.BaseController;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.FileItemFactory;
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
@@ -25,7 +26,7 @@

@Slf4j
@Component
public class WxXCXTempSend {
public class WxXCXTempSend extends BaseController {

    public static final String APP_ID = "wx0cef797390444b75";
    private static final String APP_SECRET = "c7ea9aaa7e391a487e8a5b9ba61045d1";
@@ -109,7 +110,7 @@
        try {
            // 此处APP_ID APP_SECRET 在微信小程序后端可见
            // String accessTokenUrl = String.format(TEMP_URL, APP_ID, APP_SECRET);
            String accessTokenUrl = ACCESS_TOKEN_URL + "&appid=" + APP_ID + "&secret=" + APP_SECRET;
            String accessTokenUrl = ACCESS_TOKEN_URL + "&appid=" + getAppId() + "&secret=" + getAppSecret();
            String result = HttpClientUtil.httpGet(accessTokenUrl, null, null);
            Map<String, Object> resultMap = JSON.parseObject(result, Map.class);
            if (resultMap.containsKey("access_token")) {

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

@@ -23,6 +23,8 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;

import static java.util.Objects.isNull;

@Slf4j
@Api(tags = {"社区动态分类模块"})
@RestController
@@ -35,8 +37,9 @@
    @ApiOperation(value = "分页查询社区动态列表", response = ComActDynTypeVO.class)
    @PostMapping("/page")
    public R page(@RequestBody PageComActDynTypeDTO comActDynTypeDTO) {
        Long communityId = this.getCommunityId();
        comActDynTypeDTO.setCommunityId(communityId);
        if (isNull(comActDynTypeDTO.getCommunityId())) {
            comActDynTypeDTO.setCommunityId(this.getCommunityId());
        }
        return communityService.pageDynTypeByAdmin(comActDynTypeDTO);
    }


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

@@ -134,4 +134,25 @@
        pagePartyOrganizationVO.setCommunityId(id);
        return partyBuildingService.pagePartyOrganization(pagePartyOrganizationVO);
    }

    /**
     * 党员活动折线图
     * @return
     */
    @ApiOperation(value = "党员活动折线图", response = BigScreenActivityLine.class)
    @GetMapping("/partyActivityLine")
    public R partyActivityLine(){
        return communityService.partyActivityLine(this.getCommunityId());
    }

    /**
     * 党员积分前3
     * @return
     */
    @ApiOperation(value = "党员积分前3", response = BigScreenActivityTop.class)
    @PostMapping("/partyActivityTop")
    public R partyActivityTop(@RequestBody PageBigScreenStatisticPartyOrg pageBigScreenStatisticPartyOrg){
        pageBigScreenStatisticPartyOrg.setCommunityId(this.getCommunityId());
        return communityService.partyActivityTop(pageBigScreenStatisticPartyOrg);
    }
}

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

@@ -1,34 +1,88 @@
package com.panzhihua.community_backstage.api;

import static java.util.Objects.isNull;

import javax.annotation.Resource;

import cn.hutool.http.HttpUtil;
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 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.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.constants.HttpConstant;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.utlis.HttpClientUtil;
import com.panzhihua.common.utlis.HttpUtils;
import org.springframework.web.bind.annotation.*;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
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.property.CommonPage;
import com.panzhihua.common.model.vos.R;
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.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.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.BigScreenQuestionnaireStatisticsInfo;
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.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.convenient.ConvenientMerchantVO;
import com.panzhihua.common.model.vos.community.screen.civil.CivilStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.event.*;
import com.panzhihua.common.model.vos.community.screen.event.EventComprehensiveGovernanceStatisticsVO;
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;
import com.panzhihua.common.model.vos.community.screen.event.EventNewStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.event.EventPopulationStatisticsVO;
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.PartyBuildingComPbDynVO;
import com.panzhihua.common.model.vos.screen.ScreenDrawEventPopulationTotalVO;
import com.panzhihua.common.model.vos.screen.ScreenDrawEventVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.grid.GridService;
import com.panzhihua.common.service.partybuilding.PartyBuildingService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.HttpClientUtil;
import com.panzhihua.common.utlis.HttpUtils;

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

import static java.util.Objects.isNull;

@Slf4j
@Api(tags = {"大屏统计数据模块"})
@@ -42,6 +96,8 @@
    private GridService gridService;
    @Resource
    private UserService userService;
    @Resource
    private PartyBuildingService partyBuildingService;

    @ApiOperation(value = "大屏测试接口")
    @GetMapping("/test/noToken")
@@ -182,7 +238,321 @@
        return gridService.getGridsMemberTrajectory(communityId);
    }

    /**
     * 西区大屏治理数据
     */
    @ApiOperation(value = "西区大屏治理数据@lyq", response = WestScreenStatics.class)
    @GetMapping("/getWestScreenStatics")
    public R westScreenStatics(){
        return communityService.westScreenStatics();
    }


    @ApiOperation(value = "西区大数据分析平台-综合治理栏", response = EventComprehensiveGovernanceStatisticsVO.class)
    @GetMapping("/comprehensive/governance")
    public R getComprehensiveGovernanceStatics() {
        return gridService.getComprehensiveGovernanceStatics();
    }

    @ApiOperation(value = "西区大数据分析平台-一标三实栏", response = EventPopulationStatisticsVO.class)
    @GetMapping("/comprehensive/population")
    public R getComprehensivePopulationStatics(@RequestParam(value = "streetId",required = false,defaultValue = "0") Long streetId) {
        return communityService.getComprehensivePopulationStatics(streetId);
    }
    /**
     * 新版大屏首页接口
     */
    @ApiOperation(value = "新版大屏首页接口", response = IndexInfo.class)
    @GetMapping("/indexInfo")
    public R indexInfo(){
        return communityService.indexInfo(this.getCommunityId());
    }

    /**
     * 首页二级页面-微心愿
     */
    @ApiOperation(value = "首页二级页面-微心愿", response = BigScreenMicroWishStatisticsInfo.class)
    @GetMapping("/index/microWish")
    public R indexMicroWish() {
        return communityService.indexMicroWish(this.getCommunityId());
    }

    /**
     * 首页二级页面-微心愿展示列表
     */
    @ApiOperation(value = "首页二级页面-微心愿展示列表", response = ComActMicroWishVO.class)
    @PostMapping("/index/microWishList")
    public R indexMicroWishList(@RequestBody PageBaseDTO pageBaseDTO) {
        pageBaseDTO.setCommunityId(this.getCommunityId());
        return communityService.indexMicroWishList(pageBaseDTO);
    }

    /**
     * 首页二级页面-随手拍
     */
    @ApiOperation(value = "首页二级页面-随手拍", response = BigScreenEasyPhotoStatisticsInfo.class)
    @GetMapping("/index/easyPhoto")
    public R indexEasyPhoto() {
        return communityService.indexEasyPhoto(this.getCommunityId());
    }

    /**
     * 首页二级页面-随手拍展示列表
     */
    @ApiOperation(value = "首页二级页面-随手拍展示列表", response = ComActEasyPhotoVO.class)
    @PostMapping("/index/easyPhotoList")
    public R indexEasyPhotoList(@RequestBody PageBaseDTO pageBaseDTO) {
        pageBaseDTO.setCommunityId(this.getCommunityId());
        return communityService.indexEasyPhotoList(pageBaseDTO);
    }

    /**
     * 首页二级页面-社区问卷
     */
    @ApiOperation(value = "首页二级页面-社区问卷", response = BigScreenQuestionnaireStatisticsInfo.class)
    @GetMapping("/index/questionnaire")
    public R indexQuestionnaire() {
        return communityService.indexQuestionnaire(this.getCommunityId());
    }

    /**
     * 首页二级页面-社区问卷展示列表
     */
    @ApiOperation(value = "首页二级页面-随手拍展示列表", response = ComActQuestnaireVO.class)
    @PostMapping("/index/questionnaireList")
    public R indexQuestionnaireList(@RequestBody PageBaseDTO pageBaseDTO) {
        pageBaseDTO.setCommunityId(this.getCommunityId());
        return communityService.indexQuestionnaireList(pageBaseDTO);
    }

    /**
     * 首页二级页面-社区动态
     */
    @ApiOperation(value = "首页二级页面-社区动态", response = BigScreenDynStatisticsInfo.class)
    @GetMapping("/index/dyn")
    public R indexDyn() {
        return communityService.indexDyn(this.getCommunityId());
    }

    /**
     * 首页二级页面-社区动态展示列表
     */
    @ApiOperation(value = "首页二级页面-社区动态展示列表", response = ComActDynVO.class)
    @PostMapping("/index/dynList")
    public R indexDynList(@RequestBody PageBaseDTO pageBaseDTO) {
        if (isNull(pageBaseDTO.getCommunityId())) {
            pageBaseDTO.setCommunityId(this.getCommunityId());
        }
        return communityService.indexDynList(pageBaseDTO);
    }

    /**
     * 首页二级页面-邻里圈
     */
    @ApiOperation(value = "首页二级页面-邻里圈", response = BigScreenNeighborStatisticsInfo.class)
    @GetMapping("/index/neighbor")
    public R indexNeighbor() {
        return communityService.indexNeighbor(this.getCommunityId());
    }

    @ApiOperation(value = "西区大数据分析平台-西区街道列表", response = EventPopulationStreetVO.class)
    @GetMapping("/comprehensive/street/list")
    public R getComprehensiveStreetList() {
        return communityService.getComprehensiveStreetList();
    }
    /**
     * 首页二级页面-邻里圈展示列表
     */
    @ApiOperation(value = "首页二级页面-邻里圈展示列表", response = ComActNeighborCircleAdminVO.class)
    @PostMapping("/index/neighborList")
    public R indexNeighborList(@RequestBody PageBaseDTO pageBaseDTO) {
        if (isNull(pageBaseDTO.getCommunityId())) {
            pageBaseDTO.setCommunityId(this.getCommunityId());
        }
        return communityService.indexNeighborList(pageBaseDTO);
    }

    @ApiOperation(value = "分页获取党建动态", response = BigScreenStatisticPartyOrg.class)
    @PostMapping("/comprehensive/partydyn")
    public R<BigScreenStatisticPartyOrg> partydyn(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO) {
        partyBuildingComPbDynVO.setType(1);
        return partyBuildingService.pageYnamic(partyBuildingComPbDynVO);
    }
    /**
     * 首页二级页面-便民商家
     */
    @ApiOperation(value = "首页二级页面-便民商家", response = BigScreenMerchantStatisticsInfo.class)
    @GetMapping("/index/merchant")
    public R indexMerchant() {
        return communityService.indexMerchant(this.getCommunityId());
    }

    @ApiOperation(value = "分页获取社区动态", response = ComActDynVO.class)
    @PostMapping("/comprehensive/pagedynamic")
    public R pageDynamic(@RequestBody ComActDynVO comActDynVO) {
        comActDynVO.setIsTopping(null);
        comActDynVO.setStatus(1);
        return communityService.pageDynamic(comActDynVO);
    }

    @ApiOperation(value = "通过社区id查询社区账号密码")
    @PostMapping("/get/community/password")
    public R getCommunityPassword(@RequestParam("communityId") Long communityId) {
        if(communityId == null){
            return R.fail("参数错误");
        }
        return communityService.getCommunityPassword(communityId);
    }
    /**
     * 首页二级页面-商家展示列表
     */
    @ApiOperation(value = "首页二级页面-商家展示列表", response = ConvenientMerchantVO.class)
    @PostMapping("/index/merchantList")
    public R indexMerchantList(@RequestBody PageBaseDTO pageBaseDTO) {
        pageBaseDTO.setCommunityId(this.getCommunityId());
        return communityService.indexMerchantList(pageBaseDTO);
    }

    /**
     * 社区服务大屏数据分析接口
     */
    @ApiOperation(value = "社区服务大屏数据分析接口", response = BigScreenServiceData.class)
    @GetMapping("/serviceData")
    public R serviceData(){
        return this.communityService.serviceData(this.getCommunityId());
    }

    /**
     * 服务居民接口
     */
    @ApiOperation(value = "社区服务大屏服务居民接口", response = BigScreenServiceUser.class)
    @GetMapping("/serviceUser")
    public R serviceUser(){
        return this.communityService.serviceUser(this.getCommunityId());
    }

    @ApiOperation(value = "大数据分析平台-居民自治", response = ResidentAutonomyStatisticsVO.class)
    @GetMapping("/resident/autonomy")
    public R getResidentAutonomy() {
        Long communityId = this.getCommunityId();
        if (communityId == null) {
            return R.fail(401, "请先登录");
        }
        return communityService.getResidentAutonomy(communityId);
    }

    @ApiOperation(value = "大数据分析平台-清网治格", response = GridsGovernanceStatisticsVO.class)
    @GetMapping("/grids/governance")
    public R getGridsGovernance() {
        Long communityId = this.getCommunityId();
        if (communityId == null) {
            return R.fail(401, "请先登录");
        }
        return communityService.getGridsGovernance(communityId);
    }

    @ApiOperation(value = "新版事件大屏画圈展示事件坐标点接口", response = GridsGovernanceStatisticsVO.class)
    @PostMapping("/civil/draw/list-new")
    public R civilDrawListNew(@RequestBody ScreenDrawEventListDTO eventListDTO) {
        Long id = this.getCommunityId();
        if (id == null) {
            return R.fail(401, "请先登录");
        }
        eventListDTO.setCommunityId(id);
        return gridService.getCivilDrawListNew(eventListDTO);
    }

    @ApiOperation(value = "新版根据小区id获取小区信息", response = GridsGovernanceStatisticsVO.class)
    @GetMapping("/civil/village/statistics-new")
    public R civilVillageStatisticsNew(@RequestParam("villageId") Long villageId) {
        if (villageId == null) {
            return R.fail("参数错误");
        }
        return gridService.civilVillageStatisticsNew(villageId);
    }

    @ApiOperation(value = "大数据分析平台-社区服务", response = BigScreenCommunityStatisticsVO.class)
    @GetMapping("/community/service")
    public R getCommunityServiceStatistics() {
        Long communityId = this.getCommunityId();
        if (communityId == null) {
            return R.fail(401, "请先登录");
        }
        return communityService.getCommunityServiceStatistics(communityId);
    }

    @ApiOperation(value = "分页获取热度排行商家", response = ConvenientMerchantVO.class)
    @PostMapping("/merchant/popular")
    public R getScreenPopularMerchants(@RequestBody PagePopularMerchantDTO pagePopularMerchantDTO) {
        Long communityId = this.getCommunityId();
        if (communityId == null) {
            return R.fail(401, "请先登录");
        }
        pagePopularMerchantDTO.setCommunityId(communityId);
        return communityService.getScreenPopularMerchants(pagePopularMerchantDTO);
    }

    /**
     * 首页二级页面-居民活动
     */
    @ApiOperation(value = "首页二级页面-居民活动", response = BigScreenResidentActStatisticsInfo.class)
    @GetMapping("/index/residentAct")
    public R indexResidentAct() {
        return communityService.indexResidentAct(this.getCommunityId());
    }

    /**
     * 首页二级页面-居民活动展示列表
     */
    @ApiOperation(value = "首页二级页面-居民活动展示列表", response = ComActActivityVO.class)
    @PostMapping("/index/residentActList")
    public R indexResidentActList(@RequestBody PageBaseDTO pageBaseDTO) {
        if (isNull(pageBaseDTO.getCommunityId())) {
            pageBaseDTO.setCommunityId(this.getCommunityId());
        }
        return communityService.indexResidentActList(pageBaseDTO);
    }

    /**
     * 首页二级页面-志愿者活动
     */
    @ApiOperation(value = "首页二级页面-志愿者活动", response = BigScreenVolunteerActStatisticsInfo.class)
    @GetMapping("/index/volunteerAct")
    public R indexVolunteerAct() {
        return communityService.indexVolunteerAct(this.getCommunityId());
    }

    /**
     * 首页二级页面-志愿者活动展示列表
     */
    @ApiOperation(value = "首页二级页面-志愿者活动展示列表", response = ComActActivityVO.class)
    @PostMapping("/index/volunteerActList")
    public R indexVolunteerActList(@RequestBody PageBaseDTO pageBaseDTO) {
        if (isNull(pageBaseDTO.getCommunityId())) {
            pageBaseDTO.setCommunityId(this.getCommunityId());
        }
        return communityService.indexVolunteerActList(pageBaseDTO);
    }

    @ApiOperation(value = "查询所有社区", response = StreetAllAppletsVO.class)
    @GetMapping("/list/act")
    public R list() {
        return communityService.communitySwitchList(this.getAreaCode());
    }

    @ApiOperation(value = "清网治格-根据事件分类获取近1月的社区事件数据", response = EventGridIncidentStatisticsVO.class)
    @ApiImplicitParam(name = "type", value = "事件状态(1治安防控、2民生服务、3矛盾劝解、4不稳定因素、5突发事件报告、6特殊人群服务、9防灾减灾、10其他", required = true)
    @GetMapping("/event/list")
    public R getEventList(@RequestParam(value = "type") Integer type) {
        return communityService.getEventList(type, this.getCommunityId());
    }

    @ApiOperation(value = "清网治格-社区事件数据分页", response = EventGridIncidentStatisticsVO.class)
    @PostMapping("/event/page")
    public R pageEventList(@RequestBody PageBaseDTO pageBaseDTO) {
        if (isNull(pageBaseDTO.getCommunityId())) {
            pageBaseDTO.setCommunityId(this.getCommunityId());
        }
        return communityService.pageEventList(pageBaseDTO);
    }
}

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

@@ -101,6 +101,7 @@
            Long communityId = this.getCommunityId();
            pageReserveDTO.setCommunityId(communityId);
        }
        pageReserveDTO.setAreaCode(this.getAreaCode());
        return communityService.pageReserveAdmin(pageReserveDTO);
    }

@@ -426,6 +427,7 @@
            return R.fail("请先登录");
        }
        makeHandleDTO.setUserId(loginUserInfo.getUserId());
        makeHandleDTO.setAreaCode(this.getAreaCode());
        return communityService.makeHandleAdmin(makeHandleDTO);
    }

@@ -750,6 +752,6 @@
    @ApiOperation(value = "查询西区社区列表")
    @GetMapping("/westList/noToken")
    public R getWestCommunityLists() {
        return communityService.getWestCommunityLists();
        return communityService.getWestCommunityLists(null);
    }
}

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

@@ -18,6 +18,7 @@
import com.panzhihua.common.model.dtos.community.PageComPropertyPublicityDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngVillageVO;
import com.panzhihua.common.model.vos.community.ComActPictureLibraryVO;
import com.panzhihua.common.model.vos.community.ComPropertyPublicityVO;
import com.panzhihua.common.model.vos.community.ComPropertyVO;

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

@@ -157,6 +157,9 @@
            Long communityId = this.getCommunityId();
            comSwPatrolRecordPageDTO.setCommunityId(communityId);
        }
        if(StringUtils.isNotEmpty(this.getAreaCode())){
            comSwPatrolRecordPageDTO.setAreaCode(this.getAreaCode());
        }
        return communityService.pageSafetyWorkRecord(comSwPatrolRecordPageDTO);
    }

@@ -217,6 +220,7 @@
            Long communityId = this.getCommunityId();
            comSwPatrolRecordPageDTO.setCommunityId(communityId);
        }
        comSwPatrolRecordPageDTO.setAreaCode(this.getAreaCode());
        return communityService.pageDangerReport(comSwPatrolRecordPageDTO);
    }


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

@@ -21,6 +21,8 @@
import javax.validation.Valid;

import com.panzhihua.common.model.vos.community.ComActActivityTypeVO;
import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
import io.swagger.annotations.ApiImplicitParams;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
@@ -237,11 +239,11 @@
                                if (R.isOk(r2)) {
                                    log.info("新增取消社区活动通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
                                }

                                R<SysTemplateConfigVO> r4=userService.selectTemplate(this.getAreaCode(),3);
                                // 取消社区活动推送订阅消息给用户
                                WxUtil.sendSubscribeHDQX(activitySignVO1.getOpenid(), accessToken,
                                    comActActivityVO.getActivityName(),
                                    DateUtils.format(comActActivityVO.getBeginAt(), DateUtils.ymdhms_format));
                                    DateUtils.format(comActActivityVO.getBeginAt(), DateUtils.ymdhms_format),r4.getData().getTemplateId());
                            });
                        } catch (Exception e) {
                            log.error("新增取消社区活动通知失败，错误原因：" + e.getMessage());
@@ -278,6 +280,7 @@
        if (R.isOk(r)) {
            List<ComActActSignExcelVO> excelVOS =
                    JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComActActSignExcelVO.class);
            excelVOS.forEach(e -> e.generateCondition());
            try {
                SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
                sftp.login();
@@ -290,8 +293,7 @@
                    InputStream inputStream = null;
                    try {
                        excelWriter = EasyExcel.write(fileName, ComActActSignExcelVO.class)
                                .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                                .registerWriteHandler(new CustomSheetWriteHandler()).build();
                                .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).build();
                        WriteSheet writeSheet = EasyExcel.writerSheet("活动报名名单导出数据").build();
                        excelWriter.write(excelVOS, writeSheet);
                        excelWriter.finish();
@@ -764,7 +766,7 @@
    @ApiOperation(value = "查询西区社区列表")
    @GetMapping("community/westList")
    public R getWestCommunityLists() {
        return communityService.getWestCommunityLists();
        return communityService.getWestCommunityLists(this.getAreaCode());
    }

    @ApiOperation(value = "随手拍详情", response = ComActEasyPhotoVO.class)
@@ -850,9 +852,10 @@
                                    result = result.substring(0, 4);
                                    result += "…";
                                }
                                R<SysTemplateConfigVO> sysTemplateConfigVO=userService.selectTemplate(this.getAreaCode(),4);
                                WxUtil.sendSubscribeSHZT(openid, util.getAppAccessToken(), "微心愿",
                                    DateUtils.format(comActMicroWishVO1.getExamineAt(), DateUtils.ymdhms_format),
                                    result);
                                    result,sysTemplateConfigVO.getData().getTemplateId());
                            } catch (Exception e) {
                                log.error("消息推送失败，失败原因：" + e.getMessage());
                            }
@@ -890,10 +893,11 @@
                        if (R.isOk(userResult)) {
                            String openid = userResult.getData().toString();
                            WxXCXTempSend util = new WxXCXTempSend();
                            R<SysTemplateConfigVO> sysTemplateConfigVO=userService.selectTemplate(this.getAreaCode(),4);
                            try {
                                WxUtil.sendSubscribeSHZT(openid, util.getAppAccessToken(), "微心愿",
                                    DateUtils.format(comActMicroWishVO1.getExamineAt(), DateUtils.ymdhms_format),
                                    "审核通过");
                                    "审核通过",sysTemplateConfigVO.getData().getTemplateId());
                            } catch (Exception e) {
                                log.error("消息推送失败，失败原因：" + e.getMessage());
                            }
@@ -943,6 +947,7 @@
        if(comActEasyPhotoVO.getHandlerId() == null){
            comActEasyPhotoVO.setHandlerId(userId);
        }
        R<SysTemplateConfigVO> sysTemplateConfigVO=userService.selectTemplate(this.getAreaCode(),4);
        R r = communityService.putEasypHotoStatus(comActEasyPhotoVO);
        if (R.isOk(r)) {
            R r1 = communityService.detailEasyPhoto(id, userId);
@@ -978,7 +983,7 @@
                                result += "…";
                            }
                            WxUtil.sendSubscribeSHZT(openid, util.getAppAccessToken(), "随手拍",
                                DateUtils.format(comActEasyPhotoVO1.getExamineAt(), DateUtils.ymdhms_format), result);
                                DateUtils.format(comActEasyPhotoVO1.getExamineAt(), DateUtils.ymdhms_format), result,sysTemplateConfigVO.getData().getTemplateId());
                        } catch (Exception e) {
                            log.error("消息推送失败，失败原因：" + e.getMessage());
                        }
@@ -1005,7 +1010,7 @@
                        WxXCXTempSend util = new WxXCXTempSend();
                        try {
                            WxUtil.sendSubscribeSHZT(openid, util.getAppAccessToken(), "随手拍",
                                DateUtils.format(comActEasyPhotoVO1.getExamineAt(), DateUtils.ymdhms_format), "审核通过");
                                DateUtils.format(comActEasyPhotoVO1.getExamineAt(), DateUtils.ymdhms_format), "审核通过",sysTemplateConfigVO.getData().getTemplateId());
                        } catch (Exception e) {
                            log.error("消息推送失败，失败原因：" + e.getMessage());
                        }
@@ -1034,6 +1039,7 @@
    @PostMapping("grantReward")
    public R grantReward(@Valid @RequestBody GrantRewardDTO grantRewardDTO) {
        grantRewardDTO.setUserId(this.getUserId());
        grantRewardDTO.setAreaCode(this.getAreaCode());
        if (grantRewardDTO.getAmount() == null || grantRewardDTO.getAmount().compareTo(BigDecimal.ZERO) < -1) {
            return R.fail("您输入的发放金额有误");
        }
@@ -1107,9 +1113,16 @@
    }

    @ApiOperation(value = "获取活动类型（目前只有志愿者活动需要获取）", response = ComActActivityTypeVO.class)
    @ApiImplicitParam(name = "type", value = "活动类型（1.志愿者 2.居民 3.党员）", required = true)
    @ApiImplicitParams({
            @ApiImplicitParam(name = "type", value = "活动类型（1.志愿者 2.居民 3.党员）", required = true),
            @ApiImplicitParam(name = "communityId", value = "社区id", required = false)
    })
    @GetMapping("activity/type/list")
    public R listActivityType(@RequestParam("type") Integer type) {
        return communityService.listActivityType(getCommunityId(), type);
    public R listActivityType(@RequestParam("type") Integer type,
                              @RequestParam(value = "communityId", required = false) Long communityId) {
        if (isNull(communityId)) {
            communityId = getCommunityId();
        }
        return communityService.listActivityType(communityId, type);
    }
}

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

@@ -11,6 +11,12 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.community_backstage.util.BaseUtils;
import lombok.Data;
import org.apache.commons.io.FilenameUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.validation.annotation.Validated;
@@ -40,11 +46,6 @@
import com.panzhihua.common.model.dtos.community.convenient.PageConvenientMerchantDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.ComCvtBusinessVO;
import com.panzhihua.common.model.vos.community.ComCvtCategoryVO;
import com.panzhihua.common.model.vos.community.ComCvtServeExcelVO;
import com.panzhihua.common.model.vos.community.ComCvtServeVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientServiceCategoryVO;
import com.panzhihua.common.model.vos.community.convenient.ExportMerchantVO;
@@ -121,7 +122,7 @@
    @ApiOperation(value = "社区下拉列表", response = ComActVO.class)
    @GetMapping("/community")
    public R listCommunity() {
        return communityService.listCommunityAll();
        return communityService.listCommunityAll(this.getAreaCode());
    }

    @Deprecated
@@ -216,14 +217,16 @@
    }

    @ApiOperation(value = "上传文件")
    @PostMapping(value = "/upload/file/noToken", consumes = "multipart/*", headers = "content-type=multipart/form-date")
    public R uploadImageNoToken(@RequestParam MultipartFile file, HttpServletRequest request) {
        String extension = FilenameUtils.getExtension(file.getOriginalFilename());
        String name = UUID.randomUUID().toString().replaceAll("-", "") + "." + extension;
    @PostMapping(value = "/upload/file/noToken")
    public R uploadImageNoToken(@RequestBody Base64File file, HttpServletRequest request) {
        if(StringUtils.isEmpty(file.getFile())){
            return R.fail("文件不能为Null");
        }
        String name = UUID.randomUUID().toString().replaceAll("-", "")+".jpg";
        try {
            SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
            sftp.login();
            InputStream is = file.getInputStream();
            InputStream is = BaseUtils.base64StrToInputStream(file.getFile().replace("data:image/png;base64,","").replace("data:image/jpg;base64,","").replace("data:image/jpeg;base64,",""));
            sftp.uploadMore(FtpConstants.FTPFILEPATH_IDCARD, name, is);
            sftp.logout();
            return R.ok(url + "/idcard/" + name);

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

@@ -13,6 +13,7 @@

import javax.annotation.Resource;

import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
@@ -446,10 +447,11 @@

                if (R.isOk(userResult)) {
                    String openid = userResult.getData().toString();
                    R<SysTemplateConfigVO> sysTemplateConfigVO=userService.selectTemplate(this.getAreaCode(),5);
                    WxXCXTempSend util = new WxXCXTempSend();
                    try {
                        WxUtil.sendSubscribeRZSH(openid, util.getAppAccessToken(), "志愿者认证",
                            DateUtils.format(comMngVolunteerMngVO1.getCreateAt(), DateUtils.ymdhms_format), "审核通过");
                            DateUtils.format(comMngVolunteerMngVO1.getCreateAt(), DateUtils.ymdhms_format), "审核通过",sysTemplateConfigVO.getData().getTemplateId());
                    } catch (Exception e) {
                        log.error("消息推送失败，失败原因：" + e.getMessage());
                    }
@@ -465,11 +467,12 @@

                if (R.isOk(userResult)) {
                    String openid = userResult.getData().toString();
                    R<SysTemplateConfigVO> sysTemplateConfigVO=userService.selectTemplate(this.getAreaCode(),5);
                    WxXCXTempSend util = new WxXCXTempSend();
                    try {
                        WxUtil.sendSubscribeRZSH(openid, util.getAppAccessToken(), "志愿者认证",
                            DateUtils.format(comMngVolunteerMngVO1.getCreateAt(), DateUtils.ymdhms_format),
                            "审核驳回，驳回原因：" + comMngVolunteerMngVO1.getRejectReson());
                            "审核驳回，驳回原因：" + comMngVolunteerMngVO1.getRejectReson(),sysTemplateConfigVO.getData().getTemplateId());
                    } catch (Exception e) {
                        log.error("消息推送失败，失败原因：" + e.getMessage());
                    }

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

@@ -11,6 +11,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
import com.panzhihua.community_backstage.config.MinioUtil;
import org.apache.commons.io.FilenameUtils;
import org.springframework.beans.factory.annotation.Value;
@@ -607,10 +608,11 @@
                R r1 = userService.getUserOpenId(userId);
                if (R.isOk(r1)) {
                    String openid = r1.getData().toString();
                    R<SysTemplateConfigVO> sysTemplateConfigVO=userService.selectTemplate(this.getAreaCode(),5);
                    WxXCXTempSend util = new WxXCXTempSend();
                    try {
                        WxUtil.sendSubscribeRZSH(openid, util.getAppAccessToken(), "党员认证",
                            DateUtils.format(vo1.getCreateAt(), DateUtils.ymdhms_format), "审核通过");
                            DateUtils.format(vo1.getCreateAt(), DateUtils.ymdhms_format), "审核通过",sysTemplateConfigVO.getData().getTemplateId());
                    } catch (Exception e) {
                        log.error("消息推送失败，失败原因：" + e.getMessage());
                    }
@@ -637,11 +639,12 @@
                    R r2 = userService.getUserOpenId(userId);
                    if (R.isOk(r2)) {
                        String openid = r2.getData().toString();
                        R<SysTemplateConfigVO> sysTemplateConfigVO=userService.selectTemplate(this.getAreaCode(),5);
                        WxXCXTempSend util = new WxXCXTempSend();
                        try {
                            WxUtil.sendSubscribeRZSH(openid, util.getAppAccessToken(), "党员认证",
                                DateUtils.format(vo1.getCreateAt(), DateUtils.ymdhms_format),
                                "审核驳回，驳回原因：" + partyBuildingMemberVO.getRefuseReason());
                                "审核驳回，驳回原因：" + partyBuildingMemberVO.getRefuseReason(),sysTemplateConfigVO.getData().getTemplateId());
                        } catch (Exception e) {
                            log.error("消息推送失败，失败原因：" + e.getMessage());
                        }

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

@@ -227,6 +227,7 @@
    R addFeedback(@Validated @RequestBody EldersAuthFeedbackAddDTO eldersAuthFeedbackAddDTO) {
        ClazzUtils.setIfStringIsEmpty(eldersAuthFeedbackAddDTO);
        eldersAuthFeedbackAddDTO.setUserId(getUserId());
        eldersAuthFeedbackAddDTO.setAreaCode(this.getAreaCode());
        return communityService.addFeedback(eldersAuthFeedbackAddDTO);
    }

@@ -282,6 +283,7 @@
    @PostMapping("/authRecords/examine")
    public R examineElderAuthRecords(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO) {
        comElderAuthRecordVO.setApproverId(this.getUserId());
        comElderAuthRecordVO.setAreaCode(this.getAreaCode());
        return communityService.examineElderAuthRecords(comElderAuthRecordVO);
    }

@@ -577,6 +579,7 @@
    @PostMapping("/pensionAuthRecords/examine")
    public R examinePensionAuthRecords(@RequestBody ComPensionAuthRecordVO comPensionAuthRecordVO) {
        comPensionAuthRecordVO.setApproverId(this.getUserId());
        comPensionAuthRecordVO.setAreaCode(this.getAreaCode());
        return communityService.examinePensionAuthRecords(comPensionAuthRecordVO);
    }

@@ -616,6 +619,7 @@
    R addPensionAuthRecordVO(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO){
        comElderAuthRecordVO.setSubmitUserId(this.getUserId());
        comElderAuthRecordVO.setCommunityId(this.getCommunityId());
        comElderAuthRecordVO.setAreaCode(this.getAreaCode());
        return communityService.addPensionAuthRecordVO(comElderAuthRecordVO);
    }


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

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

import javax.annotation.Resource;

import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -71,7 +72,7 @@
            return R.fail("房屋租售id主键不能为空");
        }
        R r = communityService.putOpsHouse(comOpsHouseVO);

        R<SysTemplateConfigVO> sysTemplateConfigVO=userService.selectTemplate(this.getAreaCode(),4);
        Date nowDate = new Date();
        //查询用户openid
        R userResult = null;
@@ -101,7 +102,7 @@
                WxXCXTempSend util = new WxXCXTempSend();
                try {
                    WxUtil.sendSubscribeSHZT(openid, util.getAppAccessToken(), "房屋租售",
                        DateUtils.format(nowDate, DateUtils.ymdhms_format), "审核通过");
                        DateUtils.format(nowDate, DateUtils.ymdhms_format), "审核通过",sysTemplateConfigVO.getData().getTemplateId());
                } catch (Exception e) {
                    log.error("消息推送失败，失败原因：" + e.getMessage());
                }
@@ -136,7 +137,7 @@
                        result += "…";
                    }
                    WxUtil.sendSubscribeSHZT(openid, util.getAppAccessToken(), "房屋租售",
                        DateUtils.format(nowDate, DateUtils.ymdhms_format), result);
                        DateUtils.format(nowDate, DateUtils.ymdhms_format), result,sysTemplateConfigVO.getData().getTemplateId());
                } catch (Exception e) {
                    log.error("消息推送失败，失败原因：" + e.getMessage());
                }

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

@@ -88,4 +88,18 @@
        return r;
    }

    @ApiOperation(value = "西区大屏登录", response = LoginReturnVO.class)
    @PostMapping("xq/login")
    public R xqdpLogin(@RequestBody LoginBody loginBody) {
        String account = loginBody.getAccount();
        String password = loginBody.getPassword();
        boolean empty = ObjectUtils.isEmpty(account);
        boolean empty1 = ObjectUtils.isEmpty(password);
        if (empty || empty1) {
            return R.fail("账户密码不能为空");
        }
        R r = tokenService.loginXQDP(account, password);
        return r;
    }

}

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

@@ -19,6 +19,8 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;

import static java.util.Objects.isNull;

/**
 * @auther llming
 * @describe
@@ -155,7 +157,9 @@
    @ApiOperation(value = "分页查询邻里圈话题列表", response = ComActNeighborCircleTopicAdminVO.class)
    @PostMapping("pageNeighborTopicByAdmin")
    public R pageNeighborTopicByAdmin(@RequestBody ComActNeighborCircleTopicAdminDTO circleTopicAdminDTO) {
        circleTopicAdminDTO.setCommunityId(this.getCommunityId());
        if (isNull(circleTopicAdminDTO.getCommunityId())) {
            circleTopicAdminDTO.setCommunityId(this.getCommunityId());
        }
        return communityService.pageNeighborTopicByAdmin(circleTopicAdminDTO);
    }


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

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

import javax.annotation.Resource;

import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStaticsReserve;
import org.springframework.web.bind.annotation.*;

import com.panzhihua.common.controller.BaseController;
@@ -284,4 +285,9 @@
        return communityService.detailDynamic(id);
    }

    @ApiOperation(value = "安全防控",response = BigScreenStaticsReserve.class)
    @GetMapping("/reserve")
    public R reserve(){
        return communityService.bigScreenStaticsReserve(this.getCommunityId());
    }
}

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

@@ -83,7 +83,7 @@
    @GetMapping("listrolebackstage")
    public R listRoleBackstage(@RequestParam("pageNum")Integer pageNum,@RequestParam("pageSize")Integer pageSize) {
        Long communityId = this.getCommunityId();
        return userService.listRoleBackstage(communityId,pageNum,pageSize);
        return userService.listRoleBackstage(communityId,pageNum,pageSize,"");
    }

    @ApiOperation(value = "分页查询后台用户", response = AdministratorsUserVO.class)

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/util/BaseUtils.java

New file
@@ -0,0 +1,24 @@
package com.panzhihua.community_backstage.util;


import org.bouncycastle.util.encoders.Base64;

import java.io.*;

/**
 * @author zzj
 */
public class BaseUtils {


    public static InputStream base64StrToInputStream(String base64string) {
        ByteArrayInputStream stream = null;
        try {
            byte[] bytes = Base64.decode(base64string);
            stream = new ByteArrayInputStream(bytes);
        } catch (Exception e) {
            e.printStackTrace();
        }
        return stream;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonEventApi.java

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

import javax.annotation.Resource;

import com.panzhihua.common.model.vos.grid.GridMemberPositionDTO;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

@@ -80,7 +81,16 @@
        commonEventAddDTO.setUserId(loginUserInfoVO.getUserId());
        commonEventAddDTO.setUserName(loginUserInfoVO.getNickName());
        commonEventAddDTO.setPhone(loginUserInfoVO.getPhone());
        return gridService.addCommon(commonEventAddDTO);
        R r = gridService.addCommon(commonEventAddDTO);
        if(R.isOk(r)){
            GridMemberPositionDTO memberPositionDTO = new GridMemberPositionDTO();
            memberPositionDTO.setGridMemberId(loginUserInfoVO.getUserId());
            memberPositionDTO.setPositionAddress(commonEventAddDTO.getHappenAddress());
            String []lngLatString = commonEventAddDTO.getHappentLatLng().split(",");
            memberPositionDTO.setLngLat(lngLatString[1] + "," + lngLatString[0]);
            gridService.gridReportPosition(memberPositionDTO);
        }
        return r;
    }

    /**

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

@@ -85,4 +85,24 @@
        bigscreenPartyactivity(@RequestBody BigScreenStatisticPartyActivityDTO bigScreenStatisticPartyActivityDTO) {
        return bigScreenService.bigscreenPartyactivity(bigScreenStatisticPartyActivityDTO);
    }

    /**
     * 党员活动折线图
     * @param communityId
     * @return
     */
    @GetMapping("/partyActivityLine")
    public R partyActivityLine(@RequestParam("communityId")Long communityId){
        return bigScreenService.partyActivityLine(communityId);
    }

    /**
     * 党员积分前3
     * @param pageBigScreenStatisticPartyOrg
     * @return
     */
    @PostMapping("/partyActivityTop")
    public R partyActivityTop(@RequestBody PageBigScreenStatisticPartyOrg pageBigScreenStatisticPartyOrg){
        return bigScreenService.partyActivityTop(pageBigScreenStatisticPartyOrg);
    }
}

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

@@ -2,6 +2,11 @@

import javax.annotation.Resource;

import com.panzhihua.service_community.service.ComActService;
import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
import com.panzhihua.service_community.service.BigScreenStatisticsService;
import com.panzhihua.service_community.service.BigScreenService;
import org.springframework.web.bind.annotation.*;

import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDTO;
@@ -18,6 +23,12 @@

    @Resource
    private ComMngPopulationService comMngPopulationService;
    @Resource
    private ComActService comActService;
    @Resource
    private BigScreenService bigScreenService;
    @Resource
    private BigScreenStatisticsService bigScreenStatisticsService;

    /**
     * 首页大屏统计接口
@@ -79,4 +90,270 @@
        return R.ok(comMngPopulationService.getScreenEventDetail(eventDetailDTO));
    }

    /**
     * 西区大屏治理数据
     */
    @GetMapping("/getWestScreenStatics")
    public R westScreenStatics(){
        return comMngPopulationService.westScreenStatics();
    }

    @GetMapping("/getComprehensivePopulationStatics")
    public R getComprehensivePopulationStatics(@RequestParam("streetId") Long streetId){
        return comMngPopulationService.getComprehensivePopulationStatics(streetId);
    }

    @GetMapping("/getComprehensiveStreetList")
    public R getComprehensiveStreetList(){
        return comMngPopulationService.getComprehensiveStreetList();
    }


    @GetMapping("/getCommunityPassword")
    public R getCommunityPassword(@RequestParam("communityId") Long communityId){
        return comActService.getCommunityPassword(communityId);
    }
    /**
     * 新版大屏首页接口
     */
    @GetMapping("/indexInfo")
    public R indexInfo(@RequestParam("communityId") Long communityId){
        return comMngPopulationService.indexInfo(communityId);
    }

    /**
     * 首页二级页面-微心愿
     * @param communityId
     * @return
     */
    @GetMapping("/index/microWish")
    public R indexMicroWish(@RequestParam("communityId") Long communityId) {
        return bigScreenStatisticsService.indexMicroWish(communityId);
    }

    /**
     * 首页二级页面-随手拍
     * @param communityId
     * @return
     */
    @GetMapping("/index/easyPhoto")
    public R indexEasyPhoto(@RequestParam("communityId") Long communityId) {
        return bigScreenStatisticsService.indexEasyPhoto(communityId);
    }

    /**
     * 首页二级页面-随手拍展示列表
     * @return
     */
    @PostMapping("/index/easyPhotoList")
    public R indexEasyPhotoList(@RequestBody PageBaseDTO pageBaseDTO) {
        return bigScreenStatisticsService.indexEasyPhotoList(pageBaseDTO);
    }

    /**
     * 首页二级页面-社区问卷
     * @param communityId
     * @return
     */
    @GetMapping("/index/questionnaire")
    public R indexQuestionnaire(@RequestParam("communityId") Long communityId) {
        return bigScreenStatisticsService.indexQuestionnaire(communityId);
    }

    /**
     * 首页二级页面-社区动态
     * @param communityId
     * @return
     */
    @GetMapping("/index/dyn")
    public R indexDyn(@RequestParam("communityId") Long communityId) {
        return bigScreenStatisticsService.indexDyn(communityId);
    }

    /**
     * 首页二级页面-社区动态展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/index/dynList")
    public R indexDynList(@RequestBody PageBaseDTO pageBaseDTO) {
        return bigScreenStatisticsService.indexDynList(pageBaseDTO);
    }

    /**
     * 首页二级页面-邻里圈
     * @param communityId
     * @return
     */
    @GetMapping("/index/neighbor")
    public R indexNeighbor(@RequestParam("communityId") Long communityId) {
        return bigScreenStatisticsService.indexNeighbor(communityId);
    }

    /**
     * 首页二级页面-邻里圈展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/index/neighborList")
    public R indexNeighborList(@RequestBody PageBaseDTO pageBaseDTO) {
        return bigScreenStatisticsService.indexNeighborList(pageBaseDTO);
    }

    /**
     * 首页二级页面-便民商家
     * @param communityId
     * @return
     */
    @GetMapping("/index/merchant")
    public R indexMerchant(@RequestParam("communityId") Long communityId) {
        return bigScreenStatisticsService.indexMerchant(communityId);
    }

    /**
     * 首页二级页面-商家展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/index/merchantList")
    public R indexMerchantList(@RequestBody PageBaseDTO pageBaseDTO) {
        return bigScreenStatisticsService.indexMerchantList(pageBaseDTO);
    }

    /**
     * 首页二级页面-微心愿展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/index/microWishList")
    public R indexMicroWishList(@RequestBody PageBaseDTO pageBaseDTO) {
        return bigScreenStatisticsService.indexMicroWishList(pageBaseDTO);
    }

    /**
     * 首页二级页面-社区问卷展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/index/questionnaireList")
    public R indexQuestionnaireList(@RequestBody PageBaseDTO pageBaseDTO) {
        return bigScreenStatisticsService.indexQuestionnaireList(pageBaseDTO);
    }

    /**
     * 社区服务大屏数据分析接口
     */
    @GetMapping("/serviceData")
    public R serviceData(@RequestParam("communityId")Long communityId){
        return this.bigScreenService.serviceData(communityId);
    }

    /**
     * 服务居民接口
     */
    @GetMapping("/serviceUser")
    public R serviceUser(@RequestParam("communityId") Long communityId){
        return this.bigScreenService.serviceUser(communityId);
    }

    /**
     * 大数据分析平台-居民自治
     * @param communityId
     * @return
     */
    @GetMapping("/resident/autonomy")
    public R getResidentAutonomy(@RequestParam("communityId") Long communityId) {
        return bigScreenStatisticsService.getResidentAutonomy(communityId);
    }

    /**
     * 大数据分析平台-清网治格
     * @param communityId
     * @return
     */
    @GetMapping("/grids/governance")
    public R getGridsGovernance(@RequestParam("communityId") Long communityId) {
        return bigScreenStatisticsService.getGridsGovernance(communityId);
    }

    /**
     * 大数据分析平台-社区服务
     * @param communityId
     * @return
     */
    @GetMapping("/community/service")
    public R getCommunityServiceStatistics(@RequestParam("communityId") Long communityId) {
        return bigScreenStatisticsService.getCommunityServiceStatistics(communityId);
    }

    /**
     * 分页获取热度排行商家
     * @param pagePopularMerchantDTO
     * @return
     */
    @PostMapping("/merchant/popular")
    public R getScreenPopularMerchants(@RequestBody PagePopularMerchantDTO pagePopularMerchantDTO) {
        return bigScreenStatisticsService.getScreenPopularMerchants(pagePopularMerchantDTO);
    }

    /**
     * 首页二级页面-居民活动
     * @param communityId
     * @return
     */
    @GetMapping("/index/residentAct")
    public R indexResidentAct(@RequestParam("communityId") Long communityId) {
        return bigScreenStatisticsService.indexResidentAct(communityId);
    }

    /**
     * 首页二级页面-居民活动展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/index/residentActList")
    public R indexResidentActList(@RequestBody PageBaseDTO pageBaseDTO) {
        return bigScreenStatisticsService.indexResidentActList(pageBaseDTO);
    }

    /**
     * 首页二级页面-志愿者活动
     * @param communityId
     * @return
     */
    @GetMapping("/index/volunteerAct")
    public R indexVolunteerAct(@RequestParam("communityId") Long communityId) {
        return bigScreenStatisticsService.indexVolunteerAct(communityId);
    }

    /**
     * 首页二级页面-志愿者活动展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/index/volunteerActList")
    public R indexVolunteerActList(@RequestBody PageBaseDTO pageBaseDTO) {
        return bigScreenStatisticsService.indexVolunteerActList(pageBaseDTO);
    }

    /**
     * 清网治格-根据事件分类获取近1月的社区事件数据
     * @param type
     * @param communityId
     * @return
     */
    @GetMapping("/event/list")
    public R getEventList(@RequestParam(value = "type") Integer type, @RequestParam(value = "communityId") Long communityId) {
        return bigScreenStatisticsService.getEventList(type, communityId);
    }

    /**
     * 清网治格-社区事件数据分页
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/event/page")
    public R pageEventList(@RequestBody PageBaseDTO pageBaseDTO) {
        return bigScreenStatisticsService.pageEventList(pageBaseDTO);
    }
}

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

@@ -142,11 +142,11 @@
    }

    /**
     * 根据社区活动id查询社区活动报名人员列表
     * 根据社区活动id查询社区活动报名且未参与人员列表
     * 
     * @param activityId
     *            活动id
     * @return 社区活动报名人员列表
     * @return 社区活动报名且未参与人员列表
     */
    @PostMapping("/act/activity/admin")
    public R getTaskActivityPeopleList(@RequestParam("activityId") Long activityId) {

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

@@ -348,4 +348,9 @@
    public R exportHomeQuarantine(@RequestBody PageReserveRegisterDetailedAdminDTO detailedAdminDTO) {
        return comActReserveAnswerContentService.exportHomeQuarantine(detailedAdminDTO);
    }

    @GetMapping("/bigScreenStaticsReserve")
    public R bigScreenStaticsReserve(@RequestParam("communityId") Long communityId){
        return comActReserveAnswerContentService.bigScreenStaticsReserve(communityId);
    }
}

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

@@ -2,6 +2,8 @@

import static java.util.stream.Collectors.toList;

import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
@@ -12,6 +14,7 @@
import javax.annotation.Resource;

import com.panzhihua.common.model.vos.community.ComActActivityTypeVO;
import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
import com.panzhihua.service_community.dao.ComActActEvaluateDAO;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.*;
@@ -362,6 +365,23 @@
        comActActivityVO.setComActActEvaluateVOList(comActActEvaluatePage.getRecords());
        //活动评价总数
        comActActivityVO.setEvaluateAmount(comActActEvaluatePage.getTotal());
        List<ComActActEvaluateDO> comActActEvaluateList = comActActEvaluateDAO
                .selectList(new QueryWrapper<ComActActEvaluateDO>().lambda().eq(ComActActEvaluateDO::getActivityId, id));
        if (comActActEvaluateList != null && comActActEvaluateList.size() > 0) {
            BigDecimal starNum = BigDecimal.ZERO;
            //总星级
            for (ComActActEvaluateDO evaluate:comActActEvaluateList) {
                starNum = starNum.add(BigDecimal.valueOf(evaluate.getStarLevel()==null?0:evaluate.getStarLevel()));
            }
            //评分星级(如果无评分默认5分)=总星级/总评价人数
            if(starNum.compareTo(BigDecimal.ZERO) == 0){
                comActActivityVO.setEvaluateLevel(BigDecimal.valueOf(5));
            }else{
                comActActivityVO.setEvaluateLevel(starNum.divide(BigDecimal.valueOf(comActActEvaluateList.size()),2, RoundingMode.HALF_UP));
            }
        }else{
            comActActivityVO.setEvaluateLevel(BigDecimal.valueOf(5));
        }
        //当前用户对活动的评分
        ComActActEvaluateVO userActEvaluateVO = comActActEvaluateDAO.getEvaluateListByUserId(id,userId);
        if(userActEvaluateVO != null){
@@ -381,6 +401,7 @@
        //活动报名名单
        ActivitySignVO activitySignVO = new ActivitySignVO();
        activitySignVO.setActivityId(activityId);
        activitySignVO.setStatus(1);
        R r = comActActivityService.listActivitySigns(activitySignVO);
        if (R.isOk(r)) {
            List<ActivitySignVO> activitySignVOS =
@@ -1495,8 +1516,8 @@
     * @return 社区集合 按照创建顺序倒序排列
     */
    @PostMapping("listcommunityall")
    public R listCommunityAll() {
        return comActService.listCommunityAll();
    public R listCommunityAll(@RequestParam("areaCode") String areaCode) {
        return comActService.listCommunityAll(areaCode);
    }

    /**
@@ -2220,10 +2241,11 @@
                String openid = map.get("openid");
                try {
                    WxXCXTempSend util = new WxXCXTempSend();
                    R<SysTemplateConfigVO> sysTemplateConfigVO=userService.selectTemplate(eldersAuthFeedbackAddDTO.getAreaCode(),5);
                    String accessToken = util.getAppAccessToken();
                    WxUtil.sendSubscribeRZSH(openid, accessToken, "高龄认证",
                        DateUtils.format(eldersAuthDO.getCreateAt(), DateUtils.ymdhms_format),
                        eldersAuthFeedbackAddDTO.getFeedBack());
                        eldersAuthFeedbackAddDTO.getFeedBack(),sysTemplateConfigVO.getData().getTemplateId());
                } catch (Exception e) {
                    log.error("推送审核状态订阅消息失败，失败原因：" + e.getMessage());
                }
@@ -2295,8 +2317,8 @@
     * @return 社区列表
     */
    @GetMapping("/eventgrid/community/westList")
    public R getWestCommunityLists() {
        return comActService.getWestCommunityLists();
    public R getWestCommunityLists(String areaCode) {
        return comActService.getWestCommunityLists(areaCode);
    }

    /**

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

@@ -24,8 +24,8 @@
     * @return 社区列表
     */
    @GetMapping("/community/all/list")
    public R getCommunityAllList() {
        return comActService.getCommunityAllList();
    public R getCommunityAllList(@RequestParam("areaCode") String areaCode) {
        return comActService.getCommunityAllList(areaCode);
    }

    /**
@@ -36,8 +36,8 @@
     * @return 社区列表
     */
    @GetMapping("/community/search/list")
    public R communitySwitchSearchList(@RequestParam(value = "name") String name) {
        return comActService.communitySwitchSearchList(name);
    public R communitySwitchSearchList(@RequestParam(value = "name") String name,@RequestParam(value = "areaCode") String areaCode) {
        return comActService.communitySwitchSearchList(name,areaCode);
    }

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/config/MybatisHmkInterceptor.java

New file
@@ -0,0 +1,30 @@
package com.panzhihua.service_community.config;

import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.PluginUtils;
import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor;
import org.apache.ibatis.executor.Executor;
import org.apache.ibatis.mapping.BoundSql;
import org.apache.ibatis.mapping.MappedStatement;
import org.apache.ibatis.mapping.ParameterMapping;
import org.apache.ibatis.session.ResultHandler;
import org.apache.ibatis.session.RowBounds;

import java.lang.reflect.Field;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;

public class MybatisHmkInterceptor implements InnerInterceptor {
    @Override
    public void beforeQuery(Executor executor, MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler, BoundSql boundSql) throws SQLException {
        String sql=boundSql.getSql();
            if(sql.contains("community_id = 10086")){
                sql=sql.replace("community_id = 10086","community_id in (30,31)");
                PluginUtils.mpBoundSql(boundSql).sql(sql);
        }
        InnerInterceptor.super.beforeQuery(executor, ms, parameter, rowBounds, resultHandler, boundSql);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/config/MybatisPlusConfig.java

@@ -1,5 +1,6 @@
package com.panzhihua.service_community.config;

import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

@@ -23,6 +24,7 @@
    @Bean
    public MybatisPlusInterceptor mybatisPlusInterceptor() {
        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
        interceptor.addInnerInterceptor(new MybatisHmkInterceptor());
        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.H2));
        return interceptor;
    }

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

@@ -27,7 +27,7 @@

    @Select("<script> " + " SELECT org.id, org.name, COUNT(pm.id) as total " + " FROM com_pb_org  org "
        + " LEFT JOIN com_pb_member pm ON org.id = pm.org_id " + " <where> " + " org.status = 1 "
        + "<if test='pageDTO.communityId != null'>" + "  AND org.community_id = #{pageDTO.communityId} " + "</if> "
        + "<if test='pageDTO.communityId != null'>" + "  AND org.community_id = ${pageDTO.communityId} " + "</if> "
        + " </where>" + " GROUP BY org.id " +
        // " ORDER BY org.${pageDTO.sortBy} ${pageDTO.order} " +
        " ORDER BY total desc  " + "</script>")
@@ -42,7 +42,7 @@
        + "  when age &gt; 60  then '60以上' " + "  ELSE '' " + "  END AS lev " + " FROM ( "
        + "  SELECT id, id_card, ROUND(DATEDIFF(CURDATE(), STR_TO_DATE(SUBSTRING(id_card,7,15), '%Y%m%d'))/365.2422) AS age    "
        + "  FROM com_pb_member  " + " <where> " + " audit_result = 1 " + "<if test='queryDTO.communityId != null'> "
        + " AND  community_id = #{queryDTO.communityId} " + "</if> " + " </where>" + "  ) t     " + " )abt     "
        + " AND  community_id = ${queryDTO.communityId} " + "</if> " + " </where>" + "  ) t     " + " )abt     "
        + " GROUP BY abt.lev    " + " ) t2  " + "</script>")
    BigScreenStatisticAgeGender age(@Param("queryDTO") BigScreenStatisticAgeGenderDTO bigScreenStatisticAgeGenderDTO);

@@ -52,7 +52,7 @@
        + "  FROM ( "
        + "  SELECT CONVERT(SUBSTRING(id_card,'17',1), UNSIGNED INTEGER)%2 AS sxi, COUNT(id_card) AS total "
        + "  FROM com_pb_member " + " <where> " + " audit_result = 1 " + "<if test='queryDTO.communityId != null'>"
        + "  AND community_id = #{queryDTO.communityId} " + "</if> " + " </where>" + "  GROUP BY sxi  " + "  )t  "
        + "  AND community_id = ${queryDTO.communityId} " + "</if> " + " </where>" + "  GROUP BY sxi  " + "  )t  "
        + " ) t2  " + "</script>")
    BigScreenStatisticAgeGender
        gender(@Param("queryDTO") BigScreenStatisticAgeGenderDTO bigScreenStatisticAgeGenderDTO);
@@ -60,15 +60,17 @@
    @Select("<script> " + "  SELECT   " + " SUM(CASE TYPE WHEN 1 THEN total ELSE 0 END) as 'orgCount',  "
        + " SUM(CASE TYPE WHEN 2 THEN total ELSE 0 END) as 'memberCount',  "
        + " SUM(CASE TYPE WHEN 3 THEN total ELSE 0 END) as 'activityCount',  "
        + " SUM(CASE TYPE WHEN 4 THEN total ELSE 0 END) as 'dynCount'  " + " FROM (  "
        + " SUM(CASE TYPE WHEN 4 THEN total ELSE 0 END) as 'dynCount',SUM(CASE TYPE WHEN 5 THEN total ELSE 0 END) as 'committeeCount'  " + " FROM (  "
        + " SELECT 1 AS TYPE , COUNT(id) total  " + " FROM com_pb_org org   "
        + " WHERE org.community_id  = #{communityId} AND STATUS=1  " + " UNION ALL   "
        + " WHERE org.community_id = ${communityId} AND STATUS=1  " + " UNION ALL   "
        + " SELECT 2 AS TYPE , COUNT(id) total  " + " FROM  com_pb_member   "
        + " WHERE community_id  = #{communityId} AND audit_result = 1  " + " UNION ALL   "
        + " WHERE community_id = ${communityId} AND audit_result = 1  " + " UNION ALL   "
        + " SELECT 3 AS TYPE , COUNT(id) total  " + " FROM  com_pb_activity  "
        + " WHERE community_id  = #{communityId} AND STATUS IN (2,3,4,5)  " + " UNION ALL   "
        + " WHERE community_id = ${communityId} AND STATUS IN (2,3,4,5)  " + " UNION ALL   "
        + " SELECT 4 AS TYPE , COUNT(id) total  " + " FROM  com_pb_dyn   "
        + " WHERE community_id  = #{communityId} AND TYPE = 1  " + ") t" + "</script>")
        + " WHERE community_id = ${communityId} AND TYPE = 1  UNION ALL " +
            "select 5 AS TYPE,count(id) total      from com_pb_member_role " +
            "where community_id = ${communityId}" + ") t" + "</script>")
    BigScreenStatisticPartyBuild partybuild(@Param("communityId") Long communityId);

    @Select("<script> " + " SELECT pm.id, pm.member_id, pm.user_id, pm.name, " + " case "
@@ -78,7 +80,7 @@
        + " ,COUNT(pa.id) AS total   "
        + " FROM com_pb_activity_member  pm  LEFT JOIN com_pb_activity pa  ON pm.activity_id = pa.id  "
        + " LEFT JOIN com_pb_member me ON pm.member_id = me.id  "
        + " WHERE pa.community_id = #{communityId}  AND me.id IS NOT null  " + " GROUP BY pm.member_id  "
        + " WHERE pa.community_id = ${communityId}  AND me.id IS NOT null  " + " GROUP BY pm.member_id  "
        + " ORDER BY total DESC  " + " LIMIT 3  " + "</script>")
    List<PartyBuildingMemberVO> bigscreenPartyactivitytopuser(@Param("communityId") Long communityId);

@@ -86,7 +88,7 @@
        + " when photo_path IS NOT NULL then  photo_path  "
        + " when CAST(SUBSTRING(id_card , 17, 1) AS SIGNED)%2=1 then 'https://www.psciio.com/idcard/tst/idcard/a723e5bcbd594a48956ef9354c8b477c.jpg' "
        + " ELSE 'https://www.psciio.com/idcard/tst/idcard/cfb9b58913074068bba8c7002f91e7ff.jpg' END AS photo_path , "
        + " 0 AS total  " + " FROM  com_pb_member " + " WHERE community_id=#{communityId}  "
        + " 0 AS total  " + " FROM  com_pb_member " + " WHERE community_id = ${communityId}  "
        + " ORDER BY join_time ASC  " + " LIMIT 3  " + "</script>")
    List<PartyBuildingMemberVO> defaultPartyactivity(@Param("communityId") Long communityId);

@@ -97,7 +99,7 @@
        + " ORDER BY idxName " + ")m LEFT JOIN  " + "( " + "SELECT   "
        + " date_format(activity_time_begin, '%Y-%m') AS idxName, " + " COUNT(id) AS total "
        + " FROM com_pb_activity    " + " WHERE  "
        + " community_id=#{queryDTO.communityId}  AND STATUS IN ( 3, 4, 5 ) AND  "
        + " community_id = ${queryDTO.communityId}  AND STATUS IN ( 3, 4, 5 ) AND  "
        + " activity_time_begin &lt; DATE_FORMAT( DATE_ADD( STR_TO_DATE(#{queryDTO.date}, '%Y-%m-%d'), INTERVAL 1 MONTH ), '%Y-%m-%d' ) AND "
        + " activity_time_begin &gt; DATE_FORMAT( DATE_ADD( STR_TO_DATE(#{queryDTO.date}, '%Y-%m-%d'), INTERVAL - 12 MONTH ), '%Y-%m-%d')  "
        + " GROUP BY idxName " + " ORDER BY idxName ASC   " + " ) d ON m.idxName = d.idxName "
@@ -111,7 +113,7 @@
        + "  ( SELECT @cdate := date_add( #{queryDTO.endTime}, INTERVAL 1 DAY ) FROM com_pb_activity LIMIT 7 ) d  "
        + " ORDER BY " + "  idxName  " + " ) m " + " LEFT JOIN ( " + " SELECT "
        + "  date_format( activity_time_begin, '%Y-%m-%d' ) AS idxName, " + "  COUNT( id ) AS total  " + " FROM "
        + "  com_pb_activity  " + " WHERE " + "  community_id = #{queryDTO.communityId}  "
        + "  com_pb_activity  " + " WHERE " + "  community_id = ${queryDTO.communityId}  "
        + "  AND STATUS IN ( 3, 4, 5 )  "
        + "  AND activity_time_begin &lt; DATE_FORMAT( STR_TO_DATE( #{queryDTO.startTime}, '%Y-%m-%d' ), '%Y-%m-%d' )  "
        + "  AND activity_time_begin &gt; DATE_FORMAT( STR_TO_DATE( #{queryDTO.endTime}, '%Y-%m-%d' ), '%Y-%m-%d' )  "

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

@@ -44,4 +44,11 @@
     */
    ComActActEvaluateVO getEvaluateListByUserId(@Param("activityId") Long activityId,@Param("userId") Long userId);

    /**
     * 查询某活动的用户评价列表
     * @param activityId
     * @param userId
     * @return
     */
    List<ComActActEvaluateVO> selectEvaluateList(@Param("activityId") Long activityId, @Param("userId") Long userId);
}

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

@@ -37,4 +37,12 @@
     * @return
     */
    List<ComActActRegistVO> listRegistRecord(@Param("id") Long id, @Param("userId") Long userId);

    /**
     * 获取总积分奖励
     * @param activityId
     * @param userId
     * @return
     */
    Integer selectTotalAwardWithRegist(@Param("activityId") Long activityId, @Param("userId") Long userId);
}

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

@@ -47,8 +47,8 @@
//        + "AND a.is_volunteer=#{activitySignVO.type}-1   " + " </if> " + " order by a.create_at desc " + "</script>")
    IPage<ActivitySignVO> listActivitySign(Page page, @Param("activitySignVO") ActivitySignVO activitySignVO);

@Select("<script> " + "SELECT " + "u.user_id id, " + "u.image_url, " + "u.name, " + "u.nick_name, "
        + "case WHEN u.is_partymember = 1 THEN '党员' WHEN a.is_volunteer = 1 THEN '志愿者' ELSE '居民' END identity, "
@Select("<script> " + "SELECT " + "u.user_id id, " + "u.image_url, " + "u.name, " + "u.nick_name, u.openid, "
        + "CASE WHEN a.is_volunteer = 1 THEN '志愿者' ELSE '居民' END identity, "
        + "u.phone, " + "u.tags, " + "a.create_at,  " + "a.is_volunteer, a.status , a.reason, t.limit " + "FROM " + "com_act_act_sign a "
        + "JOIN sys_user u ON a.user_id = u.user_id  left join com_act_activity t on a.activity_id = t.id " + "WHERE " + "a.activity_id = #{activitySignVO.activityId}  "
        + "<if test='activitySignVO.phone != null and activitySignVO.phone != &quot;&quot;'>"
@@ -68,8 +68,8 @@

    List<ComActActSignExcelVO> getSignLists (@Param("activitySignVO") ActivitySignVO activitySignVO);

    @Select("<script> " + "SELECT " + " caas.user_id, " + " su.NAME, " + "CASE " + "  WHEN su.is_volunteer = 1 THEN "
        + "  '志愿者' ELSE '居民'  " + " END identity, " + " su.phone, " + " caas.create_at  " + "FROM "
    @Select("<script> " + "SELECT " + " caas.user_id, " + " su.NAME, " + "CASE WHEN caas.is_volunteer = 1 THEN '志愿者' ELSE '居民' END identity, "
        + " su.phone, " + " caas.create_at  " + "FROM "
        + " com_act_act_sign AS caas "
        + " LEFT JOIN sys_user AS su ON su.user_id = caas.user_id where caas.activity_id = #{activityPeopleListDTO.activityId} "
        + "<if test='activityPeopleListDTO.phone != null and activityPeopleListDTO.phone != &quot;&quot;'>"

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

@@ -4,8 +4,10 @@
import java.util.List;
import java.util.Map;

import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.vos.community.ComActActivityStatisticsVO;
import com.panzhihua.common.model.vos.community.ComActActivityTypeVO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -45,10 +47,10 @@
        + "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  "
        + "left join sys_user u on a.sponsor_id=u.user_id " + "left join com_act_act_sign s on a.id=s.activity_id  "
        + "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 " +

        "<if test='comActActivityVO.choice == 0 '>" + "AND a.community_id=#{comActActivityVO.communityId} " + " </if> "
        "<if test='comActActivityVO.choice == 0 '>" + "AND a.community_id = ${comActActivityVO.communityId} " + " </if> "
        +

        "<if test='comActActivityVO.activityName != null and comActActivityVO.activityName.trim() != &quot;&quot;'>"
@@ -79,12 +81,12 @@
     */
    ComActActivityVO inforActivity(@Param("id") Long id);

    @Select("SELECT " + "a.*  " + "FROM " + "com_act_act_sign s " + "JOIN com_act_activity a ON s.activity_id = a.id  "
    @Select("SELECT " + "a.*  " + "FROM " + "(select * from com_act_act_sign where `status` = 1) s " + "JOIN com_act_activity a ON s.activity_id = a.id  "
        + "WHERE " + "s.user_id = #{comActActivityVO.sponsorId}  " + "ORDER BY " + "s.create_at DESC")
    IPage<ComActActivityVO> pageMyActivity(Page page, @Param("comActActivityVO") ComActActivityVO comActActivityVO);

    @Select("select " + "t.activity_name," + "t.id," + "t.end_at," + "t.begin_at," + "t.cover," + "t.status "
        + "from com_act_act_sign s  "
        + "from (select * from com_act_act_sign where `status` = 1) s  "
        + "join sys_user u on s.user_id=u.user_id and u.phone=#{phone} and s.is_volunteer=1 "
        + "join com_act_activity t on s.activity_id=t.id and t.status=5")
    List<ComActActivityVO> listActivityByPhone(String phone);
@@ -92,7 +94,7 @@
    @Select("select t.id from ( " + "SELECT  " + "a.id, " + "a.activity_name, "
        + "COUNT(case when s.is_volunteer=1 then s.id else null end )volunteernum, "
        + "COUNT(case when s.is_volunteer=0 then s.id else null end)usernum, " + "a.participant_min, "
        + "a.volunteer_min " + "FROM " + "com_act_activity a  " + "LEFT JOIN com_act_act_sign s on a.id=s.activity_id  "
        + "a.volunteer_min " + "FROM " + "com_act_activity a  " + "LEFT JOIN (select * from com_act_act_sign where `status` = 1) s on a.id=s.activity_id  "
        + "WHERE " + "a.`status` in(3,4) and TIMESTAMPDIFF(MINUTE,SYSDATE(),a.sign_up_end)<=0 "
        + "GROUP BY a.id)t WHERE t.usernum<participant_min or t.volunteernum<volunteer_min")
    List<Long> selectTimedTaskActActivity();
@@ -117,7 +119,7 @@
//        + "a.publish_at, " + "a.is_qr_code, " + "a.begin_at, " + "a.end_at, " + "a.sign_up_begin, " + "a.sign_up_end " + "FROM "
//        + " com_act_activity a  " + " LEFT JOIN sys_user u on a.sponsor_id=u.user_id "
//        + " LEFT JOIN com_act_act_sign s on a.id=s.activity_id " + "WHERE "
//        + "  a.`status` = 1 and a.community_id=#{comActActivityVO.communityId} "
//        + "  a.`status` = 1 and a.community_id = ${comActActivityVO.communityId} "
//        + "<if test='comActActivityVO.activityName != null and comActActivityVO.activityName !=&quot;&quot;'>"
//        + " and a.activity_name LIKE concat( #{comActActivityVO.activityName}, '%' )  " + " </if> "
//        + "<if test='comActActivityVO.status != null and comActActivityVO.status !=0 and comActActivityVO.status !=1'>"
@@ -129,7 +131,7 @@
//        + "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 " + "FROM " + " com_act_activity a  "
//        + " LEFT JOIN sys_user u on a.sponsor_id=u.user_id " + " LEFT JOIN com_act_act_sign s on a.id=s.activity_id "
//        + "WHERE " + "  a.`status` != 1 and a.community_id=#{comActActivityVO.communityId} "
//        + "WHERE " + "  a.`status` != 1 and a.community_id = ${comActActivityVO.communityId} "
//        + "<if test='comActActivityVO.activityName != null and comActActivityVO.activityName !=&quot;&quot;'>"
//        + " and a.activity_name LIKE concat( #{comActActivityVO.activityName}, '%' )  " + " </if> "
//        + "<if test='comActActivityVO.status != null and comActActivityVO.status !=0 '>"
@@ -151,37 +153,37 @@
    int updateStatusToBeginAfterSingEnd();

    @Select("select GROUP_CONCAT(t.x1,',',t.x2,',',t.x3,',',t.x4) from ( " + "SELECT "
        + "(select COUNT(d.id) from com_act_discuss d where  d.community_id=#{communityId})x1, "
        + "(select COUNT(w.id) from com_act_micro_wish w where  w.community_id=#{communityId})x2, "
        + "(select COUNT(p.id) from com_act_easy_photo p where  p.community_id=#{communityId})x3, "
        + " COUNT( a.id ) x4 " + "FROM " + " com_pb_activity a  " + "WHERE " + "  a.community_id =#{communityId})t")
        + "(select COUNT(d.id) from com_act_discuss d where  d.community_id = ${communityId})x1, "
        + "(select COUNT(w.id) from com_act_micro_wish w where  w.community_id = ${communityId})x2, "
        + "(select COUNT(p.id) from com_act_easy_photo p where  p.community_id = ${communityId})x3, "
        + " COUNT( a.id ) x4 " + "FROM " + " com_pb_activity a  " + "WHERE " + "  a.community_id = ${communityId})t")
    String selectCommunityGovernanceTrendsVO(Long communityId);

    @Select(" " + " SELECT "
        + " (select COUNT(d.id) from com_act_discuss d where DATE_FORMAT(d.create_at,'%Y-%m-%d')=DATE_FORMAT(#{date},'%Y-%m-%d') and d.community_id=#{communityId})discuss, "
        + " (select COUNT(w.id) from com_act_micro_wish w where DATE_FORMAT(w.create_at,'%Y-%m-%d')=DATE_FORMAT(#{date},'%Y-%m-%d') and w.community_id=#{communityId})microWish, "
        + " (select COUNT(p.id) from com_act_easy_photo p where DATE_FORMAT(p.create_at,'%Y-%m-%d')=DATE_FORMAT(#{date},'%Y-%m-%d') and p.community_id=#{communityId})eashPhoto, "
        + " (select COUNT(pa.id) from com_pb_activity pa where DATE_FORMAT(pa.create_at,'%Y-%m-%d')=DATE_FORMAT(#{date},'%Y-%m-%d') and pa.community_id=#{communityId})pbActivity, "
        + " (select COUNT(d.id) from com_act_discuss d where DATE_FORMAT(d.create_at,'%Y-%m-%d')=DATE_FORMAT(#{date},'%Y-%m-%d') and d.community_id = ${communityId})discuss, "
        + " (select COUNT(w.id) from com_act_micro_wish w where DATE_FORMAT(w.create_at,'%Y-%m-%d')=DATE_FORMAT(#{date},'%Y-%m-%d') and w.community_id = ${communityId})microWish, "
        + " (select COUNT(p.id) from com_act_easy_photo p where DATE_FORMAT(p.create_at,'%Y-%m-%d')=DATE_FORMAT(#{date},'%Y-%m-%d') and p.community_id = ${communityId})eashPhoto, "
        + " (select COUNT(pa.id) from com_pb_activity pa where DATE_FORMAT(pa.create_at,'%Y-%m-%d')=DATE_FORMAT(#{date},'%Y-%m-%d') and pa.community_id = ${communityId})pbActivity, "
        + "  COUNT( a.id ) actActivity " + " FROM " + "  com_pb_activity a  " + " WHERE "
        + "  DATE_FORMAT( a.create_at, '%Y-%m-%d' )=DATE_FORMAT(#{date},'%Y-%m-%d')  "
        + "  AND a.community_id =#{communityId}")
        + "  AND a.community_id = ${communityId}")
    CommunityActivitiesVO selectCommunityActivitiesVO(@Param("communityId") Long communityId, @Param("date") Date date);

    @Select("SELECT " + " count( caa.id ) as totalNum, "
        + " (select count(id) from com_act_activity where `status` IN (1,2,3,4,5) and volunteer_min = 0 and community_id = #{communityId}) as commonNum, "
        + " (select count(id) from com_act_activity where `status` IN (1,2,3,4,5) and volunteer_min > 0 and community_id = #{communityId}) as volunteerNum, "
        + " (select count(caas.user_id) from com_act_act_sign as caas left join com_act_activity as caa on caa.id = caas.activity_id where caa.`status` IN (1,2,3,4,5) and is_volunteer = 0 and caa.community_id = #{communityId}) as commonPeopleNum, "
        + " (select count(caas.user_id) from com_act_act_sign as caas left join com_act_activity as caa on caa.id = caas.activity_id where caa.`status` IN (1,2,3,4,5) and is_volunteer = 1 and caa.community_id = #{communityId}) as volunteerPeopleNum, "
        + " (select count(id) from com_act_activity where `status` IN (1,2,3,4,5) and community_id = #{communityId} and create_at between date_sub(curdate() - day(curdate()) +1,interval 1 month) and now()) as currentNum "
        + " (select count(id) from com_act_activity where `status` IN (1,2,3,4,5) and volunteer_min = 0 and community_id = ${communityId}) as commonNum, "
        + " (select count(id) from com_act_activity where `status` IN (1,2,3,4,5) and volunteer_min > 0 and community_id = ${communityId}) as volunteerNum, "
        + " (select count(caas.user_id) from (select * from com_act_act_sign where `status` = 1) as caas left join com_act_activity as caa on caa.id = caas.activity_id where caa.`status` IN (1,2,3,4,5) and is_volunteer = 0 and caa.community_id = ${communityId}) as commonPeopleNum, "
        + " (select count(caas.user_id) from (select * from com_act_act_sign where `status` = 1) as caas left join com_act_activity as caa on caa.id = caas.activity_id where caa.`status` IN (1,2,3,4,5) and is_volunteer = 1 and caa.community_id = ${communityId}) as volunteerPeopleNum, "
        + " (select count(id) from com_act_activity where `status` IN (1,2,3,4,5) and community_id = ${communityId} and create_at between date_sub(curdate() - day(curdate()) +1,interval 1 month) and now()) as currentNum "
        + "FROM " + " com_act_activity AS caa  " + "WHERE "
        + " caa.`status` IN (1,2,3,4,5) and community_id = #{communityId}")
        + " caa.`status` IN (1,2,3,4,5) and community_id = ${communityId}")
    Map<String, Long> countByCommunityId(@Param("communityId") Long communityId, @Param("nowDate") String nowDate);

    @Select("SELECT id,activity_name as content,IF(volunteer_max = 0,'居民活动','志愿者活动') AS typeName  FROM com_act_activity "
        + "WHERE community_id = #{communityId} AND (status = 3 OR status = 4 OR status = 5) ORDER BY create_at DESC LIMIT #{pageSize}")
        + "WHERE community_id = ${communityId} AND (status = 3 OR status = 4 OR status = 5) ORDER BY create_at DESC LIMIT #{pageSize}")
    List<CarouselInfoVO> screenActivity(@Param("communityId") Long communityId, @Param("pageSize") Integer pageSize);

    @Select("SELECT cover FROM com_act_activity WHERE community_id = #{communityId}")
    @Select("SELECT cover FROM com_act_activity WHERE community_id = ${communityId}")
    List<String> listImg(@Param("communityId") Long communityId);

    @Select("<script> " + "SELECT " + " caa.id, " + " su.`name` AS userName , " + " su.image_url, "
@@ -191,7 +193,7 @@
        + " caa.content, " + " caa.activity_addr  " + "FROM " + " com_act_activity AS caa "
        + " LEFT JOIN sys_user AS su ON su.user_id = caa.sponsor_id" + " <where> "
        + "<if test='actActivityListDTO.communityId != null '>"
        + " and caa.community_id = #{actActivityListDTO.communityId} " + " </if> "
        + " and caa.community_id = ${actActivityListDTO.communityId} " + " </if> "
        + "<if test='actActivityListDTO.startTime!=null and actActivityListDTO.startTime != &quot;&quot;'>"
        + " AND DATE_FORMAT(caa.create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{actActivityListDTO.startTime} "
        + " </if> " + "<if test='actActivityListDTO.endTime!=null and actActivityListDTO.endTime != &quot;&quot;'>"
@@ -202,9 +204,9 @@
        @Param("actActivityListDTO") ScreenActActivityListDTO actActivityListDTO);

    @Select("SELECT " + " count( caas.id ) AS volunteerCount,( " + " SELECT " + "  count( caas1.id )  " + " FROM "
        + "  com_act_act_sign AS caas1 " + "  LEFT JOIN sys_user AS su1 ON su1.user_id = caas1.user_id  " + " WHERE "
        + "  (select * from com_act_act_sign where `status` = 1) AS caas1 " + "  LEFT JOIN sys_user AS su1 ON su1.user_id = caas1.user_id  " + " WHERE "
        + "  su1.is_volunteer = 0  " + "  AND caas1.activity_id = #{activityId}  " + " ) AS participantCount  "
        + "FROM " + " com_act_act_sign AS caas " + " LEFT JOIN sys_user AS su ON su.user_id = caas.user_id  " + "WHERE "
        + "FROM " + " (select * from com_act_act_sign where `status` = 1) AS caas " + " LEFT JOIN sys_user AS su ON su.user_id = caas.user_id  " + "WHERE "
        + " su.is_volunteer = 1  " + " AND activity_id = #{activityId} ")
    ActActivityListVO getScreenActActivityPeopleCount(@Param("activityId") Long activityId);

@@ -231,4 +233,39 @@
     * @return
     */
    int addActivityType(@Param("comActActivityTypeVO") ComActActivityTypeVO comActActivityTypeVO);

    /**
     * 居民活动分类统计数据
     * @param communityId
     * @param isResidentAct
     * @return
     */
    List<StatisticsCommVO> selectResidentActHistogramData(@Param("communityId") Long communityId, @Param("isResidentAct") boolean isResidentAct);

    /**
     * 居民活动分类人口参与统计
     * @param communityId
     * @param isResidentAct
     * @return
     */
    List<StatisticsCommVO> getIndexResidentActBaseData(@Param("communityId") Long communityId, @Param("isResidentAct") boolean isResidentAct);

    /**
     * 获取活动新增折线数据
     * @param communityId
     * @param isResidentAct
     * @return
     */
    List<StatisticsCommVO> getActAddPolylineData(@Param("communityId") Long communityId, @Param("isResidentAct") boolean isResidentAct);

    /**
     * 获取活动累计折线数据
     * @param communityId
     * @param isResidentAct
     * @param date
     * @return
     */
    StatisticsCommVO getActTotalPolylineData(@Param("communityId") Long communityId, @Param("isResidentAct") boolean isResidentAct, @Param("date") String date);

    IPage<ComActActivityVO> indexActList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO, @Param("isResidentAct") boolean isResidentAct);
}

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

@@ -5,9 +5,12 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.community.ComActCommiteeVO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComActCommittee;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * (ComActCommittee)表数据库访问层
@@ -25,4 +28,10 @@
     */
    IPage<ComActCommiteeVO> pageList(Page page, @Param("commonPage")CommonPage commonPage);

    /**
     * 业主委员会党员占比
     * @param communityId
     * @return
     */
    List<StatisticsCommVO> selectCommitteePartyPercent(@Param("communityId") Long communityId);
}

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

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

import java.util.List;

import com.panzhihua.common.model.vos.community.ComActPasswordVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -58,22 +59,22 @@
        + " order by a.create_at desc" + "</script>")
    IPage<ComActVO> pageCommunity(Page page, @Param("pageComActDTO") PageComActDTO pageComActDTO);

    @Update("update sys_user u set u.password=#{password} where u.account=#{account} and u.type=3 and u.community_id=#{communityId}")
    @Update("update sys_user u set u.password=#{password} where u.account=#{account} and u.type=3 and u.community_id = ${communityId}")
    void updateAccountPassword(@Param("password") String password, @Param("account") String account,
        @Param("communityId") Long communityId);

    @Select("select community_id,`name` from com_act where state = 0")
    @Select("select community_id,`name`,lng,lat from com_act where state = 0")
    List<EventGridCommunityAdminVO> getCommunityLists();

    @Select("select ca.`name`,cmsap.province_name,cmsac.city_name,cmsad.district_name,ca.street_id,ca.community_id,cs.`name` as streetName from com_act as ca \n"
        + "left join com_mng_struct_area_province as cmsap on cmsap.province_adcode = ca.province_code\n"
        + "left join com_mng_struct_area_city as cmsac on cmsac.city_adcode = ca.city_code\n"
        + "left join com_mng_struct_area_district as cmsad on cmsad.district_adcode = ca.area_code\n"
        + "left join com_street as cs on cs.street_id = ca.street_id\n" + "where ca.community_id = #{communityId}")
        + "left join com_street as cs on cs.street_id = ca.street_id\n" + "where ca.community_id = ${communityId}")
    ComPopulationActVO getPopulationActById(@Param("communityId") Long communityId);

    @Select("select `name`,street_id from com_street where area_code = '510423'")
    List<StreetAllAppletsVO> getStreetList();
    @Select("select `name`,street_id from com_street where area_code = #{areaCode}")
    List<StreetAllAppletsVO> getStreetList(String areaCode);

    @Select("select ca.`name`,ca.street_id,ca.community_id,cs.`name` as streetName from com_act as ca left join com_street as cs on cs.street_id = ca.street_id where ca.state = 0 and ca.street_id = #{streetId}")
    List<CommunitySwitchAllAppletsVO> getCommunityListByStreetId(@Param("streetId") Long streetId);
@@ -81,16 +82,19 @@
    @Select("select ca.`name`,ca.street_id,ca.community_id,cs.`name` as streetName " +
            "from com_act as ca " +
            "left join com_street as cs on cs.street_id = ca.street_id " +
            "where ca.state = 0 and ca.name like '%%' and cs.area_code = '510423'")
    List<CommunitySwitchAllAppletsVO> getCommunityListByName(@Param("name") String name);
            "where ca.state = 0 and ca.name like '%%' and cs.area_code = #{areaCode}")
    List<CommunitySwitchAllAppletsVO> getCommunityListByName(@Param("name") String name,@Param("areaCode") String areaCode);

    @Select("SELECT   c.community_id,    c.`name`,    c.street_id,    cs.`name` as streetName," +
            "round( ST_Distance_Sphere ( Point ( #{communityDTO.longitude}, #{communityDTO.latitude} ), Point ( c.lng, c.lat ) )/ 1000, 2 ) AS distance  " +
            "FROM    com_act c     left join com_street as cs on cs.street_id = c.street_id  " +
            "where cs.area_code = '510423' " +
            "where cs.area_code = #{areaCode} " +
            "HAVING distance >= 0 and distance <= #{communityDTO.distance}   ORDER BY    distance ASC")
    List<CommunitySwitchAllAppletsVO> getCommunityListByNearby(@Param("communityDTO") SearchCommunityDTO communityDTO);

    @Select("select community_id,name from com_act  where state = 0 and area_code = '510423' ")
    List<EventGridCommunityAdminVO> getWestCommunityLists();
    @Select("select community_id,name,lng,lat from com_act  where state = 0 <if test='areaCode !=null'> and area_code = #{areaCode} </if> ")
    List<EventGridCommunityAdminVO> getWestCommunityLists(@Param("areaCode") String areCode);

    @Select("select account,plaintext_password as password from com_act where community_id = ${communityId}")
    ComActPasswordVo getCommunityPassword(@Param("communityId") Long communityId);
}

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

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

import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -48,7 +49,7 @@
//        + "COUNT( DISTINCT c.id ) commentNum, " + "u.name userName, " + "u.nick_name userNickName, " + "d.create_at  "
//        + "FROM " + "com_act_discuss d " + "JOIN sys_user u ON d.user_id = u.user_id "
//        + "LEFT JOIN com_act_discuss_comment c ON d.id = c.discuss_id  "
//        + " where d.community_id=#{pageComActDiscussDTO.communityId}"
//        + " where d.community_id = ${pageComActDiscussDTO.communityId}"
//        + "<if test='pageComActDiscussDTO.subject != null and pageComActDiscussDTO.subject.trim() != &quot;&quot;'>"
//        + " and d.`discuss_subject` LIKE concat( #{pageComActDiscussDTO.subject}, '%' )  " + " </if> "
//        + "<if test='pageComActDiscussDTO.begin != null '>" + "AND d.create_at BETWEEN #{pageComActDiscussDTO.begin}  "
@@ -106,7 +107,7 @@
//        + "LEFT JOIN com_act_discuss_user du ON d.id = du.discuss_id  "
//        + "<if test='pageComActDiscussDTO.loginUserId != null '>"
//        + "LEFT JOIN com_act_discuss_option_user ou on do.id=ou.discuss_option_id and ou.user_id=#{pageComActDiscussDTO.loginUserId} "
//        + " </if> " + " where d.community_id=#{pageComActDiscussDTO.communityId}" + " and d.is_del = 2"
//        + " </if> " + " where d.community_id = ${pageComActDiscussDTO.communityId}" + " and d.is_del = 2"
//        + "<if test='pageComActDiscussDTO.type != null '>"
//        + " and d.`type` = #{pageComActDiscussDTO.type}  " + " </if> "
//        + "<if test='pageComActDiscussDTO.subject != null and pageComActDiscussDTO.subject.trim() != &quot;&quot;'>"
@@ -141,7 +142,7 @@
    IPage<ComActDiscussCommentVO> pageDiscussCommentApplets(Page page,
        @Param("pageComActDiscussCommentDTO") PageComActDiscussCommentDTO pageComActDiscussCommentDTO);

    @Select("select name,address from com_act where community_id=#{communityId}")
    @Select("select name,address from com_act where community_id = ${communityId}")
    ComActVO selectCommunity(Long communityId);

    @Select("SELECT  " + "if(du.id is not null,1,0)haveSign, " + "if(ou.id is not null,1,0)haveVote " + "FROM "
@@ -155,13 +156,13 @@

    Map<String, Long> countByCommunityId(@Param("communityId") Long communityId, @Param("date") String date);

    @Select(" SELECT id,discuss_subject AS content,IF(type = 1,'图文','投票') AS typeName FROM com_act_discuss WHERE community_id = #{communityId} ORDER BY create_at DESC LIMIT #{pageSize}")
    @Select(" SELECT id,discuss_subject AS content,IF(type = 1,'图文','投票') AS typeName FROM com_act_discuss WHERE community_id = ${communityId} ORDER BY create_at DESC LIMIT #{pageSize}")
    List<CarouselInfoVO> screenDiscuss(@Param("communityId") Long communityId, @Param("pageSize") Integer pageSize);

    @Select("<script> " + "SELECT " + " cad.id, " + " su.nick_name AS userName, " + " su.image_url, "
        + " cad.create_at, " + " cad.type, " + " cad.discuss_subject, " + " cad.photo_pah  " + "FROM "
        + " com_act_discuss AS cad " + " LEFT JOIN sys_user AS su ON su.user_id = cad.user_id  " + " <where> "
        + "<if test='discussListDTO.communityId != null '>" + " and cad.community_id = #{discussListDTO.communityId} "
        + "<if test='discussListDTO.communityId != null '>" + " and cad.community_id = ${discussListDTO.communityId} "
        + " </if> " + "<if test='discussListDTO.startTime!=null and discussListDTO.startTime != &quot;&quot;'>"
        + " AND DATE_FORMAT(cad.create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{discussListDTO.startTime} "
        + " </if> " + "<if test='discussListDTO.endTime!=null and discussListDTO.endTime != &quot;&quot;'>"
@@ -209,4 +210,20 @@
     * @return
     */
    int batchUpdateViewNum(@Param("needDealMap") HashMap<Long, Integer> needDealMap);

    /**
     * 居民自治-议事投票类型占比统计
     * @param communityId
     * @return
     */
    List<StatisticsCommVO> selectTypePercent(@Param("communityId") Long communityId);

    /**
     * 获取一起议标题
     * @param type
     * @param communityId
     * @param pageSize
     * @return
     */
    List<String> getTitles(@Param("type") int type, @Param("communityId") Long communityId, @Param("pageSize") Integer pageSize);
}

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

@@ -1,7 +1,10 @@
package com.panzhihua.service_community.dao;

import java.util.List;
import java.util.Map;

import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -23,13 +26,13 @@
 **/
@Mapper
public interface ComActDynDAO extends BaseMapper<ComActDynDO> {
    @Select("<script> " + "SELECT  " + "d.id, " + "d.title, " + "COUNT(u.id)readNum, " + "d.`status`, "
    @Select("<script> " + "SELECT  " + "d.id, " + "d.title, " + "IFNULL(u.readNum,0) readNum, " + "d.`status`, "
        + "d.`content`, " + "d.`cover`, " + "d.`type`, " + "d.`cover_mode`, d.jump_url,d.jump_type, " + "d.is_topping, " + "d.publish_at, "
        + "d.create_at, " + "cadt.`name` as typeName, " + "cadt.color as typeColor, " + "ca.name as communityName  "
        + "FROM " + "com_act_dyn d " + "LEFT JOIN com_act_dyn_user u ON d.id = u.dyn_id  "
        + "FROM " + "com_act_dyn d " + "LEFT JOIN ( select dyn_id,count(id) as readNum from com_act_dyn_user GROUP BY dyn_id  )  u ON d.id = u.dyn_id  "
        + "LEFT JOIN com_act_dyn_type as cadt ON cadt.id = d.type  "
        + "LEFT JOIN com_act ca ON d.community_id = ca.community_id  " + "WHERE 1=1  "
        + "<if test='comActDynVO.choice == 0 '>" + "and d.community_id=#{comActDynVO.communityId} " + " </if> "
        + "<if test='comActDynVO.choice == 0 '>" + "and d.community_id = ${comActDynVO.communityId} " + " </if> "
        + "<if test='comActDynVO.title != null and comActDynVO.title.trim() != &quot;&quot;'>"
        + "AND d.title like concat(#{comActDynVO.title},'%')   " + " </if> "
        + "<if test='comActDynVO.isTopping != null '>" + "AND d.is_topping = #{comActDynVO.isTopping}  " + " </if> "
@@ -48,7 +51,7 @@
        + "LEFT JOIN com_act_dyn_user u ON d.id = u.dyn_id  "
        + "LEFT JOIN com_act_dyn_type as cadt ON cadt.id = d.type  "
        + "LEFT JOIN com_act ca ON d.community_id = ca.community_id  " + "WHERE  "
        + "d.community_id=#{comActDynVO.communityId} "
        + "d.community_id = ${comActDynVO.communityId} "
        + "<if test='comActDynVO.title != null and comActDynVO.title.trim() != &quot;&quot;'>"
        + "AND d.title like concat(#{comActDynVO.title},'%')   " + " </if> "
        + "<if test='comActDynVO.isTopping != null '>" + "AND d.is_topping = #{comActDynVO.isTopping}  " + " </if> "
@@ -60,17 +63,25 @@
    IPage<ComActDynVO> pageDynamicByAdmin(Page page, @Param("comActDynVO") ComActDynVO comActDynVO);

    @Select("SELECT " + " count( cad.id ) AS dynTotal, "
        + " (select count(id) from com_act_dyn where community_id = #{communityId} and create_at LIKE CONCAT(#{nowDate},'%')) as currentNum "
        + "FROM " + " com_act_dyn AS cad  " + "WHERE " + " community_id = #{communityId}")
        + " (select count(id) from com_act_dyn where community_id = ${communityId} and create_at LIKE CONCAT(#{nowDate},'%')) as currentNum "
        + "FROM " + " com_act_dyn AS cad  " + "WHERE " + " community_id = ${communityId}")
    Map<String, Long> countByCommunityId(@Param("communityId") Long communityId, @Param("nowDate") String nowDate);

    @Select("select create_at as startTime,(select create_at from com_act_dyn where community_id = #{communityId} order by create_at desc LIMIT 1 ) as endTime from com_act_dyn where community_id = #{communityId} order by create_at asc LIMIT 1")
    @Select("select create_at as startTime,(select create_at from com_act_dyn where community_id = ${communityId} order by create_at desc LIMIT 1 ) as endTime from com_act_dyn where community_id = ${communityId} order by create_at asc LIMIT 1")
    DateScreenVO countByAvgCommunityId(@Param("communityId") Long communityId);

    @Select("SELECT "
        + "(SELECT COUNT(id) FROM com_act_dyn WHERE community_id = #{communityId} AND create_at < #{end}) AS dynTotal, "
        + "(SELECT COUNT(id) FROM com_act_dyn WHERE community_id = #{communityId} AND #{start} < create_at AND create_at < #{end}) AS dynAdd "
        + "(SELECT COUNT(id) FROM com_act_dyn WHERE community_id = ${communityId} AND create_at < #{end}) AS dynTotal, "
        + "(SELECT COUNT(id) FROM com_act_dyn WHERE community_id = ${communityId} AND #{start} < create_at AND create_at < #{end}) AS dynAdd "
        + " FROM DUAL")
    DynamicWorkVO countByTime(@Param("start") String start, @Param("end") String end,
        @Param("communityId") Long communityId);

    List<StatisticsCommVO> getIndexDynBaseData(@Param("communityId") Long communityId);

    List<StatisticsCommVO> getDynAddPolylineData(@Param("communityId") Long communityId);

    StatisticsCommVO getDynTotalPolylineDate(@Param("communityId") Long communityId, @Param("date") String date);

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

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

@@ -3,9 +3,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.easyPhoto.ExportEasyPhotoDTO;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import com.panzhihua.common.model.vos.community.TodoEventsVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenEasyPhotoStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigscreenGridsGovernanceStatisticsVO;
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.easyPhoto.BannerVO;
import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoCountVO;
import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoStatisticsVO;
@@ -71,7 +77,7 @@
            " </if> " +
            "where p.del_tag = 0 and p.status !=2"+
            "<if test='comActEasyPhotoVO.communityId != null and comActEasyPhotoVO.communityId != 0'>" +
            "  and p.community_id=#{comActEasyPhotoVO.communityId} " +
            "  and p.community_id = ${comActEasyPhotoVO.communityId} " +
            " </if> " +
            "<if test='comActEasyPhotoVO.happenAddr != null and comActEasyPhotoVO.happenAddr.trim() != &quot;&quot;'>" +
            "AND p.happen_addr like concat(#{comActEasyPhotoVO.happenAddr},'%')   " +
@@ -143,7 +149,7 @@
            "and p.handler_id=#{comActEasyPhotoVO.backUserId}"+
            " </if> " +
            "<if test='comActEasyPhotoVO.communityId != null and comActEasyPhotoVO.communityId != 0'>" +
            "  and p.community_id=#{comActEasyPhotoVO.communityId} " +
            "  and p.community_id = ${comActEasyPhotoVO.communityId} " +
            " </if> " +
            "<if test='comActEasyPhotoVO.happenAddr != null and comActEasyPhotoVO.happenAddr.trim() != &quot;&quot;'>" +
            "AND p.happen_addr like concat(#{comActEasyPhotoVO.happenAddr},'%')   " +
@@ -226,7 +232,7 @@
            "FROM " +
            " com_act_easy_photo p  " +
            "WHERE " +
            " p.del_tag = 0 and p.community_id = #{communityId}  " +
            " p.del_tag = 0 and p.community_id = ${communityId}  " +
            "AND p.STATUS = 1  "+
            " " +
            "union all  " +
@@ -236,7 +242,7 @@
            "FROM " +
            "  com_act_easy_photo p  " +
            "WHERE " +
            " p.del_tag = 0 and p.community_id = #{communityId}  " +
            " p.del_tag = 0 and p.community_id = ${communityId}  " +
            "AND p.`status` = 2 and p.is_need_feed_back=1 and p.handler_id=#{userId} "
            )
    List<TodoEventsVO> selectNeedToDo(@Param("communityId") Long communityId, @Param("userId") Long userId);
@@ -277,7 +283,7 @@
            " <where>" +
            " p.del_tag = 0 "  +
            "<if test='comActEasyPhotoVO.communityId != null and comActEasyPhotoVO.communityId != 0'>" +
            "  and p.community_id=#{comActEasyPhotoVO.communityId} " +
            "  and p.community_id = ${comActEasyPhotoVO.communityId} " +
            " </if> " +
            "<if test='comActEasyPhotoVO.status != null and comActEasyPhotoVO.status!=0' >" +
            "AND p.`status` = #{comActEasyPhotoVO.status}  " +
@@ -299,17 +305,17 @@
    IPage<ComActEasyPhotoVO> pageEasyPhotoApplets(Page page, @Param("comActEasyPhotoVO")ComActEasyPhotoVO comActEasyPhotoVO);

    @Select("SELECT t.name,COUNT(p.id) as num FROM com_act_easy_photo_type t LEFT JOIN com_act_easy_photo_type_relation r ON  t.id = r.easy_type_id " +
            "LEFT JOIN com_act_easy_photo p ON r.easy_id = p.id AND p.handle_status = 1 AND p.community_id = #{communityId} " +
            "LEFT JOIN com_act_easy_photo p ON r.easy_id = p.id AND p.handle_status = 1 AND p.community_id = ${communityId} " +
            "GROUP BY t.name ")
    List<EastPhotoTypeVO> countDeal(@Param("communityId")Long communityId);

    @Select("SELECT t.name,COUNT(p.id) as num FROM com_act_easy_photo_type t LEFT JOIN com_act_easy_photo_type_relation r ON  t.id = r.easy_type_id " +
            "LEFT JOIN com_act_easy_photo p ON r.easy_id = p.id AND p.is_publicity = 1 AND p.community_id = #{communityId} " +
            "LEFT JOIN com_act_easy_photo p ON r.easy_id = p.id AND p.is_publicity = 1 AND p.community_id = ${communityId} " +
            "GROUP BY t.name ")
    List<EastPhotoTypeVO> countPub(@Param("communityId")Long communityId);

    @Select("SELECT t.name,COUNT(p.id) as num FROM com_act_easy_photo_type t LEFT JOIN com_act_easy_photo_type_relation r ON  t.id = r.easy_type_id " +
            "LEFT JOIN com_act_easy_photo p ON r.easy_id = p.id AND p.status = 4 where p.community_id = #{communityId} " +
            "LEFT JOIN com_act_easy_photo p ON r.easy_id = p.id AND p.status = 4 where p.community_id = ${communityId} " +
            "GROUP BY t.name ")
    List<EastPhotoTypeVO> countApproved(@Param("communityId")Long communityId);

@@ -318,28 +324,28 @@
            "SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = 2 AND create_at LIKE concat(#{nowDate},'%') " +
            ") AS currentNum," +
            "(" +
            "(SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = #{communityId} AND STATUS = 4 AND handle_status = 2)*100/(SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = #{communityId} AND handle_status = 2) " +
            "(SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = ${communityId} AND STATUS = 4 AND handle_status = 2)*100/(SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = ${communityId} AND handle_status = 2) " +
            ") AS pubPoint," +
            "(SELECT AVG(TIMESTAMPDIFF(HOUR,create_at,feedback_at))  FROM com_act_easy_photo WHERE community_id = #{communityId} and handle_status = 2 ) AS dealTime " +
            "FROM com_act_easy_photo where community_id = #{communityId}")
            "(SELECT AVG(TIMESTAMPDIFF(HOUR,create_at,feedback_at))  FROM com_act_easy_photo WHERE community_id = ${communityId} and handle_status = 2 ) AS dealTime " +
            "FROM com_act_easy_photo where community_id = ${communityId}")
    Map<String, Object> countByCommunityId(@Param("communityId")Long communityId,@Param("nowDate") String nowDate);

    @Select("SELECT COUNT(id) AS total, " +
            "(SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = #{communityId} AND #{start} < create_at and create_at < #{end} ) AS adds, " +
            "(SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id =#{communityId} AND handle_status = 2 AND #{start} < create_at and create_at < #{end}) AS deal " +
            "FROM com_act_easy_photo WHERE community_id = #{communityId} AND #{start} < create_at and create_at < #{end} ")
            "(SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = ${communityId} AND #{start} < create_at and create_at < #{end} ) AS adds, " +
            "(SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = ${communityId} AND handle_status = 2 AND #{start} < create_at and create_at < #{end}) AS deal " +
            "FROM com_act_easy_photo WHERE community_id = ${communityId} AND #{start} < create_at and create_at < #{end} ")
    EastPhotoVO countByTime(@Param("start")String start, @Param("end")String end, @Param("nowDate")String nowDate, @Param("communityId")Long communityId);

//    @Select("SELECT " +
//            " count( id ) AS examineNum, " +
//            " ( SELECT count( id ) FROM com_act_easy_photo WHERE `status` = 2 AND community_id = #{communityId} and del_tag = 0 ) AS verificationNum, " +
//            " ( SELECT count( id ) FROM com_act_easy_photo WHERE `status` = 3 AND community_id = #{communityId} and del_tag = 0 ) AS rejectNum, " +
//            " ( SELECT count( id ) FROM com_act_easy_photo WHERE `status` = 4 AND community_id = #{communityId} and del_tag = 0 ) AS completeNum  " +
//            " ( SELECT count( id ) FROM com_act_easy_photo WHERE `status` = 2 AND community_id = ${communityId} and del_tag = 0 ) AS verificationNum, " +
//            " ( SELECT count( id ) FROM com_act_easy_photo WHERE `status` = 3 AND community_id = ${communityId} and del_tag = 0 ) AS rejectNum, " +
//            " ( SELECT count( id ) FROM com_act_easy_photo WHERE `status` = 4 AND community_id = ${communityId} and del_tag = 0 ) AS completeNum  " +
//            "FROM " +
//            " com_act_easy_photo  " +
//            "WHERE " +
//            " `status` = 1  " +
//            " AND community_id = #{communityId} and del_tag = 0")
//            " AND community_id = ${communityId} and del_tag = 0")
    ComActEasyPhotoStatisticsVO getEasyPhotoStatistics(@Param("communityId")Long communityId);
    ComActEasyPhotoCountVO easyPhotoCount(ComActEasyPhotoVO comActEasyPhotoVO);
    List<ExportEasyPhotoVO> export(ExportEasyPhotoDTO exportEasyPhotoDTO);
@@ -358,4 +364,49 @@
     * @return
     */
    List<BannerVO>  banner(@Param("communityId") Long communityId);

    /**
     * 获取随手拍居民自治统计数据
     * @param communityId
     * @return
     */
    List<StatisticsCommVO> selectStatisticsList(@Param("communityId") Long communityId);

    /**
     * 获取居民自治统计数据
     * @param communityId
     * @return
     */
    ResidentAutonomyStatisticsVO selectResidentAutonomyStatistics(@Param("communityId") Long communityId);

    /**
     * 获取清网治格统计数据
     * @param communityId
     * @return
     */
    GridsGovernanceStatisticsVO selectGridsGovernance(@Param("communityId") Long communityId);

    /**
     * 首页大屏获取网格统计数据
     */
    BigscreenGridsGovernanceStatisticsVO selectBigscreenGridsGovern(@Param("communityId")Long communityId);

    /**
     * 首页二级页面-随手拍基础数据查询
     * @param communityId
     * @return
     */
    BigScreenEasyPhotoStatisticsInfo selectIndexEasyPhotoBaseData(@Param("communityId") Long communityId);

    List<StatisticsCommVO> getEasyPhotoAddPolylineData(@Param("communityId") Long communityId);

    StatisticsCommVO getEasyPhotoTotalPolylineDate(@Param("communityId") Long communityId, @Param("date") String date);

    /**
     * 首页二级页面-随手拍展示列表
     * @param page
     * @param pageBaseDTO
     * @return
     */
    IPage<ComActEasyPhotoVO> indexEasyPhotoList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);
}

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

@@ -54,11 +54,11 @@
        @Param("communityRankDTO") ComActIntegralCommunityRankDTO communityRankDTO);

    /**
     * 根据社区活动id查询社区活动报名人员列表
     * 根据社区活动id查询社区活动报名且未参与人员列表
     * 
     * @param activityId
     *            活动id
     * @return 社区活动报名人员列表
     * @return 社区活动报名且未参与人员列表
     */
    List<ComActActivityPeopleVO> getTaskActivityPeopleList(@Param("activityId") Long activityId);
}

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

@@ -52,7 +52,7 @@
        + "SELECT t.id,t.msg_content,t.photo_pah,t.phone,t.sendto_user_id,t.sendto_user_name,t.status,t.ispublic,"
        + "t.user_id,t.user_account,t.user_name,t.user_phone,t.community_id,t.create_at,t.type, u.phone as userAccount \n"
        + "FROM \n" + " com_act_message t LEFT JOIN sys_user u ON t.user_id = u.user_id "
        + " where t.community_id=#{comActMessageVO.communityId}\n"
        + " where t.community_id = ${comActMessageVO.communityId}\n"
        + "<if test='comActMessageVO.userAccount != null and comActMessageVO.userAccount.trim() != &quot;&quot;'>"
        + " and u.phone=#{comActMessageVO.userAccount} \n" + " </if> "
        + "<if test='comActMessageVO.userName != null and comActMessageVO.userName.trim() != &quot;&quot;'>"

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

@@ -3,9 +3,12 @@
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.bigscreen.work.ScreenMicroListDTO;
import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import com.panzhihua.common.model.vos.community.TodoEventsVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenMicroWishStatisticsInfo;
import com.panzhihua.common.model.vos.community.screen.work.MicroListVO;
import com.panzhihua.common.model.vos.user.SysUserVO;
import com.panzhihua.service_community.model.dos.ComActMicroWishDO;
@@ -65,7 +68,7 @@
            " </if> " +
            " <where>" +
            "<if test='comActMicroWishVO.communityId != null and comActMicroWishVO.communityId != 0'>" +
            " and w.community_id=#{comActMicroWishVO.communityId}  " +
            " and w.community_id = ${comActMicroWishVO.communityId}  " +
            " </if> " +
            "<if test='comActMicroWishVO.sponsorPhone != null and comActMicroWishVO.sponsorPhone.trim() != &quot;&quot;'>" +
            "AND w.sponsor_phone like concat(#{comActMicroWishVO.sponsorPhone},'%')   " +
@@ -163,7 +166,7 @@
            "FROM " +
            "com_act_micro_wish w  " +
            "WHERE " +
            "w.community_id = #{communityId}  " +
            "w.community_id = ${communityId}  " +
            "AND w.`status` = 1 " +
            " " +
            "union all  " +
@@ -173,7 +176,7 @@
            "FROM " +
            " com_act_micro_wish w  " +
            "WHERE " +
            " w.community_id = #{communityId}  " +
            " w.community_id = ${communityId}  " +
            " AND w.`status` = 3  " +
            " AND w.form = 1  " +
            " AND w.responsible_id = #{userId}  " +
@@ -188,12 +191,12 @@
    List<Long> getWishAutoConfirmIds();

    @Select("SELECT COUNT(id) AS completedNum," +
            "(SELECT COUNT(id) FROM com_act_micro_wish WHERE community_id = #{communityId} AND (status =1 OR status =2 OR status = 3 OR status = 5)) AS willNum ," +
            "(SELECT COUNT(id) FROM com_act_micro_wish WHERE community_id = #{communityId} AND (status =1 OR status =2 OR status = 3 OR status = 5 OR status = 6) AND create_at LIKE CONCAT(#{nowDate},'%')) AS currentNum " +
            "FROM com_act_micro_wish WHERE community_id = #{communityId} AND status = 6 ")
            "(SELECT COUNT(id) FROM com_act_micro_wish WHERE community_id = ${communityId} AND (status =1 OR status =2 OR status = 3 OR status = 5)) AS willNum ," +
            "(SELECT COUNT(id) FROM com_act_micro_wish WHERE community_id = ${communityId} AND (status =1 OR status =2 OR status = 3 OR status = 5 OR status = 6) AND create_at LIKE CONCAT(#{nowDate},'%')) AS currentNum " +
            "FROM com_act_micro_wish WHERE community_id = ${communityId} AND status = 6 ")
    Map<String, Long> countByCommunityId(@Param("communityId") Long communityId,@Param("nowDate") String nowDate);

    @Select("SELECT photo_path_list FROM com_act_micro_wish WHERE community_id = #{communityId} AND (status =1 OR status =2 OR status = 3 OR status = 5 OR status = 6) ORDER BY create_at DESC limit #{pageSize}")
    @Select("SELECT photo_path_list FROM com_act_micro_wish WHERE community_id = ${communityId} AND (status =1 OR status =2 OR status = 3 OR status = 5 OR status = 6) ORDER BY create_at DESC limit #{pageSize}")
    List<String> getAllImgs(@Param("communityId") Long communityId,@Param("pageSize") Integer pageSize);

    @Select("<script> " +
@@ -224,7 +227,7 @@
            "AND camw.`status` =#{microListDTO.status}  " +
            " </if> " +
            "<if test='microListDTO.communityId != null'>" +
            "AND camw.community_id =#{microListDTO.communityId}  " +
            "AND camw.community_id = ${microListDTO.communityId}  " +
            " </if> " +
            "<if test='microListDTO.startTime!=null and microListDTO.startTime != &quot;&quot;'>" +
            " AND DATE_FORMAT(camw.create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{microListDTO.startTime} " +
@@ -246,4 +249,38 @@
    List<SysUserVO> getWishHandleListAdmin(@Param("type") Integer type,@Param("communityId") Long communityId);

    SysUserVO getUserByUserId(@Param("userId") Long userId);

    /**
     * 待实现&已实现数目及占比
     * @param communityId
     * @return
     */
    List<StatisticsCommVO> selectRealizePercent(@Param("communityId") Long communityId);

    /**
     * 获取通过的微心愿图片
     * @param communityId
     * @param pageSize
     * @return
     */
    List<String> getPassedAllImages(@Param("communityId") Long communityId, @Param("pageSize") Integer pageSize);

    /**
     * 首页二级页面-微心愿基础数据查询
     * @param communityId
     * @return
     */
    BigScreenMicroWishStatisticsInfo selectIndexMicroWishBaseData(@Param("communityId") Long communityId);

    List<StatisticsCommVO> getMicroWishAddPolylineData(@Param("communityId") Long communityId);

    StatisticsCommVO getMicroWishTotalPolylineDate(@Param("communityId") Long communityId, @Param("date") String date);

    /**
     * 微心愿大屏展示列表
     * @param page
     * @param pageBaseDTO
     * @return
     */
    IPage<ComActMicroWishVO> selectScreenDisplayList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);
}

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

@@ -3,6 +3,8 @@
import java.util.List;
import java.util.Map;

import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -66,54 +68,78 @@
        + " where reply.comment_id = #{commentId} and reply.status = 1")
    IPage<ComActNeighborCommentReplyAppVO> neighborCommentReplyByApp(Page page, @Param("commentId") Long commentId);

    @Select("SELECT id,release_content as content FROM com_act_neighbor_circle WHERE community_id =#{communityId} and status = 2 ORDER BY create_at DESC limit #{pageSize}")
    @Select("SELECT id,release_content as content FROM com_act_neighbor_circle WHERE community_id = ${communityId} and status = 2 ORDER BY create_at DESC limit #{pageSize}")
    List<CarouselInfoVO> screenNeighborCircle(@Param("communityId") Long communityId,
        @Param("pageSize") Integer pageSize);

    @Select(" SELECT COUNT(id) AS totalNum,"
        + " (SELECT COUNT(id) FROM com_act_neighbor_circle WHERE  community_id = #{communityId} AND status = 2 AND create_at LIKE CONCAT(#{nowDate},'%')) AS currentNum "
        + "  FROM com_act_neighbor_circle WHERE community_id = #{communityId} AND status = 2")
        + " (SELECT COUNT(id) FROM com_act_neighbor_circle WHERE  community_id = ${communityId} AND status = 2 AND create_at LIKE CONCAT(#{nowDate},'%')) AS currentNum "
        + "  FROM com_act_neighbor_circle WHERE community_id = ${communityId} AND status = 2")
    Map<String, Long> countByCommunityId(@Param("communityId") Long communityId, @Param("nowDate") String nowDate);

    @Select("SELECT SUM(comment_num) as commentNum,SUM(fabulous_num) as fabulousNum,SUM(forward_num) as forwardNum FROM com_act_neighbor_circle WHERE  community_id = #{communityId} and status = 2 ")
    @Select("SELECT SUM(comment_num) as commentNum,SUM(fabulous_num) as fabulousNum,SUM(forward_num) as forwardNum FROM com_act_neighbor_circle WHERE  community_id = ${communityId} and status = 2 ")
    Map<String, Object> sumScreenNum(@Param("communityId") Long communityId);

    @Select("SELECT release_images FROM com_act_neighbor_circle WHERE  community_id = #{communityId} and status = 2 order by create_at desc limit #{pageSize}")
    @Select("SELECT release_images FROM com_act_neighbor_circle WHERE  community_id = ${communityId} and status = 2 order by create_at desc limit #{pageSize}")
    List<String> screenNeighborCircleImgs(@Param("communityId") Long communityId, @Param("pageSize") Integer pageSize);

    @Select("SELECT COUNT(id) as num,'随手拍' as name FROM com_act_easy_photo WHERE community_id = #{communityId} AND STATUS = 4 "
    @Select("SELECT COUNT(id) as num,'随手拍' as name FROM com_act_easy_photo WHERE community_id = ${communityId} AND STATUS = 4 "
        + "UNION ALL "
        + "SELECT COUNT(id) as num,'微心愿' as name FROM com_act_micro_wish WHERE community_id = #{communityId} AND STATUS = 6 "
        + "SELECT COUNT(id) as num,'微心愿' as name FROM com_act_micro_wish WHERE community_id = ${communityId} AND STATUS = 6 "
        + "UNION ALL "
        + "SELECT COUNT(id) as num,'一起议' as name FROM com_act_discuss WHERE community_id = #{communityId} "
        + "SELECT COUNT(id) as num,'一起议' as name FROM com_act_discuss WHERE community_id = ${communityId} "
        + "UNION ALL "
        + "SELECT COUNT(id) as num,'邻里圈' as name FROM com_act_neighbor_circle WHERE community_id = #{communityId} AND STATUS = 2 "
        + "SELECT COUNT(id) as num,'邻里圈' as name FROM com_act_neighbor_circle WHERE community_id = ${communityId} AND STATUS = 2 "
        + "UNION ALL "
        + "SELECT COUNT( e.id ) AS num,'网格事件' AS name FROM `event` as e left join event_grid_data as egd on egd.id = e.grid_id WHERE egd.grid_community_id = #{communityId} AND e.event_process_status = 2 "
        + "SELECT COUNT( e.id ) AS num,'网格事件' AS name FROM `event` as e left join event_grid_data as egd on egd.id = e.grid_id WHERE egd.grid_community_id = ${communityId} AND e.event_process_status = 2 "
        + "UNION ALL "
        + "SELECT COUNT(id) as num,'社区活动' as name FROM com_act_activity WHERE community_id = #{communityId} AND STATUS = 5 ")
        + "SELECT COUNT(id) as num,'社区活动' as name FROM com_act_activity WHERE community_id = ${communityId} AND STATUS = 5 ")
    List<PieElementVO> countAllCompletedWorkByCommunityId(@Param("communityId") Long communityId);

    @Select("SELECT COUNT(id) as num,'随手拍' as name FROM com_act_easy_photo WHERE community_id = #{communityId} AND (STATUS = 1 or STATUS = 2)  "
    @Select("SELECT COUNT(id) as num,'随手拍' as name FROM com_act_easy_photo WHERE community_id = ${communityId} AND (STATUS = 1 or STATUS = 2)  "
        + "UNION ALL "
        + "SELECT COUNT(id) as num,'微心愿' as name FROM com_act_micro_wish WHERE community_id = #{communityId} AND (STATUS = 1 or STATUS = 2 or STATUS = 3 or STATUS = 4) "
        + "SELECT COUNT(id) as num,'微心愿' as name FROM com_act_micro_wish WHERE community_id = ${communityId} AND (STATUS = 1 or STATUS = 2 or STATUS = 3 or STATUS = 4) "
        + "UNION ALL "
        + "SELECT COUNT(id) as num,'一起议' as name FROM com_act_discuss WHERE community_id = #{communityId} "
        + "SELECT COUNT(id) as num,'一起议' as name FROM com_act_discuss WHERE community_id = ${communityId} "
        + "UNION ALL "
        + "SELECT COUNT(id) as num,'邻里圈' as name FROM com_act_neighbor_circle WHERE community_id = #{communityId} AND STATUS = 1 "
        + "SELECT COUNT(id) as num,'邻里圈' as name FROM com_act_neighbor_circle WHERE community_id = ${communityId} AND STATUS = 1 "
        + "UNION ALL "
        + "SELECT COUNT( e.id ) AS num,'网格事件' AS NAME FROM `event` as e left join event_grid_data as egd on egd.id = e.grid_id WHERE egd.grid_community_id = #{communityId} AND e.event_status = 2 and e.event_deal_status in (1,2,3) "
        + "SELECT COUNT( e.id ) AS num,'网格事件' AS NAME FROM `event` as e left join event_grid_data as egd on egd.id = e.grid_id WHERE egd.grid_community_id = ${communityId} AND e.event_status = 2 and e.event_deal_status in (1,2,3) "
        + "UNION ALL "
        + "SELECT COUNT(id),'社区活动' as name FROM com_act_activity WHERE community_id = #{communityId} AND (STATUS = 1 or STATUS = 2 or STATUS = 3 or STATUS = 4)  ")
        + "SELECT COUNT(id),'社区活动' as name FROM com_act_activity WHERE community_id = ${communityId} AND (STATUS = 1 or STATUS = 2 or STATUS = 3 or STATUS = 4)  ")
    List<PieElementVO> countAllNoneCompletedWorkByCommunityId(@Param("communityId") Long communityId);

    @Select(" SELECT AVG(b.t)AS avgTime "
            + "  FROM (SELECT  TIMESTAMPDIFF(MINUTE,create_at,feedback_at) AS t  FROM com_act_easy_photo WHERE community_id = #{communityId} and STATUS = 4 "
            + "  UNION ALL SELECT  TIMESTAMPDIFF(MINUTE,create_at,finish_at) AS t  FROM com_act_micro_wish WHERE community_id = #{communityId} and STATUS = 6 "
            + "  FROM (SELECT  TIMESTAMPDIFF(MINUTE,create_at,feedback_at) AS t  FROM com_act_easy_photo WHERE community_id = ${communityId} and STATUS = 4 "
            + "  UNION ALL SELECT  TIMESTAMPDIFF(MINUTE,create_at,finish_at) AS t  FROM com_act_micro_wish WHERE community_id = ${communityId} and STATUS = 6 "
            + "  )AS b ")
    Map<String, Object> countAvgByCommunityId(@Param("communityId")Long communityId);

    void addHotNum(@Param("circleId") Long circleId,@Param("hotNum") Long hotNum);

    void addTopicHotNum(@Param("circleId") Long circleId,@Param("hotNum") Long hotNum);

    /**
     * 获取大屏邻里圈展示图片
     * @param communityId
     * @param pageSize
     * @return
     */
    List<String> getAllImages(@Param("communityId") Long communityId, @Param("pageSize") Integer pageSize);

    /**
     * 获取大屏邻里圈展示文本内容
     * @param communityId
     * @param pageSize
     * @return
     */
    List<String> getContents(@Param("communityId") Long communityId, @Param("pageSize") Integer pageSize);

    List<StatisticsCommVO> getIndexNeighborBaseData(@Param("communityId") Long communityId);

    List<StatisticsCommVO> getNeighborAddPolylineData(@Param("communityId") Long communityId);

    StatisticsCommVO getNeighborTotalPolylineDate(@Param("communityId") Long communityId, @Param("date") String date);

    IPage<ComActNeighborCircleAdminVO> indexNeighborList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);
}

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

@@ -2,6 +2,10 @@

import java.util.List;

import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.vos.community.ComActQuestnaireVO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenQuestionnaireStatisticsInfo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -27,14 +31,14 @@
        + " if(caqua.id is not null,1,2) isAnswer, " + " caq.view_num  " + "FROM " + " com_act_questnaire as caq "
        + " left join com_act_questnaire_user_answer as caqua on caqua.questnaire_id = caq.id and caqua.user_id = #{pageQuestnaireDTO.userId} "
        + "WHERE " + " caq.state IN ( 2, 3 )  "
        + " AND caq.community_id = #{pageQuestnaireDTO.communityId}  and caq.is_hide = 0 " + "ORDER BY "
        + " AND caq.community_id = ${pageQuestnaireDTO.communityId}  and caq.is_hide = 0 " + "ORDER BY "
        + " caq.state ASC, " + " isAnswer ASC, " + " caq.create_at DESC" + "</script>")
    IPage<QuestnaireListVo> selectPageList(Page page, @Param("pageQuestnaireDTO") PageQuestnaireDTO pageQuestnaireDTO);

    @Select("<script>"
        + "select id,title,view_num,join_count,for_masses,for_party,for_volunteer,adver_position_top,adver_position_popup"
        + ",adver_position_application,create_at,start_time,end_time,publish_time,state,is_cover,project_key,count"
        + " from com_act_questnaire as caq where community_id = #{pageQuestnaireDTO.communityId} and is_hide = 0 "
        + " from com_act_questnaire as caq where community_id = ${pageQuestnaireDTO.communityId} and is_hide = 0 "
        + "<if test='pageQuestnaireDTO.identity != null and pageQuestnaireDTO.identity == 1'>"
        + " and caq.for_masses = 1 " + " </if> "
        + "<if test='pageQuestnaireDTO.identity != null and pageQuestnaireDTO.identity == 2'>"
@@ -66,14 +70,14 @@
    @Select("SELECT " + " id, " + " title, " + " remark, " + " is_cover, " + " for_masses, " + " for_party, "
        + " for_volunteer, " + " is_force, " + " adver_position_popup, " + " adver_position_top, "
        + " adver_position_application, " + " project_key  " + "FROM " + " com_act_questnaire  " + "WHERE "
        + " end_time >= now()  " + " AND now() >= start_time  " + " and community_id = #{communityId} "
        + " end_time >= now()  " + " AND now() >= start_time  " + " and community_id = ${communityId} "
        + " and adver_position_top = 1 " + " and state = 2")
    List<ComActQuestnaireAppVO> getIndexTopQuestnaireList(@Param("communityId") Long communityId);

    @Select("SELECT " + " id, " + " title, " + " remark, " + " for_masses, " + " for_party, " + " for_volunteer, "
        + " is_cover, " + " is_force, " + " adver_position_popup, " + " adver_position_top, "
        + " adver_position_application, " + " project_key  " + "FROM " + " com_act_questnaire  " + "WHERE "
        + " end_time >= now()  " + " AND now() >= start_time  " + " and community_id = #{communityId} "
        + " end_time >= now()  " + " AND now() >= start_time  " + " and community_id = ${communityId} "
        + " and adver_position_application = 1 " + " and state = 2")
    List<ComActQuestnaireAppVO> getIndexApplicationQuestnaireList(@Param("communityId") Long communityId);

@@ -125,4 +129,23 @@
        @Param("communityId") Long communityId);

    void addNoNotice(@Param("questId") Long questId, @Param("userId") Long userId);

    /**
     * 首页大屏二级页面-社区问卷基础数据
     * @param communityId
     * @return
     */
    BigScreenQuestionnaireStatisticsInfo getIndexQuestionnaireBaseData(@Param("communityId") Long communityId);

    List<StatisticsCommVO> getQuestionnaireAddPolylineData(@Param("communityId") Long communityId);

    StatisticsCommVO getQuestionnaireTotalPolylineDate(@Param("communityId") Long communityId, @Param("date") String date);

    /**
     * 大屏问卷展示列表
     * @param page
     * @param pageBaseDTO
     * @return
     */
    IPage<ComActQuestnaireVO> selectQuestionnaireDisplayList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);
}

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

@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.reserve.ComActReserveMakeStatisticsDTO;
import com.panzhihua.common.model.dtos.community.reserve.PageReserveAdminDTO;
import com.panzhihua.common.model.vos.community.bigscreen.IndexReserve;
import com.panzhihua.common.model.vos.community.bigscreen.IndexReserveSub;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveListAdminVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveMakeLeftStatisticsAdminVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveMakeRightStatisticsAdminVO;
@@ -94,4 +96,31 @@
     */
    List<ComActReserveIndexVo> getReserveIndexList(@Param("communityId") Long communityId);

    /**
     * 首页大屏返攀登记数据统计总数
     * @param communityId
     * @return
     */
    Integer indexBackReserve(@Param("communityId") Long communityId);

    /**
     * 首页大屏居家隔离数据统计总数
     * @param communityId
     * @return
     */
    Integer indexHomeQuarantine(@Param("communityId") Long communityId);

    /**
     * 首页大屏返攀登记数据统计选项
     * @param communityId
     * @return
     */
    List<IndexReserveSub> indexBackReserveSub(@Param("communityId") Long communityId);

    /**
     * 首页大屏居家隔离数据统计选项
     * @param communityId
     * @return
     */
    List<IndexReserveSub> IndexHomeQuarantineSub(@Param("communityId") Long communityId);
}

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

@@ -7,6 +7,8 @@
import com.panzhihua.common.model.dtos.community.reserve.ComActReserveRegisterStatisticsDTO;
import com.panzhihua.common.model.dtos.community.reserve.PageReserveMakeAdminDTO;
import com.panzhihua.common.model.dtos.community.reserve.PageReserveMakeHandleAdminDTO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStaticsReserve;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStaticsReserveMonth;
import com.panzhihua.common.model.vos.community.reserve.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -105,4 +107,19 @@
     * @return
     */
    List<ComOperationListVO> queryAll(OperationDetailDTO operationDetailDTO);

    /**
     * 大屏数据统计
     * @param communityId
     * @return
     */
    BigScreenStaticsReserve biggestScreen(@Param("communityId") Long communityId);

    /**
     * 大屏折线图
     * @param communityId
     * @param date
     * @return
     */
    BigScreenStaticsReserveMonth biggestScreenMonth(@Param("communityId")Long communityId,@Param("date")String date,@Param("year")String year);
}

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

@@ -35,9 +35,9 @@
    ComMngVillageVO getStatisticsCount(@Param("villageId") Long villageId);

    @Select("select count(distinct `name`) as villageTotal"
        + ",(select count(distinct `name`) from com_mng_village where community_id = #{communityId} and type = 1) as townTotal"
        + ",(select count(distinct `name`) from com_mng_village where community_id = #{communityId} and type = 2) as countrysideTotal"
        + " from com_mng_village where community_id = #{communityId}")
        + ",(select count(distinct `name`) from com_mng_village where community_id = ${communityId} and type = 1) as townTotal"
        + ",(select count(distinct `name`) from com_mng_village where community_id = ${communityId} and type = 2) as countrysideTotal"
        + " from com_mng_village where community_id = ${communityId}")
    ComMngVillageTotalVO getVillageStatisticsCount(@Param("communityId") Long communityId);

    @Select("select village_id,alley,house_num,group_at,type,address,update_at from com_mng_village where village_id = #{villageId}")
@@ -50,7 +50,7 @@
        + " ( SELECT count( id ) FROM com_mng_population WHERE village_id = cmv.village_id AND out_or_local = 1 ) AS registerNum, "
        + " ( SELECT count( id ) FROM com_mng_population WHERE village_id = cmv.village_id AND is_rent = 2 ) AS rentNum  "
        + "FROM " + " com_mng_village AS cmv where 1=1 " + "<if test='villageListAppDTO.communityId != null'>"
        + " and cmv.community_id = #{villageListAppDTO.communityId} " + " </if> "
        + " and cmv.community_id = ${villageListAppDTO.communityId} " + " </if> "
        + "<if test='villageListAppDTO.address != null and villageListAppDTO.address != &quot;&quot;'>"
        + " and cmv.address like concat(#{villageListAppDTO.address},'%') " + " </if> "
        + "<if test='villageListAppDTO.alley != null and villageListAppDTO.alley != &quot;&quot;'>"
@@ -74,7 +74,7 @@
        + " ( SELECT count( id ) FROM com_mng_population WHERE village_id = cmv.village_id ) AS userSum, "
        + " ( SELECT count( id ) FROM com_mng_population_house WHERE village_id = cmv.village_id ) AS houseNum "
        + "FROM " + " com_mng_village AS cmv where 1=1 " + "<if test='villageListAppDTO.communityId != null'>"
        + " and cmv.community_id = #{villageListAppDTO.communityId} " + " </if> "
        + " and cmv.community_id = ${villageListAppDTO.communityId} " + " </if> "
        + "<if test='villageListAppDTO.villageIds != null and villageListAppDTO.villageIds.size > 0'>"
        + " and cmv.village_id in "
        + "<foreach item='item' collection='villageListAppDTO.villageIds' separator=',' open='(' close=')' index=''> "

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

@@ -70,4 +70,28 @@
     */
    DonatesStatisticsVO selectDonatesStatistics(@Param("communityId") Long communityId, @Param("currentYear") String currentYear,
                                                @Param("currentMonth") String currentMonth, @Param("today") String today);

    /**
     * 居民自治大屏-捐赠记录
     * @param communityId
     * @param pageSize
     * @return
     */
    List<String> getWarehouseDonateRecords(@Param("communityId") Long communityId, @Param("pageSize") Integer pageSize);

    /**
     * 居民自治大屏-爱心传递
     * @param communityId
     * @param pageSize
     * @return
     */
    List<String> getWarehouseLoveTransfer(@Param("communityId") Long communityId, @Param("pageSize") Integer pageSize);

    /**
     * 居民自治大屏-捐赠物品图片
     * @param communityId
     * @param pageSize
     * @return
     */
    List<String> getWarehouseImages(@Param("communityId") Long communityId, @Param("pageSize") Integer pageSize);
}

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

@@ -23,6 +23,8 @@
        + " <where>"
        + "<if test='pageActWorkGuideDTO.classify != null'>"
        + "and classify = #{pageActWorkGuideDTO.classify} " + " </if> "
        + "<if test='pageActWorkGuideDTO.areaCode != null'>"
        + "and area_code = #{pageActWorkGuideDTO.areaCode} " + " </if> "
        + "<if test='pageActWorkGuideDTO.title != null and pageActWorkGuideDTO.title.trim() != &quot;&quot;'>"
        + "and title like concat('%',#{pageActWorkGuideDTO.title},'%')" + " </if> " + " </where>" + "order by update_at desc"
        + "</script>")

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

@@ -47,7 +47,7 @@
        + "a.activity_time_begin,\n" + "a.activity_time_end,\n" + "a.enroll_time_begin,\n" + "a.cover,\n"
        + "if(u.type=3 ,'管理员',u.name)createByName,\n" + "a.enroll_time_end \n" + "FROM\n" + "com_pb_activity a\n"
        + "left join sys_user u on a.create_by=u.user_id \n"
        + "where a.community_id=#{partyBuildingActivityVO.communityId}\n"
        + "where a.community_id = ${partyBuildingActivityVO.communityId}\n"
        + "<if test='partyBuildingActivityVO.name != null and partyBuildingActivityVO.name.trim() != &quot;&quot;'>"
        + "and a.name = #{partyBuildingActivityVO.name} \n" + " </if> "
        + "<if test='partyBuildingActivityVO.isAppliets != null and partyBuildingActivityVO.isAppliets==1'>"
@@ -106,6 +106,6 @@
     *            社区id
     * @return 社区名字
     */
    @Select("select name from com_act where community_id=#{communityId}")
    @Select("select name from com_act where community_id = ${communityId}")
    String selectCommunityNameByCommunityId(Long communityId);
}

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

@@ -21,7 +21,7 @@
        + "<if test='pageComCvtBusinessDTO.name != null and pageComCvtBusinessDTO.name.trim() != &quot;&quot;'>"
        + " and a.name LIKE concat( '%', #{pageComCvtBusinessDTO.name}, '%' )  " + " </if> "
        + "<if test='pageComCvtBusinessDTO.communityId != null and pageComCvtBusinessDTO.communityId != 0'>"
        + " and a.community_id = #{pageComCvtBusinessDTO.communityId} " + " </if> " + " </where>"
        + " and a.community_id = ${pageComCvtBusinessDTO.communityId} " + " </if> " + " </where>"
        + " order by a.create_at desc" + "</script>")
    IPage<ComCvtBusinessVO> pageComCvtBusiness(Page page,
        @Param("pageComCvtBusinessDTO") PageComCvtBusinessDTO pageComCvtBusinessDTO);
@@ -29,7 +29,7 @@
    @Select("<script> " + "SELECT " + "t.*  " + "FROM " + "com_cvt_business t  " + " <where>"
        + "<if test='comCvtBusinessAppletsDTO.communityId != null and comCvtBusinessAppletsDTO.communityId != 0'>"
        + " t.area_flag = 1 " + " OR (" + " t.area_flag = 2 "
        + " AND EXISTS ( SELECT * FROM com_cvt_business_area t2 WHERE t2.business_id = t.id AND t2.community_id = #{comCvtBusinessAppletsDTO.communityId} ) \n"
        + " AND EXISTS ( SELECT * FROM com_cvt_business_area t2 WHERE t2.business_id = t.id AND t2.community_id = ${comCvtBusinessAppletsDTO.communityId} ) \n"
        + " ) " + " </if> " + " </where>" + " order by t.create_at desc" + "</script>")
    IPage<ComCvtBusinessVO> pageComCvtBusinessByServiceArea(Page page,
        @Param("comCvtBusinessAppletsDTO") PageComCvtBusinessAppletsDTO comCvtBusinessAppletsDTO);

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

@@ -29,7 +29,7 @@
        + "<if test='pageComMngRealCompanyDTO.comName != null and pageComMngRealCompanyDTO.comName.trim() != &quot;&quot;'>"
        + " and t.com_name LIKE concat( '%',#{pageComMngRealCompanyDTO.comName}, '%' )  " + " </if> "
        + "<if test='pageComMngRealCompanyDTO.communityId != null and pageComMngRealCompanyDTO.communityId != 0'>"
        + " and t.community_id = #{pageComMngRealCompanyDTO.communityId} " + " </if> " + " order by t.create_at desc"
        + " and t.community_id = ${pageComMngRealCompanyDTO.communityId} " + " </if> " + " order by t.create_at desc"
        + "</script>")
    IPage<ComExServicemanVO> pageQueryComExServiceman(Page page,
        @Param(value = "comExServicemanDTO") ComExServicemanDTO comExServicemanDTO);

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

@@ -35,7 +35,7 @@
        + "<if test='pageComMngCarDTO.villageId != null and pageComMngCarDTO.villageId != &quot;&quot;'>"
        + " and t.area_id = #{pageComMngCarDTO.villageId} " + " </if> "
        + "<if test='pageComMngCarDTO.communityId != null and pageComMngCarDTO.communityId != 0'>"
        + " and t.community_id = #{pageComMngCarDTO.communityId} " + " </if> "
        + " and t.community_id = ${pageComMngCarDTO.communityId} " + " </if> "
        + "<if test='pageComMngCarDTO.areaName != null and pageComMngCarDTO.areaName != &quot;&quot;'>"
        + " and t2.area_name LIKE concat( '%',#{pageComMngCarDTO.areaName}, '%' )  " + " </if> "
        + " order by t.create_at desc" + "</script>")
@@ -52,7 +52,7 @@
        + "<if test='exportComMngCarExcelDTO.areaName != null and exportComMngCarExcelDTO.areaName.trim() != &quot;&quot;'>"
        + " and t.area_name LIKE concat( #{exportComMngCarExcelDTO.areaName}, '%' )  " + " </if> "
        + "<if test='exportComMngCarExcelDTO.communityId != null and exportComMngCarExcelDTO.communityId != &quot;&quot;'>"
        + " and t.community_id = #{exportComMngCarExcelDTO.communityId} " + " </if> "
        + " and t.community_id = ${exportComMngCarExcelDTO.communityId} " + " </if> "
        + "<if test='exportComMngCarExcelDTO.villageId != null and exportComMngCarExcelDTO.villageId != &quot;&quot;'>"
        + " and t.area_id = #{exportComMngCarExcelDTO.villageId} " + " </if> "
        + "<if test='exportComMngCarExcelDTO.userName != null and exportComMngCarExcelDTO.userName.trim() != &quot;&quot;'>"

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

@@ -4,9 +4,14 @@
import java.util.List;
import java.util.Map;

import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.CascadeHouseDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.bigscreen.WestScreenStatics;
import com.panzhihua.common.model.vos.community.screen.civil.*;
import com.panzhihua.common.model.vos.community.bigscreen.BaseInfo;
import com.panzhihua.common.model.vos.community.bigscreen.IndexDynamic;
import com.panzhihua.service_community.model.dos.ComMngPopulationCommunityTagsDO;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper;
@@ -25,8 +30,6 @@
import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationDTO;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.vos.area.AreaAddressVO;
import com.panzhihua.common.model.vos.community.screen.civil.CivilPopulationStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.civil.CivilVillageStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.event.*;
import com.panzhihua.common.model.vos.community.screen.index.*;
import com.panzhihua.common.model.vos.grid.EventGridDataVO;
@@ -102,7 +105,7 @@
        + "AND cmp.`name` LIKE concat(#{comMngPopulationVO.name},'%') " + " </if> "
        + "<if test='comMngPopulationVO.label != null and comMngPopulationVO.label != &quot;&quot;'>"
        + "AND cmpct.label LIKE concat('%',#{comMngPopulationVO.label},'%') " + " </if> "
        + "<if test='comMngPopulationVO.actId != null'>" + " and cmpct.community_id = #{comMngPopulationVO.actId} "
        + "<if test='comMngPopulationVO.actId != null'>" + " and cmpct.community_id = ${comMngPopulationVO.actId} "
        + " </if> " + "<if test='comMngPopulationVO.outOrLocal != null'>"
        + " and cmp.out_or_local = #{comMngPopulationVO.outOrLocal} " + " </if> "
        + "<if test='comMngPopulationVO.villageId != null and comMngPopulationVO.villageId != &quot;&quot;'>"
@@ -185,23 +188,23 @@
        @Param("districtCode") String districtCode);

    @Select("select count(cmpct.id) as populationTotal "
        + ",(select count(cmpct.id) from com_mng_population_community_tags cmpct left join com_mng_population cmp on cmpct.population_id = cmp.id where cmpct.community_id = #{communityId} and cmp.out_or_local = 1) as localTotal "
        + ",(select count(cmpct.id) from com_mng_population_community_tags cmpct left join com_mng_population cmp on cmpct.population_id = cmp.id where cmpct.community_id = #{communityId} and cmp.out_or_local = 2) as outTotal "
        + ",(select count(cmpct.id) from com_mng_population_community_tags cmpct left join com_mng_population cmp on cmpct.population_id = cmp.id where cmpct.community_id = #{communityId} and cmpct.label is not null) as specialTotal "
        + ",(select count(DISTINCT `name`) from com_mng_village where community_id = #{communityId}) as villageTotal "
        + ",(select count(cmpct.id) from com_mng_population_community_tags cmpct left join com_mng_population cmp on cmpct.population_id = cmp.id where cmpct.community_id = ${communityId} and cmp.out_or_local = 1) as localTotal "
        + ",(select count(cmpct.id) from com_mng_population_community_tags cmpct left join com_mng_population cmp on cmpct.population_id = cmp.id where cmpct.community_id = ${communityId} and cmp.out_or_local = 2) as outTotal "
        + ",(select count(cmpct.id) from com_mng_population_community_tags cmpct left join com_mng_population cmp on cmpct.population_id = cmp.id where cmpct.community_id = ${communityId} and cmpct.label is not null) as specialTotal "
        + ",(select count(DISTINCT `name`) from com_mng_village where community_id = ${communityId}) as villageTotal "
        + ",(select count(id) from com_mng_building where act_id = #{communityId}) as buildNum "
        + ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','吸毒人员','%')) as drugTotal "
        + ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','社区矫正','%')) as correctTotal "
        + ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','精神障碍患者','%')) as majorTotal "
        + ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','邪教人员','%')) as cultTotal "
        + ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','刑释人员','%')) as rehabilitationTotal "
        + ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','重点人员','%')) as keyTotal "
        + ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','退役军人','%')) as veteransTotal "
        + ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','残疾人','%')) as disabilityTotal "
        + ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','低保户','%')) as lowSecurityTotal "
        + ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','高龄老人','%')) as elderTotal "
        + ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','养老金人员','%')) as pensionTotal "
        + " from com_mng_population_community_tags as cmpct inner join com_mng_population as cmp on cmp.id = cmpct.population_id where community_id = #{communityId}")
        + ",(select count(id) from com_mng_population_community_tags where community_id = ${communityId} and label LIKE CONCAT('%','吸毒人员','%')) as drugTotal "
        + ",(select count(id) from com_mng_population_community_tags where community_id = ${communityId} and label LIKE CONCAT('%','社区矫正','%')) as correctTotal "
        + ",(select count(id) from com_mng_population_community_tags where community_id = ${communityId} and label LIKE CONCAT('%','精神障碍患者','%')) as majorTotal "
        + ",(select count(id) from com_mng_population_community_tags where community_id = ${communityId} and label LIKE CONCAT('%','邪教人员','%')) as cultTotal "
        + ",(select count(id) from com_mng_population_community_tags where community_id = ${communityId} and label LIKE CONCAT('%','刑释人员','%')) as rehabilitationTotal "
        + ",(select count(id) from com_mng_population_community_tags where community_id = ${communityId} and label LIKE CONCAT('%','重点人员','%')) as keyTotal "
        + ",(select count(id) from com_mng_population_community_tags where community_id = ${communityId} and label LIKE CONCAT('%','退役军人','%')) as veteransTotal "
        + ",(select count(id) from com_mng_population_community_tags where community_id = ${communityId} and label LIKE CONCAT('%','残疾人','%')) as disabilityTotal "
        + ",(select count(id) from com_mng_population_community_tags where community_id = ${communityId} and label LIKE CONCAT('%','低保户','%')) as lowSecurityTotal "
        + ",(select count(id) from com_mng_population_community_tags where community_id = ${communityId} and label LIKE CONCAT('%','高龄老人','%')) as elderTotal "
        + ",(select count(id) from com_mng_population_community_tags where community_id = ${communityId} and label LIKE CONCAT('%','养老金人员','%')) as pensionTotal "
        + " from com_mng_population_community_tags as cmpct inner join com_mng_population as cmp on cmp.id = cmpct.population_id where community_id = ${communityId}")
    ComMngPopulationTotalVO getPopulationTotalByAdmin(@Param("communityId") Long communityId);

    @Select("select count(id) as populationTotal," +
@@ -209,21 +212,18 @@
            "IFNULL((select count(id) from com_mng_real_company where community_id = cmpct.community_id),0) as companyTotal, " +
            "IFNULL((select count(DISTINCT `name`) from com_mng_village where community_id = cmpct.community_id),0) as villageTotal " +
            " from com_mng_population_community_tags AS cmpct " +
            " where cmpct.community_id = #{communityId}")
            " where cmpct.community_id = ${communityId}")
    IndexBasicsStatisticsVO getScreenIndexByBasics(@Param("communityId") Long communityId);

    @Select("SELECT " + " IFNULL( NULL, 1 ) AS type, " + " count( cmpct.id ) AS sum  " + "FROM "
        + " com_mng_population_community_tags as cmpct  "
        + " left join com_mng_population  as cmp on cmpct.population_id = cmp.id " + "WHERE " + " cmp.sex = 1  "
        + " AND cmpct.community_id = #{communityId} UNION ALL " + "SELECT " + " IFNULL( NULL, 2 ) AS type, "
        + " count( cmpct.id ) AS sum  " + "FROM " + " com_mng_population_community_tags as cmpct  "
        + " left join com_mng_population  as cmp on cmpct.population_id = cmp.id " + "WHERE " + " cmp.sex = 2  "
        + " AND cmpct.community_id = #{communityId}")
    @Select("SELECT    cmp.sex as type,    count( cmpct.id ) AS sum,  count( cmpct.id )*100/(select count(*) from com_mng_population_community_tags as cmpct  \n" +
            "          left join com_mng_population  as cmp on cmpct.population_id = cmp.id   WHERE    cmpct.community_id = ${communityId} ) as percent    FROM \n" +
            "          com_mng_population_community_tags as cmpct  \n" +
            "          left join com_mng_population  as cmp on cmpct.population_id = cmp.id   WHERE cmp.sex is not null  and  cmpct.community_id = ${communityId} GROUP BY cmp.sex")
    List<IndexPopulationSexStatisticsVO> getScreenIndexByPopulationSex(@Param("communityId") Long communityId);

    @Select("SELECT " + " e.happen_time as createAt, " + " e.event_des, " + " e.event_deal_status  " + "FROM "
        + " `event` AS e " + " LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id  " + "WHERE "
        + " egd.grid_community_id = #{communityId}  " + " AND e.event_deal_status IN ( 1, 4 )  " + "ORDER BY "
        + " egd.grid_community_id = ${communityId}  " + " AND e.event_deal_status IN ( 1, 4 )  " + "ORDER BY "
        + " e.happen_time DESC  " + " LIMIT 8")
    List<IndexEventListStatisticsVO> getScreenIndexByEventList(@Param("communityId") Long communityId);

@@ -235,33 +235,33 @@
        + " IFNULL(( SELECT count( id ) FROM com_act_questnaire WHERE community_id = camw.community_id ),0) AS investigationTotal, "
        + " IFNULL(( SELECT count( id ) FROM com_act_dyn WHERE community_id = camw.community_id AND STATUS = 1 ),0) AS propagandaTotal  "
        + "FROM " + " com_act_micro_wish AS camw  " + "WHERE " + " camw.STATUS = 6  "
        + " AND camw.community_id = #{communityId}")
        + " AND camw.community_id = ${communityId}")
    IndexDynamicStatisticsVO getScreenIndexByDynamic(@Param("communityId") Long communityId);

    @Select("SELECT " + " count( e.id ) AS eventTFTotal, " + " IFNULL(( " + "  SELECT " + "   count( e1.id )  "
        + "  FROM " + "   `event` AS e1 " + "   LEFT JOIN event_grid_data AS egd1 ON egd1.id = e1.grid_id  "
        + "  WHERE " + "   event_category = 1  " + "   AND event_type = 1  " + "   AND event_status = 2  "
        + "   AND egd1.grid_community_id = #{communityId}  " + "   ), " + "  0  " + " ) AS eventZATotal, "
        + "   AND egd1.grid_community_id = ${communityId}  " + "   ), " + "  0  " + " ) AS eventZATotal, "
        + " IFNULL(( " + "  SELECT " + "   count( e2.id )  " + "  FROM " + "   `event` AS e2 "
        + "   LEFT JOIN event_grid_data AS egd2 ON egd2.id = e2.grid_id  " + "  WHERE " + "   event_category = 1  "
        + "   AND event_type = 3  " + "   AND event_status = 2  " + "   AND egd2.grid_community_id = #{communityId}  "
        + "   AND event_type = 3  " + "   AND event_status = 2  " + "   AND egd2.grid_community_id = ${communityId}  "
        + "   ), " + "  0  " + " ) AS eventMDTotal, " + " IFNULL(( " + "  SELECT " + "   count( e3.id )  " + "  FROM "
        + "   `event` AS e3 " + "   LEFT JOIN event_grid_data AS egd3 ON egd3.id = e3.grid_id  " + "  WHERE "
        + "   event_category = 1  " + "   AND event_type = 6  " + "   AND event_status = 2  "
        + "   AND egd3.grid_community_id = #{communityId}  " + "   ), " + "  0  " + " ) AS eventTSTotal, "
        + "   AND egd3.grid_community_id = ${communityId}  " + "   ), " + "  0  " + " ) AS eventTSTotal, "
        + " IFNULL(( " + "  SELECT " + "   count( e4.id )  " + "  FROM " + "   `event` AS e4 "
        + "   LEFT JOIN event_grid_data AS egd4 ON egd4.id = e4.grid_id  " + "  WHERE " + "   event_category = 2  "
        + "   AND event_status = 2  " + "   AND egd4.grid_community_id = #{communityId}  "
        + "   AND event_status = 2  " + "   AND egd4.grid_community_id = ${communityId}  "
        + "   ), " + "  0  " + " ) AS eventBWDTotal, " + " IFNULL(( " + "  SELECT " + "   count( e5.id )  " + "  FROM "
        + "   `event` AS e5 " + "   LEFT JOIN event_grid_data AS egd5 ON egd5.id = e5.grid_id  " + "  WHERE "
        + "   event_category = 1  " + "   AND event_type = 2  " + "   AND event_status = 2  "
        + "   AND egd5.grid_community_id = #{communityId}  " + "   ), " + "  0  " + " ) AS eventGGTotal  " + "FROM "
        + "   AND egd5.grid_community_id = ${communityId}  " + "   ), " + "  0  " + " ) AS eventGGTotal  " + "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_type = 5  " + " AND e.event_status = 2  "
        + " AND egd.grid_community_id = #{communityId}")
        + " AND egd.grid_community_id = ${communityId}")
    IndexGridEventStatisticsVO getGridEventStatisticsList(@Param("communityId") Long communityId);

    @Select("select id,grid_name from event_grid_data where grid_community_id = #{communityId}")
    @Select("select id,grid_name from event_grid_data where grid_community_id = ${communityId}")
    List<EventGridDataVO> getGridDataListByCommunityId(@Param("communityId") Long communityId);

    @Select("SELECT " + " count( e.id ) AS eventTFTotal, "
@@ -275,12 +275,16 @@
    IndexGridEventStatisticsVO getGridEventByGirdId(@Param("gridId") Long gridId);

    @Select("SELECT " + " tag_name, " + " sys_flag  " + "FROM " + " com_mng_user_tag  " + "WHERE " + " sys_flag = 1  "
        + " OR community_id = #{communityId}")
        + " OR community_id = ${communityId}")
    List<ComMngUserTagVO> getUserTagListByCommunityId(@Param("communityId") Long communityId);

    @Select("SELECT " + " count( id )  " + "FROM " + " com_mng_population_community_tags  " + "WHERE "
        + " community_id = #{communityId} and label like concat('%',#{label},'%')")
        + " community_id = ${communityId} and label like concat('%',#{label},'%')")
    Integer getSpecialStatisticsByLabel(@Param("label") String label,@Param("communityId") Long communityId);

    @Select("SELECT " + " count( id )  " + "FROM " + " com_mng_population_community_tags  " + "WHERE "
            + " community_id = ${communityId} ")
    Integer getSpecialStatistics(@Param("communityId") Long communityId);

    @Select("<script> " + "SELECT " + " count( egd.id ) AS gridTotal, "
        + " ( select count(egmr.id) from event_grid_member_relation as egmr"
@@ -307,14 +311,14 @@
        + " AND e1.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " + " </if> "
        + "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>"
        + " AND e1.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " + " </if> " + " ) AS solveEventTotal  "
        + "FROM " + " event_grid_data AS egd  " + "WHERE " + " egd.grid_community_id = #{screenEventDTO.communityId} "
        + "FROM " + " event_grid_data AS egd  " + "WHERE " + " egd.grid_community_id = ${screenEventDTO.communityId} "
        + " </script>")
    EventLeftTopStatisticsVO getEventScreenLeftTop(@Param("screenEventDTO") BigScreenEventDTO screenEventDTO);

    @Select("SELECT " + " DATE_FORMAT( e.create_at, '%m' ) months  " + "FROM " + " `event` AS e "
        + " LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id  " + "WHERE "
        + " e.create_at BETWEEN concat( YEAR ( now()), '-01-01 00:00:00' )  "
        + " AND concat( YEAR ( now()), '-12-31 23:59:59' )  " + " AND egd.grid_community_id = #{communityId}  "
        + " AND concat( YEAR ( now()), '-12-31 23:59:59' )  " + " AND egd.grid_community_id = ${communityId}  "
        + "GROUP BY " + " months  " + "ORDER BY " + " count( e.id ) DESC  " + " LIMIT 3")
    List<Integer> getFrequentlyEventMonth(@Param("communityId") Long communityId);

@@ -330,18 +334,18 @@
        + " e.happent_lat_lng, " + " e.event_type, " + " e.id, " + " e.event_deal_status  " + "FROM " + " `event` AS e "
        + " LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id "
        + " LEFT JOIN sys_user AS su ON su.user_id = e.grid_member_id  " + "WHERE "
        + " egd.grid_community_id = #{communityId}  " + " AND e.event_status = 2  " + " AND e.event_deal_status = 1  "
        + " egd.grid_community_id = ${communityId}  " + " AND e.event_status = 2  " + " AND e.event_deal_status = 1  "
        + " AND e.event_category = 1  " + "ORDER BY " + " e.happen_time DESC  " + " LIMIT 1")
    EventNewStatisticsVO getEventScreenRightTop(@Param("communityId") Long communityId);

    @Select("SELECT " + " grid_name, " + " `data`, " + " line_color, " + " line_broadband, " + " id, " + " fill_color  "
        + "FROM " + " event_grid_data AS egd  " + "WHERE " + " egd.grid_community_id = #{communityId}")
        + "FROM " + " event_grid_data AS egd  " + "WHERE " + " egd.grid_community_id = ${communityId}")
    List<EventGridStatisticsVO> getEventScreenGridData(@Param("communityId") Long communityId);

    @Select("<script> " + "SELECT " + " event_type AS type, " + " e.id AS eventId, " + " happent_lat_lng AS latLng  "
    @Select("<script> " + "(SELECT " + " event_type AS type, " + " e.id AS eventId, " + " happent_lat_lng AS latLng,e.create_at as createAt  "
        + "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_type IN ( 1, 2, 3, 4, 5, 6 )  " + " AND e.event_status = 2  "
        + " AND egd.grid_community_id = #{screenEventDTO.communityId}  "
        + " AND egd.grid_community_id = ${screenEventDTO.communityId}  "
        + "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>"
        + " AND e.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " + " </if> "
        + "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>"
@@ -350,26 +354,26 @@
        + " AND e.event_process_status = #{screenEventDTO.eventProcessStatus} " + " </if> "
        + "<if test='screenEventDTO.redCard != null'>" + " AND e.red_card = #{screenEventDTO.redCard} " + " </if> "
        + "<if test='screenEventDTO.yellowCard != null'>" + " AND e.yellow_card = #{screenEventDTO.yellowCard} "
        + " </if> " + "UNION ALL SELECT " + " IFNULL( NULL, 7 ) AS type, " + " id AS eventId, " + " lng_lat AS latLng  "
        + "FROM " + " com_act_easy_photo  " + "WHERE " + " community_id = #{screenEventDTO.communityId}  "
        + " </if> )" + "UNION ALL (SELECT " + " IFNULL( NULL, 7 ) AS type, " + " id AS eventId, " + " lng_lat AS latLng,create_at as createAt  "
        + "FROM " + " com_act_easy_photo  " + "WHERE " + " community_id = ${screenEventDTO.communityId}  "
        + "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>"
        + " AND create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " + " </if> "
        + "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>"
        + " AND create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " + " </if> "
        + "<if test='screenEventDTO.eventProcessStatus != null'>"
        + " AND handle_status = #{screenEventDTO.eventProcessStatus} " + " </if> " + " </script>")
        + " AND handle_status = #{screenEventDTO.eventProcessStatus} " + " </if> )" + "order by createAt desc </script>")
    List<EventGridIncidentStatisticsVO>
        getEventScreenEventList(@Param("screenEventDTO") BigScreenEventDTO screenEventDTO);

    @Select("SELECT " + " count( id ) AS specialTotal, "
        + " ( SELECT count( id ) FROM com_mng_population_community_tags WHERE label IS NOT NULL AND community_id = #{communityId} AND create_at < #{lastMonth} ) AS toMonthSpecialTotal  "
        + " ( SELECT count( id ) FROM com_mng_population_community_tags WHERE label IS NOT NULL AND community_id = ${communityId} AND create_at < #{lastMonth} ) AS toMonthSpecialTotal  "
        + "FROM " + " com_mng_population_community_tags AS cmpct  " + "WHERE " + " label IS NOT NULL  "
        + " AND community_id = #{communityId}")
        + " AND community_id = ${communityId}")
    CivilPopulationStatisticsVO getCivilScreenPopulation(@Param("communityId") Long communityId,
        @Param("lastMonth") Date lastMonth);

    @Select("SELECT `NAME`, " + " user_sum, " + " lng, " + " lat, " + " village_images, " + " village_id  " + "FROM "
        + " com_mng_village AS cmv  " + "WHERE " + " community_id = #{communityId}")
    @Select("SELECT `NAME`, " + "user_sum, " + " lng, " + " lat, " + " village_images, " + " village_id  " + "FROM "
        + " com_mng_village AS cmv  " + "WHERE " + " community_id = ${communityId}")
    List<CivilVillageStatisticsVO> getCivilScreenVillageList(@Param("communityId") Long communityId);

    @Select("SELECT " + " count( id ) AS peopleNum, "
@@ -379,51 +383,55 @@
        + "FROM " + " com_mng_population AS cmp  " + "WHERE " + " village_id = #{villageId}")
    CivilVillageStatisticsVO getCivilScreenVillageStatistics(@Param("villageId") Long villageId);

    @Select("SELECT COUNT(cmpct.id) AS man,(SELECT COUNT(cmpct.id) FROM com_mng_population_community_tags as cmpct left join com_mng_population as cmp on cmpct.population_id = cmp.id WHERE cmp.sex = 2 AND cmpct.community_id = #{communityId}) AS woman "
        + "FROM com_mng_population_community_tags as cmpct left join com_mng_population as cmp on cmpct.population_id = cmp.id WHERE cmp.sex = 1 AND cmpct.community_id = #{communityId}")
    @Select("SELECT COUNT(cmpct.id) AS man,(SELECT COUNT(cmpct.id) FROM com_mng_population_community_tags as cmpct left join com_mng_population as cmp on cmpct.population_id = cmp.id WHERE cmp.sex = 2 AND cmpct.community_id = ${communityId}) AS woman "
        + "FROM com_mng_population_community_tags as cmpct left join com_mng_population as cmp on cmpct.population_id = cmp.id WHERE cmp.sex = 1 AND cmpct.community_id = ${communityId}")
    Map<String, Long> countBySex(@Param("communityId") Long communityId);

    @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<= 16) as age16,"
        + "(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<= 16) as age16,"
        + "(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 > 16 and aa.age<= 25) AS age25,"
        + "(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 > 16 and aa.age<= 25) AS age25,"
        + "(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 > 25 and aa.age<= 35) AS age35,"
        + "(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 > 25 and aa.age<= 35) AS age35,"
        + "(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 > 35 and aa.age<= 45) AS age45,"
        + "(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 > 35 and aa.age<= 45) AS age45,"
        + "(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 > 45 and aa.age<= 55) AS age55,"
        + "(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 > 45 and aa.age<= 55) AS age55,"
        + "(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 > 55) AS age55over")
        + "(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 > 55) AS age55over")
    Map<String, Long> countByAge(@Param("communityId") Long communityId);

    @Select("SELECT COUNT(cmp.id)AS xx,"
        + "(SELECT COUNT(cmp.id) FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 2 AND cmpct.community_id = #{communityId}) as cz,"
        + "(SELECT COUNT(cmp.id) FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 3 AND cmpct.community_id = #{communityId}) as gz,"
        + "(SELECT COUNT(cmp.id) FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 4 AND cmpct.community_id = #{communityId}) as zz,"
        + "(SELECT COUNT(cmp.id) FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 5 AND cmpct.community_id = #{communityId}) as dz,"
        + "(SELECT COUNT(cmp.id) FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 6 AND cmpct.community_id = #{communityId}) as bk,"
        + "(SELECT COUNT(cmp.id) FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 7 AND cmpct.community_id = #{communityId}) as ss,"
        + "(SELECT COUNT(cmp.id) FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 8 AND cmpct.community_id = #{communityId}) as bs,"
        + "(SELECT COUNT(cmp.id) FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 9 AND cmpct.community_id = #{communityId}) as qt"
        + " FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 1 AND cmpct.community_id = #{communityId}")
        + "(SELECT COUNT(cmp.id) FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 2 AND cmpct.community_id = ${communityId}) as cz,"
        + "(SELECT COUNT(cmp.id) FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 3 AND cmpct.community_id = ${communityId}) as gz,"
        + "(SELECT COUNT(cmp.id) FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 4 AND cmpct.community_id = ${communityId}) as zz,"
        + "(SELECT COUNT(cmp.id) FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 5 AND cmpct.community_id = ${communityId}) as dz,"
        + "(SELECT COUNT(cmp.id) FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 6 AND cmpct.community_id = ${communityId}) as bk,"
        + "(SELECT COUNT(cmp.id) FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 7 AND cmpct.community_id = ${communityId}) as ss,"
        + "(SELECT COUNT(cmp.id) FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 8 AND cmpct.community_id = ${communityId}) as bs,"
        + "(SELECT COUNT(cmp.id) FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 9 AND cmpct.community_id = ${communityId}) as qt"
        + " FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 1 AND cmpct.community_id = ${communityId}")
    Map<String, Long> countByCulture(@Param("communityId") Long communityId);

    @Select("select count(user_id) from sys_user where community_id = #{communityId} and type = 1")
    @Select("select count(user_id) from sys_user where community_id = ${communityId} and type = 1")
    Long countUsedCommunityPopulation(@Param("communityId") Long communityId);

    @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<= 16) as age16,"
        + "(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 > 16 and aa.age<= 27) 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 > 27 and aa.age<= 35) AS age35,"
        + "(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 "
        + "(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 > 35 and aa.age<= 45) AS age45,"
        + "(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 > 41 and aa.age<= 50) AS age45,"
        + "(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 > 45 and aa.age<= 55) AS age55,"
        + "(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 > 51 and aa.age<= 59) AS age55,"
        + "(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 > 55) AS age55over")
        + "(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 >= 60 and aa.age<= 79) AS age65,"
        + "(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 >= 80 and aa.age<= 89) AS age75,"
        + "(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 > 89) AS age55over")
    Map<String, Long> indexCountByAge(@Param("communityId") Long communityId);

    @Select("SELECT " + " id, " + " su.nick_name AS userName, " + " su.image_url, " + " caep.create_at, "
@@ -434,7 +442,7 @@
    EventNewStatisticsVO getEventScreenSSPDateil(@Param("eventId") Long eventId);

    @Select("SELECT " + " su.nick_name AS userName, " + " su.image_url AS imageUrl, " + " e.create_at as createAt, "
        + " e.event_des, " + " e.event_clazz, " + " e.danger_level, " + " e.urgent, " + " e.major, "
        + " e.event_des, " + " e.event_clazz, " + " e.danger_level, " + " e.urgent, " + " e.major,e.process_desc, "
        + " e.happen_address, " + " e.happent_lat_lng, " + " e.event_type, " + " e.event_category, " + " e.id, "
        + " egd.grid_name, " + " e.event_deal_status  " + "FROM " + " `event` AS e "
        + " LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id "
@@ -450,10 +458,10 @@
        + " LEFT JOIN com_street AS cs ON cs.street_id = ca.street_id  " + "WHERE " + " e.id = #{eventId}")
    EventTransferRecordDetailVO getEventScreenEventTransDetail(@Param("eventId") Long eventId);

    @Select("select ca.`name` AS communityName,cs.address AS streetName from com_act as ca LEFT JOIN com_street AS cs ON cs.street_id = ca.street_id where ca.community_id = #{communityId}")
    @Select("select ca.`name` AS communityName,cs.address AS streetName from com_act as ca LEFT JOIN com_street AS cs ON cs.street_id = ca.street_id where ca.community_id = ${communityId}")
    EventTransferRecordDetailVO getEventScreenEventTransDetailByCommunityId(@Param("communityId") Long communityId);

    @Select("select count(id) from com_elders_auth_elderly WHERE community_id = #{communityId}")
    @Select("select count(id) from com_elders_auth_elderly WHERE community_id = ${communityId}")
    Integer getStatisticsCount(@Param("communityId") Long communityId);

    IPage<PopulationListVO> pagePopulationListApp(Page page,
@@ -539,7 +547,7 @@
        + "#{item}" + "</foreach>" + " </if> "
        + "<if test='populationExportDTO.isHouse != null and populationExportDTO.isHouse == 2'>"
        + "AND cmp.house_id is null " + " </if> " + "<if test='populationExportDTO.communityId != null'>"
        + "AND cmpct.community_id = #{populationExportDTO.communityId} " + " </if> "
        + "AND cmpct.community_id = ${populationExportDTO.communityId} " + " </if> "
        + "<if test='populationExportDTO.politicalOutlook != null'>"
        + "AND cmp.political_outlook = #{populationExportDTO.politicalOutlook} " + " </if> " + " </script>")
    List<ComMngPopulationListVO>
@@ -616,4 +624,72 @@
     * @param newUnitNo 新单元号
     */
    void updatePopulationUnit(@Param("villageId") Long villageId, @Param("floor") String floor,@Param("oldUnitNo") String oldUnitNo,@Param("newUnitNo") String newUnitNo);

    /**
     * 根据villageId查询特殊人群数
     * @param villageId
     * @param label
     * @return
     */
    Integer selectCountByVillageId(@Param("villageId") Long villageId,@Param("label")String label);

    CivilPartyStatisticsVO getCivilParty(@Param("communityId") Long communityId);

    CivilGovernmentStatisticsVO getCivilGovernment(@Param("communityId") Long communityId);

    CivilGridStatisticsVO getCivilGrid(@Param("communityId") Long communityId);

    CivilConvenienceStatisticsVO getCivilConvenience(@Param("communityId") Long communityId);

    /**
     * 西区治理数据统计
     * @return
     */
    WestScreenStatics westScreenStatics();

    List<EventPopulationBasicsStatisticsVO> getBasicsList(@Param("streetId") Long streetId);

    EventPopulationSpecialStatisticsVO getPopulationSpecial(@Param("streetId") Long streetId);

    List<String> getPopulationListCardNo(@Param("streetId") Long streetId);

    Integer getPopulationAge(@Param("streetId") Long streetId, @Param("age") Integer age);

    List<EventPopulationStreetVO> getComprehensiveStreetList();

    /**
     * 基础数据统计
     * @param communityId
     * @return
     */
    BaseInfo baseInfo(Long communityId);

    /**
     * 业务数据统计
     * @param communityId
     * @return
     */
    IndexDynamic indexDynamic(Long communityId);

    /**
     * 大屏30天內事件数据
     * @param communityId
     * @return
     */
    List<EventGridIncidentStatisticsVO> getGridsGovernanceEventList(@Param("communityId") Long communityId);

    /**
     * 分页查询事件数据
     * @param page
     * @param pageBaseDTO
     * @return
     */
    IPage<EventGridIncidentStatisticsVO> pageEventList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);

    /**
     * 大屏事件详情新处理方式
     * @param eventId
     * @return
     */
    EventNewStatisticsVO getEventScreenSSPDateilNew(@Param("eventId") Long eventId);
}

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

@@ -34,21 +34,21 @@
    List<ComMngHouseVo> getPopulHouseListByPopulId(@Param("populId") Long populId);

    @Select("<script> "
        + "select id as houseId,cmv.alley from com_mng_population_house as cmph left join com_mng_village as cmv on cmv.village_id = cmph.village_id where cmph.community_id = #{communityId}"
        + "select id as houseId,cmv.alley from com_mng_population_house as cmph left join com_mng_village as cmv on cmv.village_id = cmph.village_id where cmph.community_id = ${communityId}"
        + "<if test='villageId != null and villageId != &quot;&quot;'>" + "and cmv.village_id = #{villageId}"
        + " </if> " + " </script>")
    List<ComMngCascadeHouseVO> getHouseLevelByAlley(@Param(value = "communityId") Long communityId,
        @Param(value = "villageId") Long villageId);

    @Select("<script> "
        + "select id as houseId,cmv.alley,cmv.house_num from com_mng_population_house as cmph left join com_mng_village as cmv on cmv.village_id = cmph.village_id where cmph.community_id = #{communityId}"
        + "select id as houseId,cmv.alley,cmv.house_num from com_mng_population_house as cmph left join com_mng_village as cmv on cmv.village_id = cmph.village_id where cmph.community_id = ${communityId}"
        + "<if test='name != null and name != &quot;&quot;'>" + "and cmv.alley = #{name}" + " </if> "
        + "<if test='villageId != null'>" + "and cmv.village_id = #{villageId}" + " </if> " + " </script>")
    List<ComMngCascadeHouseVO> getHouseLevelByHouseNum(@Param("name") String name,
        @Param("communityId") Long communityId, @Param(value = "villageId") Long villageId);

    @Select("<script> "
        + "select id as houseId,cmv.alley,cmv.house_num,cmph.floor from com_mng_population_house as cmph left join com_mng_village as cmv on cmv.village_id = cmph.village_id where cmph.community_id = #{communityId} "
        + "select id as houseId,cmv.alley,cmv.house_num,cmph.floor from com_mng_population_house as cmph left join com_mng_village as cmv on cmv.village_id = cmph.village_id where cmph.community_id = ${communityId} "
        + "<if test='name != null and name != &quot;&quot;'>" + "and cmv.alley = #{name}" + " </if> "
        + "<if test='houseNum != null and houseNum != &quot;&quot;'>" + "and cmv.house_num = #{houseNum}" + " </if> "
        + "<if test='villageId != null'>" + "and cmv.village_id = #{villageId}" + " </if> " + " </script>")
@@ -56,7 +56,7 @@
        @Param("communityId") Long communityId, @Param(value = "villageId") Long villageId);

    @Select("<script> "
        + "select id as houseId,cmv.alley,cmv.house_num,cmph.floor,cmph.unit_no from com_mng_population_house as cmph left join com_mng_village as cmv on cmv.village_id = cmph.village_id where cmph.community_id = #{communityId} "
        + "select id as houseId,cmv.alley,cmv.house_num,cmph.floor,cmph.unit_no from com_mng_population_house as cmph left join com_mng_village as cmv on cmv.village_id = cmph.village_id where cmph.community_id = ${communityId} "
        + "<if test='name != null and name != &quot;&quot;'>" + "and cmv.alley = #{name}" + " </if> "
        + "<if test='houseNum != null and houseNum != &quot;&quot;'>" + "and cmv.house_num = #{houseNum}" + " </if> "
        + "<if test='floor != null and floor != &quot;&quot;'>" + "and cmph.floor = #{floor}" + " </if> "
@@ -66,7 +66,7 @@
        @Param(value = "villageId") Long villageId);

    @Select("<script> "
        + "select cmph.id as houseId,cmv.alley,cmv.house_num,cmph.floor,cmph.unit_no,cmph.house_no from com_mng_population_house as cmph left join com_mng_village as cmv on cmv.village_id = cmph.village_id where cmph.community_id = #{communityId} "
        + "select cmph.id as houseId,cmv.alley,cmv.house_num,cmph.floor,cmph.unit_no,cmph.house_no from com_mng_population_house as cmph left join com_mng_village as cmv on cmv.village_id = cmph.village_id where cmph.community_id = ${communityId} "
        + "<if test='name != null and name != &quot;&quot;'>" + "and cmv.alley = #{name}" + " </if> "
        + "<if test='houseNum != null and houseNum != &quot;&quot;'>" + "and cmv.house_num = #{houseNum}" + " </if> "
        + "<if test='floor != null and floor != &quot;&quot;'>" + "and cmph.floor = #{floor}" + " </if> "
@@ -84,7 +84,7 @@
        + ",cmph.update_at,cmph.is_empty from com_mng_population_house as cmph"
        + " left join com_mng_village as cmv on cmv.village_id = cmph.village_id" + "<where>"
        + "<if test='populationHouseAdminDTO.communityId != null'>"
        + " and cmph.community_id = #{populationHouseAdminDTO.communityId} " + " </if> "
        + " and cmph.community_id = ${populationHouseAdminDTO.communityId} " + " </if> "
        + "<if test='populationHouseAdminDTO.alley != null and populationHouseAdminDTO.alley != &quot;&quot;'>" +
        // "AND cmv.alley like #{populationHouseAdminDTO.alley} " +
        "AND cmv.alley like concat('%',#{populationHouseAdminDTO.alley},'%') " + " </if> "
@@ -124,17 +124,17 @@
    ComMngPopulationHouseDetailAdminVO getHouseDetail(@Param("houseId") Long houseId);

    @Select("select count(id) as houseTotal"
        + ",(select count(id) from com_mng_population_house where is_empty = 1 and community_id = #{communityId}) as emptyTotal"
        + ",(select count(id) from com_mng_population_house where control_status = 2 and community_id = #{communityId}) as followTotal"
        + ",(select count(id) from com_mng_population_house where control_status = 3 and community_id = #{communityId}) as controlTotal"
        + " from com_mng_population_house as cmph where community_id = #{communityId}")
        + ",(select count(id) from com_mng_population_house where is_empty = 1 and community_id = ${communityId}) as emptyTotal"
        + ",(select count(id) from com_mng_population_house where control_status = 2 and community_id = ${communityId}) as followTotal"
        + ",(select count(id) from com_mng_population_house where control_status = 3 and community_id = ${communityId}) as controlTotal"
        + " from com_mng_population_house as cmph where community_id = ${communityId}")
    ComMngPopulationHouseTotalVO getHouseTotalByAdmin(@Param("communityId") Long communityId);

    @Select("select (select province_name from com_mng_struct_area_province where province_adcode = ca.province_code) as provinceName,"
        + "(select city_name from com_mng_struct_area_city where city_adcode = ca.city_code) as cityName,"
        + "(select district_name from com_mng_struct_area_district where district_adcode = ca.area_code) as districtName"
        + ",ca.province_code as provinceAdcode,ca.city_code as cityAdcode,ca.area_code as districtAdcode"
        + " from com_act as ca where ca.community_id = #{communityId}")
        + " from com_act as ca where ca.community_id = ${communityId}")
    ComMngVillageRegionVO getRegion(@Param("communityId") Long communityId);

    @Select("<script> "

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

@@ -32,7 +32,7 @@
        + "<if test='pageComMngRealAssetsDTO.name != null and pageComMngRealAssetsDTO.name.trim() != &quot;&quot;'>"
        + " and t.name LIKE concat( #{pageComMngRealAssetsDTO.name}, '%' )  " + " </if> "
        + "<if test='pageComMngRealAssetsDTO.communityId != null and pageComMngRealAssetsDTO.communityId != 0'>"
        + " and t.community_id = #{pageComMngRealAssetsDTO.communityId} " + " </if> " + " order by t.create_at desc"
        + " and t.community_id = ${pageComMngRealAssetsDTO.communityId} " + " </if> " + " order by t.create_at desc"
        + "</script>")
    IPage<ComMngRealAssetsVO> pageQueryComMngRealAssets(Page page,
        @Param(value = "pageComMngRealAssetsDTO") PageComMngRealAssetsDTO pageComMngRealAssetsDTO);
@@ -46,7 +46,7 @@
        + "<if test='exportRealAssetsExcelDTO.name != null and exportRealAssetsExcelDTO.name.trim() != &quot;&quot;'>"
        + " and t.name LIKE concat( #{exportRealAssetsExcelDTO.name}, '%' )  " + " </if> "
        + "<if test='exportRealAssetsExcelDTO.communityId != null and exportRealAssetsExcelDTO.communityId != 0'>"
        + " and t.community_id = #{exportRealAssetsExcelDTO.communityId} " + " </if> " + " order by t.create_at desc"
        + " and t.community_id = ${exportRealAssetsExcelDTO.communityId} " + " </if> " + " order by t.create_at desc"
        + "</script>")
    List<ComMngRealAssetsExcelVO> exportRealAssetsExcel(
        @Param(value = "exportRealAssetsExcelDTO") ExportRealAssetsExcelDTO exportRealAssetsExcelDTO);

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

@@ -36,7 +36,7 @@
        + "<if test='pageComMngRealCompanyDTO.comName != null and pageComMngRealCompanyDTO.comName.trim() != &quot;&quot;'>"
        + " and t.com_name LIKE concat( '%',#{pageComMngRealCompanyDTO.comName}, '%' )  " + " </if> "
        + "<if test='pageComMngRealCompanyDTO.communityId != null and pageComMngRealCompanyDTO.communityId != 0'>"
        + " and t.community_id = #{pageComMngRealCompanyDTO.communityId} " + " </if> " + " order by t.create_at desc"
        + " and t.community_id = ${pageComMngRealCompanyDTO.communityId} " + " </if> " + " order by t.create_at desc"
        + "</script>")
    IPage<ComMngRealCompanyVO> pageQueryComMngRealCompany(Page page,
        @Param(value = "pageComMngRealCompanyDTO") PageComMngRealCompanyDTO pageComMngRealCompanyDTO);
@@ -47,7 +47,7 @@
        + "<if test='exportRealCompanyExcelDTO.comName != null and exportRealCompanyExcelDTO.comName.trim() != &quot;&quot;'>"
        + " and t.com_name LIKE concat( #{exportRealCompanyExcelDTO.comName}, '%' )  " + " </if> "
        + "<if test='exportRealCompanyExcelDTO.communityId != null and exportRealCompanyExcelDTO.communityId != 0'>"
        + " and t.community_id = #{exportRealCompanyExcelDTO.communityId} " + " </if> "
        + " and t.community_id = ${exportRealCompanyExcelDTO.communityId} " + " </if> "
        + "<if test='exportRealCompanyExcelDTO.legalPerson != null and exportRealCompanyExcelDTO.legalPerson.trim() != &quot;&quot;'>"
        + " and t.legal_person LIKE concat( #{exportRealCompanyExcelDTO.legalPerson}, '%' )  " + " </if> "
        + " order by t.create_at desc" + "</script>")
@@ -69,6 +69,6 @@
    ComMngRealCompanyBelongsVO queryComMngRealCompanyBelongs(
        @Param(value = "pageComMngRealCompanyBelongsDTO") ComMngRealCompanyBelongsDTO comMngRealCompanyBelongsDTO);

    @Select("select count(id) as companyTotal from com_mng_real_company where community_id = #{communityId}")
    @Select("select count(id) as companyTotal from com_mng_real_company where community_id = ${communityId}")
    ComMngRealCompanyTotalVO getComMngRealCompanyTotalByAdmin(@Param("communityId") Long communityId);
}

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

@@ -32,14 +32,14 @@
    // "</script>")
    @Select("<script> " + "SELECT\n" + "id,\n" + "area_name,\n" + "area_code,\n" + "address_detail,\n" + "create_at \n"
        + "FROM\n" + "com_mng_struct_area \n" + "WHERE 1=1  \n" + "<if test='comMngStructAreaVO.communityId != null '>"
        + "AND community_id=#{comMngStructAreaVO.communityId} \n" + " </if> "
        + "AND community_id = ${comMngStructAreaVO.communityId} \n" + " </if> "
        + "<if test='comMngStructAreaVO.areaName != null and comMngStructAreaVO.areaName.trim() != &quot;&quot;'>"
        + "AND area_name like concat( '%',#{comMngStructAreaVO.areaName}, '%' )" + " </if> " + "</script>")
    IPage<ComMngStructAreaVO> pageArea(Page page, @Param("comMngStructAreaVO") ComMngStructAreaVO comMngStructAreaVO);

    @Select("SELECT\n" + "\ta.id,\n" + "\ta.role_floor,\n" + "\ta.area_name,\n" + "\ta.role_connector,\n"
        + "\ta.role_door \n" + "FROM\n" + "\tcom_mng_struct_area a \n" + "WHERE\n"
        + "\ta.area_name LIKE CONCAT( '%', #{areaName}, '%' ) \n" + "\tAND a.community_id =#{communityId}")
        + "\ta.area_name LIKE CONCAT( '%', #{areaName}, '%' ) \n" + "\tAND a.community_id = ${communityId}")
    List<ComMngStructAreaVO> listAreas(@Param("areaName") String areaName, @Param("communityId") Long communityId);

    @Select("select count(id) from com_mng_struct_house where parent_code=#{areaCode}")

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

@@ -37,12 +37,12 @@
        + "<if test='comMngStructOtherBuildVO.name != null and comMngStructOtherBuildVO.name.trim() != &quot;&quot;'>"
        + " and b.name like concat(#{comMngStructOtherBuildVO.name},'%') " + " </if> "
        + "<if test='comMngStructOtherBuildVO.communityId != null'>"
        + " and b.community_id = #{comMngStructOtherBuildVO.communityId} " + " </if> " + " </where>"
        + " and b.community_id = ${comMngStructOtherBuildVO.communityId} " + " </if> " + " </where>"
        + " order by b.create_at desc" + "</script>")
    IPage<ComMngStructOtherBuildVO> pageOtherBuild(Page page,
        @Param("comMngStructOtherBuildVO") ComMngStructOtherBuildVO comMngStructOtherBuildVO);

    @Select("SELECT\n" + "b.type_id \n" + "FROM\n" + "com_mng_struct_other_build b\n" + "WHERE\n"
        + "b.community_id = #{communityId}\n" + "GROUP BY\n" + "b.type_id")
        + "b.community_id = ${communityId}\n" + "GROUP BY\n" + "b.type_id")
    List<Long> selectAllBuildTypeIds(Long communityId);
}

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

@@ -21,7 +21,10 @@

    @Select("<script> " + "select * from com_mng_vaccines" + " <where>"
        + "<if test='vaccinesByAdminDTO.name != null and vaccinesByAdminDTO.name != &quot;&quot;'>"
        + "`name` like concat('%',#{vaccinesByAdminDTO.name},'%') " + " </if> " + " </where>"
        + "`name` like concat('%',#{vaccinesByAdminDTO.name},'%') " + " </if> "
        + "<if test='vaccinesByAdminDTO.areaCode != null and vaccinesByAdminDTO.areaCode != &quot;&quot;'>"
        + "`area_code` = #{vaccinesByAdminDTO.areaCode} " + " </if> "
        + " </where>"
        + " order by create_at desc" + " </script>")
    IPage<VaccinesByAppVO> getVaccinesByName(Page page,
        @Param("vaccinesByAdminDTO") VaccinesByAdminDTO vaccinesByAdminDTO);

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

@@ -36,7 +36,7 @@
        + "select cmver.id,cmver.name,cmver.sex,cmver.age,cmver.phone,cmver.id_card,cmver.create_at,cmv.name as vaccines from com_mng_vaccines_enroll_record as cmver "
        + " left join com_mng_vaccines as cmv on cmv.id = cmver.type " + " <where>"
        + "<if test='vaccinesByAdminDTO.communityId != null'>"
        + " and cmver.community_id = #{vaccinesByAdminDTO.communityId} " + " </if> "
        + " and cmver.community_id = ${vaccinesByAdminDTO.communityId} " + " </if> "
        + "<if test='vaccinesByAdminDTO.vaccines != null and vaccinesByAdminDTO.vaccines != &quot;&quot;'>"
        + " and cmv.name = #{vaccinesByAdminDTO.vaccines} " + " </if> "
        + "<if test='vaccinesByAdminDTO.name != null and vaccinesByAdminDTO.name != &quot;&quot;'>"
@@ -57,7 +57,7 @@
        + "select cmver.name,cmver.sex,cmver.age,cmver.phone,cmver.id_card,cmver.create_at,cmv.name as vaccines from com_mng_vaccines_enroll_record as cmver "
        + " left join com_mng_vaccines as cmv on cmv.id = cmver.type " + " <where>"
        + "<if test='vaccinesByAdminDTO.communityId != null'>"
        + " and cmver.community_id = #{vaccinesByAdminDTO.communityId} " + " </if> "
        + " and cmver.community_id = ${vaccinesByAdminDTO.communityId} " + " </if> "
        + "<if test='vaccinesByAdminDTO.ids != null and vaccinesByAdminDTO.ids.size > 0'>" + " and cmver.id in "
        + "<foreach item=\"item\" collection=\"vaccinesByAdminDTO.ids\" separator=\",\" open=\"(\" close=\")\" index=\"\"> \n"
        + "#{item}" + "</foreach>" + " </if> "

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

@@ -37,7 +37,7 @@
        + "select cmvir.id,cmvir.name,cmvir.sex,cmvir.age,cmvir.phone,cmvir.id_card,cmvir.inoculation_at,cmvir.dosage "
        + ",cmvir.medical_institution,cmvir.vaccines_code,cmvir.vaccines,cmvir.remark from com_mng_vaccines_inoculation_record as cmvir"
        + " <where>" + "<if test='inoculationByAdminDTO.communityId != null'>"
        + " and cmvir.community_id = #{inoculationByAdminDTO.communityId} " + " </if> "
        + " and cmvir.community_id = ${inoculationByAdminDTO.communityId} " + " </if> "
        + "<if test='inoculationByAdminDTO.name != null and inoculationByAdminDTO.name != &quot;&quot;'>"
        + " and cmvir.name like concat('%',#{inoculationByAdminDTO.name},'%') " + " </if> "
        + "<if test='inoculationByAdminDTO.dosage != null and inoculationByAdminDTO.dosage != &quot;&quot;'>"
@@ -58,7 +58,7 @@
        + "select cmvir.name,cmvir.sex,cmvir.age,cmvir.phone,cmvir.id_card,cmvir.inoculation_at,cmvir.dosage "
        + ",cmvir.medical_institution,cmvir.vaccines_code,cmvir.vaccines,cmvir.remark from com_mng_vaccines_inoculation_record as cmvir"
        + " <where>" + "<if test='inoculationByAdminDTO.communityId != null'>"
        + " and cmvir.community_id = #{inoculationByAdminDTO.communityId} " + " </if> "
        + " and cmvir.community_id = ${inoculationByAdminDTO.communityId} " + " </if> "
        + "<if test='inoculationByAdminDTO.ids != null and inoculationByAdminDTO.ids.size > 0'>" + " and cmvir.id in "
        + "<foreach item=\"item\" collection=\"inoculationByAdminDTO.ids\" separator=\",\" open=\"(\" close=\")\" index=\"\"> \n"
        + "#{item}" + "</foreach>" + " </if> "

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

@@ -33,7 +33,7 @@
    // "</script>")
    @Select("<script> " + "SELECT\n" + "id,\n" + "`name`,\n" + "photo_path,\n" + "phone,\n" + "integral,\n"
        + "create_at \n" + "FROM\n" + "com_mng_volunteer_mng \n"
        + " where state=2 and community_id=#{comMngVolunteerMngVO.communityId}"
        + " where state=2 and community_id = ${comMngVolunteerMngVO.communityId}"
        + "<if test='comMngVolunteerMngVO.name != null and comMngVolunteerMngVO.name.trim() != &quot;&quot;'>"
        + " and name like concat(#{comMngVolunteerMngVO.name},'%')  \n" + " </if> "
        + "<if test='comMngVolunteerMngVO.phone != null and comMngVolunteerMngVO.phone.trim() != &quot;&quot;'>"
@@ -46,7 +46,7 @@
        + "t.create_at, " + "t.submit_user_id \n" + "FROM\n" + "com_mng_volunteer_mng t\n" + " RIGHT JOIN \n"
        + "(select submit_user_id, MAX(create_at)create_at  from com_mng_volunteer_mng where state IN ( 1, 3 ) GROUP BY submit_user_id ) tmp \n"
        + "on t.create_at = tmp.create_at and t.submit_user_id=tmp.submit_user_id " + "WHERE\n"
        + "state in (1,3)  and community_id=#{comMngVolunteerMngVO.communityId} \n"
        + "state in (1,3)  and community_id = ${comMngVolunteerMngVO.communityId} \n"
        + "<if test='comMngVolunteerMngVO.name != null and comMngVolunteerMngVO.name.trim() != &quot;&quot;'>"
        + "and t.name like concat(#{comMngVolunteerMngVO.name},'%')  \n" + " </if> "
        + "<if test='comMngVolunteerMngVO.phone != null and comMngVolunteerMngVO.phone.trim() != &quot;&quot;'>"

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

@@ -29,11 +29,14 @@

    @Select("<script> " + "SELECT d.*,\n" + "u.name userName,u.type as userType\n" + "FROM\n" + "com_ops_house d\n"
        + " LEFT JOIN sys_user u ON d.user_id = u.user_id\n"
        + " LEFT JOIN com_act ca ON d.community_id = ca.community_id\n"
        + " LEFT JOIN com_mng_struct_area sa ON d.house_community_id = sa.id \n" + "where 1=1 "
        + "<if test='pageComOpsHouseDTO.communityId != null '>"
        + "AND ( d.community_id=#{pageComOpsHouseDTO.communityId} or sa.community_id=#{pageComOpsHouseDTO.communityId} )\n"
        + "AND ( d.community_id = ${pageComOpsHouseDTO.communityId} or sa.community_id = ${pageComOpsHouseDTO.communityId} )\n"
        + " </if> "
        + "<if test='pageComOpsHouseDTO.areaCode != null '>"
        + "AND ca.area_code = #{pageComOpsHouseDTO.areaCode}"
        + " </if> " +

        "<if test='pageComOpsHouseDTO.userId != null '>" + "AND d.user_id=#{pageComOpsHouseDTO.userId} \n" + " </if> "
        + "<if test='pageComOpsHouseDTO.orient != null '>" + "AND d.orient=#{pageComOpsHouseDTO.orient} \n" + " </if> "
        + "<if test='pageComOpsHouseDTO.houseType != null '>" + "AND d.house_type=#{pageComOpsHouseDTO.houseType} \n"
@@ -45,7 +48,7 @@
        + "AND d.brn <![CDATA[ >= ]]> 4 \n" + " </if> " +

        "<if test='pageComOpsHouseDTO.houseCommunityId != null '>"
        + "AND d.house_community_id=#{pageComOpsHouseDTO.houseCommunityId} \n" + " </if> "
        + "AND d.house_community_id = ${pageComOpsHouseDTO.houseCommunityId} \n" + " </if> "
        + "<if test='pageComOpsHouseDTO.status != null and pageComOpsHouseDTO.status &lt; 4 '>"
        + "AND d.status=#{pageComOpsHouseDTO.status} \n" + " </if> "
        + "<if test='pageComOpsHouseDTO.status != null and pageComOpsHouseDTO.status ==4 '>"

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

@@ -16,16 +16,16 @@
public interface ComPbDynDAO {

    @Select("SELECT COUNT(id) AS activityNum ,"
        + "(SELECT COUNT(id) FROM com_pb_dyn WHERE community_id = #{communityId} AND STATUS = 2) AS dynNum," + "("
        + " (SELECT COUNT(id) FROM com_pb_activity WHERE community_id = #{communityId} AND (STATUS = 3 or STATUS = 4 or STATUS = 5 ) AND create_at LIKE CONCAT(#{nowDate},'%')) + "
        + " (SELECT COUNT(id) FROM com_pb_dyn WHERE community_id = #{communityId} AND STATUS = 2 AND create_at LIKE CONCAT(#{nowDate},'%'))"
        + "(SELECT COUNT(id) FROM com_pb_dyn WHERE community_id = ${communityId} AND STATUS = 2) AS dynNum," + "("
        + " (SELECT COUNT(id) FROM com_pb_activity WHERE community_id = ${communityId} AND (STATUS = 3 or STATUS = 4 or STATUS = 5 ) AND create_at LIKE CONCAT(#{nowDate},'%')) + "
        + " (SELECT COUNT(id) FROM com_pb_dyn WHERE community_id = ${communityId} AND STATUS = 2 AND create_at LIKE CONCAT(#{nowDate},'%'))"
        + " ) AS currentNum "
        + " FROM com_pb_activity WHERE community_id = #{communityId} AND (STATUS = 3 or STATUS = 4 or STATUS = 5 )")
        + " FROM com_pb_activity WHERE community_id = ${communityId} AND (STATUS = 3 or STATUS = 4 or STATUS = 5 )")
    Map<String, Long> countByCommunityId(@Param("communityId") Long communityId, @Param("nowDate") String nowDate);

    @Select("SELECT "
        + "(SELECT COUNT(id) FROM com_pb_activity WHERE community_id = #{communityId} AND (STATUS = 3 or STATUS = 4 or STATUS = 5 ) AND #{start} < create_at AND create_at < #{end}) AS activity,"
        + "(SELECT COUNT(id) FROM com_pb_dyn WHERE community_id = #{communityId} AND STATUS = 2 AND #{start} < create_at AND create_at < #{end}) AS dyn "
        + "(SELECT COUNT(id) FROM com_pb_activity WHERE community_id = ${communityId} AND (STATUS = 3 or STATUS = 4 or STATUS = 5 ) AND #{start} < create_at AND create_at < #{end}) AS activity,"
        + "(SELECT COUNT(id) FROM com_pb_dyn WHERE community_id = ${communityId} AND STATUS = 2 AND #{start} < create_at AND create_at < #{end}) AS dyn "
        + "FROM DUAL")
    PbWorkVO countByTime(@Param("start") String start, @Param("end") String end,
        @Param("communityId") Long communityId);

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

@@ -3,6 +3,10 @@
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.community.bigscreen.BigScreenActivityLine;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenActivityTop;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenServiceData;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenServiceUser;
import com.panzhihua.common.model.vos.partybuilding.*;
import com.panzhihua.service_community.model.dos.ComPbMemberDO;
import org.apache.ibatis.annotations.Mapper;
@@ -26,4 +30,33 @@
     * @return
     */
    ComPbMemberVO selectById(String idCard);

    /**
     *根据社区id日期查询活动数
     * @param communityId
     * @param date
     * @return
     */
    BigScreenActivityLine selectActivityCountMonth(@Param("communityId")Long communityId, @Param("date")String date,@Param("year")String year);

    /**
     * 查询党员积分前3
     * @param communityId
     * @return
     */
    IPage<BigScreenActivityTop> selectActivityTop(Page page,@Param("communityId") Long communityId);

    /**
     * 服务数据查询
     * @param communityId
     * @return
     */
    BigScreenServiceData bigScreenServiceData(@Param("communityId")Long communityId);

    /**
     * 服务居民
     * @param communityId
     * @return
     */
    List<BigScreenServiceUser> bigScreenServiceUser(@Param("communityId")Long communityId);
}

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

@@ -6,9 +6,12 @@
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 org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComProperty;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * (ComProperty)表数据库访问层
@@ -25,4 +28,23 @@
     * @return
     */
    IPage<ComPropertyVO> pageList(Page page, @Param("commonPage") CommonPage commonPage);

    /**
     * 居民自治大屏统计数据获取
     * @param communityId
     * @return
     */
    List<StatisticsCommVO> getRepairPolylineDate(@Param("communityId") Long communityId);

    /**
     * 报事报修date之前的累计数量
     * @param communityId
     * @param date
     * @return
     */
    StatisticsCommVO getRepairTotalPolylineDate(@Param("communityId") Long communityId, @Param("date") String date);

    List<StatisticsCommVO> getEventAddPolylineData(@Param("communityId") Long communityId);

    StatisticsCommVO getEventTotalPolylineDate(@Param("communityId") Long communityId, @Param("date") String date);
}

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

@@ -2,10 +2,14 @@

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.ExportMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.PageClassifyMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.PageConvenientMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.PageSearchDTO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenMerchantStatisticsInfo;
import com.panzhihua.common.model.vos.community.convenient.ConvenientConsultationStatisticsVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientViewStatisticsVO;
@@ -124,4 +128,29 @@
     * @return
     */
    int batchUpdateBusinessStatus(@Param("convenientMerchantDOList") List<ConvenientMerchantDO> convenientMerchantDOList, @Param("status") int status);

    /**
     * 社区商家
     * @param communityId
     * @return
     */
    List<ConvenientMerchantVO> selectMerchantListByCommunity(@Param("communityId") Long communityId);

    /**
     * 大屏分页获取热度排行商家
     * @param page
     * @param pagePopularMerchantDTO
     * @return
     */
    List<ConvenientMerchantVO> getScreenPopularMerchants(@Param("page") Page page, @Param("pagePopularMerchantDTO") PagePopularMerchantDTO pagePopularMerchantDTO);

    BigScreenMerchantStatisticsInfo getIndexMerchantBaseData(@Param("communityId") Long communityId);

    List<StatisticsCommVO> selectServiceTypeCircleData(@Param("communityId") Long communityId);

    List<StatisticsCommVO> getServiceTimesAddPolylineData(@Param("communityId") Long communityId);

    StatisticsCommVO getServiceTimesTotalPolylineDate(@Param("communityId") Long communityId, @Param("date") String date);

    IPage<ConvenientMerchantVO> indexMerchantList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);
}

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

@@ -42,7 +42,7 @@
        + " LEFT JOIN com_act ac ON u.community_id = ac.community_id\n" + " <where> " +

        "<if test='pageEldersAuthDTO.communityId != null'>"
        + "  AND ac.community_id = #{pageEldersAuthDTO.communityId} " + " </if> " +
        + "  AND ac.community_id = ${pageEldersAuthDTO.communityId} " + " </if> " +

        "<if test='pageEldersAuthDTO.sumitUserId != null'>"
        + " AND ea.submit_user_id = #{pageEldersAuthDTO.sumitUserId} " + " </if> "
@@ -84,7 +84,7 @@
        + " LEFT JOIN com_act ac ON u.community_id = ac.community_id\n" + " <where> " +

        "<if test='pageEldersAuthDTO.communityId != null'>"
        + "  AND ac.community_id = #{pageEldersAuthDTO.communityId} " + " </if> " +
        + "  AND ac.community_id = ${pageEldersAuthDTO.communityId} " + " </if> " +

        "<if test='pageEldersAuthDTO.ids != null and pageEldersAuthDTO.ids.length>0 '>" + " AND ea.id in "
        + "<foreach collection='pageEldersAuthDTO.ids' item='id' index='index' open='(' close=')' separator=',' >\n"

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

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.rentingHouses.NearbyDTO;
import com.panzhihua.common.model.dtos.community.rentingHouses.PageRentingHouseRegisterDTO;
import com.panzhihua.common.model.vos.community.rentingHouses.RentingHouseRegisterVO;
import org.apache.ibatis.annotations.Mapper;
@@ -34,12 +35,11 @@
     * @param maxX
     * @param minY
     * @param maxY
     * @param keyword
     * @param communityId
     * @param nearbyDTO
     * @return
     */
    List<RentingHouseRegisterVO> nearby(@Param("minX") Double minX, @Param("maxX") Double maxX, @Param("minY") Double minY,
                                        @Param("maxY") Double maxY, @Param("keyword") String keyword, @Param("communityId") Long communityId);
                                        @Param("maxY") Double maxY, @Param("nearbyDTO") NearbyDTO nearbyDTO);

    /**
     * 分页获取房源信息

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

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

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.SysTemplateConfig;

/**
 * (SysTemplateConfig)表数据库访问层
 *
 * @author makejava
 * @since 2022-01-13 14:46:03
 */
@Mapper
public interface SysTemplateConfigDao extends BaseMapper<SysTemplateConfig> {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/SysTemplateConfig.java

New file
@@ -0,0 +1,52 @@
package com.panzhihua.service_community.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.io.Serializable;
import java.util.Date;


/**
 * (SysTemplateConfig)表实体类
 *
 * @author makejava
 * @since 2022-01-13 14:46:03
 */
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("")
public class SysTemplateConfig implements Serializable {

    private static final long serialVersionUID = 159008627741278306L;

    @TableId(type = IdType.AUTO)
    private Long id;

    /**
     * 模板id
     */
    @ApiModelProperty(value = "模板id")
    private String templateId;

    /**
     * 模板类型 1活动变更 2留言回复 3活动取消 4审核状态 5认证审核 6调研问卷 7奖励发放 8报名成功 9活动即将开始 10预约提醒
     */
    @ApiModelProperty(value = "模板类型 1活动变更 2留言回复 3活动取消 4审核状态 5认证审核 6调研问卷 7奖励发放 8报名成功 9活动即将开始 10预约提醒 ")
    private Integer type;

    /**
     * 区域编码
     */
    @ApiModelProperty(value = "区域编码")
    private String areaCode;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActSignDO.java

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

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -55,5 +56,6 @@
    /**
     * 取消原因
     */
    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String reason;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java

@@ -186,6 +186,7 @@
    /**
     * 积分奖励方式（1.按次奖励 2.记时奖励）
     */
    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private Integer rewardWay;
    /**
     * 奖励积分

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDO.java

@@ -110,4 +110,9 @@
     */
    private Long streetId;

    /**
     * 明文密码
     */
    private String plaintextPassword;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoClassifyDO.java

@@ -56,6 +56,8 @@
     */
    private Date updateAt;

    private String areaCode;

    @Override
    public String toString() {
        return "ComActEasyPhotoClassifyDO{" + "id=" + id + ", name=" + name + ", status=" + status + ", weight="

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActWorkGuideDO.java

@@ -54,4 +54,5 @@
    @TableField("`lat`")
    private String lat;

    private String areaCode;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVaccinesDO.java

@@ -47,6 +47,8 @@
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;

    private String areaCode;

    @Override
    public String toString() {
        return "ComMngVaccinesDO{" + "id=" + id + ", name=" + name + ", describe=" + describe + ", status=" + status

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientMerchantDO.java

@@ -119,4 +119,6 @@
     * 更新人
     */
    private Long updatedBy;

    private String areaCode;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientServiceCategoryDO.java

@@ -65,4 +65,6 @@
     * 更新人
     */
    private Long updatedBy;

    private String areaCode;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/BigScreenService.java

@@ -10,6 +10,7 @@
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyActivity;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyBuild;
import com.panzhihua.common.model.vos.community.bigscreen.PartyBuildingMemberVO;
import org.springframework.web.bind.annotation.RequestParam;

/**
 * @ClasssName BigScreenService
@@ -56,4 +57,32 @@
     */
    R<List<BigScreenStatisticPartyActivity>>
        bigscreenPartyactivity(BigScreenStatisticPartyActivityDTO bigScreenStatisticPartyActivityDTO);

    /**
     * 党员活动折线图
     * @param communityId
     * @return
     */
    R partyActivityLine(Long communityId);

    /**
     *查询党员积分前3
     * @param pageBigScreenStatisticPartyOrg
     * @return
     */
    R partyActivityTop(PageBigScreenStatisticPartyOrg pageBigScreenStatisticPartyOrg);

    /**
     * 服务数据
     * @param communityId
     * @return
     */
    R serviceData(Long communityId);

    /**
     * 服务用户
     * @param communityId
     * @return
     */
    R serviceUser(Long communityId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/BigScreenStatisticsService.java

New file
@@ -0,0 +1,169 @@
package com.panzhihua.service_community.service;

import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
import com.panzhihua.common.model.vos.R;

/**
 * @title: BigScreenStatisticsService
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 大屏统计服务类
 * @author: hans
 * @date: 2021/12/06 9:56
 */
public interface BigScreenStatisticsService {

    /**
     * 大数据分析平台-居民自治
     * @param communityId
     * @return
     */
    R getResidentAutonomy(Long communityId);

    /**
     * 大数据分析平台-清网治格
     * @param communityId
     * @return
     */
    R getGridsGovernance(Long communityId);

    /**
     * 大数据分析平台-社区服务
     * @param communityId
     * @return
     */
    R getCommunityServiceStatistics(Long communityId);

    /**
     * 分页获取热度排行商家
     * @param pagePopularMerchantDTO
     * @return
     */
    R getScreenPopularMerchants(PagePopularMerchantDTO pagePopularMerchantDTO);

    /**
     * 首页二级页面-微心愿
     * @param communityId
     * @return
     */
    R indexMicroWish(Long communityId);

    /**
     * 首页二级页面-随手拍
     * @param communityId
     * @return
     */
    R indexEasyPhoto(Long communityId);

    /**
     * 首页二级页面-随手拍展示列表
     * @return
     */
    R indexEasyPhotoList(PageBaseDTO pageBaseDTO);

    /**
     * 首页二级页面-社区问卷
     * @param communityId
     * @return
     */
    R indexQuestionnaire(Long communityId);

    /**
     * 首页二级页面-社区动态
     * @param communityId
     * @return
     */
    R indexDyn(Long communityId);

    /**
     * 首页二级页面-社区动态展示列表
     * @param pageBaseDTO
     * @return
     */
    R indexDynList(PageBaseDTO pageBaseDTO);

    /**
     * 首页二级页面-邻里圈
     * @param communityId
     * @return
     */
    R indexNeighbor(Long communityId);

    /**
     * 首页二级页面-邻里圈展示列表
     * @param pageBaseDTO
     * @return
     */
    R indexNeighborList(PageBaseDTO pageBaseDTO);

    /**
     * 首页二级页面-便民商家
     * @param communityId
     * @return
     */
    R indexMerchant(Long communityId);

    /**
     * 首页二级页面-商家展示列表
     * @param pageBaseDTO
     * @return
     */
    R indexMerchantList(PageBaseDTO pageBaseDTO);

    /**
     * 首页二级页面-微心愿展示列表
     * @param pageBaseDTO
     * @return
     */
    R indexMicroWishList(PageBaseDTO pageBaseDTO);

    /**
     * 首页二级页面-社区问卷展示列表
     * @param pageBaseDTO
     * @return
     */
    R indexQuestionnaireList(PageBaseDTO pageBaseDTO);

    /**
     * 首页二级页面-居民活动
     * @param communityId
     * @return
     */
    R indexResidentAct(Long communityId);

    /**
     * 首页二级页面-居民活动展示列表
     * @param pageBaseDTO
     * @return
     */
    R indexResidentActList(PageBaseDTO pageBaseDTO);

    /**
     * 首页二级页面-志愿者活动
     * @param communityId
     * @return
     */
    R indexVolunteerAct(Long communityId);

    /**
     * 首页二级页面-志愿者活动展示列表
     * @param pageBaseDTO
     * @return
     */
    R indexVolunteerActList(PageBaseDTO pageBaseDTO);

    /**
     * 清网治格-根据事件分类获取近1月的社区事件数据
     * @param type
     * @param communityId
     * @return
     */
    R getEventList(Integer type, Long communityId);

    /**
     * 清网治格-社区事件数据分页
     * @param pageBaseDTO
     * @return
     */
    R pageEventList(PageBaseDTO pageBaseDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActIntegralUserService.java

@@ -49,11 +49,11 @@
    R getIntegralCommunityRankApplets(ComActIntegralCommunityRankDTO communityRankDTO);

    /**
     * 根据社区活动id查询社区活动报名人员列表
     * 根据社区活动id查询社区活动报名且未参与人员列表
     * 
     * @param activityId
     *            活动id
     * @return 社区活动报名人员列表
     * @return 社区活动报名且未参与人员列表
     */
    R getTaskActivityPeopleList(Long activityId);


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveAnswerContentService.java

@@ -39,4 +39,11 @@
     * @return
     */
    R exportHomeQuarantine(PageReserveRegisterDetailedAdminDTO detailedAdminDTO);

    /**
     * 大屏数据统计
     * @param communityId
     * @return
     */
    R bigScreenStaticsReserve(Long communityId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveService.java

@@ -6,6 +6,7 @@
import com.panzhihua.common.model.dtos.community.PageUserReserveDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActReserveCommitVO;
import com.panzhihua.common.model.vos.community.bigscreen.IndexReserve;
import com.panzhihua.service_community.model.dos.ComActReserveDO;

/**
@@ -119,4 +120,11 @@
     */
    R reserveListApplets(Long communityId);

    /**
     * 返攀登记居家隔离大屏数据
     * @param communityId
     * @return
     */
    IndexReserve indexReserve(Long communityId);

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActService.java

@@ -62,7 +62,7 @@
     * 
     * @return 社区集合 按照创建顺序倒序排列
     */
    R listCommunityAll();
    R listCommunityAll(String areaCode);

    /**
     * 删除社区
@@ -85,14 +85,14 @@
     *
     * @return 社区列表
     */
    R getWestCommunityLists();
    R getWestCommunityLists(String areaCode);

    /**
     * 查询社区所有列表
     * 
     * @return 社区列表
     */
    R getCommunityAllList();
    R getCommunityAllList(String areaCode);

    /**
     * 根据名字查询所有社区列表
@@ -101,7 +101,7 @@
     *            社区名字
     * @return 社区列表
     */
    R communitySwitchSearchList(String name);
    R communitySwitchSearchList(String name,String areaCode);

    /**
     * 根据经纬度以及距离搜索附近社区列表
@@ -111,4 +111,6 @@
     * @return 社区列表
     */
    R communitySwitchSearchDistanceList(SearchCommunityDTO communityDTO);

    R getCommunityPassword(Long communityId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java

@@ -521,4 +521,21 @@
     * @return
     */
    R specialInputUserExport(PageInputUserDTO PageInputUserDTO);

    /**
     * 西区大屏治理数据
     * @return
     */
    R westScreenStatics();

    R getComprehensivePopulationStatics(Long streetId);

    R getComprehensiveStreetList();

    /**
     * 新版大屏首页
     * @param communityId
     * @return
     */
    R indexInfo(Long communityId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenServiceImpl.java

@@ -1,10 +1,15 @@
package com.panzhihua.service_community.service.impl;

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

import javax.annotation.Resource;

import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.SensitiveUtil;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComPbMemberDAO;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

@@ -32,6 +37,8 @@
public class BigScreenServiceImpl implements BigScreenService {
    @Resource
    private BigScreenDAO bigScreenDAO;
    @Resource
    private ComPbMemberDAO comPbMemberDAO;

    @Override
    public R partyOrgMembers(PageBigScreenStatisticPartyOrg pageBigScreenStatisticPartyOrg) {
@@ -48,25 +55,28 @@
        BigScreenStatisticAgeGender age = bigScreenDAO.age(bigScreenStatisticAgeGenderDTO);

        BigScreenStatisticAgeGender ageGender = new BigScreenStatisticAgeGender();
        BeanUtils.copyProperties(age, ageGender);
        ageGender.setManTotal(gender.getManTotal());
        ageGender.setWomeTotal(gender.getWomeTotal());
        if(age!=null){
            BeanUtils.copyProperties(age, ageGender);
            ageGender.setManTotal(gender.getManTotal());
            ageGender.setWomeTotal(gender.getWomeTotal());

        /**
         * 计算百分比
         */
        Double manPer = 1.0 * ageGender.getManTotal() / (ageGender.getManTotal() + ageGender.getWomeTotal());
        Double womenPer = 1.0 * ageGender.getWomeTotal() / (ageGender.getManTotal() + ageGender.getWomeTotal());
        ageGender.setManPer(manPer);
        ageGender.setWomenPer(womenPer);
            /**
             * 计算百分比
             */
            Double manPer = 1.0 * ageGender.getManTotal() / (ageGender.getManTotal() + ageGender.getWomeTotal());
            Double womenPer = 1.0 * ageGender.getWomeTotal() / (ageGender.getManTotal() + ageGender.getWomeTotal());
            ageGender.setManPer(manPer);
            ageGender.setWomenPer(womenPer);

        Integer memTotal = ageGender.getThirtyTotal() + ageGender.getSixtyTotal() + ageGender.getBiggerTotal();
        Double thrPer = 1.0 * ageGender.getThirtyTotal() / memTotal;
        Double sixPer = 1.0 * ageGender.getSixtyTotal() / memTotal;
        Double biggerPer = 1.0 * ageGender.getBiggerTotal() / memTotal;
        ageGender.setThirtyPer(thrPer);
        ageGender.setSixtyPer(sixPer);
        ageGender.setBiggerPer(biggerPer);
            Integer memTotal = ageGender.getThirtyTotal() + ageGender.getSixtyTotal() + ageGender.getBiggerTotal();
            Double thrPer = 1.0 * ageGender.getThirtyTotal() / memTotal;
            Double sixPer = 1.0 * ageGender.getSixtyTotal() / memTotal;
            Double biggerPer = 1.0 * ageGender.getBiggerTotal() / memTotal;
            ageGender.setThirtyPer(thrPer);
            ageGender.setSixtyPer(sixPer);
            ageGender.setBiggerPer(biggerPer);
        }

        return R.ok(ageGender);
    }

@@ -86,6 +96,11 @@
                listRt = listRt.subList(0, 3);
            }
        }
        listRt.forEach(partyBuildingMemberVO -> {
            if(StringUtils.isNotEmpty(partyBuildingMemberVO.getName())){
                partyBuildingMemberVO.setName(SensitiveUtil.replaceName(partyBuildingMemberVO.getName()));
            }
        });
        return R.ok(listRt);
    }

@@ -101,4 +116,61 @@
        return R.ok(listR);
    }

    @Override
    public R partyActivityLine(Long communityId) {
        List<BigScreenActivityLine> bigScreenActivityLines=this.getPastMonth();
        bigScreenActivityLines.forEach(bigScreenActivityLine -> {
           BigScreenActivityLine bigScreenActivityLine1=comPbMemberDAO.selectActivityCountMonth(communityId,bigScreenActivityLine.getX(),bigScreenActivityLine.getYear());
           bigScreenActivityLine.setY(bigScreenActivityLine1.getY());
           bigScreenActivityLine.setCountY(bigScreenActivityLine1.getCountY());
           bigScreenActivityLine.setX(bigScreenActivityLine.getYear().substring(2,4)+"-"+bigScreenActivityLine.getX());
        });
        return R.ok(bigScreenActivityLines);
    }

    @Override
    public R partyActivityTop(PageBigScreenStatisticPartyOrg pageBigScreenStatisticPartyOrg) {
        return R.ok(this.comPbMemberDAO.selectActivityTop(new Page(pageBigScreenStatisticPartyOrg.getPageNum(),pageBigScreenStatisticPartyOrg.getPageSize()),pageBigScreenStatisticPartyOrg.getCommunityId()));
    }

    @Override
    public R serviceData(Long communityId) {
        return R.ok(this.comPbMemberDAO.bigScreenServiceData(communityId));
    }

    @Override
    public R serviceUser(Long communityId) {
        return R.ok(this.comPbMemberDAO.bigScreenServiceUser(communityId));
    }

    public List<BigScreenActivityLine> getPoints(){
        List<BigScreenActivityLine> bigScreenActivityLines=new ArrayList<>();
        for(int i=1;i<=12;i++){
            String aDate="";
            if(i<10){
                aDate = "0"+i;
            }
            else {
                aDate=i+"";
            }
            BigScreenActivityLine bigScreenActivityLine=new BigScreenActivityLine();
            bigScreenActivityLine.setX(aDate);
            bigScreenActivityLines.add(bigScreenActivityLine);
        }
        return bigScreenActivityLines;
    }

    public List<BigScreenActivityLine> getPastMonth(){
        List<BigScreenActivityLine> bigScreenActivityLines=new ArrayList<>();
        for(int i=11;i>=0;i--){
            BigScreenActivityLine bigScreenActivityLine=new BigScreenActivityLine();
            String date=DateUtils.getDateFormatString(DateUtils.addMonth(new Date(),-i),"MM");
            String year=DateUtils.getDateFormatString(DateUtils.addMonth(new Date(),-i),"yyyy");
            bigScreenActivityLine.setX(date);
            bigScreenActivityLine.setYear(year);
            bigScreenActivityLines.add(bigScreenActivityLine);
        }
        return bigScreenActivityLines;
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java

New file
@@ -0,0 +1,648 @@
package com.panzhihua.service_community.service.impl;

import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;

import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;

import javax.annotation.Resource;

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.vos.R;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
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.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.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.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.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.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.ComActMicroWishDAO;
import com.panzhihua.service_community.dao.ComActNeighborCircleDAO;
import com.panzhihua.service_community.dao.ComActQuestnaireDAO;
import com.panzhihua.service_community.dao.ComActWarehouseDonatesDao;
import com.panzhihua.service_community.dao.ComMngPopulationDAO;
import com.panzhihua.service_community.dao.ComPropertyDao;
import com.panzhihua.service_community.dao.ConvenientMerchantDAO;
import com.panzhihua.service_community.service.BigScreenStatisticsService;

import lombok.extern.slf4j.Slf4j;

/**
 * @title: BigScreenStatisticsServiceImpl
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 大屏统计服务实现类
 * @author: hans
 * @date: 2021/12/06 9:56
 */
@Service
@Slf4j
public class BigScreenStatisticsServiceImpl implements BigScreenStatisticsService {

    private static final Integer pageSize = 100;

    @Resource
    private ComActEasyPhotoDAO comActEasyPhotoDAO;

    @Resource
    private ComActMicroWishDAO comActMicroWishDAO;

    @Resource
    private ComActDiscussDAO comActDiscussDAO;

    @Resource
    private ComActNeighborCircleDAO comActNeighborCircleDAO;

    @Resource
    private ComPropertyDao comPropertyDao;

    @Resource
    private ComActWarehouseDonatesDao comActWarehouseDonatesDao;

    @Resource
    private ComMngPopulationDAO comMngPopulationDAO;

    @Resource
    private ConvenientMerchantDAO convenientMerchantDAO;

    @Resource
    private ComActQuestnaireDAO comActQuestnaireDAO;

    @Resource
    private ComActDynDAO comActDynDAO;

    @Resource
    private ComActActivityDAO comActActivityDAO;

    @Resource
    private ComActCommitteeDao comActCommitteeDao;

    /**
     * 大数据分析平台-居民自治
     * @param communityId
     * @return
     */
    @Override
    public R getResidentAutonomy(Long communityId) {
        ResidentAutonomyStatisticsVO statisticsVO = comActEasyPhotoDAO.selectResidentAutonomyStatistics(communityId);
        if (isNull(statisticsVO)) {
            statisticsVO = new ResidentAutonomyStatisticsVO();
        }
        List<StatisticsCommVO> easyPhotoHistogram = comActEasyPhotoDAO.selectStatisticsList(communityId);
        //随手拍总数
        Integer easyPhotoTotalCount = 0;
        //随手拍柱状统计
        if (Objects.nonNull(easyPhotoHistogram) && !easyPhotoHistogram.isEmpty()) {
            easyPhotoTotalCount = easyPhotoHistogram.stream().map(StatisticsCommVO::getNum).mapToInt(Integer::intValue).sum();
        }
        statisticsVO.setEasyPhotoTotalCount(easyPhotoTotalCount);
        statisticsVO.setEasyPhotoHistogram(easyPhotoHistogram);

        //待实现&已实现数目及占比
        List<StatisticsCommVO> microWishRealizePercent = comActMicroWishDAO.selectRealizePercent(communityId);
        statisticsVO.setMicroWishRealizePercent(microWishRealizePercent);
        //微心愿图片
        List<String> microWishImages = comActMicroWishDAO.getPassedAllImages(communityId, 20);
        statisticsVO.setMicroWishImages(microWishImages);

        //议事投票类型占比
        List<StatisticsCommVO> discussTypePercent = comActDiscussDAO.selectTypePercent(communityId);
        statisticsVO.setDiscussTypePercent(discussTypePercent);
        //议事标题
        List<String> discussTitles = comActDiscussDAO.getTitles(1, communityId, pageSize);
        statisticsVO.setDiscussTitles(discussTitles);
        //投票标题
        List<String> voteTitles = comActDiscussDAO.getTitles(2, communityId, pageSize);
        statisticsVO.setVoteTitles(voteTitles);

        //邻里圈图片
        List<String> neighborImages = comActNeighborCircleDAO.getAllImages(communityId, 20);
        statisticsVO.setNeighborImages(neighborImages);
        //邻里圈文本内容
        List<String> neighborContents = comActNeighborCircleDAO.getContents(communityId, pageSize);
        statisticsVO.setNeighborContents(neighborContents);

        //报事报修新增折线数据
        List<StatisticsCommVO> repairAddPolylineData = comPropertyDao.getRepairPolylineDate(communityId);
        statisticsVO.setRepairAddPolylineData(repairAddPolylineData);
        //报事报修累计折线数据
        List<StatisticsCommVO> repairTotalPolylineData = new ArrayList<>();
        repairAddPolylineData.forEach(e -> {
            StatisticsCommVO temp = comPropertyDao.getRepairTotalPolylineDate(communityId, e.getFiled());
            temp.setFiled(e.getFiled());
            repairTotalPolylineData.add(temp);
        });
        statisticsVO.setRepairTotalPolylineData(repairTotalPolylineData);

        //捐赠记录
        List<String> warehouseDonateRecords = comActWarehouseDonatesDao.getWarehouseDonateRecords(communityId, pageSize);
        statisticsVO.setWarehouseDonateRecords(warehouseDonateRecords);
        //爱心传递
        List<String> warehouseLoveTransfer = comActWarehouseDonatesDao.getWarehouseLoveTransfer(communityId, pageSize);
        statisticsVO.setWarehouseLoveTransfer(warehouseLoveTransfer);
        //捐赠图片
        List<String> warehouseImages = comActWarehouseDonatesDao.getWarehouseImages(communityId, 20);
        statisticsVO.setWarehouseImages(warehouseImages);

        //居民活动柱状统计
        List<StatisticsCommVO> residentActHistogram = comActActivityDAO.selectResidentActHistogramData(communityId, true);
        //居民活动新增数据
        List<StatisticsCommVO> actAddPolylineData = comActActivityDAO.getActAddPolylineData(communityId, true);
        //居民活动发布总数
        int residentActTotalCount = 0;
        if (!residentActHistogram.isEmpty()) {
            residentActTotalCount = residentActHistogram.stream().map(StatisticsCommVO::getNum).mapToInt(Integer::intValue).sum();
        }
        statisticsVO.setResidentActTotalCount(residentActTotalCount);
        statisticsVO.setResidentActHistogram(actAddPolylineData);
        //业主委员会党员占比
        List<StatisticsCommVO> committeePartyPercent = comActCommitteeDao.selectCommitteePartyPercent(communityId);
        statisticsVO.setCommitteePartyPercent(committeePartyPercent);
        return R.ok(statisticsVO);
    }

    /**
     * 大数据分析平台-清网治格
     * @param communityId
     * @return
     */
    @Override
    public R getGridsGovernance(Long communityId) {
        GridsGovernanceStatisticsVO statisticsVO = comActEasyPhotoDAO.selectGridsGovernance(communityId);
        if (isNull(statisticsVO)) {
            statisticsVO = new GridsGovernanceStatisticsVO();
        }
        // 查询网格数据
        List<EventGridStatisticsVO> gridStatisticsList = comMngPopulationDAO.getEventScreenGridData(communityId);
        statisticsVO.setGridStatisticsList(gridStatisticsList);

        // 查询小区列表
        List<CivilVillageStatisticsVO> villageStatisticsList = comMngPopulationDAO.getCivilScreenVillageList(communityId);
        if (!villageStatisticsList.isEmpty()) {
            villageStatisticsList.forEach(village -> {
                CivilVillageStatisticsVO villageStatisticsVO =
                        comMngPopulationDAO.getCivilScreenVillageStatistics(village.getVillageId());
                if (villageStatisticsVO != null) {
                    village.setPeopleNum(villageStatisticsVO.getPeopleNum());
                    village.setHouseNum(villageStatisticsVO.getHouseNum());
                    village.setRegisterNum(villageStatisticsVO.getRegisterNum());
                    village.setFlowNum(villageStatisticsVO.getFlowNum());
                    // BeanUtils.copyProperties(villageStatisticsVO,village);
                }
            });
        }
        statisticsVO.setVillageStatisticsList(villageStatisticsList);
        //事件分析新增折线数据
        List<StatisticsCommVO> eventAddPolylineData = comPropertyDao.getEventAddPolylineData(communityId);
        statisticsVO.setEventAddPolylineData(eventAddPolylineData);
        //事件分析累计折线数据
        List<StatisticsCommVO> eventTotalPolylineData = new ArrayList<>();
        eventAddPolylineData.forEach(e -> {
            StatisticsCommVO temp = comPropertyDao.getEventTotalPolylineDate(communityId, e.getFiled());
            temp.setFiled(e.getFiled());
            eventTotalPolylineData.add(temp);
        });
        statisticsVO.setEventTotalPolylineData(eventTotalPolylineData);
        statisticsVO.generateStatisticsData();
        return R.ok(statisticsVO);
    }

    /**
     * 大数据分析平台-社区服务
     * @param communityId
     * @return
     */
    @Override
    public R getCommunityServiceStatistics(Long communityId) {
        BigScreenCommunityStatisticsVO statisticsVO = new BigScreenCommunityStatisticsVO();
        // 查询网格数据
        List<EventGridStatisticsVO> gridStatisticsList = comMngPopulationDAO.getEventScreenGridData(communityId);
        statisticsVO.setGridStatisticsList(gridStatisticsList);
        // 查询小区列表
        List<CivilVillageStatisticsVO> villageStatisticsList = comMngPopulationDAO.getCivilScreenVillageList(communityId);
        if (!villageStatisticsList.isEmpty()) {
            villageStatisticsList.forEach(village -> {
                CivilVillageStatisticsVO villageStatisticsVO =
                        comMngPopulationDAO.getCivilScreenVillageStatistics(village.getVillageId());
                if (villageStatisticsVO != null) {
                    village.setPeopleNum(villageStatisticsVO.getPeopleNum());
                    village.setHouseNum(villageStatisticsVO.getHouseNum());
                    village.setRegisterNum(villageStatisticsVO.getRegisterNum());
                    village.setFlowNum(villageStatisticsVO.getFlowNum());
                }
            });
        }
        statisticsVO.setVillageStatisticsList(villageStatisticsList);
        //商家地图点位数据
        List<ConvenientMerchantVO> merchantVOList = convenientMerchantDAO.selectMerchantListByCommunity(communityId);
        statisticsVO.setMerchantMapDataList(merchantVOList);
        return R.ok(statisticsVO);
    }

    /**
     * 分页获取热度排行商家
     * @param pagePopularMerchantDTO
     * @return
     */
    @Override
    public R getScreenPopularMerchants(PagePopularMerchantDTO pagePopularMerchantDTO) {
        Page page = new Page<>();
        page.setSize(pagePopularMerchantDTO.getPageSize());
        page.setCurrent(pagePopularMerchantDTO.getPageNum());
        List<ConvenientMerchantVO> popularMerchants = convenientMerchantDAO.getScreenPopularMerchants(page, pagePopularMerchantDTO);
        return R.ok(popularMerchants);
    }

    /**
     * 首页二级页面-微心愿
     * @param communityId
     * @return
     */
    @Override
    public R indexMicroWish(Long communityId) {
        BigScreenMicroWishStatisticsInfo statisticsInfo = comActMicroWishDAO.selectIndexMicroWishBaseData(communityId);
        //微心愿新增折线数据
        Date nowDate = new Date();
        List<StatisticsCommVO> microWishAddPolylineData = comActMicroWishDAO.getMicroWishAddPolylineData(communityId);
        statisticsInfo.setMicroWishAddPolylineData(microWishAddPolylineData);
        //微心愿累计折线数据
        List<StatisticsCommVO> microWishTotalPolylineData = new ArrayList<>();
        microWishAddPolylineData.forEach(e -> {
            StatisticsCommVO temp = comActMicroWishDAO.getMicroWishTotalPolylineDate(communityId, e.getFiled());
            temp.setFiled(e.getFiled());
            microWishTotalPolylineData.add(temp);
        });
        statisticsInfo.setMicroWishTotalPolylineData(microWishTotalPolylineData);
        return R.ok(statisticsInfo);
    }

    /**
     * 首页二级页面-随手拍
     * @param communityId
     * @return
     */
    @Override
    public R indexEasyPhoto(Long communityId) {
        BigScreenEasyPhotoStatisticsInfo statisticsInfo = comActEasyPhotoDAO.selectIndexEasyPhotoBaseData(communityId);
        //随手拍新增折线数据
        Date nowDate = new Date();
        List<StatisticsCommVO> easyPhotoAddPolylineData = comActEasyPhotoDAO.getEasyPhotoAddPolylineData(communityId);
        statisticsInfo.setEasyPhotoAddPolylineData(easyPhotoAddPolylineData);
        //随手拍累计折线数据
        List<StatisticsCommVO> easyPhotoTotalPolylineData = new ArrayList<>();
        easyPhotoAddPolylineData.forEach(e -> {
            StatisticsCommVO temp = comActEasyPhotoDAO.getEasyPhotoTotalPolylineDate(communityId, e.getFiled());
            temp.setFiled(e.getFiled());
            easyPhotoTotalPolylineData.add(temp);
        });
        statisticsInfo.setEasyPhotoTotalPolylineData(easyPhotoTotalPolylineData);
        return R.ok(statisticsInfo);
    }

    /**
     * 首页二级页面-随手拍展示列表
     * @return
     */
    @Override
    public R indexEasyPhotoList(PageBaseDTO pageBaseDTO) {
        Page page = retrievePage(pageBaseDTO);
        return R.ok(comActEasyPhotoDAO.indexEasyPhotoList(page, pageBaseDTO));
    }

    /**
     * 首页二级页面-社区问卷
     * @param communityId
     * @return
     */
    @Override
    public R indexQuestionnaire(Long communityId) {
        BigScreenQuestionnaireStatisticsInfo statisticsInfo = comActQuestnaireDAO.getIndexQuestionnaireBaseData(communityId);
        //社区问卷新增折线数据
        List<StatisticsCommVO> questionnaireAddPolylineData = comActQuestnaireDAO.getQuestionnaireAddPolylineData(communityId);
        statisticsInfo.setQuestionnaireAddPolylineData(questionnaireAddPolylineData);
        //社区问卷累计折线数据
        List<StatisticsCommVO> questionnaireTotalPolylineData = new ArrayList<>();
        questionnaireAddPolylineData.forEach(e -> {
            StatisticsCommVO temp = comActQuestnaireDAO.getQuestionnaireTotalPolylineDate(communityId, e.getFiled());
            temp.setFiled(e.getFiled());
            questionnaireTotalPolylineData.add(temp);
        });
        statisticsInfo.setQuestionnaireTotalPolylineData(questionnaireTotalPolylineData);
        return R.ok(statisticsInfo);
    }

    /**
     * 首页二级页面-社区动态
     * @param communityId
     * @return
     */
    @Override
    public R indexDyn(Long communityId) {
        BigScreenDynStatisticsInfo statisticsInfo = new BigScreenDynStatisticsInfo();
        List<StatisticsCommVO> dynCircleData = comActDynDAO.getIndexDynBaseData(communityId);
        statisticsInfo.setDynCircleData(dynCircleData);
        if (!dynCircleData.isEmpty()) {
            statisticsInfo.setDynNum(dynCircleData.stream().map(StatisticsCommVO::getNum).mapToInt(Integer::intValue).sum());
        }
        //社区动态新增折线数据
        List<StatisticsCommVO> dynAddPolylineData = comActDynDAO.getDynAddPolylineData(communityId);
        statisticsInfo.setDynAddPolylineData(dynAddPolylineData);
        //社区动态累计折线数据
        List<StatisticsCommVO> dynTotalPolylineData = new ArrayList<>();
        dynAddPolylineData.forEach(e -> {
            StatisticsCommVO temp = comActDynDAO.getDynTotalPolylineDate(communityId, e.getFiled());
            temp.setFiled(e.getFiled());
            dynTotalPolylineData.add(temp);
        });
        statisticsInfo.setDynTotalPolylineData(dynTotalPolylineData);
        return R.ok(statisticsInfo);
    }

    /**
     * 首页二级页面-社区动态展示列表
     * @param pageBaseDTO
     * @return
     */
    @Override
    public R indexDynList(PageBaseDTO pageBaseDTO) {
        Page page = retrievePage(pageBaseDTO);
        return R.ok(comActDynDAO.indexDynList(page, pageBaseDTO));
    }

    /**
     * 首页二级页面-邻里圈
     * @param communityId
     * @return
     */
    @Override
    public R indexNeighbor(Long communityId) {
        BigScreenNeighborStatisticsInfo statisticsInfo = new BigScreenNeighborStatisticsInfo();
        List<StatisticsCommVO> neighborCircleData = comActNeighborCircleDAO.getIndexNeighborBaseData(communityId);
        statisticsInfo.setNeighborCircleData(neighborCircleData);
        if (!neighborCircleData.isEmpty()) {
            statisticsInfo.setPublishContentNum(neighborCircleData.stream().map(StatisticsCommVO::getNum).mapToInt(Integer::intValue).sum());
            statisticsInfo.setPublishTopicNum(neighborCircleData.stream().filter(e -> !"无话题".equals(e.getFiled())).collect(Collectors.toList()).size());
        }
        //邻里圈新增折线数据
        List<StatisticsCommVO> neighborAddPolylineData = comActNeighborCircleDAO.getNeighborAddPolylineData(communityId);
        statisticsInfo.setNeighborAddPolylineData(neighborAddPolylineData);
        //邻里圈累计折线数据
        List<StatisticsCommVO> neighborTotalPolylineData = new ArrayList<>();
        neighborAddPolylineData.forEach(e -> {
            StatisticsCommVO temp = comActNeighborCircleDAO.getNeighborTotalPolylineDate(communityId, e.getFiled());
            temp.setFiled(e.getFiled());
            neighborTotalPolylineData.add(temp);
        });
        statisticsInfo.setNeighborTotalPolylineData(neighborTotalPolylineData);
        return R.ok(statisticsInfo);
    }

    /**
     * 首页二级页面-邻里圈展示列表
     * @param pageBaseDTO
     * @return
     */
    @Override
    public R indexNeighborList(PageBaseDTO pageBaseDTO) {
        Page page = retrievePage(pageBaseDTO);
        return R.ok(comActNeighborCircleDAO.indexNeighborList(page, pageBaseDTO));
    }

    /**
     * 首页二级页面-便民商家
     * @param communityId
     * @return
     */
    @Override
    public R indexMerchant(Long communityId) {
        BigScreenMerchantStatisticsInfo statisticsInfo = convenientMerchantDAO.getIndexMerchantBaseData(communityId);
        //资源类型饼图数据（暂无）
//        List<StatisticsCommVO> resourceTypeCircleData;
        //服务类型饼图数据
        List<StatisticsCommVO> serviceTypeCircleData = convenientMerchantDAO.selectServiceTypeCircleData(communityId);
        statisticsInfo.setServiceTypeCircleData(serviceTypeCircleData);
        if (!serviceTypeCircleData.isEmpty()) {
            //服务类型数
            statisticsInfo.setServiceTypeNum(serviceTypeCircleData.size());
        }
        //服务次数（目前暂时使用浏览量）新增折线数据
        List<StatisticsCommVO> serviceTimesAddPolylineData = convenientMerchantDAO.getServiceTimesAddPolylineData(communityId);
        statisticsInfo.setServiceTimesAddPolylineData(serviceTimesAddPolylineData);
        //服务次数（目前暂时使用浏览量）累计折线数据
        List<StatisticsCommVO> serviceTimesTotalPolylineData = new ArrayList<>();
        serviceTimesAddPolylineData.forEach(e -> {
            StatisticsCommVO temp = convenientMerchantDAO.getServiceTimesTotalPolylineDate(communityId, e.getFiled());
            temp.setFiled(e.getFiled());
            serviceTimesTotalPolylineData.add(temp);
        });
        statisticsInfo.setServiceTimesTotalPolylineData(serviceTimesTotalPolylineData);
        return R.ok(statisticsInfo);
    }

    /**
     * 首页二级页面-商家展示列表
     * @param pageBaseDTO
     * @return
     */
    @Override
    public R indexMerchantList(PageBaseDTO pageBaseDTO) {
        Page page = retrievePage(pageBaseDTO);
        return R.ok(convenientMerchantDAO.indexMerchantList(page, pageBaseDTO));
    }

    /**
     * 首页二级页面-微心愿展示列表
     * @param pageBaseDTO
     * @return
     */
    @Override
    public R indexMicroWishList(PageBaseDTO pageBaseDTO) {
        Page page = retrievePage(pageBaseDTO);
        return R.ok(comActMicroWishDAO.selectScreenDisplayList(page, pageBaseDTO));
    }

    /**
     * 首页二级页面-社区问卷展示列表
     * @param pageBaseDTO
     * @return
     */
    @Override
    public R indexQuestionnaireList(PageBaseDTO pageBaseDTO) {
        Page page = retrievePage(pageBaseDTO);
        return R.ok(comActQuestnaireDAO.selectQuestionnaireDisplayList(page, pageBaseDTO));
    }

    /**
     * 首页二级页面-居民活动
     * @param communityId
     * @return
     */
    @Override
    public R indexResidentAct(Long communityId) {
        BigScreenResidentActStatisticsInfo statisticsInfo = new BigScreenResidentActStatisticsInfo();
        List<StatisticsCommVO> actCircleData = comActActivityDAO.getIndexResidentActBaseData(communityId, true);
        statisticsInfo.setActCircleData(actCircleData);
        if (!actCircleData.isEmpty()) {
            statisticsInfo.setJoinNum(actCircleData.stream().map(StatisticsCommVO::getNum).mapToInt(Integer::intValue).sum());
        }
        List<StatisticsCommVO> residentActHistogram = comActActivityDAO.selectResidentActHistogramData(communityId, true);
        //居民活动发布总数
        int publishNum = 0;
        if (!residentActHistogram.isEmpty()) {
            publishNum = residentActHistogram.stream().map(StatisticsCommVO::getNum).mapToInt(Integer::intValue).sum();
        }
        statisticsInfo.setPublishNum(publishNum);
        //居民活动新增折线数据
        List<StatisticsCommVO> actAddPolylineData = comActActivityDAO.getActAddPolylineData(communityId, true);
        statisticsInfo.setActAddPolylineData(actAddPolylineData);
        //居民活动累计折线数据
        List<StatisticsCommVO> actTotalPolylineData = new ArrayList<>();
        actAddPolylineData.forEach(e -> {
            StatisticsCommVO temp = comActActivityDAO.getActTotalPolylineData(communityId, true, e.getFiled());
            temp.setFiled(e.getFiled());
            actTotalPolylineData.add(temp);
        });
        statisticsInfo.setActTotalPolylineData(actTotalPolylineData);
        return R.ok(statisticsInfo);
    }

    /**
     * 首页二级页面-居民活动展示列表
     * @param pageBaseDTO
     * @return
     */
    @Override
    public R indexResidentActList(PageBaseDTO pageBaseDTO) {
        Page page = retrievePage(pageBaseDTO);
        return R.ok(comActActivityDAO.indexActList(page, pageBaseDTO, true));
    }

    /**
     * 首页二级页面-志愿者活动
     * @param communityId
     * @return
     */
    @Override
    public R indexVolunteerAct(Long communityId) {
        BigScreenVolunteerActStatisticsInfo statisticsInfo = new BigScreenVolunteerActStatisticsInfo();
        List<StatisticsCommVO> actCircleData = comActActivityDAO.getIndexResidentActBaseData(communityId, false);
        statisticsInfo.setActCircleData(actCircleData);
        if (!actCircleData.isEmpty()) {
            statisticsInfo.setJoinNum(actCircleData.stream().map(StatisticsCommVO::getNum).mapToInt(Integer::intValue).sum());
        }
        List<StatisticsCommVO> volunteerActHistogram = comActActivityDAO.selectResidentActHistogramData(communityId, false);
        //志愿者活动发布总数
        int publishNum = 0;
        if (!volunteerActHistogram.isEmpty()) {
            publishNum = volunteerActHistogram.stream().map(StatisticsCommVO::getNum).mapToInt(Integer::intValue).sum();
        }
        statisticsInfo.setPublishNum(publishNum);
        //志愿者活动新增折线数据
        List<StatisticsCommVO> actAddPolylineData = comActActivityDAO.getActAddPolylineData(communityId, false);
        statisticsInfo.setActAddPolylineData(actAddPolylineData);
        //志愿者活动累计折线数据
        List<StatisticsCommVO> actTotalPolylineData = new ArrayList<>();
        actAddPolylineData.forEach(e -> {
            StatisticsCommVO temp = comActActivityDAO.getActTotalPolylineData(communityId, false, e.getFiled());
            temp.setFiled(e.getFiled());
            actTotalPolylineData.add(temp);
        });
        statisticsInfo.setActTotalPolylineData(actTotalPolylineData);
        return R.ok(statisticsInfo);
    }

    /**
     * 首页二级页面-志愿者活动展示列表
     * @param pageBaseDTO
     * @return
     */
    @Override
    public R indexVolunteerActList(PageBaseDTO pageBaseDTO) {
        Page page = retrievePage(pageBaseDTO);
        return R.ok(comActActivityDAO.indexActList(page, pageBaseDTO, false));
    }

    /**
     * 清网治格-根据事件分类获取近1月的社区事件数据
     * @param type
     * @param communityId
     * @return
     */
    @Override
    public R getEventList(Integer type, Long communityId) {
        // 查询社区事件列表
        List<EventGridIncidentStatisticsVO> gridIncidentList = comMngPopulationDAO.getGridsGovernanceEventList(communityId);
        List<EventGridIncidentStatisticsVO> returnGridIncidentList = new ArrayList<>();
        if (!gridIncidentList.isEmpty()) {
            gridIncidentList.forEach(e -> {
                if (e.getEventType().equals(2)) {
                    String[] lngLatString = e.getLatLng().split(",");
                    e.setLatLng(lngLatString[1] + "," + lngLatString[0]);
                }
            });
            returnGridIncidentList = gridIncidentList.stream().filter(e -> type.equals(e.getType())).collect(Collectors.toList());
        }
        return R.ok(returnGridIncidentList);
    }

    /**
     * 清网治格-社区事件数据分页
     * @param pageBaseDTO
     * @return
     */
    @Override
    public R pageEventList(PageBaseDTO pageBaseDTO) {
        Page page = retrievePage(pageBaseDTO);
        IPage<EventGridIncidentStatisticsVO> iPage = comMngPopulationDAO.pageEventList(page, pageBaseDTO);
        List<EventGridIncidentStatisticsVO> gridIncidentList = iPage.getRecords();
        if (!gridIncidentList.isEmpty()) {
            gridIncidentList.forEach(e -> {
                if (e.getEventType().equals(2)) {
                    String[] lngLatString = e.getLatLng().split(",");
                    e.setLatLng(lngLatString[1] + "," + lngLatString[0]);
                }
            });
        }
        return R.ok(iPage);
    }

    private Page retrievePage(PageBaseDTO pageBaseDTO) {
        Long pageNum = pageBaseDTO.getPageNum();
        Long size = pageBaseDTO.getPageSize();
        Page page = new Page<>();
        if (nonNull(pageNum) && nonNull(size)) {
            page.setCurrent(pageNum);
            page.setSize(size);
        } else {
            page.setCurrent(1);
            page.setSize(pageSize);
        }
        return page;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActEvaluateServiceImpl.java

@@ -170,22 +170,13 @@
        if (isNull(comActActivityDO)) {
            return R.fail("活动不存在");
        }
        List<ComActActEvaluateDO> comActActEvaluateDOList = this.baseMapper.selectList(new QueryWrapper<ComActActEvaluateDO>()
                .lambda().eq(ComActActEvaluateDO::getUserId, userId).eq(ComActActEvaluateDO::getActivityId, activityId));
        List<ComActActEvaluateVO> comActActEvaluateVOS = new ArrayList<>();
        if (!ObjectUtils.isEmpty(comActActEvaluateDOList)) {
            comActActEvaluateDOList.forEach(comActActEvaluateDO -> {
                ComActActEvaluateVO comActActEvaluateVO = new ComActActEvaluateVO();
                BeanUtils.copyProperties(comActActEvaluateDO, comActActEvaluateVO);
                comActActEvaluateVOS.add(comActActEvaluateVO);
            });
        }
        int registCount = comActActRegistDAO.selectCount(new QueryWrapper<ComActActRegistDO>()
        List<ComActActEvaluateVO> comActActEvaluateVOS = this.baseMapper.selectEvaluateList(activityId, userId);
        int regCount = comActActRegistDAO.selectCount(new QueryWrapper<ComActActRegistDO>()
                .lambda().eq(ComActActRegistDO::getActivityId, activityId).eq(ComActActRegistDO::getUserId, userId));

        MyActivityEvaluateVO evaluateVO = new MyActivityEvaluateVO();
        evaluateVO.setMyEvaluateList(comActActEvaluateVOS);
        boolean needDisplay = registCount > comActActEvaluateVOS.size() &&
        boolean needDisplay = regCount > comActActEvaluateVOS.size() &&
                new Date().before(DateUtils.addDays(comActActivityDO.getEndAt(), 3));
        evaluateVO.setIsDisplay(needDisplay ? 1 : 0);
        return R.ok(evaluateVO);

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java

@@ -12,6 +12,7 @@
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -19,6 +20,9 @@

import javax.annotation.Resource;

import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.*;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
@@ -52,19 +56,7 @@
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.WxUtil;
import com.panzhihua.common.utlis.WxXCXTempSend;
import com.panzhihua.service_community.dao.ComActActEvaluateDAO;
import com.panzhihua.service_community.dao.ComActActPictureDAO;
import com.panzhihua.service_community.dao.ComActActRegistDAO;
import com.panzhihua.service_community.dao.ComActActSignDAO;
import com.panzhihua.service_community.dao.ComActActivityCodeDao;
import com.panzhihua.service_community.dao.ComActActivityDAO;
import com.panzhihua.service_community.dao.ComBpActivityDAO;
import com.panzhihua.service_community.entity.ComActActivityCode;
import com.panzhihua.service_community.model.dos.ComActActEvaluateDO;
import com.panzhihua.service_community.model.dos.ComActActPictureDO;
import com.panzhihua.service_community.model.dos.ComActActRegistDO;
import com.panzhihua.service_community.model.dos.ComActActSignDO;
import com.panzhihua.service_community.model.dos.ComActActivityDO;
import com.panzhihua.service_community.service.ComActActivityCodeService;
import com.panzhihua.service_community.service.ComActActivityService;
import com.panzhihua.service_community.service.ComActIntegralUserTradeService;
@@ -105,6 +97,8 @@
    private ComActIntegralUserTradeService comActIntegralUserTradeService;
    @Resource
    private ComActActivityCodeService comActActivityCodeService;
    @Resource
    private ComActDAO comActDAO;

    /**
     * 新增社区活动
@@ -115,6 +109,9 @@
     */
    @Override
    public R addActivity(ComActActivityVO comActActivityVO) {
        if (comActActivityVO.getHaveIntegralReward().intValue() == 2) {
            comActActivityVO.setRewardWay(null);
        }
        ComActActivityDO comActActivityDO = new ComActActivityDO();
        BeanUtils.copyProperties(comActActivityVO, comActActivityDO);
        Integer status = comActActivityVO.getStatus();
@@ -183,7 +180,8 @@
                try {
                    WxXCXTempSend util = new WxXCXTempSend();
                    String accessToken = util.getAppAccessToken();

                    ComActDO comActDO=comActDAO.selectById(comActActivityDO.getCommunityId());
                    R<SysTemplateConfigVO> r=userService.selectTemplate(comActDO.getAreaCode(),1);
                    activitySignVOS.forEach(activitySignVO1 -> {
                        // 变更社区活动推送订阅消息给用户
                        WxUtil.sendSubscribeHDBG(activitySignVO1.getOpenid(), accessToken,
@@ -193,18 +191,22 @@
                            comActActivityDO.getActivityAddr(),
                            com.panzhihua.common.utlis.DateUtils.format(comActActivityVO.getBeginAt(),
                                com.panzhihua.common.utlis.DateUtils.ymdhms_format),
                            comActActivityVO.getActivityAddr());
                            comActActivityVO.getActivityAddr(),r.getData().getTemplateId());
                    });
                } catch (Exception e) {
                    log.error("消息推送失败，失败原因：" + e.getMessage());
                }
            }
        }
        if (comActActivityVO.getHaveIntegralReward().intValue() == 2) {
            comActActivityVO.setRewardWay(null);
        }
        BeanUtils.copyProperties(comActActivityVO, comActActivityDO);

        // 结束时间大于当前时间则设置为“进行中”
        Date now = new Date();
        if (comActActivityVO.getSignUpEnd() != null && now.getTime() < comActActivityVO.getSignUpEnd().getTime()) {
        if (comActActivityVO.getSignUpEnd() != null && now.getTime() < comActActivityVO.getSignUpEnd().getTime()
        && now.getTime() > comActActivityVO.getSignUpBegin().getTime()) {
            comActActivityDO.setStatus(3);
        }
        boolean b = this.updateById(comActActivityDO);
@@ -278,8 +280,7 @@
     */
    @Override
    public R cancelActivity(ComActActivityVO comActActivityVO) {
        ComActActivityDO comActActivityDO = new ComActActivityDO();
        comActActivityDO.setId(comActActivityVO.getId());
        ComActActivityDO comActActivityDO = comActActivityDAO.selectById(comActActivityVO.getId());
        comActActivityDO.setStatus(comActActivityVO.getStatus());
        comActActivityDO.setCancelReason(comActActivityVO.getCancelReason());
        int update = comActActivityDAO.updateById(comActActivityDO);
@@ -310,6 +311,12 @@
                if (!ObjectUtils.isEmpty(comActActSignDO)) {
                    comActActivityVO.setIsSign(1);
                    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));
                if (!regList.isEmpty()) {
                    List<ComActActRegistDO> collect = regList.stream().sorted(Comparator.comparing(ComActActRegistDO::getId).reversed()).collect(Collectors.toList());
                    comActActivityVO.setTimes(collect.get(0).getTimes());
                }
            }
        }
@@ -477,13 +484,13 @@
                    JSONObject.parseObject(JSONObject.toJSONString(userInfoR.getData()), LoginUserInfoVO.class);
            // 查询当前活动下参与居民
            Integer residentCount = comActActSignDAO.selectCount(new QueryWrapper<ComActActSignDO>().lambda()
                    .eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getIsVolunteer, 0));
                    .eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getIsVolunteer, 0).eq(ComActActSignDO::getStatus, 1));
            if (volunteerMax != 0) {
                //志愿者活动
                boolean userIsVolunteer = loginUserInfoVO.getIsVolunteer() == 1;
                // 查询当前活动下参与志愿者
                Integer volunteerCount = comActActSignDAO.selectCount(new QueryWrapper<ComActActSignDO>().lambda()
                        .eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getIsVolunteer, 1));
                        .eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getIsVolunteer, 1).eq(ComActActSignDO::getStatus, 1));
                if (userIsVolunteer) {
                    //用户是志愿者以志愿者身份参加
                    if (volunteerMax > volunteerCount || volunteerMax.equals(-1)) {
@@ -544,6 +551,15 @@
                num = comActActSignDAO.insert(comActActSignDO);
            }
        } else {
            Integer regTimes = comActActRegistDAO.selectCount(new QueryWrapper<ComActActRegistDO>().lambda()
                    .eq(ComActActRegistDO::getActivityId, activityId).eq(ComActActRegistDO::getUserId, userId).eq(ComActActRegistDO::getType, 1));
            Integer canCancel = actActivityDO.getCanCancel();
            if (nonNull(canCancel) && canCancel.equals(2)) {
                return R.fail("该活动暂不支持取消");
            }
            if (regTimes > 0) {
                return R.fail("您已参与活动，不可取消");
            }
            if (isNull(signactivityVO.getReason())) {
                return R.fail("缺少取消原因");
            }
@@ -553,6 +569,16 @@
            comActActSignDO.setStatus(0);
            comActActSignDO.setReason(signactivityVO.getReason());
            num = comActActSignDAO.updateById(comActActSignDO);
            if (num > 0) {
                AddComActIntegralUserDTO addComActIntegralUserDTO = new AddComActIntegralUserDTO();
                addComActIntegralUserDTO.setUserId(userId);
                addComActIntegralUserDTO.setIntegralType(8);
                addComActIntegralUserDTO.setActivityType(1);
                addComActIntegralUserDTO.setIsVolunteer(comActActSignDO.getIsVolunteer());
                addComActIntegralUserDTO.setCommunityId(actActivityDO.getCommunityId());
                addComActIntegralUserDTO.setServiceId(activityId);
                comActIntegralUserTradeService.addIntegralTradeAdmin(addComActIntegralUserDTO);
            }
        }
        if (num > 0) {
            return R.ok(isVolunteer);
@@ -579,8 +605,13 @@
        List<ComActActivityDO> comActActivityDOS = comActActivityDAO.selectBatchIds(longs);
        List<ComActActivityVO> comActActivityVOS = new ArrayList<>();
        if (nonNull(status)) {
            comActActivityDOS = comActActivityDOS.stream()
                    .filter(activityDO -> activityDO.getStatus().equals(status)).collect(Collectors.toList());
            if(status.equals(4)){
                comActActivityDOS = comActActivityDOS.stream()
                        .filter(activityDO -> activityDO.getStatus().equals(3)||activityDO.getStatus().equals(4)).collect(Collectors.toList());
            }else{
                comActActivityDOS = comActActivityDOS.stream()
                        .filter(activityDO -> activityDO.getStatus().equals(status)).collect(Collectors.toList());
            }
        }
        if (!comActActivityDOS.isEmpty()) {
            comActActivityDOS.forEach(comActActivityDO -> {
@@ -609,7 +640,8 @@
                }
                comActActivityVO.setSingDate(createAt);
                comActActivityVO.setTimes(activitySignVO.getTimes());
                comActActivityVO.setAward(activitySignVO.getAward());
                Integer totalAward = comActActRegistDAO.selectTotalAwardWithRegist(activitySignVO.getActivityId(), userId);
                comActActivityVO.setAward(totalAward);
                comActActivityVOS.add(comActActivityVO);
            });
        }
@@ -813,6 +845,8 @@
            try {
                String accessToken = util.getAppAccessToken();
                actActivityList.forEach(actActivity -> {
                    ComActDO comActDO=comActDAO.selectById(actActivity.getCommunityId());
                    R<SysTemplateConfigVO> r=userService.selectTemplate(comActDO.getAreaCode(),9);
                    // 查询报名活动人员列表
                    List<ComActActSignDO> actSignList = comActActSignDAO.selectList(new QueryWrapper<ComActActSignDO>()
                        .lambda().eq(ComActActSignDO::getActivityId, actActivity.getId()));
@@ -820,12 +854,13 @@
                        // 查询用户openId
                        Map<String, String> map = comActActSignDAO.getUserOpenId(actSign.getUserId());
                        if (map != null) {

                            String openid = map.get("openid");
                            // 推送消息
                            WxUtil.sendSubscribeHDJJKS(openid, accessToken, actActivity.getActivityName(),
                                com.panzhihua.common.utlis.DateUtils.format(actActivity.getBeginAt(),
                                    com.panzhihua.common.utlis.DateUtils.ymdhms_format),
                                actActivity.getActivityAddr(), actSignList.size() + "");
                                actActivity.getActivityAddr(), actSignList.size() + "",r.getData().getTemplateId());
                        }

                    });
@@ -870,6 +905,12 @@
                return R.fail("活动不存在！");
            }

            ComActActSignDO comActActSignDO = comActActSignDAO.selectOne(new QueryWrapper<ComActActSignDO>().lambda()
                    .eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getUserId, userId).eq(ComActActSignDO::getStatus, 1));
            if (isNull(comActActSignDO)) {
                return R.fail("活动未报名");
            }

            Date beginAt = comActActivityDO.getBeginAt();
            Date endAt = comActActivityDO.getEndAt();
            Date nowDate = new Date();
@@ -884,9 +925,13 @@
            if (signDayCount > 0) {
                return R.fail("请扫描新的签到码");
            }
            int limit = comActActivityDO.getLimit().intValue();
            if(limit != -1 && signAllCount >= limit){
                return R.fail("签到次数上限");
            Integer haveIntegralReward = comActActivityDO.getHaveIntegralReward();
            boolean isHave = nonNull(haveIntegralReward) && haveIntegralReward.equals(1);
            if (isHave) {
                int limit = comActActivityDO.getLimit().intValue();
                if(limit != -1 && signAllCount >= limit){
                    return R.fail("签到次数上限");
                }
            }

//        String activitySignInKey = String.join(DELIMITER, ACTIVITY_SIGN_IN, userId.toString(), activityId.toString());
@@ -897,24 +942,28 @@
            comActActRegistDO.setActivityId(activityId);
            comActActRegistDO.setType(1);
            comActActRegistDO.setUserId(userId);
            comActActRegistDO.setIsVolunteer(comActActRegistVO.getIsVolunteer());
            comActActRegistDO.setIsVolunteer(comActActSignDO.getIsVolunteer());
            comActActRegistDO.setCreateAt(nowDate);
            comActActRegistDO.setCodeId(comActActRegistVO.getCodeId());
            comActActRegistDO.setAward(comActActivityDO.getRewardIntegral());
            comActActRegistDO.setAward(isHave ? comActActivityDO.getRewardIntegral() : 0);
            comActActRegistDO.setPosition(comActActRegistVO.getPosition());
            comActActRegistDO.setTimes(signAllCount+1);
            int result = comActActRegistDAO.insert(comActActRegistDO);
            if (result > 0) {
                AddComActIntegralUserDTO addComActIntegralUserDTO=new AddComActIntegralUserDTO();
                addComActIntegralUserDTO.setUserId(userId);
                addComActIntegralUserDTO.setIntegralType(8);
                addComActIntegralUserDTO.setActivityType(1);
                addComActIntegralUserDTO.setCommunityId(comActActivityDO.getCommunityId());
                addComActIntegralUserDTO.setServiceId(activityId);
                comActIntegralUserTradeService.addIntegralTradeAdmin(addComActIntegralUserDTO);
//            ValueOperations<String, String> opsForValue = stringRedisTemplate.opsForValue();
//            opsForValue.set(activitySignInKey, "", 1800L, TimeUnit.SECONDS);
                return R.ok(comActActivityDO.getRewardIntegral());
                if (isHave) {
                    boolean isVolunteerAct = comActActivityDO.getVolunteerMax() != 0;
                    AddComActIntegralUserDTO addComActIntegralUserDTO=new AddComActIntegralUserDTO();
                    addComActIntegralUserDTO.setUserId(userId);
                    addComActIntegralUserDTO.setIntegralType(isVolunteerAct ? 5 : 4);
                    addComActIntegralUserDTO.setActivityType(1);
                    addComActIntegralUserDTO.setIsVolunteer(comActActSignDO.getIsVolunteer());
                    addComActIntegralUserDTO.setCommunityId(comActActivityDO.getCommunityId());
                    addComActIntegralUserDTO.setServiceId(activityId);
                    comActIntegralUserTradeService.addIntegralTradeAdmin(addComActIntegralUserDTO);
                    return R.ok(comActActivityDO.getRewardIntegral());
                } else {
                    return R.ok();
                }
            }
            return R.fail("网络错误，请重试");
        }

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java

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

import com.panzhihua.common.model.vos.community.easyPhoto.BannerVO;
import com.panzhihua.service_community.entity.SysTemplateConfig;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -70,7 +71,8 @@
    private ComActReserveMapper comActReserveMapper;
    @Resource
    private ComActActivityDAO comActActivityDAO;

    @Resource
    private SysTemplateConfigDao sysTemplateConfigDao;
    /**
     * 分页查询随手拍
     *
@@ -596,10 +598,11 @@
                Map<String, String> map = comActActSignDAO.getUserOpenId(easyPhotoDO.getSponsorId());
                if (map != null) {
                    String openid = map.get("openid");
                    SysTemplateConfig sysTemplateConfig=sysTemplateConfigDao.selectOne(new QueryWrapper<SysTemplateConfig>().lambda().eq(SysTemplateConfig::getAreaCode, grantRewardDTO.getAreaCode()).eq(SysTemplateConfig::getType,7));
                    WxXCXTempSend util = new WxXCXTempSend();
                    try {
                        WxUtil.sendSubscribeJLDZ(openid, util.getAppAccessToken(), "随手拍有奖活动",
                            grantRewardDTO.getAmount(), activityType);
                            grantRewardDTO.getAmount(), activityType,sysTemplateConfig.getTemplateId());
                    } catch (Exception e) {
                        log.error("消息推送失败，失败原因：" + e.getMessage());
                    }

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserServiceImpl.java

@@ -186,11 +186,11 @@
    }

    /**
     * 根据社区活动id查询社区活动报名人员列表
     * 根据社区活动id查询社区活动报名且未参与人员列表
     * 
     * @param activityId
     *            活动id
     * @return 社区活动报名人员列表
     * @return 社区活动报名且未参与人员列表
     */
    @Override
    public R getTaskActivityPeopleList(Long activityId) {

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserTradeServiceImpl.java

@@ -29,6 +29,8 @@

import lombok.extern.slf4j.Slf4j;

import static java.util.Objects.nonNull;

/**
 * @auther lyq
 * @create 2021-07-28 16:03:18
@@ -173,7 +175,7 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R addIntegralTradeAdmin(AddComActIntegralUserDTO integralUserDTO) {
        // 判断增加积分类型 积分任务类型（1.发布随手拍 2.发布微心愿 3.参与议事投票 4.参与志愿者活动 5.参与社区活动 6.参与党员活动 7.参与调查问卷 8.活动签到 9.取消活动）
        // 判断增加积分类型 积分任务类型（1.发布随手拍 2.发布微心愿 3.参与议事投票 4.参加居民活动 5.参加志愿者活动 6.参与党员活动 7.参与调查问卷 8.取消活动）
        Integer type = integralUserDTO.getIntegralType();
        // 业务id
        Long serviceId = integralUserDTO.getServiceId();
@@ -190,24 +192,30 @@
        // 当前时间
        Date nowDate = new Date();

        // 查询随手拍增加积分数量
        ComActIntegralRuleDO integralRuleDO =
            comActIntegralRuleService.getOne(new QueryWrapper<ComActIntegralRuleDO>().lambda()
                .eq(ComActIntegralRuleDO::getIntegralType, type).eq(ComActIntegralRuleDO::getCommunityId, communityId));
        if (integralRuleDO == null) {
            log.error("未查询到该社区积分规则，社区id：" + communityId);
            return R.fail("未查询到该社区积分规则，社区id：" + communityId);
        }
        // 判断规则是否有次数限制
        if (integralRuleDO.getIsRestrict().equals(ComActIntegralRuleDO.isRestrict.yes)) {
            Integer count = this.baseMapper.getIntegralCount(
                getIntegralCountDTO(integralRuleDO.getType(), userId, communityId, integralRuleDO.getIntegralType()));
            if (count >= integralRuleDO.getCount()) {
                log.error("该用户参加任务次数已达上限");
                return R.fail("该用户参加任务次数已达上限");
        Integer changeType = ComActIntegralUserTradeDO.changeType.add;

        Integer isVolunteer = integralUserDTO.getIsVolunteer();

        if (!type.equals(8)) {
            // 查询随手拍增加积分数量
            ComActIntegralRuleDO integralRuleDO =
                    comActIntegralRuleService.getOne(new QueryWrapper<ComActIntegralRuleDO>().lambda()
                            .eq(ComActIntegralRuleDO::getIntegralType, type).eq(ComActIntegralRuleDO::getCommunityId, communityId));
            if (integralRuleDO == null) {
                log.error("未查询到该社区积分规则，社区id：" + communityId);
                return R.fail("未查询到该社区积分规则，社区id：" + communityId);
            }
            // 判断规则是否有次数限制
            if (integralRuleDO.getIsRestrict().equals(ComActIntegralRuleDO.isRestrict.yes)) {
                Integer count = this.baseMapper.getIntegralCount(
                        getIntegralCountDTO(integralRuleDO.getType(), userId, communityId, integralRuleDO.getIntegralType()));
                if (count >= integralRuleDO.getCount()) {
                    log.error("该用户参加任务次数已达上限");
                    return R.fail("该用户参加任务次数已达上限");
                }
            }
            amount = integralRuleDO.getAmount();
        }
        amount = integralRuleDO.getAmount();

        switch (type) {
            case 1:
@@ -250,27 +258,32 @@
                }
                break;
            case 4:
                identityType = 3;
                remark.append("参与志愿者活动奖励积分");
                ComActActivityDO actActivityZYZDO = comActActivityService.getById(serviceId);
                if (actActivityZYZDO != null) {
                    remark.append("【");
                    remark.append(actActivityZYZDO.getActivityName());
                    remark.append("】");
                if (nonNull(isVolunteer) && isVolunteer.equals(1)) {
                    identityType = 3;
                } else {
                    identityType = 1;
                }
                remark.append("成功参加居民活动奖励积分");
                ComActActivityDO actActivityDO1 = comActActivityService.getById(serviceId);
                if(actActivityDO1 != null) {
                    amount = actActivityDO1.getRewardIntegral();
                }
                break;
            case 5:
                remark.append("参与社区活动奖励积分");
                if (nonNull(isVolunteer) && isVolunteer.equals(0)) {
                    identityType = 1;
                } else {
                    identityType = 3;
                }
                remark.append("成功参加志愿者活动奖励积分");
                ComActActivityDO actActivityDO = comActActivityService.getById(serviceId);
                if (actActivityDO != null) {
                    remark.append("【");
                    remark.append(actActivityDO.getActivityName());
                    remark.append("】");
                if(actActivityDO != null) {
                    amount = actActivityDO.getRewardIntegral();
                }
                break;
            case 6:
                identityType = 2;
                remark.append("参与党员活动奖励积分");
                remark.append("参与党员活动");
                break;
            case 7:
                // 查询调查问卷
@@ -301,16 +314,21 @@
                remark.append("】");
                break;
            case 8:
                remark.append("成功参加活动奖励积分");
                if(integralUserDTO.getActivityType()==1){
                    ComActActivityDO actActivityDO1 = comActActivityService.getById(serviceId);
                    if(actActivityDO1!=null){
                        amount=actActivityDO1.getRewardIntegral();
                        if(actActivityDO1.getVolunteerMax()!=0){
                            identityType=3;
                        }else {
                            identityType=1;
                changeType = ComActIntegralUserTradeDO.changeType.reduce;
                if (integralUserDTO.getActivityType() == 1) {
                    ComActActivityDO actActivityDO2 = comActActivityService.getById(serviceId);
                    if (actActivityDO2 != null) {
                        amount = -actActivityDO2.getCancelDeduct();
                        if (actActivityDO2.getVolunteerMax() != 0) {
                            remark.append("取消志愿者活动扣除积分");
                        } else {
                            remark.append("取消居民活动扣除积分");
                        }
                    }
                    if (nonNull(isVolunteer) && isVolunteer.equals(1)) {
                        identityType = 3;
                    } else {
                        identityType = 1;
                    }
                }
//                else {
@@ -320,6 +338,7 @@
//                        identityType=2;
//                    }
//                }
                break;
            default:
                break;
        }
@@ -367,25 +386,45 @@
        Integer integralAvailableResident = integralUserDO.getIntegralAvailableResident();
        Integer integralFrozenResident = integralUserDO.getIntegralFrozenResident();

        integralUserDO.setIntegralSum(integralUserDO.getIntegralSum() + amount);
        integralUserDO.setIntegralAvailableSum(integralUserDO.getIntegralAvailableSum() + amount);
        integralUserDO.setUpdateAt(nowDate);
        // 根据不同身份，计算钱包金额
        int reduceAmount = 0;
        if (identityType.equals(ComActIntegralUserTradeDO.identityType.jm)) {
            integralUserDO.setIntegralResident(integralUserDO.getIntegralResident() + amount);
            integralUserDO.setIntegralAvailableResident(integralUserDO.getIntegralAvailableResident() + amount);
            int integralResidentNow = addIntegral(integralResident + amount);
            if (amount < 0) {
                reduceAmount = integralResident - integralResidentNow;
            }
            integralUserDO.setIntegralResident(integralResidentNow);
            integralUserDO.setIntegralAvailableResident(addIntegral(integralUserDO.getIntegralAvailableResident() + amount));
        } else if (identityType.equals(ComActIntegralUserTradeDO.identityType.dy)) {
            integralUserDO.setIntegralParty(integralUserDO.getIntegralParty() + amount);
            integralUserDO.setIntegralAvailableParty(integralUserDO.getIntegralAvailableParty() + amount);
            int integralPartyNow = addIntegral(integralParty + amount);
            if (amount < 0) {
                reduceAmount = integralParty - integralPartyNow;
            }
            integralUserDO.setIntegralParty(integralPartyNow);
            integralUserDO.setIntegralAvailableParty(addIntegral(integralUserDO.getIntegralAvailableParty() + amount));
        } else if (identityType.equals(ComActIntegralUserTradeDO.identityType.zyz)) {
            integralUserDO.setIntegralVolunteer(integralUserDO.getIntegralVolunteer() + amount);
            integralUserDO.setIntegralAvailableVolunteer(integralUserDO.getIntegralAvailableVolunteer() + amount);
            int integralVolunteerNow = addIntegral(integralVolunteer + amount);
            if (amount < 0) {
                reduceAmount = integralVolunteer - integralVolunteerNow;
            }
            integralUserDO.setIntegralVolunteer(integralVolunteerNow);
            integralUserDO.setIntegralAvailableVolunteer(addIntegral(integralUserDO.getIntegralAvailableVolunteer() + amount));
        }
        if (changeType == ComActIntegralUserTradeDO.changeType.reduce) {
            amount = reduceAmount;
            integralUserDO.setIntegralSum(addIntegral(integralSum - reduceAmount));
            integralUserDO.setIntegralAvailableSum(addIntegral(integralAvailableSum - reduceAmount));
        } else {
            integralUserDO.setIntegralSum(addIntegral(integralSum + amount));
            integralUserDO.setIntegralAvailableSum(addIntegral(integralAvailableSum + amount));
        }
        integralUserDO.setUpdateAt(nowDate);

        // 更新钱包
        comActIntegralUserService.updateById(integralUserDO);
        // 增加积分账户交易记录
        Long tradeId = this.addIntegralTradeRecord(userId, integralId, communityId, serviceId, type, amount,
            ComActIntegralUserTradeDO.changeType.add, remark.toString(), identityType, 2L);
                changeType, remark.toString(), identityType, 2L);
        // 增加积分账户变更记录
        comActIntegralUserChangeService.addIntegralUserChangeRecord(userId, integralId, communityId, integralSum,
            integralUserDO.getIntegralSum(), integralAvailableSum, integralUserDO.getIntegralAvailableSum(),
@@ -399,6 +438,10 @@
        return R.ok();
    }

    private int addIntegral(int integral) {
        return integral > 0 ? integral : 0;
    }

    /**
     * 根据类型、用户id、社区id构建查询请求参数
     * 

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMessageServiceImpl.java

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

import javax.annotation.Resource;

import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_community.dao.ComActDAO;
import com.panzhihua.service_community.model.dos.ComActDO;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
@@ -39,6 +43,10 @@
    private ComActMessageBackDAO comActMessageBackDAO;
    @Resource
    private ComActActSignDAO comActActSignDAO;
    @Resource
    private ComActDAO comActDAO;
    @Resource
    private UserService userService;

    @Override
    public R addMessage(ComActMessageVO comActMessageVO) {
@@ -198,9 +206,11 @@
            if (map != null) {
                String openid = map.get("openid");
                WxXCXTempSend util = new WxXCXTempSend();
                ComActDO comActDO=comActDAO.selectById(comActMessageBackVO.getCommunityId());
                R<SysTemplateConfigVO> r=userService.selectTemplate(comActDO.getAreaCode(),2);
                try {
                    WxUtil.sendSubscribeLYHF(openid, util.getAppAccessToken(), comActMessageBackVO.getUserName(),
                        DateUtils.format(new Date(), DateUtils.ymdhms_format), comActMessageBackVO.getMsgContent());
                        DateUtils.format(new Date(), DateUtils.ymdhms_format), comActMessageBackVO.getMsgContent(),r.getData().getTemplateId());
                } catch (Exception e) {
                    log.error("消息推送失败，失败原因：" + e.getMessage());
                }

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java

@@ -665,6 +665,7 @@
        DetailNeighborCircleAdminVO vo = new DetailNeighborCircleAdminVO();
        BeanUtils.copyProperties(comActNeighborCircleDO, vo);
        vo.setReleaseName(user.getName());
        vo.setImageUrl(user.getImageUrl());

        // 查询话题名称
        if (comActNeighborCircleDO.getTopicId() != null) {

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java

@@ -1,15 +1,20 @@
package com.panzhihua.service_community.service.impl;

import java.math.BigDecimal;
import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;

import javax.annotation.Resource;
import javax.xml.bind.DatatypeConverter;

import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStaticsReserve;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStaticsReserveMonth;
import com.panzhihua.common.model.vos.community.reserve.HomeQuarantineRegisterExportVO;
import com.panzhihua.service_community.dao.ComActReserveRecordMapper;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

@@ -46,6 +51,8 @@

    @Resource
    private ComActReserveSubMapper comActReserveSubMapper;
    @Resource
    private ComActReserveRecordMapper comActReserveRecordMapper;

    /**
     * 导出登记明细数据
@@ -277,6 +284,26 @@
        return R.ok(exportVO);
    }

    @Override
    public R bigScreenStaticsReserve(Long communityId) {
        BigScreenStaticsReserve bigScreenStaticsReserve=comActReserveRecordMapper.biggestScreen(communityId);
        bigScreenStaticsReserve.setReservePercent(BigDecimal.valueOf(bigScreenStaticsReserve.getReserveCount()*100d/ bigScreenStaticsReserve.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP));
        bigScreenStaticsReserve.setFirePercent(BigDecimal.valueOf(bigScreenStaticsReserve.getFireCount()*100d/ bigScreenStaticsReserve.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP));
        bigScreenStaticsReserve.setHomePercent(BigDecimal.valueOf(bigScreenStaticsReserve.getHomeCount()*100d/ bigScreenStaticsReserve.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP));
        bigScreenStaticsReserve.setGasPercent(BigDecimal.valueOf(bigScreenStaticsReserve.getGasCount()*100d/ bigScreenStaticsReserve.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP));
        List<BigScreenStaticsReserveMonth> bigScreenStaticsReserveMonthList=this.getPoints();
        bigScreenStaticsReserveMonthList.forEach(bigScreenStaticsReserveMonth -> {
            BigScreenStaticsReserveMonth bigScreenStaticsReserveMonth1=comActReserveRecordMapper.biggestScreenMonth(communityId,bigScreenStaticsReserveMonth.getX(), bigScreenStaticsReserveMonth.getYear());
            bigScreenStaticsReserveMonth.setCount(bigScreenStaticsReserveMonth1.getCount());
            bigScreenStaticsReserveMonth.setReserveCount(bigScreenStaticsReserveMonth1.getReserveCount());
            bigScreenStaticsReserveMonth.setFireCount(bigScreenStaticsReserveMonth1.getFireCount());
            bigScreenStaticsReserveMonth.setGasCount(bigScreenStaticsReserveMonth1.getGasCount());
            bigScreenStaticsReserveMonth.setHomeCount(bigScreenStaticsReserveMonth1.getHomeCount());
        });
        bigScreenStaticsReserve.setBigScreenStaticsReserveMonthList(bigScreenStaticsReserveMonthList);
        return R.ok(bigScreenStaticsReserve);
    }

    private List<ComActQuestnaireSubVO> retrieveQuestnaireSub(PageReserveRegisterDetailedAdminDTO detailedAdminDTO) {
        //查询题目
        List<ComActReserveSubDO> list = comActReserveSubMapper.selectList(new QueryWrapper<ComActReserveSubDO>().lambda()
@@ -291,4 +318,46 @@
        });
        return listSubVo;
    }

    public List<BigScreenStaticsReserveMonth> getPoints(){
        List<BigScreenStaticsReserveMonth> bigScreenStaticsReserveMonths=new ArrayList<>();
        String nowMonth=DateUtils.getDateFormatString(new Date(),"MM");
        String nowYear=DateUtils.getDateFormatString(new Date(),"yyyy");
        String nowYearMonth=DateUtils.getDateFormatString(new Date(),"yyyyMM");
        if(Integer.parseInt(nowYearMonth)<202212){
            for(int i=9;i<=12;i++){
                String aDate="";
                if(i<10){
                    aDate = "0"+i;
                }
                else {
                    aDate=i+"";
                }
                BigScreenStaticsReserveMonth bigScreenStaticsReserveMonth=new BigScreenStaticsReserveMonth();
                bigScreenStaticsReserveMonth.setYear("2021");
                bigScreenStaticsReserveMonth.setX(aDate);
                bigScreenStaticsReserveMonths.add(bigScreenStaticsReserveMonth);
            }
        }
        if(Integer.parseInt(nowYear)>2021){
            for(int i=1;i<=Integer.parseInt(nowMonth);i++){
                if(bigScreenStaticsReserveMonths.size()>=12){
                    bigScreenStaticsReserveMonths.remove(0);
                }
                String aDate="";
                if(i<10){
                    aDate = "0"+i;
                }
                else {
                    aDate=i+"";
                }
                BigScreenStaticsReserveMonth bigScreenStaticsReserveMonth=new BigScreenStaticsReserveMonth();
                bigScreenStaticsReserveMonth.setX(aDate);
                bigScreenStaticsReserveMonth.setYear(nowYear);
                bigScreenStaticsReserveMonths.add(bigScreenStaticsReserveMonth);
            }
        }
        return bigScreenStaticsReserveMonths;
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveRecordServiceImpl.java

@@ -7,6 +7,8 @@
import com.panzhihua.common.model.dtos.community.reserve.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.reserve.*;
import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.WxUtil;
import com.panzhihua.common.utlis.WxXCXTempSend;
@@ -55,6 +57,8 @@
    private ComActReserveOperationRecordService comActReserveOperationRecordService;
    @Resource
    private ComActActSignDAO comActActSignDAO;
    @Resource
    private UserService userService;

    private final static String CANCEL="用户取消";
    @Override
@@ -244,7 +248,7 @@
                ComActReserveDO reserveDO = comActReserveMapper.selectById(reserveRecordDO.getReserveId());
                // 预约以后给用户推送消息
                Map<String, String> map = comActActSignDAO.getUserOpenId(reserveRecordDO.getUserId());

                R<SysTemplateConfigVO> sysTemplateConfigVO=userService.selectTemplate(makeHandleDTO.getAreaCode(),10);
                //判断处理是否通过
                if(makeHandleDTO.getIsOk().equals(MakeHandleAdminDTO.isOk.yes)){
                    reserveRecordDO.setStatus(ComActReserveRecordDO.status.cg);
@@ -255,7 +259,7 @@
                        String openid = map.get("openid");
                        try {
                            WxUtil.sendSubscribeYYTX(openid, util.getAppAccessToken(), "预约成功",
                                    reserveDO.getTitle(), reserveRecordDO.getName(), makeHandleDTO.getMakeTime());
                                    reserveDO.getTitle(), reserveRecordDO.getName(), makeHandleDTO.getMakeTime(),sysTemplateConfigVO.getData().getTemplateId());
                        } catch (Exception e) {
                            log.error("消息推送失败，失败原因：" + e.getMessage());
                        }
@@ -270,7 +274,7 @@
                        String openid = map.get("openid");
                        try {
                            WxUtil.sendSubscribeYYTX(openid, util.getAppAccessToken(), "预约失败",
                                    reserveDO.getTitle(), reserveRecordDO.getName(), DateUtils.format(reserveRecordDO.getReserveTime(),DateUtils.ymdhms_format));
                                    reserveDO.getTitle(), reserveRecordDO.getName(), DateUtils.format(reserveRecordDO.getReserveTime(),DateUtils.ymdhms_format),sysTemplateConfigVO.getData().getTemplateId());
                        } catch (Exception e) {
                            log.error("消息推送失败，失败原因：" + e.getMessage());
                        }

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveServiceImpl.java

@@ -14,6 +14,8 @@
import com.panzhihua.common.model.dtos.community.reserve.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActReserveIndexVo;
import com.panzhihua.common.model.vos.community.bigscreen.IndexBackReserve;
import com.panzhihua.common.model.vos.community.bigscreen.IndexReserve;
import com.panzhihua.common.model.vos.community.questnaire.QuestnaiteSubSelectionVO;
import com.panzhihua.common.model.vos.community.questnaire.QuestnaiteSubVO;
import com.panzhihua.common.model.vos.community.reserve.*;
@@ -762,6 +764,18 @@
        return R.ok(this.baseMapper.getReserveIndexList(communityId));
    }

    @Override
    public IndexReserve indexReserve(Long communityId) {
        List<ComActReserveDO> comActReserveDOS=this.comActReserveMapper.selectList(new QueryWrapper<ComActReserveDO>().lambda().eq(ComActReserveDO::getCommunityId,communityId).orderByDesc(ComActReserveDO::getCreateAt).like(ComActReserveDO::getTitle,"返攀登记").eq(ComActReserveDO::getStatus,ComActReserveDO.status.jxz));
        if(!comActReserveDOS.isEmpty()){
            IndexBackReserve indexBackReserve=new IndexBackReserve();
            indexBackReserve.setCount(this.comActReserveRecordMapper.selectCount(new QueryWrapper<ComActReserveRecordDO>().lambda().eq(ComActReserveRecordDO::getReserveId,comActReserveDOS.get(0).getId())));

        }

        return null;
    }


    public static void getFileByBytes(byte[] bytes, String filePath, String fileName) {
        BufferedOutputStream bos = null;

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java

@@ -63,6 +63,7 @@
            return R.fail("社区已经存在");
        }
        BeanUtils.copyProperties(comActVO, comActDO);
        comActDO.setPlaintextPassword(password);
        int insert = comActDAO.insert(comActDO);
        if (insert > 0) {
            ComActDO comActDO1 =
@@ -91,6 +92,7 @@
        if (!ObjectUtils.isEmpty(password)) {
            String encode = new BCryptPasswordEncoder().encode(password);
            comActVO.setPassword(encode);
            comActDO.setPlaintextPassword(password);
            a = 1;
        }
        ComStreetDO comStreetDO = comStreetDAO.selectById(comActVO.getStreetId());
@@ -101,7 +103,6 @@
        // a=1;
        // }
        BeanUtils.copyProperties(comActVO, comActDO);

//        ComActDO selectOne = comActDAO.selectOne(new QueryWrapper<ComActDO>().lambda().eq(ComActDO::getAccount, account));
//        if (null != selectOne && selectOne.getAccount().equals(comActVO.getAccount())) {
//            return R.fail("该登录账号重复，请重新修改");
@@ -179,9 +180,9 @@
     * @return 社区集合 按照创建顺序倒序排列
     */
    @Override
    public R listCommunityAll() {
    public R listCommunityAll(String areaCode) {
        List<ComActDO> comActDOS = comActDAO.selectList(new QueryWrapper<ComActDO>().lambda().eq(ComActDO::getState, 0)
            .eq(ComActDO::getCityCode, "510400").orderByDesc(ComActDO::getCreateAt));
            .eq(ComActDO::getAreaCode, areaCode).orderByDesc(ComActDO::getCreateAt));
        List<ComActVO> comActVOS = new ArrayList<>();
        if (!ObjectUtils.isEmpty(comActDOS)) {
            comActDOS.forEach(comActDO -> {
@@ -220,8 +221,8 @@
    }

    @Override
    public R getWestCommunityLists() {
        return R.ok(this.comActDAO.getWestCommunityLists());
    public R getWestCommunityLists(String areaCode) {
        return R.ok(this.comActDAO.getWestCommunityLists(areaCode));
    }

    /**
@@ -230,9 +231,9 @@
     * @return 社区列表
     */
    @Override
    public R getCommunityAllList() {
    public R getCommunityAllList(String areaCode) {
        // 查询街道列表
        List<StreetAllAppletsVO> streetList = this.comActDAO.getStreetList();
        List<StreetAllAppletsVO> streetList = this.comActDAO.getStreetList(areaCode);
        streetList.forEach(street -> {
            // 查询街道下社区列表
            List<CommunitySwitchAllAppletsVO> communityList =
@@ -255,8 +256,8 @@
     * @return 社区列表
     */
    @Override
    public R communitySwitchSearchList(String name) {
        return R.ok(this.comActDAO.getCommunityListByName(name));
    public R communitySwitchSearchList(String name,String areaCode) {
        return R.ok(this.comActDAO.getCommunityListByName(name,areaCode));
    }

    /**
@@ -271,4 +272,9 @@
        return R.ok(this.comActDAO.getCommunityListByNearby(communityDTO));
    }

    @Override
    public R getCommunityPassword(Long communityId){
        return R.ok(comActDAO.getCommunityPassword(communityId));
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActUserWalletServiceImpl.java

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

import javax.annotation.Resource;

import com.panzhihua.service_community.entity.SysTemplateConfig;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -56,6 +57,10 @@
    private ComActEasyPhotoRewardMapper comActEasyPhotoRewardMapper;
    @Resource
    private ComActActSignDAO comActActSignDAO;
    @Resource
    private ComActDAO comActDAO;
    @Resource
    private SysTemplateConfigDao sysTemplateConfigDao;

    /**
     * 查询用户钱包信息
@@ -246,10 +251,12 @@
        Map<String, String> map = comActActSignDAO.getUserOpenId(easyPhotoDO.getSponsorId());
        if (map != null) {
            String openid = map.get("openid");
            ComActDO comActDO=comActDAO.selectById(easyPhotoDO.getCommunityId());
            SysTemplateConfig sysTemplateConfig=sysTemplateConfigDao.selectOne(new QueryWrapper<SysTemplateConfig>().lambda().eq(SysTemplateConfig::getAreaCode, comActDO.getAreaCode()).eq(SysTemplateConfig::getType,7));
            WxXCXTempSend util = new WxXCXTempSend();
            try {
                WxUtil.sendSubscribeJLDZ(openid, util.getAppAccessToken(), "随手拍有奖活动",
                    amount.setScale(2, RoundingMode.HALF_UP), activityTypeName);
                    amount.setScale(2, RoundingMode.HALF_UP), activityTypeName,sysTemplateConfig.getTemplateId());
            } catch (Exception e) {
                log.error("消息推送失败，失败原因：" + e.getMessage());
            }

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComElderAuthRecordsServiceImpl.java

@@ -15,6 +15,8 @@

import javax.annotation.Resource;

import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.ComElderAuthElderliesService;
@@ -87,6 +89,8 @@
    private ComPensionAuthPensionerDAO comPensionAuthPensionerDAO;
    @Resource
    private ComElderAuthElderliesService comElderAuthElderliesService;
    @Resource
    private UserService userService;

    @Override
    public R pageElderAuthRecords(PageElderAuthRecordsDTO pageElderAuthRecordsDTO) {
@@ -164,12 +168,12 @@
        comElderAuthRecordsDO.setApprovalDate(nowDate);
        if (comElderAuthRecordVO.getApprovalStatus().equals(ComElderAuthRecordsDO.approvalStatus.tg)) {
            comElderAuthRecordsDO.setAuthStatus(ComElderAuthRecordsDO.authStatus.yrz);
            sendAuthSubscribe(comElderAuthRecordsDO.getSubmitUserId(), "高龄认证", "认证成功！");
            sendAuthSubscribe(comElderAuthRecordsDO.getSubmitUserId(), "高龄认证", "认证成功！",comElderAuthRecordVO.getAreaCode());

            authElderliesDO.setAddress(comElderAuthRecordVO.getAddress());
            comElderAuthElderliesDAO.updateById(authElderliesDO);
        } else {
            sendAuthSubscribe(comElderAuthRecordsDO.getSubmitUserId(), "高龄认证", comElderAuthRecordVO.getRejectReason());
            sendAuthSubscribe(comElderAuthRecordsDO.getSubmitUserId(), "高龄认证", comElderAuthRecordVO.getRejectReason(),comElderAuthRecordVO.getAreaCode());
        }
//        comElderAuthRecordsDO.setApprovalDate(new Date());
        int nub = comElderAuthRecordsDAO.updateById(comElderAuthRecordsDO);
@@ -179,7 +183,7 @@
        return R.ok();
    }

    private void sendAuthSubscribe(Long userId, String name, String result) {
    private void sendAuthSubscribe(Long userId, String name, String result,String areaCode) {
        //发送订阅通知
        Map<String, String> map = comActActSignDAO.getUserOpenId(userId);
        if (map != null) {
@@ -187,9 +191,10 @@
            try {
                WxXCXTempSend util = new WxXCXTempSend();
                String accessToken = util.getAppAccessToken();
                R<SysTemplateConfigVO> sysTemplateConfigVO=userService.selectTemplate(areaCode,5);
                WxUtil.sendSubscribeRZSH(openid, accessToken, name,
                        DateUtils.format(new Date(), DateUtils.ymdhms_format),
                        result);
                        result,sysTemplateConfigVO.getData().getTemplateId());
            } catch (Exception e) {
                log.error("推送审核状态订阅消息失败，失败原因：" + e.getMessage());
            }
@@ -580,7 +585,7 @@
            return R.fail("认证失败，请重新尝试");
        }
        if (addIdentityAuthDTO.getAuthMethod().intValue() == FACE_AUTH.getMethod()) {
            sendAuthSubscribe(addIdentityAuthDTO.getSubmitUserId(), "高龄认证", "认证成功！");
            sendAuthSubscribe(addIdentityAuthDTO.getSubmitUserId(), "高龄认证", "认证成功！",addIdentityAuthDTO.getAreaCode());
        }
        return R.ok();
    }

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java

@@ -9,7 +9,11 @@

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
import com.panzhihua.common.model.vos.community.bigscreen.WestScreenStatics;
import com.panzhihua.common.model.vos.community.screen.civil.*;
import com.panzhihua.common.model.vos.community.bigscreen.*;
import com.panzhihua.common.utlis.*;
import com.panzhihua.service_community.util.WxDataUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
@@ -62,6 +66,8 @@
import cn.hutool.core.util.IdcardUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RequestParam;

import static java.util.Objects.nonNull;

/**
 * 实有人口Service实现类
@@ -127,8 +133,12 @@
    private ComEldersAuthStatisticsMapper comEldersAuthStatisticsMapper;
    @Resource
    private ComPensionAuthStatisticsDAO comPensionAuthStatisticsDAO;
    @Resource
    private ComActReserveMapper comActReserveMapper;
    @Value("${domain.aesKey:}")
    private String aesKey;
    @Resource
    private ComActEasyPhotoDAO comActEasyPhotoDAO;

    /**
     * 新增实有人口
@@ -6894,13 +6904,16 @@
        IndexPopulationAgeStatisticsVO ageStatisticsVO4 = new IndexPopulationAgeStatisticsVO();
        IndexPopulationAgeStatisticsVO ageStatisticsVO5 = new IndexPopulationAgeStatisticsVO();
        IndexPopulationAgeStatisticsVO ageStatisticsVO6 = new IndexPopulationAgeStatisticsVO();
        IndexPopulationAgeStatisticsVO ageStatisticsVO7 = new IndexPopulationAgeStatisticsVO();
        IndexPopulationAgeStatisticsVO ageStatisticsVO8 = new IndexPopulationAgeStatisticsVO();
        ageStatisticsVO1.setType(1);
        ageStatisticsVO2.setType(2);
        ageStatisticsVO3.setType(3);
        ageStatisticsVO4.setType(4);
        ageStatisticsVO5.setType(5);
        ageStatisticsVO6.setType(6);

        ageStatisticsVO7.setType(7);
        ageStatisticsVO8.setType(8);
        if (ageMap.isEmpty()) {
            ageStatisticsVO1.setSum(0);
            ageStatisticsVO2.setSum(0);
@@ -6908,13 +6921,27 @@
            ageStatisticsVO4.setSum(0);
            ageStatisticsVO5.setSum(0);
            ageStatisticsVO6.setSum(0);
            ageStatisticsVO7.setSum(0);
            ageStatisticsVO8.setSum(0);
        } else {
            int count=ageMap.get("age16").intValue()+ageMap.get("age27").intValue()+ageMap.get("age35").intValue()
                    +ageMap.get("age45").intValue()+ageMap.get("age55").intValue()+ageMap.get("age55over").intValue()+ageMap.get("age65").intValue()+ageMap.get("age75").intValue();
            ageStatisticsVO1.setSum(ageMap.get("age16").intValue());
            ageStatisticsVO1.setPercent(BigDecimal.valueOf(ageMap.get("age16").intValue()*100d/count).setScale(2,BigDecimal.ROUND_HALF_UP));
            ageStatisticsVO2.setSum(ageMap.get("age27").intValue());
            ageStatisticsVO2.setPercent(BigDecimal.valueOf(ageMap.get("age27").intValue()*100d/count).setScale(2,BigDecimal.ROUND_HALF_UP));
            ageStatisticsVO3.setSum(ageMap.get("age35").intValue());
            ageStatisticsVO3.setPercent(BigDecimal.valueOf(ageMap.get("age35").intValue()*100d/count).setScale(2,BigDecimal.ROUND_HALF_UP));
            ageStatisticsVO4.setSum(ageMap.get("age45").intValue());
            ageStatisticsVO4.setPercent(BigDecimal.valueOf(ageMap.get("age45").intValue()*100d/count).setScale(2,BigDecimal.ROUND_HALF_UP));
            ageStatisticsVO5.setSum(ageMap.get("age55").intValue());
            ageStatisticsVO5.setPercent(BigDecimal.valueOf(ageMap.get("age55").intValue()*100d/count).setScale(2,BigDecimal.ROUND_HALF_UP));
            ageStatisticsVO6.setSum(ageMap.get("age55over").intValue());
            ageStatisticsVO6.setPercent(BigDecimal.valueOf(ageMap.get("age55over").intValue()*100d/count).setScale(2,BigDecimal.ROUND_HALF_UP));
            ageStatisticsVO7.setSum(ageMap.get("age65").intValue());
            ageStatisticsVO7.setPercent(BigDecimal.valueOf(ageMap.get("age65").intValue()*100d/count).setScale(2,BigDecimal.ROUND_HALF_UP));
            ageStatisticsVO8.setSum(ageMap.get("age75").intValue());
            ageStatisticsVO8.setPercent(BigDecimal.valueOf(ageMap.get("age75").intValue()*100d/count).setScale(2,BigDecimal.ROUND_HALF_UP));
        }

        agePopulationList.add(ageStatisticsVO1);
@@ -6923,6 +6950,8 @@
        agePopulationList.add(ageStatisticsVO4);
        agePopulationList.add(ageStatisticsVO5);
        agePopulationList.add(ageStatisticsVO6);
        agePopulationList.add(ageStatisticsVO7);
        agePopulationList.add(ageStatisticsVO8);
        return agePopulationList;
    }

@@ -7043,7 +7072,7 @@
        // 查询特殊人群统计
        List<IndexSpecialStatisticsVO> specialStatisticsVOList = new ArrayList<>();

        // 查询特殊人群标签列表
        //查询特殊人群标签列表
        List<ComMngUserTagVO> userTagList = comMngPopulationDAO.getUserTagListByCommunityId(communityId);
        IndexSpecialStatisticsVO otherSpecialVO = new IndexSpecialStatisticsVO();
        otherSpecialVO.setTitle("其他");
@@ -7127,8 +7156,49 @@

        // 查询小区列表
        List<CivilVillageStatisticsVO> villageStatisticsList = this.baseMapper.getCivilScreenVillageList(communityId);
//        villageStatisticsList.forEach(civilVillageStatisticsVO -> {
//            civilVillageStatisticsVO.setUserSum(comMngPopulationDAO.selectCount(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getVillageId,civilVillageStatisticsVO.getVillageId())));
//            List<IndexSpecialStatisticsVO> specialStatisticsVOS = new ArrayList<>();
//            IndexSpecialStatisticsVO otherSpecial = new IndexSpecialStatisticsVO();
//            otherSpecial.setTitle("其他");
//            otherSpecial.setSum(0);
//            // 查询特殊人群标签列表
//            List<ComMngUserTagVO> userTagVOS = comMngPopulationDAO.getUserTagListByCommunityId(communityId);
//
//            userTagVOS.forEach(comMngUserTagVO -> {
//              Integer count=comMngPopulationDAO.selectCountByVillageId(civilVillageStatisticsVO.getVillageId(),comMngUserTagVO.getTagName());
//              IndexSpecialStatisticsVO indexSpecialStatisticsVO=new IndexSpecialStatisticsVO();
//              indexSpecialStatisticsVO.setTitle(comMngUserTagVO.getTagName());
//              indexSpecialStatisticsVO.setSum(count);
//              otherSpecial.setSum(otherSpecial.getSum()+count);
//              specialStatisticsVOS.add(indexSpecialStatisticsVO);
//            });
//            otherSpecial.setSum(civilVillageStatisticsVO.getUserSum()-otherSpecial.getSum());
//            specialStatisticsVOS.add(otherSpecial);
//            civilVillageStatisticsVO.setSpecialStatisticsList(specialStatisticsVOS);
//        });
        civilStatisticsVO.setVillageStatisticsList(villageStatisticsList);

        //查询党建引领数据
        CivilPartyStatisticsVO civilParty = this.baseMapper.getCivilParty(communityId);
        if(civilParty != null){
            civilStatisticsVO.setCivilPartyStatisticsVO(civilParty);
        }
        //查询社区治理数据
        CivilGovernmentStatisticsVO civilGovernment = this.baseMapper.getCivilGovernment(communityId);
        if(civilGovernment != null){
            civilStatisticsVO.setCivilGovernmentStatisticsVO(civilGovernment);
        }
        //查询网格管理数据
        CivilGridStatisticsVO civilGrid = this.baseMapper.getCivilGrid(communityId);
        if(civilGrid != null){
            civilStatisticsVO.setCivilGridStatisticsVO(civilGrid);
        }
        //查询便民服务数据
        CivilConvenienceStatisticsVO civilConvenience = this.baseMapper.getCivilConvenience(communityId);
        if(civilConvenience != null){
            civilStatisticsVO.setCivilConvenienceStatisticsVO(civilConvenience);
        }
        return R.ok(civilStatisticsVO);
    }

@@ -7337,8 +7407,14 @@
    @Override
    public R getScreenEventDetail(BigScreenEventDetailDTO eventDetailDTO) {
        EventNewStatisticsVO statisticsVO = new EventNewStatisticsVO();
        if (eventDetailDTO.getType().equals(7)) {// 随手拍详情
            statisticsVO = this.baseMapper.getEventScreenSSPDateil(eventDetailDTO.getEventId());
        Integer eventType = eventDetailDTO.getEventType();
        boolean isNewReq = nonNull(eventType) && eventType.equals(2);
        if (eventDetailDTO.getType().equals(7) || isNewReq) {// 随手拍详情
            if (isNewReq) {
                statisticsVO = this.baseMapper.getEventScreenSSPDateilNew(eventDetailDTO.getEventId());
            } else {
                statisticsVO = this.baseMapper.getEventScreenSSPDateil(eventDetailDTO.getEventId());
            }
            if (statisticsVO != null && StringUtils.isNotEmpty(statisticsVO.getPhotoPathList())) {
                statisticsVO.setDangerLevel("0");
                statisticsVO.setMajor(false);
@@ -7699,6 +7775,184 @@
        return R.ok(this.comMngPopulationDAO.specialInputUserExport(pageInputUserDTO));
    }

    @Override
    public R westScreenStatics() {
        WestScreenStatics westScreenStatics=this.comMngPopulationDAO.westScreenStatics();
        WxDataUtil wxDataUtil=new WxDataUtil();
        westScreenStatics.setDayUser(wxDataUtil.getDayUser());
        westScreenStatics.setCountUser(wxDataUtil.getMonthUser());
        return R.ok(westScreenStatics);
    }

    @Override
    public R getComprehensivePopulationStatics(Long streetId){
        EventPopulationStatisticsVO statisticsVo = new EventPopulationStatisticsVO();
        //查询人口数据
        List<EventPopulationBasicsStatisticsVO> basicsList = comMngPopulationDAO.getBasicsList(streetId);
        if(basicsList != null){
            for (EventPopulationBasicsStatisticsVO basics : basicsList) {
                statisticsVo.setPopulationNum(statisticsVo.getPopulationNum() + basics.getPopulationNum());
                statisticsVo.setVillageNum(statisticsVo.getVillageNum() + basics.getVillageNum());
                statisticsVo.setHouseNum(statisticsVo.getHouseNum() + basics.getHouseNum());
            }
            statisticsVo.setBasicsList(basicsList);
        }
        //查询特殊人群数据
        EventPopulationSpecialStatisticsVO populationSpecial = comMngPopulationDAO.getPopulationSpecial(streetId);
        if(populationSpecial != null){
            populationSpecial.setOtherTotal(populationSpecial.getZjTotal() + populationSpecial.getSfTotal()
                    + populationSpecial.getXsTotal() + populationSpecial.getXjTotal()
                    + populationSpecial.getJzTotal() + populationSpecial.getXdTotal());
            populationSpecial.setLnTotal(comMngPopulationDAO.getPopulationAge(streetId,60));
            populationSpecial.setGlTotal(comMngPopulationDAO.getPopulationAge(streetId,80));
            statisticsVo.setSpecialStatisticsVo(populationSpecial);
        }
        return R.ok(statisticsVo);
    }

    @Override
    public R getComprehensiveStreetList(){
        return R.ok(comMngPopulationDAO.getComprehensiveStreetList());
    }

    @Override
    public R indexInfo(Long communityId) {
        IndexInfo indexInfo=new IndexInfo();
        //基础数据
        BaseInfo baseInfo=this.comMngPopulationDAO.baseInfo(communityId);
        indexInfo.setBaseInfo(baseInfo);
        // 查询实有人口统计模块
        IndexPopulationStatisticsVO populationStatisticsVO = new IndexPopulationStatisticsVO();
        // 查询实有人口性别统计
        List<IndexPopulationSexStatisticsVO> sexPopulationList =
                comMngPopulationDAO.getScreenIndexByPopulationSex(communityId);
        populationStatisticsVO.setSexPopulationList(sexPopulationList);
        // 查询实有人口年龄统计
        List<IndexPopulationAgeStatisticsVO> agePopulationList = statisticsAge(communityId);
        populationStatisticsVO.setAgePopulationList(agePopulationList);
        indexInfo.setIndexPopulationStatisticsVO(populationStatisticsVO);
        // 查询特殊人群统计
        List<IndexSpecialStatisticsVO> specialStatisticsVOList = new ArrayList<>();

        // 查询特殊人群标签列表
        List<ComMngUserTagVO> userTagList = comMngPopulationDAO.getUserTagListByCommunityId(communityId);
        IndexSpecialStatisticsVO otherSpecialVO = new IndexSpecialStatisticsVO();
        otherSpecialVO.setTitle("其他");
        otherSpecialVO.setSum(0);
        IndexSpecialStatisticsVO otherSpecialVO1 = new IndexSpecialStatisticsVO();
        otherSpecialVO1.setTitle("普通居民");
        otherSpecialVO1.setSum(0);
        int countNormal=comMngPopulationDAO.getSpecialStatistics(communityId);
        int countElder=comMngPopulationDAO.getStatisticsCount(communityId);
        int countAll=countElder+countNormal;
        if (!userTagList.isEmpty()) {
            userTagList.forEach(userTag -> {
                if (userTag != null) {
                    if(userTag.getTagName().equals("高龄老人")||userTag.getTagName().equals("残疾人")||userTag.getTagName().equals("低保户")||userTag.getTagName().equals("退役军人")||userTag.getTagName().equals("养老金人员")||userTag.getTagName().equals("低收入人群")){
                        IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
                        specialStatisticsVO.setTitle(userTag.getTagName());
                        Integer count =0;
                        if (userTag.getTagName().equals("高龄老人")) {
                            count=countElder;
                        }
                        else {
                            count= comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName(),communityId);
                        }
                        specialStatisticsVO.setSum(count);
                        specialStatisticsVO.setPercent(BigDecimal.valueOf(specialStatisticsVO.getSum()*100d/countAll).setScale(2,BigDecimal.ROUND_HALF_UP));
                        otherSpecialVO1.setSum(otherSpecialVO1.getSum()+count);
                        specialStatisticsVOList.add(specialStatisticsVO);
                    }
                    else{
                        Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName(),communityId);
                        otherSpecialVO.setSum(otherSpecialVO.getSum()+count);
                        otherSpecialVO1.setSum(otherSpecialVO1.getSum()+count);
                    }
                }
            });
        }
        otherSpecialVO.setPercent(BigDecimal.valueOf(otherSpecialVO.getSum()*100d/countAll).setScale(2,BigDecimal.ROUND_HALF_UP));
        specialStatisticsVOList.add(otherSpecialVO);
        otherSpecialVO1.setSum(countAll-otherSpecialVO1.getSum());
        otherSpecialVO1.setPercent(BigDecimal.valueOf(otherSpecialVO1.getSum()*100d/countAll).setScale(2,BigDecimal.ROUND_HALF_UP));
        specialStatisticsVOList.add(otherSpecialVO1);
        indexInfo.setSpecialStatisticsVOList(specialStatisticsVOList);
        // 查询网格化治理
        IndexEventGridStatisticsVO eventGridStatisticsVO = new IndexEventGridStatisticsVO();
        List<IndexGridStatisticsVO> gridStatisticsList = new ArrayList<>();
        // 查询网格化事件数据
        IndexGridEventStatisticsVO gridEventStatistics = comMngPopulationDAO.getGridEventStatisticsList(communityId);
        int count=gridEventStatistics.getEventGGTotal()+gridEventStatistics.getEventBWDTotal()+gridEventStatistics.getEventMDTotal()+gridEventStatistics.getEventTFTotal()+gridEventStatistics.getEventTSTotal()+gridEventStatistics.getEventZATotal();
        if(count!=0){
            gridEventStatistics.setGgPercent(BigDecimal.valueOf(gridEventStatistics.getEventGGTotal()*100d/count).setScale(2,BigDecimal.ROUND_HALF_UP));
            gridEventStatistics.setBwdPercent(BigDecimal.valueOf(gridEventStatistics.getEventBWDTotal()*100d/count).setScale(2,BigDecimal.ROUND_HALF_UP));
            gridEventStatistics.setMdPercent(BigDecimal.valueOf(gridEventStatistics.getEventMDTotal()*100d/count).setScale(2,BigDecimal.ROUND_HALF_UP));
            gridEventStatistics.setTfPercent(BigDecimal.valueOf(gridEventStatistics.getEventTFTotal()*100d/count).setScale(2,BigDecimal.ROUND_HALF_UP));
            gridEventStatistics.setTsPercent(BigDecimal.valueOf(gridEventStatistics.getEventTSTotal()*100d/count).setScale(2,BigDecimal.ROUND_HALF_UP));
            gridEventStatistics.setZaPercent(BigDecimal.valueOf(gridEventStatistics.getEventZATotal()*100d/count).setScale(2,BigDecimal.ROUND_HALF_UP));
        }else{
            gridEventStatistics.setGgPercent(BigDecimal.valueOf(0));
            gridEventStatistics.setBwdPercent(BigDecimal.valueOf(0));
            gridEventStatistics.setMdPercent(BigDecimal.valueOf(0));
            gridEventStatistics.setTfPercent(BigDecimal.valueOf(0));
            gridEventStatistics.setTsPercent(BigDecimal.valueOf(0));
            gridEventStatistics.setZaPercent(BigDecimal.valueOf(0));
        }

        eventGridStatisticsVO.setGridEventStatisticsList(gridEventStatistics);
        // 查询网格数据
        List<EventGridDataVO> gridDataList = comMngPopulationDAO.getGridDataListByCommunityId(communityId);
        if (!gridDataList.isEmpty()) {
            gridDataList.forEach(gridData -> {
                if (gridData != null) {
                    IndexGridStatisticsVO gridStatisticsVO = new IndexGridStatisticsVO();
                    gridStatisticsVO.setEventData(gridData.getGridName());
                    // 根据网格id查询网格事件列表
                    IndexGridEventStatisticsVO gridEventList =
                            comMngPopulationDAO.getGridEventByGirdId(gridData.getId());
                    gridStatisticsVO.setGridEventStatisticsList(gridEventList);
                    gridStatisticsList.add(gridStatisticsVO);
                }
            });
        }
        eventGridStatisticsVO.setGridStatisticsList(gridStatisticsList);
        indexInfo.setEventGridStatisticsVO(eventGridStatisticsVO);
        //首页业务统计
        IndexDynamic indexDynamic=this.populationDAO.indexDynamic(communityId);
        indexInfo.setIndexDynamic(indexDynamic);
        //返攀登记居家隔离数据统计
        IndexReserve indexReserve=new IndexReserve();
        IndexBackReserve indexBackReserve=new IndexBackReserve();
        indexBackReserve.setCount(comActReserveMapper.indexBackReserve(communityId));
        indexBackReserve.setIndexReserveSubList(comActReserveMapper.indexBackReserveSub(communityId));
        indexBackReserve.getIndexReserveSubList().forEach(indexReserveSub -> {
            if(indexReserveSub.getAllCount()!=0){
                indexReserveSub.setPercent(BigDecimal.valueOf(indexReserveSub.getNum()*100d/indexReserveSub.getAllCount()).setScale(2,BigDecimal.ROUND_HALF_UP));
            }
            else {
                indexReserveSub.setPercent(BigDecimal.valueOf(0d));
            }
        });
        IndexHomeQuarantine indexHomeQuarantine=new IndexHomeQuarantine();
        indexHomeQuarantine.setCount(comActReserveMapper.indexHomeQuarantine(communityId));
        indexHomeQuarantine.setIndexReserveSubList(comActReserveMapper.IndexHomeQuarantineSub(communityId));
        indexHomeQuarantine.getIndexReserveSubList().forEach(indexReserveSub -> {
            if(indexReserveSub.getAllCount()!=0){
                indexReserveSub.setPercent(BigDecimal.valueOf(indexReserveSub.getNum()*100d/indexReserveSub.getAllCount()).setScale(2,BigDecimal.ROUND_HALF_UP));
            }
            else {
                indexReserveSub.setPercent(BigDecimal.valueOf(0d));
            }
        });
        indexReserve.setIndexBackReserve(indexBackReserve);
        indexReserve.setIndexHomeQuarantine(indexHomeQuarantine);
        indexInfo.setIndexReserve(indexReserve);
        BigscreenGridsGovernanceStatisticsVO bigscreenGridsGovernanceStatisticsVO=comActEasyPhotoDAO.selectBigscreenGridsGovern(communityId);
        indexInfo.setBigScreenGridStaticsReturn(setData(bigscreenGridsGovernanceStatisticsVO));

        return R.ok(indexInfo);
    }

    private void setMistake(ComMngPopulationMistakeExcelVO mvo, ComMngPopulationServeExcelVO vo) {
        mvo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(vo.getPoliticalOutlook()));
        mvo.setIsRent(PopulHouseUseEnum.getCnDescByName(vo.getIsRent()));
@@ -7939,4 +8193,103 @@
        return ObjectUtils.isEmpty(hashMap.get(key));
    }


    private BigScreenGridStaticsReturn setData(BigscreenGridsGovernanceStatisticsVO bigscreenGridsGovernanceStatisticsVO){
        List<BigScreenGridStaticsReturn> bigScreenGridStaticsReturnList=new ArrayList<>();
        BigScreenGridStaticsReturn bigScreenGridStaticsReturn=new BigScreenGridStaticsReturn();
        bigScreenGridStaticsReturn.setCount(bigscreenGridsGovernanceStatisticsVO.getEventTotal()+bigscreenGridsGovernanceStatisticsVO.getOtherTotal()+bigscreenGridsGovernanceStatisticsVO.getSafety());
        BigScreenGridStaticsReturn bigScreenGridStaticsReturn1=new BigScreenGridStaticsReturn();
        bigScreenGridStaticsReturn1.setTitle("突发事件报告");
        bigScreenGridStaticsReturn1.setNum(bigscreenGridsGovernanceStatisticsVO.getEventTFTotal());
        if(bigScreenGridStaticsReturn.getCount()>0) {
            bigScreenGridStaticsReturn1.setPercent(BigDecimal.valueOf(bigscreenGridsGovernanceStatisticsVO.getEventTFTotal() * 100d / bigScreenGridStaticsReturn.getCount()).setScale(2, BigDecimal.ROUND_HALF_UP));
        }
        else {
            bigScreenGridStaticsReturn1.setPercent(BigDecimal.valueOf(0).setScale(2, BigDecimal.ROUND_HALF_UP));
        }
        bigScreenGridStaticsReturnList.add(bigScreenGridStaticsReturn1);
        BigScreenGridStaticsReturn bigScreenGridStaticsReturn2=new BigScreenGridStaticsReturn();
        bigScreenGridStaticsReturn2.setTitle("特殊人群服务");
        bigScreenGridStaticsReturn2.setNum(bigscreenGridsGovernanceStatisticsVO.getEventTSTotal());
        if(bigScreenGridStaticsReturn.getCount()>0) {
            bigScreenGridStaticsReturn2.setPercent(BigDecimal.valueOf(bigscreenGridsGovernanceStatisticsVO.getEventTSTotal()*100d/bigScreenGridStaticsReturn.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP));
        }
        else {
            bigScreenGridStaticsReturn2.setPercent(BigDecimal.valueOf(0).setScale(2, BigDecimal.ROUND_HALF_UP));
        }
        bigScreenGridStaticsReturnList.add(bigScreenGridStaticsReturn2);
        BigScreenGridStaticsReturn bigScreenGridStaticsReturn3=new BigScreenGridStaticsReturn();
        bigScreenGridStaticsReturn3.setTitle("治安防控");
        bigScreenGridStaticsReturn3.setNum(bigscreenGridsGovernanceStatisticsVO.getEventZATotal());
        if(bigScreenGridStaticsReturn.getCount()>0) {
            bigScreenGridStaticsReturn3.setPercent(BigDecimal.valueOf(bigscreenGridsGovernanceStatisticsVO.getEventZATotal()*100d/bigScreenGridStaticsReturn.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP));
        }
        else {
            bigScreenGridStaticsReturn3.setPercent(BigDecimal.valueOf(0).setScale(2, BigDecimal.ROUND_HALF_UP));
        }
        bigScreenGridStaticsReturnList.add(bigScreenGridStaticsReturn3);
        BigScreenGridStaticsReturn bigScreenGridStaticsReturn4=new BigScreenGridStaticsReturn();
        bigScreenGridStaticsReturn4.setTitle("民生服务");
        bigScreenGridStaticsReturn4.setNum(bigscreenGridsGovernanceStatisticsVO.getEventMSTotal());
        if(bigScreenGridStaticsReturn.getCount()>0) {
            bigScreenGridStaticsReturn4.setPercent(BigDecimal.valueOf(bigscreenGridsGovernanceStatisticsVO.getEventMSTotal()*100d/bigScreenGridStaticsReturn.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP));
        }
        else {
            bigScreenGridStaticsReturn4.setPercent(BigDecimal.valueOf(0).setScale(2, BigDecimal.ROUND_HALF_UP));
        }
        bigScreenGridStaticsReturnList.add(bigScreenGridStaticsReturn4);
        BigScreenGridStaticsReturn bigScreenGridStaticsReturn5=new BigScreenGridStaticsReturn();
        bigScreenGridStaticsReturn5.setTitle("矛盾劝解");
        bigScreenGridStaticsReturn5.setNum(bigscreenGridsGovernanceStatisticsVO.getEventMDTotal());
        if(bigScreenGridStaticsReturn.getCount()>0) {
            bigScreenGridStaticsReturn5.setPercent(BigDecimal.valueOf(bigscreenGridsGovernanceStatisticsVO.getEventMDTotal()*100d/bigScreenGridStaticsReturn.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP));
        }
        else {
            bigScreenGridStaticsReturn5.setPercent(BigDecimal.valueOf(0).setScale(2, BigDecimal.ROUND_HALF_UP));
        }
        bigScreenGridStaticsReturnList.add(bigScreenGridStaticsReturn5);
        BigScreenGridStaticsReturn bigScreenGridStaticsReturn6=new BigScreenGridStaticsReturn();
        bigScreenGridStaticsReturn6.setTitle("防灾减灾");
        bigScreenGridStaticsReturn6.setNum(bigscreenGridsGovernanceStatisticsVO.getEventFJTotal());
        if(bigScreenGridStaticsReturn.getCount()>0) {
            bigScreenGridStaticsReturn6.setPercent(BigDecimal.valueOf(bigscreenGridsGovernanceStatisticsVO.getEventFJTotal()*100d/bigScreenGridStaticsReturn.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP));
        }
        else {
            bigScreenGridStaticsReturn6.setPercent(BigDecimal.valueOf(0).setScale(2, BigDecimal.ROUND_HALF_UP));
        }
        bigScreenGridStaticsReturnList.add(bigScreenGridStaticsReturn6);
        BigScreenGridStaticsReturn bigScreenGridStaticsReturn7=new BigScreenGridStaticsReturn();
        bigScreenGridStaticsReturn7.setTitle("政策法规宣传");
        bigScreenGridStaticsReturn7.setNum(bigscreenGridsGovernanceStatisticsVO.getEventFGTotal());
        if(bigScreenGridStaticsReturn.getCount()>0) {
            bigScreenGridStaticsReturn7.setPercent(BigDecimal.valueOf(bigscreenGridsGovernanceStatisticsVO.getEventFGTotal()*100d/bigScreenGridStaticsReturn.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP));
        }
        else {
            bigScreenGridStaticsReturn7.setPercent(BigDecimal.valueOf(0).setScale(2, BigDecimal.ROUND_HALF_UP));
        }
        bigScreenGridStaticsReturnList.add(bigScreenGridStaticsReturn7);
        BigScreenGridStaticsReturn bigScreenGridStaticsReturn8=new BigScreenGridStaticsReturn();
        bigScreenGridStaticsReturn8.setTitle("安全巡查");
        bigScreenGridStaticsReturn8.setNum(bigscreenGridsGovernanceStatisticsVO.getSafety());
        if(bigScreenGridStaticsReturn.getCount()>0) {
            bigScreenGridStaticsReturn8.setPercent(BigDecimal.valueOf(bigscreenGridsGovernanceStatisticsVO.getSafety()*100d/bigScreenGridStaticsReturn.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP));
        }
        else {
            bigScreenGridStaticsReturn8.setPercent(BigDecimal.valueOf(0).setScale(2, BigDecimal.ROUND_HALF_UP));
        }
        bigScreenGridStaticsReturnList.add(bigScreenGridStaticsReturn8);
        BigScreenGridStaticsReturn bigScreenGridStaticsReturn9=new BigScreenGridStaticsReturn();
        bigScreenGridStaticsReturn9.setTitle("其他");
        bigScreenGridStaticsReturn9.setNum(bigscreenGridsGovernanceStatisticsVO.getOtherTotal());
        if(bigScreenGridStaticsReturn.getCount()>0) {
            bigScreenGridStaticsReturn9.setPercent(BigDecimal.valueOf(bigscreenGridsGovernanceStatisticsVO.getOtherTotal()*100d/bigScreenGridStaticsReturn.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP));
        }
        else {
            bigScreenGridStaticsReturn9.setPercent(BigDecimal.valueOf(0).setScale(2, BigDecimal.ROUND_HALF_UP));
        }
        bigScreenGridStaticsReturnList.add(bigScreenGridStaticsReturn9);
        bigScreenGridStaticsReturn.setBigScreenGridStaticsReturnList(bigScreenGridStaticsReturnList);
        return bigScreenGridStaticsReturn;
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPensionAuthRecordServiceImpl.java

@@ -16,6 +16,8 @@
import javax.annotation.Resource;

import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.ComPensionAuthPensionerService;
@@ -79,6 +81,8 @@
    private ComPensionAuthPensionerService comPensionAuthPensionerService;
    @Resource
    private ComElderAuthElderliesDAO comElderAuthElderliesDAO;
    @Resource
    private UserService userService;

    @Override
    public R pagePensionAuthRecords(PageElderAuthRecordsDTO pageElderAuthRecordsDTO) {
@@ -138,12 +142,12 @@
        BeanUtils.copyProperties(comPensionAuthRecordVO, comPensionAuthRecordDO);
        if (comPensionAuthRecordVO.getApprovalStatus().equals(PASS_THROUGH.getStatus())) {
            comPensionAuthRecordDO.setAuthStatus(CERTIFIED.getStatus());
            sendAuthSubscribe(comPensionAuthRecordDO.getSubmitUserId(), "养老认证", "认证成功！");
            sendAuthSubscribe(comPensionAuthRecordDO.getSubmitUserId(), "养老认证", "认证成功！", comPensionAuthRecordVO.getAreaCode());

            authPensionerDO.setAddress(comPensionAuthRecordVO.getAddress());
            comPensionAuthPensionerDAO.updateById(authPensionerDO);
        } else {
            sendAuthSubscribe(comPensionAuthRecordDO.getSubmitUserId(), "养老认证", comPensionAuthRecordVO.getRejectReason());
            sendAuthSubscribe(comPensionAuthRecordDO.getSubmitUserId(), "养老认证", comPensionAuthRecordVO.getRejectReason(),comPensionAuthRecordVO.getAreaCode());
        }
        comPensionAuthRecordDO.setApprovalDate(new Date());
        int nub = comPensionAuthRecordDAO.updateById(comPensionAuthRecordDO);
@@ -153,7 +157,7 @@
        return R.ok();
    }

    private void sendAuthSubscribe(Long userId, String name, String result) {
    private void sendAuthSubscribe(Long userId, String name, String result,String areaCode) {
        //发送订阅通知
        Map<String, String> map = comActActSignDAO.getUserOpenId(userId);
        if (map != null) {
@@ -161,9 +165,10 @@
            try {
                WxXCXTempSend util = new WxXCXTempSend();
                String accessToken = util.getAppAccessToken();
                R<SysTemplateConfigVO> sysTemplateConfigVO=userService.selectTemplate(areaCode,5);
                WxUtil.sendSubscribeRZSH(openid, accessToken, name,
                        DateUtils.format(new Date(), DateUtils.ymdhms_format),
                        result);
                        result,sysTemplateConfigVO.getData().getTemplateId());
            } catch (Exception e) {
                log.error("推送审核状态订阅消息失败，失败原因：" + e.getMessage());
            }
@@ -506,7 +511,7 @@
            return R.fail("认证失败，请重新尝试");
        }
        if (addIdentityAuthDTO.getAuthMethod().intValue() == FACE_AUTH.getMethod()) {
            sendAuthSubscribe(comPensionAuthRecordDO.getSubmitUserId(), "养老认证", "认证成功！");
            sendAuthSubscribe(comPensionAuthRecordDO.getSubmitUserId(), "养老认证", "认证成功！", addIdentityAuthDTO.getAreaCode());
        }
        return R.ok();
    }

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComStreetServiceImpl.java

@@ -141,6 +141,9 @@
        if (pageComStreetDTO.getName() != null) {
            userLambdaQueryWrapper.like(ComStreetDO::getName, pageComStreetDTO.getName());
        }
        if (pageComStreetDTO.getAreaCode() != null) {
            userLambdaQueryWrapper.like(ComStreetDO::getAreaCode, pageComStreetDTO.getAreaCode());
        }
        Page userPage = new Page(pageNum, pageSize);
        IPage<ComStreetDO> doPager =
            comStreetDAO.selectPage(userPage, userLambdaQueryWrapper.orderByDesc(ComStreetDO::getCreateAt));

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseRegisterServiceImpl.java

@@ -427,7 +427,7 @@
    public R nearby(NearbyDTO nearbyDTO) {
        Rectangle rectangle =new NearbyUtil().getRectangle(nearbyDTO.getDistance(), Double.parseDouble(nearbyDTO.getLongitude()), Double.parseDouble(nearbyDTO.getLatitude()));
        return R.ok(this.baseMapper.nearby(rectangle.getMinX(),rectangle.getMaxX(),
                rectangle.getMinY(),rectangle.getMaxY(),nearbyDTO.getKeyword(), nearbyDTO.getCommunityId()));
                rectangle.getMinY(),rectangle.getMaxY(), nearbyDTO));
    }

    @Override

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ScreenWorkServiceImpl.java

@@ -320,15 +320,12 @@
    private List<DynamicWorkVO> listHalfYearByDyn() {
        List<DynamicWorkVO> dateList = new ArrayList<>();
        Date now = new Date();
        for (int i = 6; i >= 1; i--) {
        for (int i = 5; i >= 0; i--) {
            Date date = DateUtils.getDateM(now, -i);
            DateTime endDay = DateUtil.endOfMonth(date);

            int m = DateUtil.month(endDay);
            m++;
            if (m == 12) {
                m = 0;
            }
            int day = DateUtil.dayOfMonth(endDay);
            int half = day / 2;
            String month = DateUtil.format(date, moth_format_str);
@@ -346,4 +343,5 @@
        return dateList;
    }


}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/ResultEntity.java

New file
@@ -0,0 +1,12 @@
package com.panzhihua.service_community.util;

import lombok.Data;

/**
 * @author zzj
 */
@Data
public class ResultEntity {
    private Integer key;
    private Integer value;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/WxDataUtil.java

New file
@@ -0,0 +1,62 @@
package com.panzhihua.service_community.util;

import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.utlis.*;

import java.util.Date;

/**
 * 微信活跃用户工具类
 * @author zzj
 */
public class WxDataUtil {
    WxXCXTempSend wxXCXTempSend=new WxXCXTempSend();
    String accessToken;
    {
        try {
            accessToken = wxXCXTempSend.getAccessToken();
        } catch (Exception e) {
            e.printStackTrace();
        }
    }

    public Integer getDayUser(){
       try {
           String dayUrl="https://api.weixin.qq.com/datacube/getweanalysisappiddailyretaininfo?access_token="+accessToken;
           WxRequestEntity wxRequestEntity=new WxRequestEntity();
           wxRequestEntity.setAccess_token(accessToken);
           String date=DateUtil.format(DateUtil.offsetDay(new Date(),-1),"yyyyMMdd");
           wxRequestEntity.setBegin_date(date);
           wxRequestEntity.setEnd_date(date);
           String result=HttpClientUtil.httpPost(dayUrl, JSONObject.toJSONString(wxRequestEntity));
           if(StringUtils.isNotEmpty(result)&result.contains("visit_uv")){
               JSONArray jsonArray=(JSONArray) JSONObject.parseObject(result).get("visit_uv");
               JSONObject jsonObject=(JSONObject)jsonArray.get(0);
               return  jsonObject.getInteger("value");
           }
       } catch (Exception e) {
           e.printStackTrace();
       }
       return null;
   }
   public Integer getMonthUser(){
       try {
           String dayUrl="https://api.weixin.qq.com/datacube/getweanalysisappidmonthlyvisittrend?access_token="+accessToken;
           WxRequestEntity wxRequestEntity=new WxRequestEntity();
           wxRequestEntity.setAccess_token(accessToken);
           wxRequestEntity.setBegin_date(DateUtil.format(DateUtil.offsetMonth(DateUtils.getFirstDayOfMonth(),-1),"yyyyMMdd"));
           wxRequestEntity.setEnd_date(DateUtil.format(DateUtil.offsetMonth(DateUtils.getLastDayOfMonth(),-1),"yyyyMMdd"));
           String result=HttpClientUtil.httpPost(dayUrl, JSONObject.toJSONString(wxRequestEntity));
           if(StringUtils.isNotEmpty(result)&result.contains("session_cnt")){
               JSONArray resultEntity= (JSONArray) JSONObject.parseObject(result).get("list");
               JSONObject resultObject= (JSONObject) resultEntity.get(0);
               return  resultObject.getInteger("session_cnt");
           }
       } catch (Exception e) {
           e.printStackTrace();
       }
       return null;
   }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/WxRequestEntity.java

New file
@@ -0,0 +1,13 @@
package com.panzhihua.service_community.util;

import lombok.Data;

/**
 * @author zzj
 */
@Data
public class WxRequestEntity {
    private String access_token;
    private String begin_date;
    private String end_date;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActEvaluateMapper.xml

@@ -77,7 +77,7 @@
        '五星' ELSE '未评价'
        END `star_level`,
        caae.evaluate_content,
        su.`nick_name`,
        su.`name`,
        su.phone,
        CASE
        WHEN su.is_partymember = 1 THEN
@@ -125,4 +125,11 @@
        order by caae.create_at desc
        limit 1
    </select>
    <select id="selectEvaluateList" resultType="com.panzhihua.common.model.vos.community.ComActActEvaluateVO">
        SELECT caae.*,su.`name`,su.nick_name,su.image_url
        FROM com_act_act_evaluate AS caae
        LEFT JOIN sys_user AS su ON su.user_id = caae.user_id
        WHERE caae.activity_id = #{activityId} AND caae.user_id = #{userId}
        ORDER BY caae.create_at DESC
    </select>
</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActRegistMapper.xml

@@ -55,6 +55,12 @@
        <if test="comActActRegistVO.createAt != null">
            AND caar.create_at = #{comActActRegistVO.createAt}
        </if>
        <if test="comActActRegistVO.startTime != null">
            AND caar.create_at &gt;= #{comActActRegistVO.startTime}
        </if>
        <if test="comActActRegistVO.endTime != null">
            AND caar.create_at &lt;= #{comActActRegistVO.endTime}
        </if>
        <if test="comActActRegistVO.type != null">
            AND caar.type = #{comActActRegistVO.type}
        </if>
@@ -64,7 +70,7 @@
    <select id="getRegistLists" resultType="com.panzhihua.common.model.vos.community.ComActActRegistExcelVO">
        SELECT
        caar.create_at,
        caar.positon,
        caar.position,
        caar.times,
        caar.award,
        su.`name`,
@@ -117,7 +123,7 @@
                '志愿者' ELSE '居民'
            END identity
        FROM
        `com_act_act_sign` caas
        (SELECT * FROM com_act_act_sign WHERE `status` = 1) caas
        LEFT JOIN sys_user su ON caas.user_id = su.user_id
        WHERE NOT EXISTS ( SELECT 1 FROM com_act_act_regist caar WHERE caas.user_id = caar.user_id )
        AND caas.activity_id = #{comActActRegistVO.activityId}
@@ -141,4 +147,7 @@
        SELECT create_at, award FROM com_act_act_regist
        WHERE activity_id = #{id} AND user_id = #{userId} AND `type` = 1 ORDER BY id DESC
    </select>
    <select id="selectTotalAwardWithRegist" resultType="java.lang.Integer">
        SELECT SUM(award) FROM com_act_act_regist WHERE activity_id = #{activityId} AND user_id = #{userId} AND `type` = 1
    </select>
</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActSignMapper.xml

@@ -21,18 +21,18 @@
    <select id="getSignLists" resultType="com.panzhihua.common.model.vos.community.ComActActSignExcelVO">
        SELECT
        caas.create_at,
        r.times,
        caas.status,
        IF(r.times IS NULL, 0, r.times) AS times,
        CASE
        WHEN caas.status = 1 THEN
        '已报名' ELSE '已取消'
        END status,
        caas.reason,
        r.award * r.times as award,
        IF(r.times IS NULL, 0, r.award * r.times) AS award,
        t.limit,
        su.`name`,
        su.phone,
        su.tags,
        CASE

        WHEN su.is_partymember = 1 THEN
        '党员'
        WHEN caas.is_volunteer = 1 THEN
        '志愿者' ELSE '居民'
        END identity
@@ -79,8 +79,9 @@
    </select>
    <select id="listActivitySign" resultType="com.panzhihua.common.model.vos.community.ActivitySignVO">
        SELECT u.user_id id, u.image_url, u.name, u.nick_name,
            case WHEN u.is_partymember = 1 THEN '党员' WHEN a.is_volunteer = 1 THEN '志愿者' ELSE '居民' END identity,
            u.phone, u.tags, a.create_at,  a.is_volunteer, a.status , r.times , a.reason, r.times * r.award as award, t.limit
            CASE WHEN a.is_volunteer = 1 THEN '志愿者' ELSE '居民' END identity,
            u.phone, u.tags, a.create_at,  a.is_volunteer, a.status , IF(r.times IS NULL, 0, r.times) AS times,
            a.reason, IF(r.times IS NULL, 0, r.award * r.times) AS award, t.limit
        FROM com_act_act_sign a
        JOIN sys_user u ON a.user_id = u.user_id
        left join com_act_activity t on a.activity_id = t.id

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActivityMapper.xml

@@ -55,30 +55,30 @@

    <select id="activityStatistics" resultType="com.panzhihua.common.model.vos.community.ComActActivityStatisticsVO">
        SELECT IFNULL(volunteer_max,0) + IFNULL(participant_max,0) as signTotal
             ,(SELECT count(id) FROM com_act_act_sign WHERE activity_id = #{activityId}) as reallySignTotal
             ,(SELECT count(id) FROM com_act_act_sign WHERE activity_id = #{activityId}) as registTotal
             ,(SELECT count(id) FROM com_act_act_sign WHERE activity_id = #{activityId} AND `status` = 1) as reallySignTotal
             ,(SELECT count(id) FROM com_act_act_sign WHERE activity_id = #{activityId} AND `status` = 1) as registTotal
             ,(SELECT count(id) FROM com_act_act_regist WHERE activity_id = #{activityId}) as reallyRegistTotal
             ,((SELECT count(id) FROM com_act_act_sign WHERE activity_id = #{activityId}) - (SELECT count(id) FROM com_act_act_regist WHERE activity_id = #{activityId})) as noRegistTotal
             ,(SELECT count(id) FROM com_act_act_sign WHERE activity_id = #{activityId}) as evaluateTotal
             ,((SELECT count(id) FROM com_act_act_sign WHERE activity_id = #{activityId} AND `status` = 1) - (SELECT count(id) FROM com_act_act_regist WHERE activity_id = #{activityId})) as noRegistTotal
             ,(SELECT count(id) FROM com_act_act_sign WHERE activity_id = #{activityId} AND `status` = 1) as evaluateTotal
             ,(SELECT count(id) FROM com_act_act_evaluate WHERE activity_id = #{activityId}) as reallyEvaluateTotal
             ,((SELECT count(id) FROM com_act_act_sign WHERE activity_id = #{activityId}) - (SELECT count(id) FROM com_act_act_evaluate WHERE activity_id = #{activityId})) as noEvaluateTotal
             ,((SELECT count(id) FROM com_act_act_sign WHERE activity_id = #{activityId} AND `status` = 1) - (SELECT count(id) FROM com_act_act_evaluate WHERE activity_id = #{activityId})) as noEvaluateTotal
        FROM com_act_activity where id = #{activityId}
    </select>
    <select id="getIndexTopActivityList" resultMap="BaseResultMap">
        SELECT * FROM `com_act_activity`
        WHERE community_id = #{communityId} and is_top = 1 and sign_up_end &gt;= now()
        WHERE community_id = ${communityId} and is_top = 1 and sign_up_end &gt;= now()
    </select>
    <select id="pageActivityCommunityBack"
            resultType="com.panzhihua.common.model.vos.community.ComActActivityVO">
        SELECT t.* FROM (
            SELECT  a.id, a.activity_name, u.`name` sponsorName, a.activity_addr, a.participant_max,
            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.begin_at, a.end_at, a.sign_up_begin, a.sign_up_end, a.reward_way, a.activity_type, a.have_integral_reward
            FROM  com_act_activity a
            LEFT JOIN sys_user u ON a.sponsor_id=u.user_id
            LEFT JOIN com_act_act_sign s ON a.id=s.activity_id
            WHERE   a.`status` = 1 AND a.community_id=#{comActActivityVO.communityId}
            LEFT JOIN (SELECT * FROM com_act_act_sign WHERE `status` = 1) s ON a.id=s.activity_id
            WHERE   a.`status` = 1 AND a.community_id = ${comActActivityVO.communityId}
                <if test='comActActivityVO.type != null and comActActivityVO.type == 1'>
                    AND a.volunteer_max != 0
                </if>
@@ -102,14 +102,14 @@
                </if>
            GROUP BY a.id
            UNION ALL SELECT t1.* FROM (
                SELECT  a.id, a.activity_name, u.`name` sponsorName, a.activity_addr, a.participant_max,
                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.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
                FROM  com_act_activity a
                LEFT JOIN sys_user u ON a.sponsor_id=u.user_id
                LEFT JOIN com_act_act_sign s ON a.id=s.activity_id
                WHERE   a.`status` != 1 AND a.community_id=#{comActActivityVO.communityId}
                LEFT JOIN (SELECT * FROM com_act_act_sign WHERE `status` = 1) s ON a.id=s.activity_id
                WHERE   a.`status` != 1 AND a.community_id = ${comActActivityVO.communityId}
                    <if test='comActActivityVO.type != null and comActActivityVO.type == 1'>
                        AND a.volunteer_max != 0
                    </if>
@@ -144,6 +144,111 @@
        left join com_act ca on a.community_id=ca.community_id  where a.id = #{id} group by a.id
    </select>
    <select id="listActivityType" resultType="com.panzhihua.common.model.vos.community.ComActActivityTypeVO">
        SELECT * FROM com_act_activity_type WHERE `type` = #{type} AND community_id = #{communityId} ORDER BY id ASC
        SELECT * FROM com_act_activity_type WHERE `type` = #{type} AND community_id = ${communityId} ORDER BY id ASC
    </select>
    <select id="selectResidentActHistogramData"
            resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT activity_type AS filed, COUNT(id) AS num
        FROM com_act_activity
        WHERE community_id = ${communityId}
        <if test="isResidentAct">
            AND volunteer_max = 0
        </if>
        <if test="!isResidentAct">
            AND volunteer_max != 0
        </if>
        GROUP BY filed
    </select>
    <select id="getIndexResidentActBaseData"
            resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT filed, num, ROUND(num/total,2) AS percent FROM
        (SELECT t1.activity_type AS filed, COUNT(t2.id) AS num
        FROM com_act_activity t1
        LEFT JOIN (SELECT * FROM com_act_act_sign WHERE `status` = 1) t2 ON t1.id = t2.activity_id
        WHERE t1.community_id = ${communityId}
        <if test="isResidentAct">
            AND t1.volunteer_max = 0
        </if>
        <if test="!isResidentAct">
            AND t1.volunteer_max != 0
        </if>
        GROUP BY filed) temp1,
        (SELECT COUNT(t2.id) AS total
        FROM com_act_activity t1
        LEFT JOIN (SELECT * FROM com_act_act_sign WHERE `status` = 1) t2 ON t1.id = t2.activity_id
        WHERE t1.community_id = ${communityId}
        <if test="isResidentAct">
            AND t1.volunteer_max = 0
        </if>
        <if test="!isResidentAct">
            AND t1.volunteer_max != 0
        </if>
        ) temp2
    </select>
    <select id="getActAddPolylineData" resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT filed, SUM(num) AS num FROM (
            SELECT DATE_FORMAT( publish_at, '%Y-%m' ) AS filed, COUNT(id) AS num
            FROM com_act_activity
            WHERE community_id = ${communityId}
            <if test="isResidentAct">
                AND volunteer_max = 0
            </if>
            <if test="!isResidentAct">
                AND volunteer_max != 0
            </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
            (
                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="getActTotalPolylineData"
            resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT COUNT(id) AS num
        FROM com_act_activity
        WHERE community_id = ${communityId}
        <if test="isResidentAct">
            AND volunteer_max = 0
        </if>
        <if test="!isResidentAct">
            AND volunteer_max != 0
        </if>
        AND DATE_FORMAT( publish_at, '%Y-%m' ) &lt;= #{date}
    </select>
    <select id="indexActList" resultType="com.panzhihua.common.model.vos.community.ComActActivityVO">
        SELECT id, `status`, activity_type, activity_name, cover
        FROM com_act_activity
        WHERE 1=1
        <if test="pageBaseDTO.communityIds != null and pageBaseDTO.communityIds.size > 0">
            AND community_id IN
            <foreach collection="pageBaseDTO.communityIds" item="item" open="(" separator="," close=")">
                #{item}
            </foreach>
        </if>
        <if test="pageBaseDTO.communityIds == null">
            AND community_id = ${pageBaseDTO.communityId}
        </if>
        <if test="isResidentAct">
            AND volunteer_max = 0
        </if>
        <if test="!isResidentAct">
            AND volunteer_max != 0
        </if>
        <if test="pageBaseDTO.param2 != null and pageBaseDTO.param2 != &quot;&quot;">
            AND activity_type = #{pageBaseDTO.param2}
        </if>
        ORDER BY id DESC
    </select>
</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActAnnouncementMapper.xml

@@ -16,7 +16,7 @@
        <where>
            1=1
            <if test="commonPage.communityId!=null">
                and t.community_id=#{commonPage.communityId}
                and t.community_id = ${commonPage.communityId}
            </if>
            <if test="commonPage.paramId!=null">
                and t.column_id =#{commonPage.paramId}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActColumnMapper.xml

@@ -21,7 +21,7 @@
                and type = #{commonPage.type}
            </if>
            <if test="commonPage.communityId!=null">
                and community_id = #{commonPage.communityId}
                and community_id = ${commonPage.communityId}
            </if>
            <if test="commonPage.status!=null">
                and status =#{commonPage.status}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActCommitteeMapper.xml

@@ -33,10 +33,16 @@
                and t.contact_name like concat(#{commonPage.username},'%')
            </if>
            <if test="commonPage.paramId!=null">
                and t.community_id =#{commonPage.paramId}
                and t.community_id = ${commonPage.paramId}
            </if>
        </where>
        order by t.create_time desc
    </select>
    <select id="selectCommitteePartyPercent"
            resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT `name` AS filed, 0 AS num, 0 AS percent
        FROM com_act_committee
        WHERE community_id = ${communityId}
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDiscussCommentDOMapper.xml

@@ -53,9 +53,7 @@
            JOIN sys_user u ON c.user_id = u.user_id
            LEFT JOIN com_act_discuss_comment_user cu ON c.id=cu.disscuss_comment_id
            WHERE
            FIND_IN_SET(
            c.id,
            getChildren ( #{parentId} )) AND c.parent_id != 0 AND c.is_del = 2
            c.parent_id = #{parentId} AND c.is_del = 2
            GROUP BY c.id
            ORDER BY create_at desc
    </select>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDiscussDOMapper.xml

@@ -85,7 +85,7 @@
        JOIN sys_user u ON d.user_id = u.user_id
        LEFT JOIN com_act_discuss_comment c ON d.id = c.discuss_id
        WHERE
        d.community_id = #{pageComActDiscussDTO.communityId} and d.is_del = 2
        d.community_id = ${pageComActDiscussDTO.communityId} and d.is_del = 2
        <if test = 'pageComActDiscussDTO.subject != null and pageComActDiscussDTO.subject.trim() != &quot;&quot;' >
            AND d.`discuss_subject` LIKE concat(#{pageComActDiscussDTO.subject}, '%' )
        </if>
@@ -118,7 +118,7 @@
        com_act_discuss d
        JOIN sys_user u ON d.user_id = u.user_id
        WHERE
        d.community_id = #{pageComActDiscussDTO.communityId} and d.is_del = 2
        d.community_id = ${pageComActDiscussDTO.communityId} and d.is_del = 2
        <if test = 'pageComActDiscussDTO.subject != null and pageComActDiscussDTO.subject.trim() != &quot;&quot;' >
            AND d.`discuss_subject` LIKE concat(#{pageComActDiscussDTO.subject}, '%' )
        </if>
@@ -174,7 +174,7 @@
            <if test='pageComActDiscussDTO.loginUserId != null '>
                LEFT JOIN com_act_discuss_option_user ou ON do.id=ou.discuss_option_id AND ou.user_id=#{pageComActDiscussDTO.loginUserId}
            </if>
            WHERE d.community_id=#{pageComActDiscussDTO.communityId} AND d.is_del = 2 AND d.status != 1
            WHERE d.community_id = ${pageComActDiscussDTO.communityId} AND d.is_del = 2 AND d.status != 1
                <if test='pageComActDiscussDTO.type != null '>
                    AND d.`type` = #{pageComActDiscussDTO.type}
                </if>
@@ -257,7 +257,16 @@
        order by cadc.create_at desc
        limit 10
    </select>

    <select id="selectTypePercent" resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT t1.filed, t1.num, ROUND( t1.num / t2.sum * 100, 2 ) AS percent
        FROM
        (SELECT IF(`type` = 1,'议事','投票') AS filed, COUNT(id) AS num FROM com_act_discuss
        WHERE community_id = ${communityId} AND is_del = 2 GROUP BY filed) t1,
        (SELECT COUNT(id) AS sum FROM com_act_discuss WHERE community_id = ${communityId} AND is_del = 2) t2
    </select>
    <select id="getTitles" resultType="java.lang.String">
        SELECT discuss_subject FROM com_act_discuss WHERE community_id = ${communityId} AND `type` = #{type} AND is_del = 2 ORDER BY release_at DESC limit #{pageSize}
    </select>
    <select id="countByCommunityId" resultType="Map">
        SELECT
            COUNT( id ) AS totalNum,
@@ -267,10 +276,10 @@
            FROM
                com_act_discuss
            WHERE
                community_id = #{communityId}
                community_id = ${communityId}
                AND create_at BETWEEN DATE_ADD(curdate(),interval -day(curdate())+1 day)
            AND now()) AS currentNum,
            ( SELECT COUNT( id ) FROM com_act_discuss WHERE community_id = #{communityId} AND TYPE = 1 ) AS imgNum,
            ( SELECT COUNT( id ) FROM com_act_discuss WHERE community_id = ${communityId} AND TYPE = 1 ) AS imgNum,
            (
            SELECT
                count( DISTINCT cadc.user_id )
@@ -279,7 +288,7 @@
                LEFT JOIN com_act_discuss AS cad ON cad.id = cadc.discuss_id
            WHERE
                cad.type = 1
                AND cad.community_id = #{communityId}
                AND cad.community_id = ${communityId}
            ) AS imgPeopleNum,
            (
            SELECT
@@ -293,7 +302,7 @@
                    LEFT JOIN com_act_discuss AS cad ON cad.id = cadc.discuss_id
                WHERE
                    cad.type = 2
                    AND cad.community_id = #{communityId} UNION ALL
                    AND cad.community_id = ${communityId} UNION ALL
                SELECT DISTINCT
                    cadou.user_id
                FROM
@@ -301,13 +310,13 @@
                    LEFT JOIN com_act_discuss_option AS cado ON cado.id = cadou.discuss_option_id
                    LEFT JOIN com_act_discuss AS cad ON cad.id = cado.discuss_id
                WHERE
                    cad.community_id = #{communityId}
                    cad.community_id = ${communityId}
                ) t
            ) AS votePeopleNum
        FROM
            com_act_discuss
        WHERE
            community_id = #{communityId}
            community_id = ${communityId}
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDynDOMapper.xml

New file
@@ -0,0 +1,84 @@
<?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.ComActDynDAO">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComActDynDO">
        <id column="id" property="id" />
        <result column="title" property="title" />
        <result column="status" property="status" />
        <result column="is_topping" property="isTopping" />
        <result column="publish_at" property="publishAt" />
        <result column="create_at" property="createAt" />
        <result column="update_at" property="updateAt" />
        <result column="community_id" property="communityId" />
        <result column="content" property="content" />
        <result column="cover" property="cover" />
        <result column="type" property="type" />
        <result column="cover_mode" property="coverMode" />
        <result column="jump_url" property="jumpUrl" />
        <result column="jump_type" property="jumpType" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id
    </sql>
    <select id="getIndexDynBaseData" resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT filed, num, ROUND(num/total,2) AS percent FROM
        (SELECT t2.`name` AS filed, COUNT(1) AS num FROM com_act_dyn t1
        LEFT JOIN com_act_dyn_type t2 ON t1.type = t2.id
        WHERE t1.community_id = ${communityId} AND t1.`status` = 1 GROUP BY filed) temp1,
        (SELECT COUNT(t1.id) AS total FROM com_act_dyn t1
        LEFT JOIN com_act_dyn_type t2 ON t1.type = t2.id
        WHERE t1.community_id = ${communityId} AND t1.`status` = 1) temp2
    </select>
    <select id="getDynAddPolylineData" 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(id) AS num
        FROM com_act_dyn
        WHERE community_id = ${communityId} AND `status` = 1
        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="getDynTotalPolylineDate"
            resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT COUNT(id) AS num FROM com_act_dyn
        WHERE community_id = ${communityId} AND `status` = 1 AND DATE_FORMAT( create_at, '%Y-%m' ) &lt;= #{date}
    </select>
    <select id="indexDynList" resultType="com.panzhihua.common.model.vos.community.ComActDynVO">
        SELECT t1.id, t1.title, t1.cover, t2.`name` AS typeName
        FROM com_act_dyn t1
        LEFT JOIN com_act_dyn_type t2 ON t1.type = t2.id
        WHERE 1=1
        <if test="pageBaseDTO.communityIds != null and pageBaseDTO.communityIds.size > 0">
            AND t1.community_id IN
            <foreach collection="pageBaseDTO.communityIds" item="item" open="(" separator="," close=")">
                #{item}
            </foreach>
        </if>
        <if test="pageBaseDTO.communityIds == null">
            AND t1.community_id = ${pageBaseDTO.communityId}
        </if>
        AND t1.`status` = 1 AND t2.is_del = 2
        <if test="pageBaseDTO.paramId != null">
            AND t1.type = #{pageBaseDTO.paramId}
        </if>
        ORDER BY t1.id DESC
    </select>
</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDynTypeDOMapper.xml

@@ -56,7 +56,7 @@
        LEFT JOIN sys_user AS su1 ON su1.user_id = cadt.update_by
        where cadt.is_del = 2
        <if test="comActDynTypeDTO.communityId != null">
            and cadt.community_id = #{comActDynTypeDTO.communityId}
            and cadt.community_id = ${comActDynTypeDTO.communityId}
        </if>
        <if test="comActDynTypeDTO.keyWord != null and comActDynTypeDTO.keyWord != &quot;&quot;">
            and (cadt.id = #{comActDynTypeDTO.keyWord} or cadt.`name` like concat (#{comActDynTypeDTO.keyWord},'%'))
@@ -100,7 +100,7 @@
        LEFT JOIN sys_user AS su1 ON su1.user_id = cadt.update_by
        where cadt.is_del = 2
        <if test="comActDynTypeDTO.communityId != null">
            and cadt.community_id = #{comActDynTypeDTO.communityId}
            and cadt.community_id = ${comActDynTypeDTO.communityId}
        </if>
        <if test="comActDynTypeDTO.keyWord != null and comActDynTypeDTO.keyWord != &quot;&quot;">
            and (cadt.id = #{comActDynTypeDTO.keyWord} or cadt.`name` like concat (#{comActDynTypeDTO.keyWord},'%'))

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoActivityDOMapper.xml

@@ -34,7 +34,7 @@
            </if>

            <if test="pageEasyPhotoActivityDTO.communityId != null">
                and community_id = #{pageEasyPhotoActivityDTO.communityId}
                and community_id = ${pageEasyPhotoActivityDTO.communityId}
            </if>

            <if test="pageEasyPhotoActivityDTO.startTime != null and pageEasyPhotoActivityDTO.startTime != &quot;&quot;
@@ -64,7 +64,7 @@
            and id != #{activityId}
        </if>

        and community_id = #{communityId}
        and community_id = ${communityId}

    </select>


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoClassifyDOMapper.xml

@@ -24,6 +24,9 @@
            <if test="photoClassifyDTO.name != null and photoClassifyDTO.name != &quot;&quot;">
                and `name` like concat (#{photoClassifyDTO.name},'%')
            </if>
            <if test="photoClassifyDTO.areaCode != null and photoClassifyDTO.areaCode != &quot;&quot;">
                and area_code = #{photoClassifyDTO.areaCode}
            </if>
        </where>
        order by create_at desc
    </select>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoDOMapper.xml

@@ -79,7 +79,7 @@
        WHERE
            p.del_tag = 0 and p.`status` != 3
        <if test='comActEasyPhotoVO.communityId != null and comActEasyPhotoVO.communityId != 0'>
          and p.community_id=#{comActEasyPhotoVO.communityId}
          and p.community_id = ${comActEasyPhotoVO.communityId}
        </if>
        <if test='comActEasyPhotoVO.status != null and comActEasyPhotoVO.status!=0' >
          AND p.`status` = #{comActEasyPhotoVO.status}
@@ -121,24 +121,24 @@
    <select id="getEasyPhotoStatistics" resultType="com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoStatisticsVO">
        SELECT
            count( id ) AS examineNum,
            ( SELECT count( id ) FROM com_act_easy_photo WHERE `status` = 2 AND community_id = #{communityId} AND del_tag = 0 ) AS verificationNum,
            ( SELECT count( id ) FROM com_act_easy_photo WHERE `status` in (1,2,4) AND `is_publicity` = 1 AND community_id = #{communityId} AND del_tag = 0 ) AS rejectNum,
            ( SELECT count( id ) FROM com_act_easy_photo WHERE `status` = 4 AND community_id = #{communityId} AND del_tag = 0 ) AS completeNum,
            (select count(id) from com_act_easy_photo where `status` in (2,4) AND community_id = #{communityId} and del_tag = 0 and activity_type = 1) as yzAllTotal,
            (select count(id) from com_act_easy_photo where `status` in (2,4) AND community_id = #{communityId} and del_tag = 0 and activity_type = 1 and examine_at between timestamp(date_add(curdate(), interval - 0 day)) and now()) as yzDayTotal,
            (select count(id) from com_act_easy_photo where `status` in (2,4) AND community_id = #{communityId} and del_tag = 0 and activity_type = 2) as jlAllTotal,
            (select count(id) from com_act_easy_photo where `status` in (2,4) AND community_id = #{communityId} and del_tag = 0 and activity_type = 2 and examine_at between timestamp(date_add(curdate(), interval - 0 day)) and now()) as jlDayTotal,
            (select count(id) from com_act_easy_photo where `status` in (2,4) AND community_id = #{communityId} and del_tag = 0 and activity_type = 3) as ptAllTotal,
            (select count(id) from com_act_easy_photo where `status` in (2,4) AND community_id = #{communityId} and del_tag = 0 and activity_type = 3 and examine_at between timestamp(date_add(curdate(), interval - 0 day)) and now()) as ptDayTotal,
            (select count(id) from com_act_easy_photo where `status` in (2,4) AND community_id = #{communityId} and del_tag = 0 and activity_type = 4) as ybAllTotal,
            (select count(id) from com_act_easy_photo where `status` in (2,4) AND community_id = #{communityId} and del_tag = 0 and activity_type = 4 and examine_at between timestamp(date_add(curdate(), interval - 0 day)) and now()) as ybDayTotal,
            (select IFNULL(sum(activity_amount),0) from com_act_easy_photo where `status` in (2,4) AND community_id = 2 and del_tag = 0) as allRewardAmount,
            (select IFNULL(sum(activity_amount),0)  from com_act_easy_photo where `status` in (2,4) AND community_id = 2 and del_tag = 0 and examine_at between timestamp(date_add(curdate(), interval - 0 day)) and now()) as dayRewardAmount
            ( SELECT count( id ) FROM com_act_easy_photo WHERE `status` = 2 AND community_id = ${communityId} AND del_tag = 0 ) AS verificationNum,
            ( SELECT count( id ) FROM com_act_easy_photo WHERE `status` in (1,2,4) AND `is_publicity` = 1 AND community_id = ${communityId} AND del_tag = 0 ) AS rejectNum,
            ( SELECT count( id ) FROM com_act_easy_photo WHERE `status` = 4 AND community_id = ${communityId} AND del_tag = 0 ) AS completeNum,
            (select count(id) from com_act_easy_photo where `status` in (2,4) AND community_id = ${communityId} and del_tag = 0 and activity_type = 1) as yzAllTotal,
            (select count(id) from com_act_easy_photo where `status` in (2,4) AND community_id = ${communityId} and del_tag = 0 and activity_type = 1 and examine_at between timestamp(date_add(curdate(), interval - 0 day)) and now()) as yzDayTotal,
            (select count(id) from com_act_easy_photo where `status` in (2,4) AND community_id = ${communityId} and del_tag = 0 and activity_type = 2) as jlAllTotal,
            (select count(id) from com_act_easy_photo where `status` in (2,4) AND community_id = ${communityId} and del_tag = 0 and activity_type = 2 and examine_at between timestamp(date_add(curdate(), interval - 0 day)) and now()) as jlDayTotal,
            (select count(id) from com_act_easy_photo where `status` in (2,4) AND community_id = ${communityId} and del_tag = 0 and activity_type = 3) as ptAllTotal,
            (select count(id) from com_act_easy_photo where `status` in (2,4) AND community_id = ${communityId} and del_tag = 0 and activity_type = 3 and examine_at between timestamp(date_add(curdate(), interval - 0 day)) and now()) as ptDayTotal,
            (select count(id) from com_act_easy_photo where `status` in (2,4) AND community_id = ${communityId} and del_tag = 0 and activity_type = 4) as ybAllTotal,
            (select count(id) from com_act_easy_photo where `status` in (2,4) AND community_id = ${communityId} and del_tag = 0 and activity_type = 4 and examine_at between timestamp(date_add(curdate(), interval - 0 day)) and now()) as ybDayTotal,
            (select IFNULL(sum(activity_amount),0) from com_act_easy_photo where `status` in (2,4) AND community_id = ${communityId} and del_tag = 0) as allRewardAmount,
            (select IFNULL(sum(activity_amount),0)  from com_act_easy_photo where `status` in (2,4) AND community_id = ${communityId} and del_tag = 0 and examine_at between timestamp(date_add(curdate(), interval - 0 day)) and now()) as dayRewardAmount
        FROM
            com_act_easy_photo
        WHERE
            `status` = 1
            AND community_id = #{communityId}
            AND community_id = ${communityId}
            AND del_tag = 0
    </select>

@@ -191,7 +191,7 @@
        WHERE
            p.del_tag = 0 and p.`is_report_urban` =1
        <if test='communityId != null and communityId != 0'>
            and p.community_id=#{communityId}
            and p.community_id = ${communityId}
        </if>
        <if test='urbanStatus != null ' >
            AND p.`urban_status` = #{urbanStatus}
@@ -259,24 +259,223 @@
    </select>

    <select id="easyPhotoNoHandleIds" resultType="Long">
        select id from com_act_easy_photo where `status` = 1 and community_id = #{communityId} and del_tag = 0
        select id from com_act_easy_photo where `status` = 1 and community_id = ${communityId} and del_tag = 0
    </select>

    <select id="banner" resultType="com.panzhihua.common.model.vos.community.easyPhoto.BannerVO">
        select id,cover,publish_at as show_time,1 as type,jump_url,jump_type  from com_act_dyn where status =1 and cover is not null and community_id =#{communityId}
        select id,cover,publish_at as show_time,1 as type,jump_url,jump_type  from com_act_dyn where status =1 and cover is not null and community_id = ${communityId}
        UNION ALL
        select id,cover,publish_at as show_time,2 as type,"" as   jump_url,"" as jump_type from com_act_activity  where status =3 and cover is not null and community_id =#{communityId}
        select id,cover,publish_at as show_time,2 as type,"" as   jump_url,"" as jump_type from com_act_activity  where status =3 and cover is not null and community_id = ${communityId}
        UNION ALL
        select id,cover,release_time as show_time,3 as type,"" as   jump_url,"" as jump_type from com_pb_activity  where status =3 and cover is not null and community_id =#{communityId}
        select id,cover,release_time as show_time,3 as type,"" as   jump_url,"" as jump_type from com_pb_activity  where status =3 and cover is not null and community_id = ${communityId}
        UNION ALL
        select id,"" as cover,publish_time as show_time,4 as type,"" as   jump_url,"" as jump_type from com_act_questnaire  where state =2   and community_id =#{communityId}
        select id,"" as cover,publish_time as show_time,4 as type,"" as   jump_url,"" as jump_type from com_act_questnaire  where state =2   and community_id = ${communityId}
        UNION ALL
        select id,cover,publish_at as show_time,5 as type,jump_url,jump_type from com_pb_dyn  where status =2 and cover is not null and community_id =#{communityId}
        select id,cover,publish_at as show_time,5 as type,jump_url,jump_type from com_pb_dyn  where status =2 and cover is not null and community_id = ${communityId}
        UNION ALL
        select id,img_url as cover,publish_time as show_time,6 as type,"" as   jump_url,"" as jump_type from com_act_reserve  where status =2 and community_id =#{communityId}
        select id,img_url as cover,publish_time as show_time,6 as type,"" as   jump_url,"" as jump_type from com_act_reserve  where status =2 and community_id = ${communityId}
        UNION ALL
        select id,logo as cover,release_at as show_time,7 as type,"" as   jump_url,"" as jump_type from com_act_easy_photo_activity  where status =2  and community_id =#{communityId}
        select id,logo as cover,release_at as show_time,7 as type,"" as   jump_url,"" as jump_type from com_act_easy_photo_activity  where status =2  and community_id = ${communityId}
        order by show_time desc limit 30
    </select>
    <select id="selectStatisticsList" resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT t1.`name` AS filed, COUNT(t2.id) AS num
        FROM com_act_easy_photo_classify t1
        LEFT JOIN (SELECT * FROM com_act_easy_photo WHERE community_id = ${communityId} AND `status` IN (1,2,4) AND del_tag = 0) t2 ON t1.id = t2.classify_id
        WHERE t1.`status` = 1 GROUP BY filed
    </select>
    <select id="selectResidentAutonomyStatistics"
            resultType="com.panzhihua.common.model.vos.community.bigscreen.ResidentAutonomyStatisticsVO">
        SELECT * FROM
        (SELECT COUNT(id) AS easyPhotoCurrentMonCount FROM com_act_easy_photo WHERE community_id = ${communityId} AND del_tag = 0 AND DATE_FORMAT( create_at, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )) t1,
        (SELECT COUNT(id) AS microWishCurrentMonCount FROM com_act_micro_wish WHERE community_id = ${communityId} AND DATE_FORMAT( create_at, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )) t2,
        (SELECT IF(SUM(aim_num) IS NULL,0,SUM(aim_num)) AS aimNum FROM com_act_micro_wish WHERE community_id = ${communityId} AND `status` != 4) t3,
        (SELECT COUNT(id) AS microWishTotal FROM com_act_micro_wish WHERE community_id = ${communityId} AND `status` != 4) t4,
        (SELECT COUNT(id) AS committeeCurrentMonCount FROM com_act_committee WHERE community_id = ${communityId} AND DATE_FORMAT( create_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )) t5,
        (SELECT COUNT(id) AS committeeTotal FROM com_act_committee WHERE community_id = ${communityId}) t6,
        (SELECT ROUND( a.num / b.total * 100, 2 ) AS areaCoverPercent FROM
            (SELECT COUNT(DISTINCT(area_id)) AS num FROM com_act_committee WHERE community_id = ${communityId}) a,
            (SELECT COUNT(village_id) AS total FROM com_mng_village WHERE community_id = ${communityId}) b
        ) t7,
        (SELECT COUNT(id) AS discussCurrentMonCount FROM com_act_discuss WHERE community_id = ${communityId} AND is_del = 2 AND DATE_FORMAT( create_at, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )) t8,
        (SELECT COUNT(id) AS discussTotal FROM com_act_discuss WHERE community_id = ${communityId} AND is_del = 2) t9,
        (SELECT COUNT(id) AS neighborCurrentMonCount FROM com_act_neighbor_circle WHERE community_id = ${communityId} AND is_del = 2 AND DATE_FORMAT( create_at, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )) t10,
        (SELECT COUNT(id) AS neighborTotal, SUM(fabulous_num) AS neighborFabulousNum, SUM(forward_num) AS neighborForwardNum,
            SUM(comment_num) AS neighborCommentNum FROM com_act_neighbor_circle WHERE community_id = ${communityId} AND is_del = 2) t11,
        (SELECT COUNT(c1.id) AS repairCurrentMonCount FROM com_property_repair c1
            LEFT JOIN com_property c2 ON c1.property_id = c2.id
            WHERE c2.community_id = ${communityId} AND DATE_FORMAT( c1.create_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )) t12,
        (SELECT COUNT(c1.id) AS repairTotal FROM com_property_repair c1
            LEFT JOIN com_property c2 ON c1.property_id = c2.id
            WHERE c2.community_id = ${communityId}) t13,
        (SELECT IF(SUM(quantity) IS NULL,0,SUM(quantity)) AS warehouseCurrentMonCount FROM com_act_warehouse_donates WHERE community_id = ${communityId} AND `status` = 2 AND DATE_FORMAT( signing_at, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )) t14,
        (SELECT warehouseTotal, warehouseSurplusTotal, warehouseTotal - warehouseSurplusTotal AS warehouseApplyTotal FROM
            (SELECT IF(SUM(quantity) IS NULL,0,SUM(quantity)) AS warehouseTotal, IF(SUM(surplus_quantity) IS NULL,0,SUM(surplus_quantity)) AS warehouseSurplusTotal FROM com_act_warehouse_donates WHERE community_id = ${communityId} AND `status` = 2) temp) t15,
        (SELECT COUNT(DISTINCT d2.user_id) AS discussCount 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 AND `type` = 1) t16,
        (SELECT COUNT(DISTINCT d2.user_id) AS voteCount FROM com_act_discuss d1
            INNER JOIN com_act_discuss_option_user d2 ON d1.id = d2.discuss_id
            WHERE d1.community_id = ${communityId} AND d1.is_del = 2 AND `type` = 2) t17,
        (SELECT COUNT(id) AS residentActCurrentMonCount
            FROM com_act_activity
            WHERE community_id = ${communityId} AND volunteer_max = 0 AND DATE_FORMAT( publish_at, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )) t18
    </select>
    <select id="selectGridsGovernance"
            resultType="com.panzhihua.common.model.vos.community.bigscreen.GridsGovernanceStatisticsVO">
        SELECT
        IFNULL((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_type = 5   AND e.event_status = 2    AND egd.grid_community_id = ${communityId}), 0) +
        IFNULL((SELECT COUNT(1) FROM com_act_easy_photo
        WHERE community_id = ${communityId} AND `status` IN (1,2,4) AND del_tag = 0 AND classify_id = 7), 0) AS eventTFTotal,

        IFNULL((   SELECT  count( e1.id )   FROM   `event` AS e1
        LEFT JOIN event_grid_data AS egd1 ON egd1.id = e1.grid_id     WHERE    event_category = 1     AND event_type = 1     AND event_status = 2      AND egd1.grid_community_id = ${communityId}     ),   0   ) +
        IFNULL((SELECT COUNT(1) FROM com_act_easy_photo
        WHERE community_id = ${communityId} AND `status` IN (1,2,4) AND del_tag = 0 AND classify_id = 4), 0) AS eventZATotal,

        IFNULL((   SELECT    count( e2.id )    FROM    `event` AS e2     LEFT JOIN event_grid_data AS egd2 ON egd2.id = e2.grid_id    WHERE    event_category = 1      AND event_type = 3     AND event_status = 2     AND egd2.grid_community_id = ${communityId}      ),   0   ) +
        IFNULL((SELECT COUNT(1) FROM com_act_easy_photo
        WHERE community_id = ${communityId} AND `status` IN (1,2,4) AND del_tag = 0 AND classify_id = 5), 0) AS eventMDTotal,

        IFNULL((   SELECT    count( e3.id )    FROM     `event` AS e3    LEFT JOIN event_grid_data AS egd3 ON egd3.id = e3.grid_id    WHERE     event_category = 1     AND event_type = 6     AND event_status = 2      AND egd3.grid_community_id = ${communityId}     ),   0   ) +
        IFNULL((SELECT COUNT(1) FROM com_act_easy_photo
        WHERE community_id = ${communityId} AND `status` IN (1,2,4) AND del_tag = 0 AND classify_id = 3), 0) AS eventTSTotal,

        IFNULL((SELECT COUNT(1) FROM com_act_easy_photo
        WHERE community_id = ${communityId} AND `status` IN (1,2,4) AND del_tag = 0 AND classify_id = 8), 0) AS eventFJTotal,

        IFNULL((   SELECT    count( e5.id )    FROM     `event` AS e5    LEFT JOIN event_grid_data AS egd5 ON egd5.id = e5.grid_id    WHERE     event_category = 1     AND event_type = 2     AND event_status = 2      AND egd5.grid_community_id = ${communityId}     ),   0   ) +
        IFNULL((SELECT COUNT(1) FROM com_act_easy_photo
        WHERE community_id = ${communityId} AND `status` IN (1,2,4) AND del_tag = 0 AND classify_id = 6), 0) AS eventMSTotal,

        IFNULL((SELECT COUNT(1) FROM com_act_easy_photo
        WHERE community_id = ${communityId} AND `status` IN (1,2,4) AND del_tag = 0 AND classify_id = 1), 0) AS otherTotal,

        IFNULL((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_type = 5   AND e.event_deal_status = 4    AND egd.grid_community_id = ${communityId}), 0) +
        IFNULL((SELECT COUNT(1) FROM com_act_easy_photo
        WHERE community_id = ${communityId} AND `status` = 4 AND del_tag = 0 AND classify_id = 7), 0) AS eventTFDeal,

        IFNULL((   SELECT  count( e1.id )   FROM   `event` AS e1
        LEFT JOIN event_grid_data AS egd1 ON egd1.id = e1.grid_id     WHERE    event_category = 1     AND event_type = 1     AND event_deal_status = 4      AND egd1.grid_community_id = ${communityId}     ),   0   ) +
        IFNULL((SELECT COUNT(1) FROM com_act_easy_photo
        WHERE community_id = ${communityId} AND `status` = 4 AND del_tag = 0 AND classify_id = 4), 0) AS eventZADeal,

        IFNULL((   SELECT    count( e2.id )    FROM    `event` AS e2     LEFT JOIN event_grid_data AS egd2 ON egd2.id = e2.grid_id    WHERE    event_category = 1      AND event_type = 3     AND event_deal_status = 4     AND egd2.grid_community_id = ${communityId}      ),   0   ) +
        IFNULL((SELECT COUNT(1) FROM com_act_easy_photo
        WHERE community_id = ${communityId} AND `status` = 4 AND del_tag = 0 AND classify_id = 5), 0) AS eventMDDeal,

        IFNULL((   SELECT    count( e3.id )    FROM     `event` AS e3    LEFT JOIN event_grid_data AS egd3 ON egd3.id = e3.grid_id    WHERE     event_category = 1     AND event_type = 6     AND event_deal_status = 4      AND egd3.grid_community_id = ${communityId}     ),   0   ) +
        IFNULL((SELECT COUNT(1) FROM com_act_easy_photo
        WHERE community_id = ${communityId} AND `status` = 4 AND del_tag = 0 AND classify_id = 3), 0) AS eventTSDeal,

        IFNULL((SELECT COUNT(1) FROM com_act_easy_photo
        WHERE community_id = ${communityId} AND `status` = 4 AND del_tag = 0 AND classify_id = 8), 0) AS eventFJDeal,

        IFNULL((   SELECT    count( e5.id )    FROM     `event` AS e5    LEFT JOIN event_grid_data AS egd5 ON egd5.id = e5.grid_id    WHERE     event_category = 1     AND event_type = 2     AND event_deal_status = 4      AND egd5.grid_community_id = ${communityId}     ),   0   ) +
        IFNULL((SELECT COUNT(1) FROM com_act_easy_photo
        WHERE community_id = ${communityId} AND `status` = 4 AND del_tag = 0 AND classify_id = 6), 0) AS eventMSDeal,

        IFNULL((SELECT COUNT(1) FROM com_act_easy_photo
        WHERE community_id = ${communityId} AND `status` = 4 AND del_tag = 0 AND classify_id = 1), 0) AS otherDeal,
        IFNULL((SELECT  count(id) FROM  event_grid_data WHERE  grid_community_id = ${communityId}), 0) AS gridTotal,
        IFNULL((select count(egmr.id) from event_grid_member_relation as egmr left join event_grid_data as egd1 on egd1.id = egmr.grid_id where egd1.grid_community_id = ${communityId}), 0) AS gridMemberTotal
    </select>
    <select id="selectIndexEasyPhotoBaseData"
            resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenEasyPhotoStatisticsInfo">
        SELECT
        (SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = ${communityId} AND `status` = 4 AND del_tag = 0 AND classify_id IN (1,3,4,5,6,7,8)) AS eventDealTotal,
        (SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = ${communityId} AND `status` = 4 AND del_tag = 0 AND classify_id = 7) AS eventTFDeal,
        (SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = ${communityId} AND `status` = 4 AND del_tag = 0 AND classify_id = 4) AS eventZADeal,
        (SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = ${communityId} AND `status` = 4 AND del_tag = 0 AND classify_id = 5) AS eventMDDeal,
        (SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = ${communityId} AND `status` = 4 AND del_tag = 0 AND classify_id = 3) AS eventTSDeal,
        (SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = ${communityId} AND `status` = 4 AND del_tag = 0 AND classify_id = 6) AS eventMSDeal,
        (SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = ${communityId} AND `status` = 4 AND del_tag = 0 AND classify_id = 8) AS eventFJDeal,
        (SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = ${communityId} AND `status` = 4 AND del_tag = 0 AND classify_id = 1) AS otherDeal
    </select>
    <select id="getEasyPhotoAddPolylineData"
            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(id) AS num
        FROM com_act_easy_photo
        WHERE community_id = ${communityId} AND del_tag = 0
        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="getEasyPhotoTotalPolylineDate"
            resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT COUNT(id) AS num FROM com_act_easy_photo
        WHERE community_id = ${communityId} AND del_tag = 0
        AND DATE_FORMAT( create_at, '%Y-%m' ) &lt;= #{date}
    </select>
    <select id="indexEasyPhotoList" resultType="com.panzhihua.common.model.vos.community.ComActEasyPhotoVO">
        SELECT t1.id, t1.detail, t1.photo_path_list, t1.`status`, t2.`name` AS classifyName
        FROM com_act_easy_photo t1
        LEFT JOIN com_act_easy_photo_classify t2 ON t1.classify_id = t2.id
        WHERE t1.community_id = ${pageBaseDTO.communityId} AND t1.`status` = 4 AND t1.del_tag = 0
        <if test="pageBaseDTO.paramId != null">
            AND t1.classify_id = #{pageBaseDTO.paramId}
        </if>
        ORDER BY t1.id DESC
    </select>

    <select id="selectBigscreenGridsGovern" resultType="com.panzhihua.common.model.vos.community.bigscreen.BigscreenGridsGovernanceStatisticsVO">
        SELECT
                IFNULL((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_type = 5   AND e.event_status = 2    AND egd.grid_community_id = ${communityId}), 0) +
                IFNULL((SELECT COUNT(1) FROM com_act_easy_photo
                        WHERE community_id = ${communityId} AND `status` IN (1,2,4) AND del_tag = 0 AND classify_id = 7), 0) AS eventTFTotal,

                IFNULL((   SELECT  count( e1.id )   FROM   `event` AS e1
                                                               LEFT JOIN event_grid_data AS egd1 ON egd1.id = e1.grid_id     WHERE    event_category = 1     AND event_type = 1     AND event_status = 2      AND egd1.grid_community_id = ${communityId}     ),   0   ) +
                IFNULL((SELECT COUNT(1) FROM com_act_easy_photo
                        WHERE community_id = ${communityId} AND `status` IN (1,2,4) AND del_tag = 0 AND classify_id = 4), 0) AS eventZATotal,

                IFNULL((   SELECT    count( e2.id )    FROM    `event` AS e2     LEFT JOIN event_grid_data AS egd2 ON egd2.id = e2.grid_id    WHERE    event_category = 1      AND event_type = 3     AND event_status = 2     AND egd2.grid_community_id = ${communityId}      ),   0   ) +
                IFNULL((SELECT COUNT(1) FROM com_act_easy_photo
                        WHERE community_id = ${communityId} AND `status` IN (1,2,4) AND del_tag = 0 AND classify_id = 5), 0) AS eventMDTotal,

                IFNULL((   SELECT    count( e3.id )    FROM     `event` AS e3    LEFT JOIN event_grid_data AS egd3 ON egd3.id = e3.grid_id    WHERE     event_category = 1     AND event_type = 6     AND event_status = 2      AND egd3.grid_community_id = ${communityId}     ),   0   ) +
                IFNULL((SELECT COUNT(1) FROM com_act_easy_photo
                        WHERE community_id = ${communityId} AND `status` IN (1,2,4) AND del_tag = 0 AND classify_id = 3), 0) AS eventTSTotal,

                IFNULL((SELECT COUNT(1) FROM com_act_easy_photo
                        WHERE community_id = ${communityId} AND `status` IN (1,2,4) AND del_tag = 0 AND classify_id = 8), 0) AS eventFJTotal,

                IFNULL((   SELECT    count( e5.id )    FROM     `event` AS e5    LEFT JOIN event_grid_data AS egd5 ON egd5.id = e5.grid_id    WHERE     event_category = 1     AND event_type = 2     AND event_status = 2      AND egd5.grid_community_id = ${communityId}     ),   0   ) +
                IFNULL((SELECT COUNT(1) FROM com_act_easy_photo
                        WHERE community_id = ${communityId} AND `status` IN (1,2,4) AND del_tag = 0 AND classify_id = 6), 0) AS eventMSTotal,

                IFNULL((   SELECT    count( e5.id )    FROM     `event` AS e5    LEFT JOIN event_grid_data AS egd5 ON egd5.id = e5.grid_id    WHERE     event_category = 1     AND event_type = 8     AND event_status = 2      AND egd5.grid_community_id = ${communityId}     ),   0   ) +
                IFNULL((SELECT COUNT(1) FROM com_act_easy_photo
                        WHERE community_id = ${communityId} AND `status` IN (1,2,4) AND del_tag = 0 AND classify_id = 2), 0) AS eventFGTotal,

                IFNULL((SELECT COUNT(1) FROM com_act_easy_photo
                        WHERE community_id = ${communityId} AND `status` IN (1,2,4) AND del_tag = 0 AND classify_id = 1), 0) AS otherTotal,
                IFNULL((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 egd.grid_community_id = ${communityId}), 0) AS eventTotal,

                IFNULL((SELECT  count(id) FROM  com_sw_patrol_record WHERE  community_id = ${communityId}), 0) AS safety
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoRewardDOMapper.xml

@@ -19,7 +19,7 @@
    </sql>

    <select id="getUserReward" resultType="java.math.BigDecimal">
        select amount from com_act_easy_photo_reward where user_id = #{userId} and is_read = 2 and community_id = #{communityId}
        select amount from com_act_easy_photo_reward where user_id = #{userId} and is_read = 2 and community_id = ${communityId}
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActFourMemberMapper.xml

@@ -26,7 +26,7 @@
        <where>
            1=1
            <if test="commonPage.paramId !=null">
                and t.community_id =#{commonPage.paramId}
                and t.community_id = ${commonPage.paramId}
            </if>
            <if test="commonPage.position !=null and commonPage.position !=''">
                and t.position like concat('%',#{commonPage.position},'%')

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActIntegralRuleDOMapper.xml

@@ -24,11 +24,11 @@
    </sql>

    <select id="getIntegralReceiveApplets" resultType="com.panzhihua.common.model.vos.community.integral.ComActIntegralUserRuleVO">
        select id,`name`,amount,integral_describe,is_restrict,type,count,integral_type,remark from com_act_integral_rule where community_id = #{communityId}
        select id,`name`,amount,integral_describe,is_restrict,type,count,integral_type,remark from com_act_integral_rule where community_id = ${communityId}
    </select>

    <select id="getIntegralRuleAdminList" resultType="com.panzhihua.common.model.vos.community.integral.admin.ComActIntegralUserRuleAdminVO">
        select id,`name`,amount,integral_describe,is_restrict,type,count,integral_type,remark,create_at,update_at from com_act_integral_rule where community_id = #{integralRuleDTO.communityId}
        select id,`name`,amount,integral_describe,is_restrict,type,count,integral_type,remark,create_at,update_at from com_act_integral_rule where community_id = ${integralRuleDTO.communityId}
    </select>

    <select id="getIntegralDefaultList" resultType="com.panzhihua.service_community.model.dos.ComActIntegralRuleDO">

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActIntegralUserDOMapper.xml

@@ -58,7 +58,7 @@
                    com_act_integral_user as caiu
                    left join sys_user as su on su.user_id = caiu.user_id
                WHERE
                    caiu.community_id = #{communityId}
                    caiu.community_id = ${communityId}
                ORDER BY
                    caiu.integral_sum DESC,su.create_at asc
                 ) AS t1,
@@ -91,7 +91,7 @@
            com_act_integral_user AS caiu
            LEFT JOIN sys_user AS su ON su.user_id = caiu.user_id
        WHERE
            caiu.community_id = #{communityRankDTO.communityId}
            caiu.community_id = ${communityRankDTO.communityId}
            <if test="communityRankDTO.type == 3">
                and su.is_volunteer = 1
            </if>
@@ -114,7 +114,11 @@
    </select>

    <select id="getTaskActivityPeopleList" resultType="com.panzhihua.common.model.vos.community.integral.admin.ComActActivityPeopleVO">
        select caas.user_id,caas.activity_id,caa.community_id,caas.is_volunteer from com_act_act_sign as caas left join com_act_activity as caa on caa.id = caas.activity_id where caa.id = #{activityId}
        select caas.user_id,caas.activity_id,caa.community_id,caas.is_volunteer
        from (SELECT * FROM com_act_act_sign WHERE `status` = 1) as caas
        left join com_act_activity as caa on caa.id = caas.activity_id
        left join com_act_act_regist AS caar ON caas.user_id = caar.user_id AND caas.activity_id = caar.activity_id
        where caa.id = #{activityId}  AND caar.id IS NULL
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActIntegralUserTradeDOMapper.xml

@@ -24,7 +24,7 @@
    </sql>

    <select id="getIntegralCount" resultType="Integer" parameterType="com.panzhihua.common.model.dtos.community.integral.ComActIntegralCountDTO">
        select count(id) from com_act_integral_user_trade where community_id = #{integralCountDTO.communityId} and service_type = #{integralCountDTO.serviceType} and user_id = #{integralCountDTO.userId} and change_type = #{integralCountDTO.type} and create_at between #{integralCountDTO.startTime} and #{integralCountDTO.endTime}
        select count(id) from com_act_integral_user_trade where community_id = ${integralCountDTO.communityId} and service_type = #{integralCountDTO.serviceType} and user_id = #{integralCountDTO.userId} and change_type = #{integralCountDTO.type} and create_at between #{integralCountDTO.startTime} and #{integralCountDTO.endTime}
    </select>

    <select id="getIntegralCommunityTradeApplets" parameterType="com.panzhihua.common.model.dtos.community.integral.ComActIntegralCommunityRankDTO"
@@ -42,7 +42,7 @@
            LEFT JOIN com_act AS ca ON ca.community_id = caiut.community_id
            <where>
                <if test="communityTradeDTO.communityId != null">
                    and caiut.community_id = #{communityTradeDTO.communityId}
                    and caiut.community_id = ${communityTradeDTO.communityId}
                </if>

                <if test="communityTradeDTO.userId != null">
@@ -74,7 +74,7 @@
            LEFT JOIN sys_user AS su ON su.user_id = caiut.user_id
            <where>
                <if test="integralRuleDTO.communityId != null">
                    and caiut.community_id = #{integralRuleDTO.communityId}
                    and caiut.community_id = ${integralRuleDTO.communityId}
                </if>
                <if test="integralRuleDTO.identityType != null">
                    and caiut.identity_type = #{integralRuleDTO.identityType}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActMicroWishDOMapper.xml

@@ -70,7 +70,7 @@
        left JOIN com_pb_service_team su ON w.responsible_id = su.id
        <where>
            <if test='comActMicroWishVO.communityId != null and comActMicroWishVO.communityId != 0'>
                and w.community_id=#{comActMicroWishVO.communityId}
                and w.community_id = ${comActMicroWishVO.communityId}
            </if>
            <if test='comActMicroWishVO.status == 3  and comActMicroWishVO.isApplets != null and comActMicroWishVO.isApplets != 0'>
                AND w.`status` in (2,3)
@@ -94,13 +94,13 @@

    <select id="getWishHandleListAdmin" resultType="com.panzhihua.common.model.vos.user.SysUserVO">
        <if test="type != null and type == 1">
            select user_id,`name` as `name` from sys_user where `type` = 3 and community_id = #{communityId} and status = 1
            select user_id,`name` as `name` from sys_user where `type` = 3 and community_id = ${communityId} and status = 1
        </if>
        <if test="type != null and type == 2">
            select user_id,IFNULL(`name`,nick_name) as `name` from sys_user where `type` = 1 and community_id = #{communityId} and status = 1 and is_partymember = 1
            select user_id,IFNULL(`name`,nick_name) as `name` from sys_user where `type` = 1 and community_id = ${communityId} and status = 1 and is_partymember = 1
        </if>
        <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
            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>
    </select>

@@ -141,7 +141,7 @@
        LEFT JOIN sys_user su1 ON w.responsible_id = su1.user_id
        <where>
            <if test='comActMicroWishVO.communityId != null and comActMicroWishVO.communityId != 0'>
                and w.community_id=#{comActMicroWishVO.communityId}
                and w.community_id = ${comActMicroWishVO.communityId}
            </if>
            <if test='comActMicroWishVO.createBegin != null '>
                AND w.create_at BETWEEN #{comActMicroWishVO.createBegin}
@@ -164,5 +164,58 @@

        ORDER BY  w.create_at desc
    </select>
    <select id="selectRealizePercent" resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT t1.filed, t1.num, ROUND( t1.num / t2.sum * 100, 2 ) AS percent
        FROM
        (SELECT IF(`status` = 6,'已实现','待实现') AS filed, COUNT(`status`) AS num FROM com_act_micro_wish
        WHERE community_id = ${communityId} AND `status` NOT IN(1,4) GROUP BY filed) t1,
        (SELECT COUNT(id) AS sum FROM com_act_micro_wish WHERE community_id = ${communityId} AND  `status` NOT IN(1,4)) t2
    </select>
    <select id="getPassedAllImages" resultType="java.lang.String">
        SELECT photo_path_list FROM com_act_micro_wish
        WHERE community_id = ${communityId} AND (`status` =2 OR `status` = 3 OR `status` = 5 OR `status` = 6 OR `status` = 7)
        AND photo_path_list IS NOT NULL AND photo_path_list != ''
        ORDER BY create_at DESC limit #{pageSize}
    </select>
    <select id="selectIndexMicroWishBaseData"
            resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenMicroWishStatisticsInfo">
        SELECT
        (SELECT COUNT(id) FROM com_act_micro_wish WHERE community_id = ${communityId} AND `status` NOT IN(1,4)) AS microWishTotal,
        (SELECT COUNT(id) FROM com_act_micro_wish WHERE community_id = ${communityId} AND `status` = 6) AS microWishRealized,
        (SELECT COUNT(id) FROM com_act_micro_wish WHERE community_id = ${communityId} AND `status` NOT IN(1,4,6)) AS microWishUnrealized
    </select>
    <select id="getMicroWishAddPolylineData"
            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(id) AS num FROM com_act_micro_wish
            WHERE community_id = ${communityId} AND `status` NOT IN(1,4) 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="getMicroWishTotalPolylineDate"
            resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT COUNT(id) AS num FROM com_act_micro_wish
        WHERE community_id = ${communityId} AND `status` NOT IN(1,4) AND DATE_FORMAT( create_at, '%Y-%m' ) &lt;= #{date}
    </select>
    <select id="selectScreenDisplayList"
            resultType="com.panzhihua.common.model.vos.community.ComActMicroWishVO">
        SELECT id, `status`, detail, photo_path_list
        FROM com_act_micro_wish
        WHERE community_id = ${pageBaseDTO.communityId} AND `status` NOT IN(1,4) ORDER BY create_at DESC
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActMicroWishOperationRecordMapper.xml

@@ -26,7 +26,7 @@
    <select id="selectId" resultType="Long">
        select id from com_act_micro_wish
        <where>
            1=1 and community_id = #{communityId}
            1=1 and community_id = ${communityId}
            <if test="status !=null">
                and status=#{status}
            </if>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleDOMapper.xml

@@ -61,7 +61,7 @@
        com_act_neighbor_circle AS canc
        left join sys_user as su on su.user_id = canc.release_id
        left join com_act_neighbor_circle_topic as canct on canct.id = canc.topic_id
        where canc.status = 2 and is_del = 2 and canc.community_id = #{neighborCircleAppDTO.communityId}
        where canc.status = 2 and is_del = 2 and canc.community_id = ${neighborCircleAppDTO.communityId}
        <if test='neighborCircleAppDTO.topicId != null '>
            and canc.topic_id = #{neighborCircleAppDTO.topicId}
        </if>
@@ -92,7 +92,7 @@
        LEFT JOIN sys_user u ON nc.release_id = u.user_id
        LEFT JOIN com_act_neighbor_circle_topic as canct ON canct.id = nc.topic_id
        <where>
            nc.community_id = #{neighborCircleAdminDTO.communityId} and is_del = 2
            nc.community_id = ${neighborCircleAdminDTO.communityId} and is_del = 2
            <if test='neighborCircleAdminDTO.releaseContent != null and neighborCircleAdminDTO.releaseContent != &quot;&quot;'>
                and nc.release_content like concat('%',#{neighborCircleAdminDTO.releaseContent},'%')
            </if>
@@ -115,5 +115,77 @@
        case when nc.`status`=1 then 0 else 1 end,
        nc.`status` asc,nc.create_at desc
    </select>
    <select id="getAllImages" resultType="java.lang.String">
        SELECT release_images FROM com_act_neighbor_circle
        WHERE community_id = ${communityId} AND `status` = 2 AND release_images IS NOT NULL AND release_images != ''
        ORDER BY create_at DESC limit #{pageSize}
    </select>
    <select id="getContents" resultType="java.lang.String">
        SELECT release_content FROM com_act_neighbor_circle
        WHERE community_id = ${communityId} AND `status` = 2 AND release_content IS NOT NULL AND release_content != ''
        ORDER BY create_at DESC limit #{pageSize}
    </select>
    <select id="getIndexNeighborBaseData"
            resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT filed, num, ROUND(num/total,2) AS percent FROM
        (SELECT IF(t2.`name` IS NULL,'无话题',t2.`name`) AS filed, COUNT(1) AS num FROM com_act_neighbor_circle t1
        LEFT JOIN com_act_neighbor_circle_topic t2 ON t1.topic_id = t2.id
        WHERE t1.community_id = ${communityId} AND t1.`status` IN (2,3) AND t1.is_del = 2 AND (t2.`status` = 1 OR t2.id IS NULL) GROUP BY filed) temp1,
        (SELECT COUNT(t1.id) AS total FROM com_act_neighbor_circle t1
        LEFT JOIN com_act_neighbor_circle_topic t2 ON t1.topic_id = t2.id
        WHERE t1.community_id = ${communityId} AND t1.`status` IN (2,3) AND t1.is_del = 2 AND (t2.`status` = 1 OR t2.id IS NULL)) temp2
    </select>
    <select id="getNeighborAddPolylineData"
            resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT filed, SUM(num) AS num FROM (
        SELECT DATE_FORMAT( t1.create_at, '%Y-%m' ) AS filed, COUNT(t1.id) AS num
        FROM com_act_neighbor_circle t1
        LEFT JOIN com_act_neighbor_circle_topic t2 ON t1.topic_id = t2.id
        WHERE t1.community_id = ${communityId} AND t1.`status` IN (2,3) AND t1.is_del = 2 AND (t2.`status` = 1 OR t2.id IS NULL)
        AND DATE_FORMAT( t1.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="getNeighborTotalPolylineDate"
            resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT COUNT(t1.id) AS num FROM com_act_neighbor_circle t1
        LEFT JOIN com_act_neighbor_circle_topic t2 ON t1.topic_id = t2.id
        WHERE t1.community_id = ${communityId} AND t1.`status` IN (2,3) AND t1.is_del = 2 AND (t2.`status` = 1 OR t2.id IS NULL) AND DATE_FORMAT( t1.create_at, '%Y-%m' ) &lt;= #{date}
    </select>
    <select id="indexNeighborList"
            resultType="com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAdminVO">
        SELECT t1.id, t1.release_content, t1.release_images, t1.comment_num, t1.fabulous_num, t2.`name` AS topicName
        FROM com_act_neighbor_circle t1
        LEFT JOIN com_act_neighbor_circle_topic t2 ON t1.topic_id = t2.id
        WHERE 1=1
        <if test="pageBaseDTO.communityIds != null and pageBaseDTO.communityIds.size > 0">
            AND t1.community_id IN
            <foreach collection="pageBaseDTO.communityIds" item="item" open="(" separator="," close=")">
                #{item}
            </foreach>
        </if>
        <if test="pageBaseDTO.communityIds == null">
            AND t1.community_id = ${pageBaseDTO.communityId}
        </if>
        AND t1.`status` IN (2,3) AND t1.is_del = 2 AND (t2.`status` = 1 OR t2.id IS NULL)
        <if test="pageBaseDTO.paramId != null">
            AND t1.topic_id = #{pageBaseDTO.paramId}
        </if>
        ORDER BY t1.id DESC
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleTopicDOMapper.xml

@@ -33,7 +33,7 @@
            LEFT JOIN sys_user AS su ON su.user_id = canct.create_by
        <where>
            <if test="circleTopicAdminDTO.communityId != null">
                and canct.community_id = #{circleTopicAdminDTO.communityId}
                and canct.community_id = ${circleTopicAdminDTO.communityId}
            </if>
            <if test="circleTopicAdminDTO.status != null">
                and canct.status = #{circleTopicAdminDTO.status}
@@ -47,7 +47,7 @@

    <select id="getNeighborTopicByApp" resultType="com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleTopicAppVO">
        SELECT canct.id, canct.`name`, canct.hot_num,( SELECT count( id ) FROM com_act_neighbor_circle WHERE is_del = 2 AND `status` = 2 and topic_id = canct.id) AS `count`
         from com_act_neighbor_circle_topic as canct where canct.`status` = 1 and canct.community_id = #{communityId}
         from com_act_neighbor_circle_topic as canct where canct.`status` = 1 and canct.community_id = ${communityId}
        <if test="isZero != null and isZero == 1">
            and `count` > 0
        </if>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActQuestnaireDOMapper.xml

@@ -45,7 +45,7 @@
            com_act_questnaire
        WHERE
            adver_position_popup = 1
            and community_id = #{communityId}
            and community_id = ${communityId}
            AND (
                #{startTime} BETWEEN start_time AND end_time OR
                #{endTime} BETWEEN start_time AND end_time OR
@@ -198,8 +198,8 @@
                count( id )
            FROM
                (
                SELECT id FROM com_pb_member AS su  WHERE community_id = #{communityId} AND user_id IS NULL UNION ALL
                SELECT id FROM com_pb_member AS su  WHERE community_id = #{communityId} AND user_id IS NOT NULL
                SELECT id FROM com_pb_member AS su  WHERE community_id = ${communityId} AND user_id IS NULL UNION ALL
                SELECT id FROM com_pb_member AS su  WHERE community_id = ${communityId} AND user_id IS NOT NULL
                AND user_id NOT IN ( SELECT user_id FROM com_act_questnaire_user_answer WHERE questnaire_id = #{questId}  )
                ) AS member) AS noPartymemberCount,
            (select count(user_id) from sys_user where community_id = 2 and type = 1) as userCount
@@ -211,7 +211,44 @@
            su.is_volunteer = 1
            AND caqua.questnaire_id = #{questId}
    </select>

    <select id="getIndexQuestionnaireBaseData"
            resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenQuestionnaireStatisticsInfo">
        SELECT COUNT(id) AS questionnaireNum, SUM(join_count) AS joinNum FROM com_act_questnaire WHERE community_id = ${communityId} AND state IN (2,3)
    </select>
    <select id="getQuestionnaireAddPolylineData"
            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(id) AS num
        FROM com_act_questnaire
        WHERE community_id = ${communityId} AND state IN (2,3)
        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="getQuestionnaireTotalPolylineDate"
            resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT COUNT(id) AS num FROM com_act_questnaire
        WHERE community_id = ${communityId} AND state IN (2,3) AND DATE_FORMAT( create_at, '%Y-%m' ) &lt;= #{date}
    </select>
    <select id="selectQuestionnaireDisplayList"
            resultType="com.panzhihua.common.model.vos.community.ComActQuestnaireVO">
        SELECT id, title, `count`, view_num, join_count, is_cover, state FROM com_act_questnaire
        WHERE community_id = ${pageBaseDTO.communityId} AND state IN (2,3) ORDER BY id DESC
    </select>
    <insert id="addNoNotice">
        insert into com_act_questnaire_user(questnaire_id,user_id,create_at)
        values(#{questId},#{userId},now())

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveMapper.xml

@@ -38,7 +38,7 @@
        where
            status = 2 and adver_position_top = 1
            <if test="communityId !=null">
                and community_id =#{communityId}
                and community_id = ${communityId}
            </if>

    </select>
@@ -48,7 +48,7 @@
        <where>
            status = 2 and adver_position_application = 1
            <if test="communityId !=null">
                and community_id =#{communityId}
                and community_id = ${communityId}
            </if>
        </where>
    </select>
@@ -77,10 +77,10 @@
            <where>
                and t.is_del = 2
                <if test="pageReserveDTO.communityId != null and pageReserveDTO.communityId !=0">
                    and t.community_id = #{pageReserveDTO.communityId}
                    and t.community_id = ${pageReserveDTO.communityId}
                </if>
                <if test="pageReserveDTO.communityId ==0">
                    and t1.area_code = '510423'
                <if test="pageReserveDTO.areaCode !=null">
                    and t1.area_code = #{pageReserveDTO.areaCode}
                </if>
                <if test="pageReserveDTO.type != null and pageReserveDTO.type.size > 0">
                    and t.`type` in
@@ -127,7 +127,7 @@
        WHERE
            `status` = 2
            AND type = 1
            AND community_id = #{communityId}
            AND community_id = ${communityId}

            group by reserveTime
    </select>
@@ -144,7 +144,7 @@
        WHERE
            carr.`status` = 2
            AND carr.type = 1
            AND carr.community_id = #{makeStatisticsDTO.communityId}
            AND carr.community_id = ${makeStatisticsDTO.communityId}
            <if test="makeStatisticsDTO.startTime != null and makeStatisticsDTO.startTime != &quot;&quot;">
                AND carr.reserve_time <![CDATA[ >= ]]> #{makeStatisticsDTO.startTime}
            </if>
@@ -158,7 +158,7 @@

    <select id="getReserveRecordCount" resultType="integer">
        select count(id) from com_act_reserve_record
        where `status` = 2 and `type` = 1 and community_id = #{communityId}
        where `status` = 2 and `type` = 1 and community_id = ${communityId}
        and reserve_time <![CDATA[ >= ]]> #{startTime}
        and reserve_time <![CDATA[ <= ]]> #{endTime}
    </select>
@@ -181,7 +181,7 @@
            adver_position_application
        FROM
            com_act_reserve
            where is_del = 2 and `type` = 1 and community_id = #{communityId}
            where is_del = 2 and `type` = 1 and community_id = ${communityId}
    </select>

    <update id="addReserveCountById">
@@ -190,6 +190,36 @@

    <select id="getReserveIndexList" resultType="com.panzhihua.common.model.vos.community.ComActReserveIndexVo">
        select id,title,type,img_type,img_url,adver_position_top,adver_position_application from com_act_reserve where `status` = 2 and is_del = 2
        and community_id = #{communityId}
        and community_id = ${communityId}
    </select>

    <select id="indexBackReserve" resultType="Integer">
        select count(*) from com_act_reserve t  LEFT JOIN com_act_reserve_record t3 on t.id=t3.reserve_id where t.community_id = ${communityId} and ( t.title like '%返攀登记%' or t.title like '%来攀登记%')
    </select>

    <select id="indexHomeQuarantine" resultType="Integer">
        select count(*) from com_act_reserve t  LEFT JOIN com_act_reserve_record t3 on t.id=t3.reserve_id where t.community_id = ${communityId} and t.title like '%居家隔离%'
    </select>
    
    <select id="indexBackReserveSub" resultType="com.panzhihua.common.model.vos.community.bigscreen.IndexReserveSub">
        select a.*,IFNULL(b.num,0) num from (select count(t2.id) as allCount,t1.key from com_act_reserve t
                                                                                             LEFT JOIN com_act_reserve_sub t1 on t.id = t1.reserve_id
                                                                                             LEFT JOIN com_act_reserve_answer_content t2 on t1.id = t2.reserve_sub_id
                                             where t.community_id = ${communityId} and ( t.title like '%返攀登记%' or t.title like '%来攀登记%') and t1.`key` in (1,2,3,17,19,26) group by t1.key) a LEFT JOIN
                                            (select count(t2.id) as num,t1.key from com_act_reserve t
                                                                                        LEFT JOIN com_act_reserve_sub t1 on t.id = t1.reserve_id
                                                                                        LEFT JOIN com_act_reserve_answer_content t2 on t1.id = t2.reserve_sub_id
                                             where t.community_id = ${communityId} and ( t.title like '%返攀登记%' or t.title like '%来攀登记%') and t1.`key` in (1,2,3,17,19,26) and t2.answer_content = '是' group by t1.key) b on a.key = b.key
    </select>

    <select id="IndexHomeQuarantineSub" resultType="com.panzhihua.common.model.vos.community.bigscreen.IndexReserveSub">
        select a.*,IFNULL(b.num,0) num from (select count(t2.id) as allCount,t1.key from com_act_reserve t
                                                                                             LEFT JOIN com_act_reserve_sub t1 on t.id = t1.reserve_id
                                                                                             LEFT JOIN com_act_reserve_answer_content t2 on t1.id = t2.reserve_sub_id
                                             where t.community_id = ${communityId} and t.title like '%居家隔离%' and t1.`key` in (12,14,16) group by t1.key) a LEFT JOIN
                                            (select count(t2.id) as num,t1.key from com_act_reserve t
                                                                                        LEFT JOIN com_act_reserve_sub t1 on t.id = t1.reserve_id
                                                                                        LEFT JOIN com_act_reserve_answer_content t2 on t1.id = t2.reserve_sub_id
                                             where t.community_id = ${communityId} and t.title like '%居家隔离%' and t1.`key` in (12,14,16) and t2.answer_content = '是' group by t1.key) b on a.key = b.key
    </select>
</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveRecordMapper.xml

@@ -144,13 +144,13 @@
        SELECT
            car.title,
            count( carr.id ) AS count,
            ( SELECT count( id ) FROM com_act_reserve_record WHERE `type` = 2 AND community_id = #{registerStatisticsDTO.communityId} AND `status` = 2 ) AS allCount
            ( SELECT count( id ) FROM com_act_reserve_record WHERE `type` = 2 AND community_id = ${registerStatisticsDTO.communityId} AND `status` = 2 ) AS allCount
        FROM
            com_act_reserve_record AS carr
            LEFT JOIN com_act_reserve AS car ON car.id = carr.reserve_id
        WHERE
            carr.type = 2
            AND carr.community_id = #{registerStatisticsDTO.communityId}
            AND carr.community_id = ${registerStatisticsDTO.communityId}
            AND carr.`status` = 2
            <if test="registerStatisticsDTO.startTime != null and registerStatisticsDTO.startTime != &quot;&quot;">
                AND DATE_FORMAT(carr.create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{registerStatisticsDTO.startTime}
@@ -167,13 +167,13 @@
        SELECT
        car.title,
        count( carr.id ) AS count,
        ( SELECT count( id ) FROM com_act_reserve_record WHERE `type` = 2 AND community_id = #{registerStatisticsDTO.communityId} AND `status` = 2 ) AS allCount
        ( SELECT count( id ) FROM com_act_reserve_record WHERE `type` = 2 AND community_id = ${registerStatisticsDTO.communityId} AND `status` = 2 ) AS allCount
        FROM
        com_act_reserve_record AS carr
        LEFT JOIN com_act_reserve AS car ON car.id = carr.reserve_id
        WHERE
        carr.type = 2
        AND carr.community_id = #{registerStatisticsDTO.communityId}
        AND carr.community_id = ${registerStatisticsDTO.communityId}
        AND carr.`status` = 2
        <if test="registerStatisticsDTO.startTime != null and registerStatisticsDTO.startTime != &quot;&quot;">
            AND DATE_FORMAT(carr.create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{registerStatisticsDTO.startTime}
@@ -221,7 +221,7 @@
                and carr.reserve_id = #{pageMakeHandleDTO.reserveId}
            </if>
            <if test="pageMakeHandleDTO.communityId != null ">
                and carr.community_id = #{pageMakeHandleDTO.communityId}
                and carr.community_id = ${pageMakeHandleDTO.communityId}
            </if>
            <if test="pageMakeHandleDTO.startTime != null and pageMakeHandleDTO.startTime != &quot;&quot;">
                AND DATE_FORMAT(carr.reserve_time,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{pageMakeHandleDTO.startTime}
@@ -276,7 +276,7 @@
            and carr.reserve_id = #{pageMakeHandleDTO.reserveId}
        </if>
        <if test="pageMakeHandleDTO.communityId != null ">
            and carr.community_id = #{pageMakeHandleDTO.communityId}
            and carr.community_id = ${pageMakeHandleDTO.communityId}
        </if>
        <if test="pageMakeHandleDTO.startTime != null and pageMakeHandleDTO.startTime != &quot;&quot;">
            AND DATE_FORMAT(carr.reserve_time,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{pageMakeHandleDTO.startTime}
@@ -318,4 +318,21 @@
        </where>
        order by create_at desc
    </select>

    <select id="biggestScreen" resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenStaticsReserve">
        select   (select count(*)  from com_act_reserve_record t LEFT JOIN com_act_reserve t1 on t.reserve_id = t1.id where (t1.title like '%居家%' or t1.title like '%返攀%' or t1.title like '%来攀%' or t1.title like '%燃气%' or t1.title like '%防火%') and t1.community_id = ${communityId}) count,
                    (select count(*)  from com_act_reserve_record t LEFT JOIN com_act_reserve t1 on t.reserve_id = t1.id where (t1.title like '%居家%' or t1.title like '%返攀%' or t1.title like '%来攀%' ) and t1.community_id = ${communityId}) epidemicCount,
                    (select count(*)  from com_act_reserve_record t LEFT JOIN com_act_reserve t1 on t.reserve_id = t1.id where (t1.title like '%燃气%' ) and t1.community_id = ${communityId}) gasCount,
                    (select count(*)  from com_act_reserve_record t LEFT JOIN com_act_reserve t1 on t.reserve_id = t1.id where (t1.title like '%防火%' ) and t1.community_id = ${communityId}) fireCount,
                    (select count(*)  from com_act_reserve_record t LEFT JOIN com_act_reserve t1 on t.reserve_id = t1.id where (t1.title like '%居家%' ) and t1.community_id = ${communityId}) homeCount,
                    (select count(*)  from com_act_reserve_record t LEFT JOIN com_act_reserve t1 on t.reserve_id = t1.id where (t1.title like '%返攀%' or t1.title like '%来攀%' ) and t1.community_id = ${communityId}) reserveCount
    </select>

    <select id="biggestScreenMonth" resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenStaticsReserveMonth">
        select   (select count(*)  from com_act_reserve_record t LEFT JOIN com_act_reserve t1 on t.reserve_id = t1.id where (t1.title like '%居家%' or t1.title like '%返攀%' or t1.title like '%来攀%' or t1.title like '%燃气%' or t1.title like '%防火%') and t1.community_id = ${communityId} and t.create_at >= DATE_FORMAT(  CONCAT(#{year},'-',#{date},'-00'), '%Y-%m-00 00:00:00') and  DATE_FORMAT( LAST_DAY(CONCAT(#{year},'-',#{date},'-00')), '%Y-%m-%d 23:59:59') >=t.create_at ) count,
                 (select count(*)  from com_act_reserve_record t LEFT JOIN com_act_reserve t1 on t.reserve_id = t1.id where (t1.title like '%燃气%' ) and t1.community_id = ${communityId} and t.create_at >= DATE_FORMAT(  CONCAT(#{year},'-',#{date},'-00'), '%Y-%m-00 00:00:00') and  DATE_FORMAT( LAST_DAY(CONCAT(#{year},'-',#{date},'-00')), '%Y-%m-%d 23:59:59') >=t.create_at) gasCount,
            (select count(*)  from com_act_reserve_record t LEFT JOIN com_act_reserve t1 on t.reserve_id = t1.id where (t1.title like '%防火%' ) and t1.community_id = ${communityId} and t.create_at >= DATE_FORMAT(  CONCAT(#{year},'-',#{date},'-00'), '%Y-%m-00 00:00:00') and  DATE_FORMAT( LAST_DAY(CONCAT(#{year},'-',#{date},'-00')), '%Y-%m-%d 23:59:59') >=t.create_at) fireCount,
            (select count(*)  from com_act_reserve_record t LEFT JOIN com_act_reserve t1 on t.reserve_id = t1.id where (t1.title like '%居家%' ) and t1.community_id = ${communityId} and t.create_at >= DATE_FORMAT(  CONCAT(#{year},'-',#{date},'-00'), '%Y-%m-00 00:00:00') and  DATE_FORMAT( LAST_DAY(CONCAT(#{year},'-',#{date},'-00')), '%Y-%m-%d 23:59:59') >=t.create_at) homeCount,
            (select count(*)  from com_act_reserve_record t LEFT JOIN com_act_reserve t1 on t.reserve_id = t1.id where (t1.title like '%返攀%' or t1.title like '%来攀%' ) and t1.community_id = ${communityId} and t.create_at >= DATE_FORMAT(  CONCAT(#{year},'-',#{date},'-00'), '%Y-%m-00 00:00:00') and  DATE_FORMAT( LAST_DAY(CONCAT(#{year},'-',#{date},'-00')), '%Y-%m-%d 23:59:59') >=t.create_at) reserveCount
    </select>
</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialOrgMapper.xml

@@ -64,7 +64,7 @@
                and t.contact_name like concat(#{commonPage.systemName},'%')
            </if>
            <if test="commonPage.paramId!=null">
                and t.community_id =#{commonPage.paramId}
                and t.community_id = ${commonPage.paramId}
            </if>
            <if test="commonPage.phone!=null and commonPage.phone!=''">
                and t.contact_phone like concat(#{commonPage.phone},'%')

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActUserWalletDOMapper.xml

@@ -28,7 +28,7 @@
            com_act AS ca
            LEFT JOIN sys_user_agreement AS sua ON sua.community_id = ca.community_id
        WHERE
            ca.community_id = #{communityId} and sua.type = #{type}
            ca.community_id = ${communityId} and sua.type = #{type}
    </select>

    <select id="getAgreementContent" resultType="Map">
@@ -39,7 +39,7 @@
            sys_user_agreement AS sua
            LEFT JOIN com_act AS ca ON sua.community_id = ca.community_id
        WHERE
            sua.community_id = #{communityId} and sua.type = #{type}
            sua.community_id = ${communityId} and sua.type = #{type}
    </select>

    <select id="getWalletRanking" resultType="com.panzhihua.common.model.vos.community.wallet.ComActWalletRankingVO">
@@ -48,11 +48,11 @@
            su.nick_name,
            su.image_url,
            cauw.income_amount,
            (select count(id) from com_act_easy_photo where sponsor_id = cauw.user_id and community_id = #{walletTradeDTO.communityId}) as easyCount
            (select count(id) from com_act_easy_photo where sponsor_id = cauw.user_id and community_id = ${walletTradeDTO.communityId}) as easyCount
        FROM
            com_act_user_wallet AS cauw
            LEFT JOIN sys_user AS su ON su.user_id = cauw.user_id
            where cauw.community_id = #{walletTradeDTO.communityId}
            where cauw.community_id = ${walletTradeDTO.communityId}
        ORDER BY
            cauw.income_amount DESC
    </select>
@@ -73,7 +73,7 @@
            LEFT JOIN sys_user AS su ON su.user_id = cauw.user_id
        <where>
            <if test="pageWalletAdminDTO.communityId != null">
                AND cauw.community_id = #{pageWalletAdminDTO.communityId}
                AND cauw.community_id = ${pageWalletAdminDTO.communityId}
            </if>
            <if test="pageWalletAdminDTO.name != null and pageWalletAdminDTO.name != &quot;&quot;">
                AND (su.nick_name like concat (#{pageWalletAdminDTO.name},'%') or su.name like concat (#{pageWalletAdminDTO.name},'%'))

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActUserWalletTradeDOMapper.xml

@@ -35,7 +35,7 @@
        FROM
            com_act_user_wallet_trade AS cauwt
            LEFT JOIN com_act AS ca ON ca.community_id = cauwt.community_id
            where cauwt.community_id = #{walletTradeDTO.communityId}
            where cauwt.community_id = ${walletTradeDTO.communityId}
            and cauwt.user_id = #{walletTradeDTO.userId}

            order by cauwt.create_at desc
@@ -62,7 +62,7 @@
            LEFT JOIN sys_user AS su1 ON su1.user_id = cauwt.create_by
        <where>
            <if test="walletTradeDTO.communityId != null">
                and cauwt.community_id = #{walletTradeDTO.communityId}
                and cauwt.community_id = ${walletTradeDTO.communityId}
            </if>
            <if test="walletTradeDTO.userId != null">
                and cauwt.user_id = #{walletTradeDTO.userId}
@@ -117,7 +117,7 @@
        LEFT JOIN sys_user AS su1 ON su1.user_id = cauwt.create_by
        <where>
            <if test="walletTradeDTO.communityId != null">
                and cauwt.community_id = #{walletTradeDTO.communityId}
                and cauwt.community_id = ${walletTradeDTO.communityId}
            </if>
            <if test="walletTradeDTO.userId != null">
                and cauwt.user_id = #{walletTradeDTO.userId}
@@ -169,7 +169,7 @@
            LEFT JOIN sys_user AS su1 ON su1.user_id = cauwt.user_id
        <where>
            <if test="walletTradeDTO.communityId != null">
                and cauwt.community_id = #{walletTradeDTO.communityId}
                and cauwt.community_id = ${walletTradeDTO.communityId}
            </if>
            <if test="walletTradeDTO.userId != null">
                and cauwt.user_id = #{walletTradeDTO.userId}
@@ -219,7 +219,7 @@
        LEFT JOIN sys_user AS su1 ON su1.user_id = cauwt.user_id
        <where>
            <if test="walletTradeDTO.communityId != null">
                and cauwt.community_id = #{walletTradeDTO.communityId}
                and cauwt.community_id = ${walletTradeDTO.communityId}
            </if>
            <if test="walletTradeDTO.userId != null">
                and cauwt.user_id = #{walletTradeDTO.userId}
@@ -263,11 +263,11 @@
            resultType="com.panzhihua.common.model.vos.community.wallet.ComActWalletTradeStatisticsAdminVO">
        SELECT
            sum( amount ) as dayTotal,
            (select sum(amount) from com_act_user_wallet_trade where community_id = #{walletTradeDTO.communityId} and change_type = #{walletTradeDTO.changeType} and create_at between timestamp(DATE_ADD(curdate(),interval -day(curdate())+1 day)) and now()) as monthTotal,
            (select sum(amount) from com_act_user_wallet_trade where community_id = #{walletTradeDTO.communityId} and change_type = #{walletTradeDTO.changeType}) as total
            (select sum(amount) from com_act_user_wallet_trade where community_id = ${walletTradeDTO.communityId} and change_type = #{walletTradeDTO.changeType} and create_at between timestamp(DATE_ADD(curdate(),interval -day(curdate())+1 day)) and now()) as monthTotal,
            (select sum(amount) from com_act_user_wallet_trade where community_id = ${walletTradeDTO.communityId} and change_type = #{walletTradeDTO.changeType}) as total
        FROM
            com_act_user_wallet_trade
            where community_id = #{walletTradeDTO.communityId} and change_type = #{walletTradeDTO.changeType}
            where community_id = ${walletTradeDTO.communityId} and change_type = #{walletTradeDTO.changeType}
            and create_at between timestamp(date_add(curdate(), interval - 0 day)) and now()
    </select>
</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActWarehouseApplyMapper.xml

@@ -30,7 +30,7 @@
        <where>
            1=1
            <if test="commonPage.paramId !=null">
                and t.community_id=#{commonPage.paramId}
                and t.community_id = ${commonPage.paramId}
            </if>
            <if test="commonPage.status !=null">
                and t.status=#{commonPage.status}
@@ -56,11 +56,11 @@

    <select id="selectStatics" resultType="com.panzhihua.common.model.vos.community.warehouse.ApplyStatistics">
        select
                (select count(*)  from com_act_warehouse_apply where status = 0 and community_id =#{communityId}) as pending,
                (select count(*)  from com_act_warehouse_apply where status = 1 and community_id =#{communityId}) as unclaimed,
                (select count(*)  from com_act_warehouse_apply where status = 2 and community_id =#{communityId}) as rejected,
                (select count(*)  from com_act_warehouse_apply where status = 3 and community_id =#{communityId}) as received,
                (select count(*)  from com_act_warehouse_apply where status = -1 and community_id =#{communityId}) as cancelled
                (select count(*)  from com_act_warehouse_apply where status = 0 and community_id = ${communityId}) as pending,
                (select count(*)  from com_act_warehouse_apply where status = 1 and community_id = ${communityId}) as unclaimed,
                (select count(*)  from com_act_warehouse_apply where status = 2 and community_id = ${communityId}) as rejected,
                (select count(*)  from com_act_warehouse_apply where status = 3 and community_id = ${communityId}) as received,
                (select count(*)  from com_act_warehouse_apply where status = -1 and community_id = ${communityId}) as cancelled
    </select>

    <select id="selectById" resultType="com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseApplyVO">

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActWarehouseDonatesMapper.xml

@@ -41,7 +41,7 @@
    <select id="exportDonatesBySearch"
            resultType="com.panzhihua.common.model.vos.community.warehouse.ExportDonatesVO">
        SELECT * FROM com_act_warehouse_donates
        WHERE community_id = #{exportDonatesDTO.communityId}
        WHERE community_id = ${exportDonatesDTO.communityId}
        <if test="exportDonatesDTO.status != null">
            AND status = #{exportDonatesDTO.status}
        </if>
@@ -66,7 +66,7 @@
    <select id="pageDonates"
            resultType="com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseDonatesVO">
        SELECT * FROM com_act_warehouse_donates
        WHERE community_id = #{pageDonatesDTO.communityId}
        WHERE community_id = ${pageDonatesDTO.communityId}
        <if test="pageDonatesDTO.isWhich != null and pageDonatesDTO.isWhich == 1">
            AND user_id = #{pageDonatesDTO.userId}
        </if>
@@ -106,14 +106,27 @@
    <select id="selectDonatesStatistics"
            resultType="com.panzhihua.common.model.vos.community.warehouse.DonatesStatisticsVO">
        SELECT
            (SELECT IF(SUM(quantity) IS NULL,0,SUM(quantity)) FROM com_act_warehouse_donates WHERE community_id = #{communityId} AND `status` = 2) as totalInc ,
            (SELECT IF(SUM(surplus_quantity) IS NULL,0,SUM(surplus_quantity)) FROM com_act_warehouse_donates WHERE community_id = #{communityId} AND `status` = 2) as surplus,
            (SELECT IF(SUM(quantity) IS NULL,0,SUM(quantity)) FROM com_act_warehouse_donates WHERE community_id = #{communityId} AND `status` = 2 AND signing_at LIKE #{currentYear}) as yearInc,
            (SELECT IF(SUM(quantity) IS NULL,0,SUM(quantity)) FROM com_act_warehouse_donates WHERE community_id = #{communityId} AND `status` = 2 AND signing_at LIKE #{currentMonth}) as mothInc,
            (SELECT IF(SUM(quantity) IS NULL,0,SUM(quantity)) FROM com_act_warehouse_donates WHERE community_id = #{communityId} AND `status` = 2 AND signing_at LIKE #{today}) as dayInc,
            (SELECT IF(SUM(goods_num) IS NULL,0,SUM(goods_num)) FROM com_act_warehouse_apply WHERE community_id = #{communityId} AND `status` = 3 AND actual_time LIKE #{currentYear}) as yearDec,
            (SELECT IF(SUM(goods_num) IS NULL,0,SUM(goods_num)) FROM com_act_warehouse_apply WHERE community_id = #{communityId} AND `status` = 3 AND actual_time LIKE #{currentMonth}) as mothDec,
            (SELECT IF(SUM(goods_num) IS NULL,0,SUM(goods_num)) FROM com_act_warehouse_apply WHERE community_id = #{communityId} AND `status` = 3 AND actual_time LIKE #{today}) as dayDec
            (SELECT IF(SUM(quantity) IS NULL,0,SUM(quantity)) FROM com_act_warehouse_donates WHERE community_id = ${communityId} AND `status` = 2) as totalInc ,
            (SELECT IF(SUM(surplus_quantity) IS NULL,0,SUM(surplus_quantity)) FROM com_act_warehouse_donates WHERE community_id = ${communityId} AND `status` = 2) as surplus,
            (SELECT IF(SUM(quantity) IS NULL,0,SUM(quantity)) FROM com_act_warehouse_donates WHERE community_id = ${communityId} AND `status` = 2 AND signing_at LIKE #{currentYear}) as yearInc,
            (SELECT IF(SUM(quantity) IS NULL,0,SUM(quantity)) FROM com_act_warehouse_donates WHERE community_id = ${communityId} AND `status` = 2 AND signing_at LIKE #{currentMonth}) as mothInc,
            (SELECT IF(SUM(quantity) IS NULL,0,SUM(quantity)) FROM com_act_warehouse_donates WHERE community_id = ${communityId} AND `status` = 2 AND signing_at LIKE #{today}) as dayInc,
            (SELECT IF(SUM(goods_num) IS NULL,0,SUM(goods_num)) FROM com_act_warehouse_apply WHERE community_id = ${communityId} AND `status` = 3 AND actual_time LIKE #{currentYear}) as yearDec,
            (SELECT IF(SUM(goods_num) IS NULL,0,SUM(goods_num)) FROM com_act_warehouse_apply WHERE community_id = ${communityId} AND `status` = 3 AND actual_time LIKE #{currentMonth}) as mothDec,
            (SELECT IF(SUM(goods_num) IS NULL,0,SUM(goods_num)) FROM com_act_warehouse_apply WHERE community_id = ${communityId} AND `status` = 3 AND actual_time LIKE #{today}) as dayDec
    </select>
    <select id="getWarehouseDonateRecords" resultType="java.lang.String">
        SELECT CONCAT('收到爱心人士捐赠的',item,'x', quantity)
        FROM com_act_warehouse_donates WHERE community_id = ${communityId} AND `status` = 2 ORDER BY signing_at DESC limit #{pageSize}
    </select>
    <select id="getWarehouseLoveTransfer" resultType="java.lang.String">
        SELECT t1.content FROM com_act_warehouse_operation t1
        LEFT JOIN com_act_warehouse_donates t2 ON t1.goods_id = t2.id
        WHERE t2.community_id = ${communityId} AND t1.`type` = 2 ORDER BY create_time DESC limit #{pageSize}
    </select>
    <select id="getWarehouseImages" resultType="java.lang.String">
        SELECT image FROM com_act_warehouse_donates
        WHERE community_id = ${communityId} AND `status` = 2 AND image IS NOT NULL AND image != '' ORDER BY signing_at DESC limit #{pageSize}
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActWarehouseOperationMapper.xml

@@ -26,7 +26,7 @@
                and t.goods_id=#{commonPage.paramId}
            </if>
            <if test="commonPage.communityId !=null">
                and t1.community_id =#{commonPage.communityId}
                and t1.community_id = ${commonPage.communityId}
            </if>
            <if test="commonPage.keyword !=null and commonPage.keyword !=''">
                and t1.item like concat('%',#{commonPage.keyword},'%')

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComClusterOrganizationDOMapper.xml

@@ -24,7 +24,7 @@
    </sql>

    <select id="listClusterApplets" resultType="com.panzhihua.common.model.vos.community.cluster.PageClusterVo">
        select id,`name` from com_cluster_organization where status = 1 and is_del = 2 and community_id = #{communityId} order by create_at desc
        select id,`name` from com_cluster_organization where status = 1 and is_del = 2 and community_id = ${communityId} order by create_at desc
    </select>

    <select id="pageClusterAdmin" resultType="com.panzhihua.common.model.vos.community.cluster.admin.PageClusterAdminVo">
@@ -40,7 +40,7 @@
        WHERE
            is_del = 2
            <if test="pageClusterAdminDto.communityId != null">
                and community_id = #{pageClusterAdminDto.communityId}
                and community_id = ${pageClusterAdminDto.communityId}
            </if>
            <if test="pageClusterAdminDto.status != null">
                and status = #{pageClusterAdminDto.status}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComClusterOrganizationMemberDOMapper.xml

@@ -34,7 +34,7 @@
            <where>
                ccom.status = 1 and ccom.is_del = 2
                <if test="pageClusterMemberDto.communityId != null">
                    and ccom.community_id = #{pageClusterMemberDto.communityId}
                    and ccom.community_id = ${pageClusterMemberDto.communityId}
                </if>
                <if test="pageClusterMemberDto.clusterId != null">
                    and ccom.cluster_id = #{pageClusterMemberDto.clusterId}
@@ -61,7 +61,7 @@
        WHERE
            ccom.is_del = 2
            <if test="pageClusterMemberAdminDto.communityId != null">
                and ccom.community_id = #{pageClusterMemberAdminDto.communityId}
                and ccom.community_id = ${pageClusterMemberAdminDto.communityId}
            </if>
            <if test="pageClusterMemberAdminDto.status != null">
                and ccom.`status` = #{pageClusterMemberAdminDto.status}
@@ -120,7 +120,7 @@
        WHERE
        ccom.is_del = 2
        <if test="pageClusterMemberAdminDto.communityId != null">
            and ccom.community_id = #{pageClusterMemberAdminDto.communityId}
            and ccom.community_id = ${pageClusterMemberAdminDto.communityId}
        </if>
        <if test="pageClusterMemberAdminDto.status != null">
            and ccom.`status` = #{pageClusterMemberAdminDto.status}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComElderAuthElderliesMapper.xml

@@ -37,7 +37,7 @@
        FROM
            com_elder_auth_elderlies ceae
        WHERE
            community_id = #{communityId}
            community_id = ${communityId}
          AND EXISTS (
                SELECT
                    1

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComElderAuthRecordsMapper.xml

@@ -57,7 +57,7 @@
                LEFT JOIN sys_user su ON cear.submit_user_id = su.user_id
                LEFT JOIN sys_user su1 ON cear.approver_id = su1.user_id
        WHERE
            ceae.community_id = #{pageElderAuthRecordsDTO.communityId}
            ceae.community_id = ${pageElderAuthRecordsDTO.communityId}
        <if test="pageElderAuthRecordsDTO.authPeriod != null and pageElderAuthRecordsDTO.authPeriod !=''">
            and cear.auth_period = #{pageElderAuthRecordsDTO.authPeriod}
        </if>
@@ -118,7 +118,7 @@
        LEFT JOIN sys_user su ON cear.submit_user_id = su.user_id
        LEFT JOIN sys_user su1 ON cear.approver_id = su1.user_id
        WHERE
        ceae.community_id = #{pageElderAuthRecordsDTO.communityId}
        ceae.community_id = ${pageElderAuthRecordsDTO.communityId}
        <if test="pageElderAuthRecordsDTO.authPeriod != null and pageElderAuthRecordsDTO.authPeriod !=''">
            and cear.auth_period = #{pageElderAuthRecordsDTO.authPeriod}
        </if>
@@ -179,7 +179,7 @@
        LEFT JOIN sys_user su ON cear.submit_user_id = su.user_id
        LEFT JOIN sys_user su1 ON cear.approver_id = su1.user_id
        WHERE
        ceae.community_id = #{pageElderAuthRecordsDTO.communityId}
        ceae.community_id = ${pageElderAuthRecordsDTO.communityId}
        <if test="pageElderAuthRecordsDTO.authPeriod != null and pageElderAuthRecordsDTO.authPeriod !=''">
            and cear.auth_period = #{pageElderAuthRecordsDTO.authPeriod}
        </if>
@@ -420,7 +420,7 @@
        LEFT JOIN sys_user su ON ceahr.submit_user_id = su.user_id
        LEFT JOIN com_elder_auth_records as cear on cear.id = ceahr.auth_id
        WHERE
        ceahr.community_id = #{pageElderAuthRecordsDTO.communityId}
        ceahr.community_id = ${pageElderAuthRecordsDTO.communityId}
        <if test="pageElderAuthRecordsDTO.authPeriod != null and pageElderAuthRecordsDTO.authPeriod !=''">
            and ceahr.auth_period = #{pageElderAuthRecordsDTO.authPeriod}
        </if>
@@ -441,7 +441,7 @@
    </select>

    <select id="getNextIds" resultType="String">
        select id from com_elder_auth_records where approval_status = 1 and community_id = #{communityId}
        select id from com_elder_auth_records where approval_status = 1 and community_id = ${communityId}
    </select>

    <select id="queryRecordWithPage" resultType="com.panzhihua.common.model.vos.community.IdentityAuthRecordDetailVO">

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEldersAuthDOMapper.xml

@@ -56,7 +56,7 @@
        FROM
            com_act AS ca
        WHERE
            community_id = #{communityId}
            community_id = ${communityId}
    </select>

    <select id="getEldersAuthRecords" resultType="com.panzhihua.common.model.vos.elders.ComEldersAuthHistoryVO">
@@ -74,7 +74,7 @@
            LEFT JOIN com_elders_auth_user AS ceau ON ceau.id = cea.family_user_id
            LEFT JOIN com_elders_auth_elderly AS ceae ON ceae.id = ceau.big_age_id
        WHERE
            type = 1 and ceau.community_id = #{communityId}
            type = 1 and ceau.community_id = ${communityId}
            AND cea.create_at BETWEEN DATE_FORMAT( date_sub( date_format( now(), '%y-%m-%d 00:00:00' ), INTERVAL extract( DAY FROM now())- 1 DAY ), '%Y-%m-%d %H:%i:%s' )
                AND DATE_FORMAT( date_sub( date_format( now(), '%y-%m-%d 23:59:59' ), INTERVAL extract( DAY FROM now()) DAY ), '%Y-%m-%d %H:%i:%s' )
        order by cea.create_at desc

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEldersAuthElderlyMapper.xml

@@ -51,7 +51,7 @@
                AND domicile = #{pageComEldersAuthElderlyDTO.domicile}
            </if>
           <if test="pageComEldersAuthElderlyDTO.communityId!=null">
                AND community_id = #{pageComEldersAuthElderlyDTO.communityId}
                AND community_id = ${pageComEldersAuthElderlyDTO.communityId}
            </if>
           <if test="pageComEldersAuthElderlyDTO.isExist!=null">
                AND is_exist = #{pageComEldersAuthElderlyDTO.isExist}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEldersAuthHistoryRecordMapper.xml

@@ -114,7 +114,7 @@
                and ceahr.is_alive = #{pageElderAuthStatisticDTO.isAlive}
            </if>
            <if test="pageElderAuthStatisticDTO.communityId != null">
                and ceahr.community_id = #{pageElderAuthStatisticDTO.communityId}
                and ceahr.community_id = ${pageElderAuthStatisticDTO.communityId}
            </if>
        </where>
        order by ceahr.create_at desc
@@ -129,7 +129,7 @@
                and auth_period = #{statisticHeaderDTO.authPeriod}
            </if>
            <if test="statisticHeaderDTO.communityId != null">
                and community_id = #{statisticHeaderDTO.communityId}
                and community_id = ${statisticHeaderDTO.communityId}
            </if>
            ) AS yesCount,
            ( SELECT count( id ) FROM com_elders_auth_history_record WHERE  is_auth = 2
@@ -137,7 +137,7 @@
                and auth_period = #{statisticHeaderDTO.authPeriod}
            </if>
            <if test="statisticHeaderDTO.communityId != null">
                and community_id = #{statisticHeaderDTO.communityId}
                and community_id = ${statisticHeaderDTO.communityId}
            </if>
            ) AS noCount
        FROM
@@ -147,7 +147,7 @@
                and auth_period = #{statisticHeaderDTO.authPeriod}
            </if>
            <if test="statisticHeaderDTO.communityId != null">
                and community_id = #{statisticHeaderDTO.communityId}
                and community_id = ${statisticHeaderDTO.communityId}
            </if>
        </where>
    </select>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEldersAuthStatisticsMapper.xml

@@ -34,7 +34,7 @@
                AND year = #{pageEldersAuthHistoryDTO.year}
            </if>
            <if test="pageEldersAuthHistoryDTO.communityId!=null">
                AND community_id = #{pageEldersAuthHistoryDTO.communityId}
                AND community_id = ${pageEldersAuthHistoryDTO.communityId}
            </if>
        </where>
        ORDER BY create_at desc

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngBuildingMapper.xml

@@ -51,7 +51,7 @@
    </resultMap>

    <select id="select" resultMap="selectMap">
        select t.village_id as villageId,t.name as villageName,t1.id,t1.name  from com_mng_village t left join com_mng_building t1 on t.village_id = t1.village_id where t.community_id=#{id} and t1.id is not null
        select t.village_id as villageId,t.name as villageName,t1.id,t1.name  from com_mng_village t left join com_mng_building t1 on t.village_id = t1.village_id where t.community_id = ${id} and t1.id is not null
    </select>

    <select id="pageBuildingAdmin" resultType="com.panzhihua.common.model.vos.community.building.admin.PageBuildingListAdminVo">
@@ -181,7 +181,7 @@
        FROM
            com_mng_population_house_user AS cmphu
            LEFT JOIN com_mng_population AS cmp ON cmp.id = cmphu.popul_id
            LEFT JOIN com_mng_population_community_tags AS cmpct ON cmp.id = cmpct.population_id and community_id = #{communityId}
            LEFT JOIN com_mng_population_community_tags AS cmpct ON cmp.id = cmpct.population_id and community_id = ${communityId}
        WHERE
            cmphu.house_id = #{houseId}
        <if test='relation != null '>
@@ -202,7 +202,7 @@
        FROM
            com_mng_village
        WHERE
            community_id = #{communityId}
            community_id = ${communityId}
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngPopulationCommunityTagsMapper.xml

@@ -37,7 +37,7 @@
    </update>

    <delete id="deletePopulationRelation">
        delete from com_mng_population_community_tags where community_id = #{communityId} and population_id in
        delete from com_mng_population_community_tags where community_id = ${communityId} and population_id in
        <foreach item="item" collection="ids" separator="," open="(" close=")" index="">
            #{item}
        </foreach>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngPopulationDOMapper.xml

@@ -268,11 +268,11 @@
    </resultMap>

    <select id="getSecondHouseAddress" resultMap="selectMap">
        select t.village_id as villageId,concat(t.alley,t.house_num,'号') as villageName,t1.id,concat(t1.unit_no,'栋',t1.floor,'单元',t1.code,'号') as name  from com_mng_village t left join com_mng_population_house t1 on t.village_id = t1.village_id where t.community_id=#{communityId}
        select t.village_id as villageId,concat(t.alley,t.house_num,'号') as villageName,t1.id,concat(t1.unit_no,'栋',t1.floor,'单元',t1.code,'号') as name  from com_mng_village t left join com_mng_population_house t1 on t.village_id = t1.village_id where t.community_id = ${communityId}
    </select>

    <select id="getSecondHouse" resultMap="selectMap">
        select t.village_id as villageId,concat(t.alley,t.house_num,'号') as villageName,t1.id,concat(t1.unit_no,'栋') as name  from com_mng_village t left join com_mng_population_house t1  on t.village_id = t1.village_id where t.community_id=#{communityId} GROUP BY t.village_id,t1.unit_no
        select t.village_id as villageId,concat(t.alley,t.house_num,'号') as villageName,t1.id,concat(t1.unit_no,'栋') as name  from com_mng_village t left join com_mng_population_house t1  on t.village_id = t1.village_id where t.community_id = ${communityId} GROUP BY t.village_id,t1.unit_no
    </select>


@@ -298,7 +298,7 @@
                AND cmp.`name` LIKE concat(#{comMngPopulationVO.name},'%')    </if>
            <if test='comMngPopulationVO.label != null and comMngPopulationVO.label != &quot;&quot;'>
                AND cmpct.label LIKE concat('%',#{comMngPopulationVO.label},'%')    </if>
            <if test='comMngPopulationVO.actId != null'>   and cmpct.community_id = #{comMngPopulationVO.actId}
            <if test='comMngPopulationVO.actId != null'>   and cmpct.community_id = ${comMngPopulationVO.actId}
            </if>   <if test='comMngPopulationVO.outOrLocal != null'>
            and cmp.out_or_local = #{comMngPopulationVO.outOrLocal}    </if>
            <if test='comMngPopulationVO.villageId != null and comMngPopulationVO.villageId != &quot;&quot;'>
@@ -361,7 +361,7 @@
            LEFT JOIN com_mng_population AS cmp ON cmp.id = cmpct.population_id
            LEFT JOIN com_mng_village AS cmv ON cmv.village_id = cmp.village_id
        WHERE
            cmpct.community_id = #{pageInputUserDTO.communityId}
            cmpct.community_id = ${pageInputUserDTO.communityId}
            AND cmpct.label IS NOT NULL
            <if test='pageInputUserDTO.name != null and pageInputUserDTO.name != &quot;&quot;'>
                AND cmp.`name` LIKE concat(#{pageInputUserDTO.name},'%')
@@ -391,7 +391,7 @@
        LEFT JOIN com_mng_population AS cmp ON cmp.id = cmpct.population_id
        LEFT JOIN com_mng_village AS cmv ON cmv.village_id = cmp.village_id
        WHERE
        cmpct.community_id = #{pageInputUserDTO.communityId}
        cmpct.community_id = ${pageInputUserDTO.communityId}
        AND cmpct.label IS NOT NULL
        <if test='pageInputUserDTO.name != null and pageInputUserDTO.name != &quot;&quot;'>
            AND cmp.`name` LIKE concat(#{pageInputUserDTO.name},'%')
@@ -519,7 +519,7 @@
            AND cmp.house_id is not null  </if>
        <if test='populationListDTO.isHouse != null and populationListDTO.isHouse == 2'>
            AND cmp.house_id is null  </if>  <if test='populationListDTO.communityId != null'>
        AND cmpct.community_id = #{populationListDTO.communityId}  </if>
        AND cmpct.community_id = ${populationListDTO.communityId}  </if>
        <if test='populationListDTO.politicalOutlook != null'>
            AND cmp.political_outlook = #{populationListDTO.politicalOutlook}  </if>
    </select>
@@ -528,7 +528,7 @@
        SELECT    count( e.id ) AS eventZATotal,    IFNULL((     SELECT
        count( e1.id )      FROM      `event` AS e1
        LEFT JOIN event_grid_data AS egd1 ON egd1.id = e1.grid_id      WHERE
        egd1.grid_community_id = #{screenEventDTO.communityId}       AND event_category = 1
        egd1.grid_community_id = ${screenEventDTO.communityId}       AND event_category = 1
        AND event_type = 1       AND event_deal_status = 4
        <if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>
            AND e1.create_at <![CDATA[>=]]> #{screenEventDTO.startTime}    </if>
@@ -536,7 +536,7 @@
            AND e1.create_at <![CDATA[<=]]> #{screenEventDTO.endTime}    </if>      ),     0
        ) AS yesEventZATotal,    IFNULL((     SELECT      count( e2.id )      FROM
        `event` AS e2      LEFT JOIN event_grid_data AS egd2 ON egd2.id = e2.grid_id      WHERE
        egd2.grid_community_id = #{screenEventDTO.communityId}       AND event_category = 1
        egd2.grid_community_id = ${screenEventDTO.communityId}       AND event_category = 1
        AND event_type = 5       AND event_status = 2
        <if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>
            AND e2.create_at <![CDATA[>=]]> #{screenEventDTO.startTime}    </if>
@@ -544,7 +544,7 @@
            AND e2.create_at <![CDATA[<=]]> #{screenEventDTO.endTime}    </if>      ),     0
        ) AS eventTFTotal,    IFNULL((     SELECT      count( e3.id )      FROM      `event` AS e3
        LEFT JOIN event_grid_data AS egd3 ON egd3.id = e3.grid_id      WHERE
        egd3.grid_community_id = #{screenEventDTO.communityId}       AND event_category = 1
        egd3.grid_community_id = ${screenEventDTO.communityId}       AND event_category = 1
        AND event_type = 5       AND event_deal_status = 4
        <if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>
            AND e3.create_at <![CDATA[>=]]> #{screenEventDTO.startTime}    </if>
@@ -552,7 +552,7 @@
            AND e3.create_at <![CDATA[<=]]> #{screenEventDTO.endTime}    </if>      ),     0
        ) AS yesEventTFTotal,    IFNULL((     SELECT      count( e4.id )      FROM
        `event` AS e4      LEFT JOIN event_grid_data AS egd4 ON egd4.id = e4.grid_id      WHERE
        egd4.grid_community_id = #{screenEventDTO.communityId}       AND event_category = 1
        egd4.grid_community_id = ${screenEventDTO.communityId}       AND event_category = 1
        AND event_type = 6       AND event_status = 2
        <if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>
            AND e4.create_at <![CDATA[>=]]> #{screenEventDTO.startTime}    </if>
@@ -560,7 +560,7 @@
            AND e4.create_at <![CDATA[<=]]> #{screenEventDTO.endTime}    </if>      ),     0
        ) AS eventTSTotal,    IFNULL((     SELECT      count( e5.id )      FROM      `event` AS e5
        LEFT JOIN event_grid_data AS egd5 ON egd5.id = e5.grid_id      WHERE
        egd5.grid_community_id = #{screenEventDTO.communityId}       AND event_category = 1
        egd5.grid_community_id = ${screenEventDTO.communityId}       AND event_category = 1
        AND event_type = 6       AND event_deal_status = 4
        <if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>
            AND e5.create_at <![CDATA[>=]]> #{screenEventDTO.startTime}    </if>
@@ -568,7 +568,7 @@
            AND e5.create_at <![CDATA[<=]]> #{screenEventDTO.endTime}    </if>      ),     0
        ) AS yesEventTSTotal,    IFNULL((     SELECT      count( e6.id )      FROM
        `event` AS e6      LEFT JOIN event_grid_data AS egd6 ON egd6.id = e6.grid_id      WHERE
        egd6.grid_community_id = #{screenEventDTO.communityId}       AND event_category = 1
        egd6.grid_community_id = ${screenEventDTO.communityId}       AND event_category = 1
        AND event_type = 3       AND event_status = 2
        <if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>
            AND e6.create_at <![CDATA[>=]]> #{screenEventDTO.startTime}    </if>
@@ -576,7 +576,7 @@
            AND e6.create_at <![CDATA[<=]]> #{screenEventDTO.endTime}    </if>      ),     0
        ) AS eventMDTotal,    IFNULL((     SELECT      count( e7.id )      FROM      `event` AS e7
        LEFT JOIN event_grid_data AS egd7 ON egd7.id = e7.grid_id      WHERE
        egd7.grid_community_id = #{screenEventDTO.communityId}       AND event_category = 1
        egd7.grid_community_id = ${screenEventDTO.communityId}       AND event_category = 1
        AND event_type = 3       AND event_deal_status = 4
        <if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>
            AND e7.create_at <![CDATA[>=]]> #{screenEventDTO.startTime}    </if>
@@ -584,7 +584,7 @@
            AND e7.create_at <![CDATA[<=]]> #{screenEventDTO.endTime}    </if>      ),     0
        ) AS yesEventMDTotal,    IFNULL((     SELECT      count( e8.id )      FROM
        `event` AS e8      LEFT JOIN event_grid_data AS egd8 ON egd8.id = e8.grid_id      WHERE
        egd8.grid_community_id = #{screenEventDTO.communityId}       AND event_category = 1
        egd8.grid_community_id = ${screenEventDTO.communityId}       AND event_category = 1
        AND event_type = 4       AND event_status = 2
        <if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>
            AND e8.create_at <![CDATA[>=]]> #{screenEventDTO.startTime}    </if>
@@ -592,7 +592,7 @@
            AND e8.create_at <![CDATA[<=]]> #{screenEventDTO.endTime}    </if>      ),     0
        ) AS eventBWDTotal,    IFNULL((     SELECT      count( e9.id )      FROM      `event` AS e9
        LEFT JOIN event_grid_data AS egd9 ON egd9.id = e9.grid_id      WHERE
        egd9.grid_community_id = #{screenEventDTO.communityId}       AND event_category = 1
        egd9.grid_community_id = ${screenEventDTO.communityId}       AND event_category = 1
        AND event_type = 4       AND event_deal_status = 4
        <if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>
            AND e9.create_at <![CDATA[>=]]> #{screenEventDTO.startTime}    </if>
@@ -600,7 +600,7 @@
            AND e9.create_at <![CDATA[<=]]> #{screenEventDTO.endTime}    </if>      ),     0
        ) AS yesEventBWDTotal,    IFNULL((     SELECT      count( e10.id )      FROM
        `event` AS e10      LEFT JOIN event_grid_data AS egd10 ON egd10.id = e10.grid_id      WHERE
        egd10.grid_community_id = #{screenEventDTO.communityId}       AND event_category = 1
        egd10.grid_community_id = ${screenEventDTO.communityId}       AND event_category = 1
        AND event_type = 2       AND event_status = 2
        <if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>
            AND e10.create_at <![CDATA[>=]]> #{screenEventDTO.startTime}    </if>
@@ -608,25 +608,25 @@
            AND e10.create_at <![CDATA[<=]]> #{screenEventDTO.endTime}    </if>      ),     0
        ) AS eventGGTotal,    IFNULL((     SELECT      count( e11.id )      FROM
        `event` AS e11      LEFT JOIN event_grid_data AS egd11 ON egd11.id = e11.grid_id      WHERE
        egd11.grid_community_id = #{screenEventDTO.communityId}       AND event_category = 1
        egd11.grid_community_id = ${screenEventDTO.communityId}       AND event_category = 1
        AND event_type = 2       AND event_deal_status = 4
        <if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>
            AND e11.create_at <![CDATA[>=]]> #{screenEventDTO.startTime}    </if>
        <if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>
            AND e11.create_at <![CDATA[<=]]> #{screenEventDTO.endTime}    </if>      ),     0
        ) AS yesEventGGTotal,
        IFNULL(( SELECT count( id ) FROM com_act_easy_photo WHERE del_tag = 0  AND community_id = #{screenEventDTO.communityId}
        IFNULL(( SELECT count( id ) FROM com_act_easy_photo WHERE del_tag = 0  AND community_id = ${screenEventDTO.communityId}
        <if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>
            AND create_at <![CDATA[>=]]> #{screenEventDTO.startTime}    </if>
        <if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>
            AND create_at <![CDATA[<=]]> #{screenEventDTO.endTime}    </if>   ), 0 ) AS eventSSPTotal,
        IFNULL(( SELECT count( id ) FROM com_act_easy_photo WHERE del_tag = 0 AND `status` = 4 AND community_id = #{screenEventDTO.communityId}
        IFNULL(( SELECT count( id ) FROM com_act_easy_photo WHERE del_tag = 0 AND `status` = 4 AND community_id = ${screenEventDTO.communityId}
        <if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>
            AND create_at <![CDATA[>=]]> #{screenEventDTO.startTime}    </if>
        <if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>
            AND create_at <![CDATA[<=]]> #{screenEventDTO.endTime}    </if>   ), 0 ) AS yesEventSSPTotal
        FROM    `event` AS e    LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id    WHERE
        egd.grid_community_id = #{screenEventDTO.communityId}     AND event_status = 2 AND event_category = 1
        egd.grid_community_id = ${screenEventDTO.communityId}     AND event_status = 2 AND event_category = 1
        AND event_type = 1
        <if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>
            AND e.create_at <![CDATA[>=]]> #{screenEventDTO.startTime}    </if>
@@ -638,4 +638,532 @@
    <update id="updatePopulationUnit">
        update com_mng_population set unit_no = #{newUnitNo} where village_id = #{villageId} and floor = #{floor} and unit_no = #{oldUnitNo}
    </update>

    <select id="selectCountByVillageId" resultType="Integer">
        select count(*) from com_mng_population t LEFT JOIN com_mng_population_community_tags t1 on t.id= t1.population_id
        where t.village_id=#{villageId} and t1.label like concat('%',#{label},'%')
    </select>

    <select id="getCivilParty" resultType="com.panzhihua.common.model.vos.community.screen.civil.CivilPartyStatisticsVO">
        SELECT
            count( id ) as committeeNum,
            (select count(id) from com_pb_dyn where community_id = ${communityId} and `type` = 1) as dynNum,
            (select count(id) from com_pb_activity where community_id = ${communityId}) as activityNum,
            (select count(id) from com_act_micro_wish where community_id = ${communityId}) as wishNum,
            (select count(id) from com_pb_member where community_id = ${communityId} and audit_result = 1) as partyNum,
            (select count(id) from com_pb_org where community_id = ${communityId} and parent_id = 0) as organizationNum,
            (select count(id) from com_mng_volunteer_mng where community_id = ${communityId} and state = 2) as volunteerNum,
            (select count(id) from com_act_questnaire where community_id = ${communityId}) as questionnaireNum
        FROM
            com_pb_member_role
        WHERE
            community_id = ${communityId}
    </select>

    <select id="getCivilGovernment" resultType="com.panzhihua.common.model.vos.community.screen.civil.CivilGovernmentStatisticsVO">
        SELECT
            count( id ) as noticeNum,
            (select count(id) from com_act_discuss where community_id = ${communityId} and is_del = 2) as discussNum,
            (select count(id) from com_act_easy_photo where community_id = ${communityId} and del_tag = 0) as easyNum,
            (select count(id) from com_act_neighbor_circle where community_id = ${communityId} and is_del = 2) as neighborNum,
            (select count(id) from com_act_activity where community_id = ${communityId}) as activityNum,
            (select count(id) from com_act_dyn where community_id = ${communityId}) as dynNum,
            (select count(id) from com_act_warehouse_donates where community_id = ${communityId}) as loveNum,
            (select count(id) from com_act_message where community_id = ${communityId}) as messageNum
        FROM
            com_act_announcement
        WHERE
            community_id = ${communityId}
    </select>

    <select id="getCivilGrid" resultType="com.panzhihua.common.model.vos.community.screen.civil.CivilGridStatisticsVO">
        SELECT
            count( e.id ) AS tfTodayNum,
            (
            SELECT
                count( e1.id )
            FROM
                `event` AS e1
                LEFT JOIN event_grid_data AS egd1 ON egd1.id = e1.grid_id
            WHERE
                egd1.grid_community_id = ${communityId}
                AND e1.event_status = 2
                AND e1.event_type = 1
                AND e1.event_category = 1
                AND e1.create_at BETWEEN DATE_FORMAT( NOW(), '%Y-%m-%d 00:00:00' )
            AND DATE_FORMAT( NOW(), '%Y-%m-%d 23:59:59' )) AS zaTodayNum,
            (
            SELECT
                count( e2.id )
            FROM
                `event` AS e2
                LEFT JOIN event_grid_data AS egd2 ON egd2.id = e2.grid_id
            WHERE
                egd2.grid_community_id = ${communityId}
                AND e2.event_status = 2
                AND e2.event_type = 2
                AND e2.event_category = 1
                AND e2.create_at BETWEEN DATE_FORMAT( NOW(), '%Y-%m-%d 00:00:00' )
            AND DATE_FORMAT( NOW(), '%Y-%m-%d 23:59:59' )) AS msTodayNum,
            (
            SELECT
                count( e3.id )
            FROM
                `event` AS e3
                LEFT JOIN event_grid_data AS egd3 ON egd3.id = e3.grid_id
            WHERE
                egd3.grid_community_id = ${communityId}
                AND e3.event_status = 2
                AND e3.event_type = 3
                AND e3.event_category = 1
                AND e3.create_at BETWEEN DATE_FORMAT( NOW(), '%Y-%m-%d 00:00:00' )
            AND DATE_FORMAT( NOW(), '%Y-%m-%d 23:59:59' )) AS mdTodayNum,
            (
            SELECT
                count( e4.id )
            FROM
                `event` AS e4
                LEFT JOIN event_grid_data AS egd4 ON egd4.id = e4.grid_id
            WHERE
                egd4.grid_community_id = ${communityId}
                AND e4.event_status = 2
                AND e4.event_type = 6
                AND e4.event_category = 1
                AND e4.create_at BETWEEN DATE_FORMAT( NOW(), '%Y-%m-%d 00:00:00' )
            AND DATE_FORMAT( NOW(), '%Y-%m-%d 23:59:59' )) AS tsTodayNum,
            (
            SELECT
                count( e5.id )
            FROM
                `event` AS e5
                LEFT JOIN event_grid_data AS egd5 ON egd5.id = e5.grid_id
            WHERE
                egd5.grid_community_id = ${communityId}
                AND e5.event_status = 2
            ) AS eventNum,
            (
            SELECT
                count( user_id )
            FROM
                sys_user AS su
                INNER JOIN event_grid_member_relation egmr ON egmr.grid_member_id = su.user_id
            WHERE
                egmr.grid_community_id = ${communityId}
            ) AS xcNum,
            ( SELECT count( id ) FROM com_sw_patrol_record WHERE community_id = ${communityId} ) AS securityNum
        FROM
            `event` AS e
            LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id
        WHERE
            egd.grid_community_id = ${communityId}
            AND e.event_status = 2
            AND e.event_type = 5
            AND e.event_category = 1
            AND e.create_at BETWEEN DATE_FORMAT( NOW(), '%Y-%m-%d 00:00:00' )
            AND DATE_FORMAT(
            NOW(),
            '%Y-%m-%d 23:59:59')
    </select>

    <select id="getCivilConvenience" resultType="com.panzhihua.common.model.vos.community.screen.civil.CivilConvenienceStatisticsVO">
        SELECT
            count( id ) AS guideNum,
            (
            SELECT
                count( carr.id )
            FROM
                com_act_reserve_record AS carr
                LEFT JOIN com_act_reserve AS car ON car.id = carr.reserve_id
            WHERE
                car.title IN ( '返攀登记', '居家隔离', '11月24日之前居家隔离', '2021-11-4之前来攀登记' )
                AND carr.community_id = ${communityId}
            ) AS situationNum,
            ( SELECT count( id ) FROM renting_hourse_register WHERE community_id = ${communityId} ) AS leaseNum,
            (
            SELECT
                count( cpr.id )
            FROM
                com_property_repair AS cpr
                LEFT JOIN com_property AS cp ON cp.id = cpr.property_id
            WHERE
                cp.community_id = ${communityId}
            ) AS repairNum,
            ( SELECT count( id ) FROM com_pension_auth_records WHERE community_id = ${communityId} ) AS pensionNum,
            ( SELECT count( id ) FROM com_elder_auth_records WHERE community_id = ${communityId} ) AS eldersNum,
            (
            SELECT
                count( cmpct.id )
            FROM
                com_mng_population_community_tags AS cmpct
                INNER JOIN com_mng_population AS cmp ON cmp.id = cmpct.population_id
            WHERE
                cmpct.label LIKE '%低保户%'
                AND cmpct.community_id = ${communityId}
            ) AS subsistenceNum,
            (
            SELECT
                count( cmpct.id )
            FROM
                com_mng_population_community_tags AS cmpct
                INNER JOIN com_mng_population AS cmp ON cmp.id = cmpct.population_id
            WHERE
                cmpct.community_id = ${communityId}
                AND cmp.death = 0
                AND cmpct.label LIKE '%高龄老人%'
            ) AS allowanceNum
        FROM
            com_act_work_guide
    </select>


    <select id="westScreenStatics" resultType="com.panzhihua.common.model.vos.community.bigscreen.WestScreenStatics">
        select  ( SELECT    count(*) FROM    com_act_micro_wish AS camw  LEFT JOIN com_act t1 on camw.community_id = t1.community_id
                  where t1.area_code ='510423'  and    camw.STATUS = 6 ) microWish ,
                (select count(user_id) from sys_user t LEFT JOIN com_act t1 on t.community_id = t1.community_id
                 where t.type=1 and t.community_id is not null and t1.area_code ='510423') user,
                (select count(id) from com_pb_org t LEFT JOIN com_act t1 on t.community_id = t1.community_id where parent_id = 0 and t1.area_code ='510423') partyOrg,
                (select count(id) from com_pb_member t LEFT JOIN com_act t1 on t.community_id = t1.community_id where audit_result = 1 and t1.area_code ='510423') partyMember,
                (select count(id) from com_mng_volunteer_mng t LEFT JOIN com_act t1 on t.community_id = t1.community_id where  t.state = 2 and t1.area_code ='510423')  volunteer,
                (select count(id) from com_sw_patrol_record t LEFT JOIN com_act t1 on t.community_id = t1.community_id where   t1.area_code ='510423') safety,
                (select count(*) from com_act_reserve t LEFT JOIN com_act_reserve_record t1 on t.id = t1.reserve_id LEFT JOIN com_act t2 on t.community_id = t2.community_id       where (title like '%居家隔离%' or title like  '%返攀登记%' or title like  '%来攀登记%') and t2.area_code ='510423' and t1.status = 2  )  reserve,
                (select (select count(*) from com_act_activity t LEFT JOIN com_act t1 on t.community_id = t1.community_id  where status !=6 and status !=1 and  t1.area_code ='510423')+(select count(id) from com_pb_activity t LEFT JOIN com_act t1 on t.community_id = t1.community_id  where status !=6 and status !=1 and  t1.area_code ='510423')) activity,
                (select count(*) from com_act_easy_photo t LEFT JOIN com_act t1 on t.community_id = t1.community_id
                where     status in (1,2,4) and del_tag = 0 and t1.area_code ='510423') neighbor,
                (select count(*) from com_act_discuss t LEFT JOIN com_act t1 on t.community_id = t1.community_id
                where     is_del =2  and t1.area_code ='510423') discuss
        </select>

    <select id="getBasicsList" resultType="com.panzhihua.common.model.vos.community.screen.event.EventPopulationBasicsStatisticsVO">
        SELECT
            ca.community_id,
            ca.`name` AS communityName,
            (
            SELECT
                count( cmpct.id )
            FROM
                com_mng_population_community_tags AS cmpct
                LEFT JOIN com_mng_population AS cmp ON cmp.id = cmpct.population_id
            WHERE
                cmpct.community_id = ca.community_id
            ) AS populationNum,
            ( SELECT count( village_id ) FROM com_mng_village AS cmv WHERE cmv.community_id = ca.community_id ) AS villageNum,
            (select count(id) from com_mng_population_house as cmph where cmph.community_id = ca.community_id) as houseNum
        FROM
            com_act AS ca
            LEFT JOIN com_street AS cs ON cs.street_id = ca.street_id
            <where>
                and ca.area_code = '510423' and ca.is_screen_statistics = 1
                <if test="streetId != null and streetId != 0">
                    and cs.street_id = #{streetId}
                </if>
            </where>
        order by cs.street_id desc,populationNum desc
    </select>

    <select id="getPopulationSpecial" resultType="com.panzhihua.common.model.vos.community.screen.event.EventPopulationSpecialStatisticsVO">
        SELECT
            count( cmpct.id ) AS cjTotal,
            (
            SELECT
            count( cmpct1.id )
        FROM
            com_mng_population_community_tags AS cmpct1
            LEFT JOIN com_act AS ca1 ON ca1.community_id = cmpct1.community_id
            LEFT JOIN com_street AS cs1 ON cs1.street_id = ca1.street_id
        WHERE
             cmpct1.label LIKE '%低保户%' and ca1.area_code = '510423' and ca1.is_screen_statistics = 1
            <if test="streetId != null and streetId != 0">
                and cs1.street_id = #{streetId}
            </if>
            ) as dbTotal ,
            (
            SELECT
            count( cmpct3.id )
        FROM
            com_mng_population_community_tags AS cmpct3
            LEFT JOIN com_act AS ca3 ON ca3.community_id = cmpct3.community_id
            LEFT JOIN com_street AS cs3 ON cs3.street_id = ca3.street_id
        WHERE
             cmpct3.label LIKE '%特殊情况（重大病史/孕）%' and ca3.area_code = '510423' and ca3.is_screen_statistics = 1
        <if test="streetId != null and streetId != 0">
            and cs3.street_id = #{streetId}
        </if>
            ) as tsTotal ,
            (
            SELECT
            count( cmpct4.id )
        FROM
            com_mng_population_community_tags AS cmpct4
            LEFT JOIN com_act AS ca4 ON ca4.community_id = cmpct4.community_id
            LEFT JOIN com_street AS cs4 ON cs4.street_id = ca4.street_id
        WHERE
            cmpct4.label LIKE '%特扶家庭%' and ca4.area_code = '510423' and ca4.is_screen_statistics = 1
        <if test="streetId != null and streetId != 0">
            and cs4.street_id = #{streetId}
        </if>
            ) as tfTotal,
            (
            SELECT
            count( cmpct5.id )
        FROM
            com_mng_population_community_tags AS cmpct5
            LEFT JOIN com_act AS ca5 ON ca5.community_id = cmpct5.community_id
            LEFT JOIN com_street AS cs5 ON cs5.street_id = ca5.street_id
        WHERE
            cmpct5.label LIKE '%退役军人%' and ca5.area_code = '510423' and ca5.is_screen_statistics = 1
        <if test="streetId != null and streetId != 0">
            and cs5.street_id = #{streetId}
        </if>
            ) as tyTotal,
            (
            SELECT
            count( cmpct7.id )
        FROM
            com_mng_population_community_tags AS cmpct7
            LEFT JOIN com_act AS ca7 ON ca7.community_id = cmpct7.community_id
            LEFT JOIN com_street AS cs7 ON cs7.street_id = ca7.street_id
        WHERE
            cmpct7.label LIKE '%吸毒人员%' and ca7.area_code = '510423' and ca7.is_screen_statistics = 1
        <if test="streetId != null and streetId != 0">
            and cs7.street_id = #{streetId}
        </if>
            ) as xdTotal,
            (
            SELECT
            count( cmpct8.id )
        FROM
            com_mng_population_community_tags AS cmpct8
            LEFT JOIN com_act AS ca8 ON ca8.community_id = cmpct8.community_id
            LEFT JOIN com_street AS cs8 ON cs8.street_id = ca8.street_id
        WHERE
            cmpct8.label LIKE '%社区矫正%' and ca8.area_code = '510423' and ca8.is_screen_statistics = 1
        <if test="streetId != null and streetId != 0">
            and cs8.street_id = #{streetId}
        </if>
            ) as jzTotal,
            (
            SELECT
            count( cmpct9.id )
        FROM
            com_mng_population_community_tags AS cmpct9
            LEFT JOIN com_act AS ca9 ON ca9.community_id = cmpct9.community_id
            LEFT JOIN com_street AS cs9 ON cs9.street_id = ca9.street_id
        WHERE
            cmpct9.label LIKE '%邪教人员%' and ca9.area_code = '510423' and ca9.is_screen_statistics = 1
        <if test="streetId != null and streetId != 0">
            and cs9.street_id = #{streetId}
        </if>
            ) as xjTotal,
            (
            SELECT
            count( cmpct10.id )
        FROM
            com_mng_population_community_tags AS cmpct10
            LEFT JOIN com_act AS ca10 ON ca10.community_id = cmpct10.community_id
            LEFT JOIN com_street AS cs10 ON cs10.street_id = ca10.street_id
        WHERE
            cmpct10.label LIKE '%刑释人员%' and ca10.area_code = '510423' and ca10.is_screen_statistics = 1
        <if test="streetId != null and streetId != 0">
            and cs10.street_id = #{streetId}
        </if>
            ) as xsTotal,
            (
            SELECT
            count( cmpct11.id )
        FROM
            com_mng_population_community_tags AS cmpct11
            LEFT JOIN com_act AS ca11 ON ca11.community_id = cmpct11.community_id
            LEFT JOIN com_street AS cs11 ON cs11.street_id = ca11.street_id
        WHERE
            cmpct11.label LIKE '%上访人员%' and ca11.area_code = '510423' and ca11.is_screen_statistics = 1
        <if test="streetId != null and streetId != 0">
            and cs11.street_id = #{streetId}
        </if>
            ) as sfTotal,
            (
            SELECT
            count( cmpct12.id )
        FROM
            com_mng_population_community_tags AS cmpct12
            LEFT JOIN com_act AS ca12 ON ca12.community_id = cmpct12.community_id
            LEFT JOIN com_street AS cs12 ON cs12.street_id = ca12.street_id
        WHERE
            cmpct12.label LIKE '%精神障碍患者%' and ca12.area_code = '510423' and ca12.is_screen_statistics = 1
        <if test="streetId != null and streetId != 0">
            and cs12.street_id = #{streetId}
        </if>
            ) as zjTotal
        FROM
            com_mng_population_community_tags AS cmpct
            LEFT JOIN com_act AS ca ON ca.community_id = cmpct.community_id
            LEFT JOIN com_street AS cs ON cs.street_id = ca.street_id
        WHERE
            cmpct.label LIKE '%残疾人%' and ca.area_code = '510423' and ca.is_screen_statistics = 1
        <if test="streetId != null and streetId != 0">
            and cs.street_id = #{streetId}
        </if>
    </select>

    <select id="getPopulationListCardNo" resultType="string">
        SELECT
            cmp.card_no
        FROM
            com_mng_population_community_tags AS cmpct
            LEFT JOIN com_mng_population AS cmp ON cmp.id = cmpct.population_id
            LEFT JOIN com_act AS ca ON ca.community_id = cmpct.community_id
            LEFT JOIN com_street AS cs ON cs.street_id = ca.street_id
        <where>
            and ca.area_code = '510423' and ca.is_screen_statistics = 1
            <if test="streetId != null and streetId != 0">
                and cs.street_id = #{streetId}
            </if>
        </where>
    </select>

    <select id="getPopulationAge" resultType="integer">
        select count(age) from (
            SELECT
            YEAR (now()) - YEAR (substring(cmp.card_no_str, 7, 8)) age
        FROM
            com_mng_population_community_tags AS cmpct
            LEFT JOIN com_mng_population AS cmp ON cmp.id = cmpct.population_id
            LEFT JOIN com_act AS ca ON ca.community_id = cmpct.community_id
            LEFT JOIN com_street AS cs ON cs.street_id = ca.street_id

        <where>
            and ca.area_code = '510423' and ca.is_screen_statistics = 1
            <if test="streetId != null and streetId != 0">
                and cs.street_id = #{streetId}
            </if>
        </where>
            having age >= #{age}
        ) as ageDual
    </select>

    <select id="getComprehensiveStreetList" resultType="com.panzhihua.common.model.vos.community.screen.event.EventPopulationStreetVO">
        SELECT
            street_id,
            `name`
        FROM
            com_street
        WHERE
            area_code = '510423'
        ORDER BY
            create_at DESC
    </select>

    <select id="baseInfo" resultType="com.panzhihua.common.model.vos.community.bigscreen.BaseInfo">
        select count(id) as population,
               IFNULL((select count(id) from com_mng_population_house where community_id = ${communityId}),0) as house,
               IFNULL((select count(id) from com_mng_real_company where community_id = ${communityId}),0) as company,
               IFNULL((select count(DISTINCT `name`) from com_mng_village where community_id = ${communityId}),0) as village,
               IFNULL((select count(user_id) from sys_user where community_id = ${communityId} and type=1),0) as user,
                        IFNULL((select count(id) from com_pb_member where community_id = ${communityId} and audit_result =1 ),0) as partyMember,
                        IFNULL((select count(id) from com_mng_volunteer_mng where community_id = ${communityId} and state=2 ),0) as volunteer,
                        IFNULL((select count(id) from com_pb_org where community_id = ${communityId} and parent_id = 0),0) as partyOrg
        from com_mng_population_community_tags AS cmpct
        where cmpct.community_id = ${communityId}
    </select>

    <select id="indexDynamic" resultType="com.panzhihua.common.model.vos.community.bigscreen.IndexDynamic">

        SELECT    count( id ) AS microWish,
                  IFNULL(( SELECT count( id ) FROM com_act_activity WHERE community_id = ${communityId} AND volunteer_max = 0),0) AS residentActivity,
                  IFNULL(( SELECT count( id ) FROM com_act_activity WHERE community_id = ${communityId} AND volunteer_max != 0),0) AS volunteerActivity,
                  IFNULL(( SELECT count( id ) FROM com_act_easy_photo WHERE status in (1,2,4) and del_tag = 0 AND community_id = ${communityId} ),0) AS easyPhoto,
                  IFNULL(( SELECT count( id ) FROM com_pb_activity WHERE community_id = ${communityId} ),0) AS partyActivity,
                  IFNULL(( SELECT count( id ) FROM com_act_questnaire WHERE community_id = ${communityId} and is_hide=0 ),0) AS questionnaire,
                  IFNULL(( SELECT count( id ) FROM com_act_dyn WHERE community_id = ${communityId} AND STATUS = 1 ),0) AS dynamic,
                  IFNULL(( SELECT count( id ) FROM com_convenient_merchants WHERE ( community_id = ${communityId} OR community_id = 0) AND is_del = 0 ),0) AS convenient,
                  IFNULL(( SELECT count( id ) FROM com_act_neighbor_circle WHERE community_id = ${communityId} AND is_del = 2 ),0) AS neighbor
                    FROM    com_act_micro_wish AS camw    WHERE    camw.STATUS = 6
                                                AND camw.community_id = ${communityId}
    </select>
    <select id="getGridsGovernanceEventList"
            resultType="com.panzhihua.common.model.vos.community.screen.event.EventGridIncidentStatisticsVO">
        SELECT event_type AS type, IFNULL( NULL, 1 ) AS eventType, e.id AS eventId, happent_lat_lng AS latLng, event_des AS content,
        (SELECT url FROM event_resource WHERE ref_id = e.id AND classification = 1 AND `type` = 1 LIMIT 1) AS cover, e.create_at,
        CASE
        WHEN event_deal_status = 4 THEN 1
        ELSE 2 END `status`
        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_type IN ( 1, 2, 3, 5, 6 )
        AND e.event_status = 2 AND egd.grid_community_id = ${communityId} AND TO_DAYS(NOW()) - TO_DAYS(e.create_at) &lt;= 30
        UNION ALL SELECT
        CASE
        WHEN classify_id = 4 THEN 1
        WHEN classify_id = 6 THEN 2
        WHEN classify_id = 5 THEN 3
        WHEN classify_id = 7 THEN 5
        WHEN classify_id = 3 THEN 6
        WHEN classify_id = 8 THEN 9
        WHEN classify_id = 1 THEN 10
        END type, IFNULL( NULL, 2 ) AS eventType, id AS eventId, lng_lat AS latLng, detail AS content, substring_index(photo_path_list, ',', 1) AS cover, create_at,
        CASE
        WHEN `status` = 4 THEN 1
        ELSE 2 END `status`
        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 TO_DAYS(NOW()) - TO_DAYS(create_at) &lt;= 30
    </select>
    <select id="pageEventList"
            resultType="com.panzhihua.common.model.vos.community.screen.event.EventGridIncidentStatisticsVO">
        (SELECT event_type AS type, IFNULL( NULL, 1 ) AS eventType, e.id AS eventId, happent_lat_lng AS latLng,
        event_des AS content,
        (SELECT url FROM event_resource WHERE ref_id = e.id AND classification = 1 AND `type` = 1 LIMIT 1) AS cover,
        e.create_at,
        CASE
        WHEN event_deal_status = 4 THEN 1
        ELSE 2 END `status`
        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_type IN ( 1, 2, 3, 5, 6 )
        AND e.event_status = 2 AND egd.grid_community_id = ${pageBaseDTO.communityId}
        <if test="pageBaseDTO.param3 != null and pageBaseDTO.param3 == 1">
            AND event_deal_status = 4
        </if>
        <if test="pageBaseDTO.param3 != null and pageBaseDTO.param3 == 2">
            AND event_deal_status != 4
        </if>
        )
        UNION ALL (SELECT
        CASE
        WHEN classify_id = 4 THEN 1
        WHEN classify_id = 6 THEN 2
        WHEN classify_id = 5 THEN 3
        WHEN classify_id = 7 THEN 5
        WHEN classify_id = 3 THEN 6
        WHEN classify_id = 8 THEN 9
        WHEN classify_id = 1 THEN 10
        END type, IFNULL( NULL, 2 ) AS eventType, id AS eventId, lng_lat AS latLng, detail AS content, substring_index(photo_path_list, ',', 1) AS cover, create_at,
        CASE
        WHEN `status` = 4 THEN 1
        ELSE 2 END `status`
        FROM com_act_easy_photo WHERE community_id = ${pageBaseDTO.communityId} AND `status` IN (1,2,4)
        AND del_tag = 0 AND classify_id IN (1,3,4,5,6,7,8)
        <if test="pageBaseDTO.param3 != null and pageBaseDTO.param3 == 1">
            AND `status` = 4
        </if>
        <if test="pageBaseDTO.param3 != null and pageBaseDTO.param3 == 2">
            AND `status` != 4
        </if>
        ) ORDER BY create_at DESC
    </select>
    <select id="getEventScreenSSPDateilNew"
            resultType="com.panzhihua.common.model.vos.community.screen.event.EventNewStatisticsVO">
        SELECT  id,  su.nick_name AS userName,  su.image_url,  caep.create_at,  caep.detail AS eventDes,
        caep.happen_addr AS happenAddress,  caep.lng_lat AS happentLatLng,  caep.photo_path_list,
        CASE
        WHEN classify_id = 4 THEN 1
        WHEN classify_id = 6 THEN 2
        WHEN classify_id = 5 THEN 3
        WHEN classify_id = 7 THEN 5
        WHEN classify_id = 3 THEN 6
        WHEN classify_id = 8 THEN 9
        WHEN classify_id = 1 THEN 10
        END eventType,  caep.status AS eventDealStatus
        FROM  com_act_easy_photo AS caep
        LEFT JOIN sys_user AS su ON su.user_id = caep.sponsor_id
        WHERE  id = #{eventId}
    </select>
</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPbMemberMapper.xml

@@ -5,4 +5,34 @@
    <select id="selectById" resultType="com.panzhihua.common.model.vos.partybuilding.ComPbMemberVO">
        select t.*,t2.name as orgName from com_pb_member t left join com_mng_population t1 on t.id_card = t1.card_no_str left join com_pb_org t2 on t.org_id = t2.id where t1.card_no_str =#{idCard}
    </select>

    <select id="selectActivityCountMonth" resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenActivityLine">
        select  ( select count(id) from com_pb_activity where status!=6 and community_id = ${communityId} and release_time >= DATE_FORMAT(  CONCAT(#{year},'-',#{date},'-00'), '%Y-%m-00 00:00:00') and  DATE_FORMAT( LAST_DAY(CONCAT(#{year},'-',#{date},'-00')), '%Y-%m-%d 23:59:59') >=release_time) y,
            (select count(id) from com_pb_activity where status!=6 and community_id = ${communityId} and DATE_FORMAT( LAST_DAY(CONCAT(#{year},'-',#{date},'-00')), '%Y-%m-%d 23:59:59') >=release_time) countY
    </select>

    <select id="selectActivityTop" resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenActivityTop">
        select t.name,t.photo_path as url,t1.name as orgName,t2.integral_available_party as score from com_pb_member t LEFT JOIN com_pb_org t1 on t.org_id= t1.id LEFT JOIN com_act_integral_user t2 on t.user_id = t2.user_id where t.community_id = ${communityId} and t2.status = 1  order by integral_available_party desc
    </select>

    <select id="bigScreenServiceData" resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenServiceData">
        select (select count(*) from com_act_work_guide ) guide,
        (select count(*) from com_act_announcement where community_id = ${communityId}) announcement,
        (select count(*) from com_elder_auth_elderlies where community_id = ${communityId}) eldersAuth,
        (select count(*) from com_convenient_merchants where (community_id = ${communityId} OR community_id = 0) and is_del =0) convenient,
        (select count(*) from renting_hourse_register where community_id = ${communityId}) rentingHouse,
        (select count(*) from com_property_alarm where community_id = ${communityId}) oneButton,
        (select count(*) from com_pension_auth_pensioners where community_id = ${communityId} ) pensionAuth,
        (select count(*) from com_pb_dyn where community_id = ${communityId} and type = 2) partyDyn,
        (select count(*) from com_property where community_id = ${communityId} ) property
    </select>

    <select id="bigScreenServiceUser" resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenServiceUser">
        select t.name AS villageName, IF(t1.num IS NULL,0,t1.num) as num
        from com_mng_village t left join (
            select count(*) num,village_id
            from com_mng_population
            where act_id = #{communityId} GROUP BY village_id
        ) t1 on t.village_id = t1.village_id where t.community_id = ${communityId}
    </select>
</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPensionAuthHistoryRecordDOMapper.xml

@@ -79,7 +79,7 @@
                and cpahr.is_alive = #{pensionAuthStatisticDTO.isAlive}
            </if>
            <if test="pensionAuthStatisticDTO.communityId != null">
                and cpahr.community_id = #{pensionAuthStatisticDTO.communityId}
                and cpahr.community_id = ${pensionAuthStatisticDTO.communityId}
            </if>
        </where>
        order by cpahr.create_at desc
@@ -94,7 +94,7 @@
            and auth_period = #{statisticHeaderDTO.authPeriod}
        </if>
        <if test="statisticHeaderDTO.communityId != null">
            and community_id = #{statisticHeaderDTO.communityId}
            and community_id = ${statisticHeaderDTO.communityId}
        </if>
        ) AS yesCount,
        ( SELECT count( id ) FROM com_pension_auth_history_record WHERE  is_auth = 2
@@ -102,7 +102,7 @@
            and auth_period = #{statisticHeaderDTO.authPeriod}
        </if>
        <if test="statisticHeaderDTO.communityId != null">
            and community_id = #{statisticHeaderDTO.communityId}
            and community_id = ${statisticHeaderDTO.communityId}
        </if>
        ) AS noCount
        FROM
@@ -112,7 +112,7 @@
                and auth_period = #{statisticHeaderDTO.authPeriod}
            </if>
            <if test="statisticHeaderDTO.communityId != null">
                and community_id = #{statisticHeaderDTO.communityId}
                and community_id = ${statisticHeaderDTO.communityId}
            </if>
        </where>
    </select>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPensionAuthPensionerMapper.xml

@@ -37,7 +37,7 @@
        FROM
            com_pension_auth_pensioners cpap
        WHERE
            community_id = #{communityId}
            community_id = ${communityId}
          AND EXISTS (
                SELECT
                    1

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPensionAuthRecordMapper.xml

@@ -51,7 +51,7 @@
        LEFT JOIN com_pension_auth_pensioners cpap ON cpar.pensioner_id = cpap.id
        LEFT JOIN sys_user su ON cpar.submit_user_id = su.user_id
        WHERE
        cpap.community_id = #{pageElderAuthRecordsDTO.communityId}
        cpap.community_id = ${pageElderAuthRecordsDTO.communityId}
        <if test="pageElderAuthRecordsDTO.authPeriod != null and pageElderAuthRecordsDTO.authPeriod !=''">
            and cpar.auth_period = #{pageElderAuthRecordsDTO.authPeriod}
        </if>
@@ -291,7 +291,7 @@
        LEFT JOIN com_pension_auth_pensioners cpap ON cpahr.elderlies_id = cpap.id
        LEFT JOIN sys_user su ON cpar.submit_user_id = su.user_id
        WHERE
        cpahr.community_id = #{pageElderAuthRecordsDTO.communityId}
        cpahr.community_id = ${pageElderAuthRecordsDTO.communityId}
        <if test="pageElderAuthRecordsDTO.authPeriod != null and pageElderAuthRecordsDTO.authPeriod !=''">
            and cpahr.auth_period = #{pageElderAuthRecordsDTO.authPeriod}
        </if>
@@ -343,6 +343,6 @@
    </select>

    <select id="getNextIds" resultType="String">
        select id from com_pension_auth_records where approval_status = 1 and community_id = #{communityId}
        select id from com_pension_auth_records where approval_status = 1 and community_id = ${communityId}
    </select>
</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPropertyMapper.xml

@@ -32,7 +32,7 @@
                and t.phone like concat(#{commonPage.phone},'%')
            </if>
            <if test="commonPage.paramId !=null">
                and t.community_id =#{commonPage.paramId}
                and t.community_id = ${commonPage.paramId}
            </if>
            <if test="commonPage.areaId !=null">
                and t.area_id =#{commonPage.areaId}
@@ -40,5 +40,75 @@
        </where>
        order by t.create_time desc
    </select>
    <select id="getRepairPolylineDate" resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT filed, SUM(num) AS num FROM (
        SELECT DATE_FORMAT( p1.create_time, '%Y-%m' ) AS filed, COUNT(1) AS num FROM com_property_repair p1
                LEFT JOIN com_property p2 ON p1.property_id = p2.id
                WHERE p2.community_id = ${communityId} AND DATE_FORMAT( p1.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="getRepairTotalPolylineDate"
            resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT COUNT(1) AS num FROM com_property_repair p1
        LEFT JOIN com_property p2 ON p1.property_id = p2.id
        WHERE p2.community_id = ${communityId} AND DATE_FORMAT( p1.create_time, '%Y-%m' ) &lt;= #{date}
    </select>
    <select id="getEventAddPolylineData"
            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(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_type IN ( 1, 2, 3, 5, 6 ) AND e.event_status = 2 AND egd.grid_community_id = ${communityId}
                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
                DATE_FORMAT( create_at, '%Y-%m' ) AS filed,  COUNT(id) AS num
        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' ) &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="getEventTotalPolylineDate"
            resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT SUM(num) AS num FROM (
        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_type IN ( 1, 2, 3, 5, 6 ) AND e.event_status = 2 AND egd.grid_community_id = ${communityId}
                AND DATE_FORMAT( e.create_at, '%Y-%m' ) &lt;= #{date}
        UNION ALL SELECT
                COUNT(id) AS num
        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>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPropertyPublicityMapper.xml

@@ -35,7 +35,7 @@
        FROM com_property_publicity pp
        INNER JOIN com_property p ON pp.property_id = p.id
        LEFT JOIN com_mng_village v ON p.area_id = v.village_id
        WHERE pp.community_id = #{pageComPropertyPublicityDTO.communityId}
        WHERE pp.community_id = ${pageComPropertyPublicityDTO.communityId}
        <if test="pageComPropertyPublicityDTO.propertyId != null">
            AND pp.property_id = #{pageComPropertyPublicityDTO.propertyId}
        </if>
@@ -61,7 +61,7 @@
        SELECT pp.*, p.`name` AS propertyName, v.`name` AS villageName FROM com_property_publicity pp
        INNER JOIN com_property p ON pp.property_id = p.id
        LEFT JOIN com_mng_village v ON p.area_id = v.village_id
        WHERE pp.community_id = #{pageComPropertyPublicityDTO.communityId}
        WHERE pp.community_id = ${pageComPropertyPublicityDTO.communityId}
        <if test="pageComPropertyPublicityDTO.villageId != null">
            AND p.area_id = #{pageComPropertyPublicityDTO.villageId}
        </if>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwDangerReportMapper.xml

@@ -78,10 +78,10 @@
                left join com_act t on cspr.community_id =t.community_id
        <where>
            <if test='comSwPatrolRecordDTO.communityId != null and comSwPatrolRecordDTO.communityId != 0'>
                AND cspr.community_id = #{comSwPatrolRecordDTO.communityId}
                AND cspr.community_id = ${comSwPatrolRecordDTO.communityId}
            </if>
            <if test='comSwPatrolRecordDTO.communityId == 0'>
                AND t.area_code = '510423'
            <if test='comSwPatrolRecordDTO.areaCode !=null'>
                AND t.area_code = #{comSwPatrolRecordDTO.areaCode}
            </if>
            <if test='comSwPatrolRecordDTO.patrolPerson != null and comSwPatrolRecordDTO.patrolPerson != ""'>
                AND cspr.person_name LIKE concat('%',#{comSwPatrolRecordDTO.patrolPerson},'%')

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwPatrolRecordMapper.xml

@@ -56,10 +56,10 @@
        left join com_act t on cspr.community_id = t.community_id
        <where>
            <if test='comSwPatrolRecordDTO.communityId != null and comSwPatrolRecordDTO.communityId != 0'>
                AND cspr.community_id = #{comSwPatrolRecordDTO.communityId}
                AND cspr.community_id = ${comSwPatrolRecordDTO.communityId}
            </if>
            <if test='comSwPatrolRecordDTO.communityId == 0'>
                AND t.area_code = '510423'
            <if test='comSwPatrolRecordDTO.areaCode !=null'>
                AND t.area_code = #{comSwPatrolRecordDTO.areaCode}
            </if>
            <if test='comSwPatrolRecordDTO.patrolPerson != null and comSwPatrolRecordDTO.patrolPerson != ""'>
                AND cspr.person_name LIKE concat('%',#{comSwPatrolRecordDTO.patrolPerson},'%')

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwRotaMapper.xml

@@ -35,7 +35,7 @@
            csr.person_phone
        FROM
            com_sw_rota csr
        where csr.community_id = #{comSwRotaPageDTO.communityId}
        where csr.community_id = ${comSwRotaPageDTO.communityId}
        <if test='comSwRotaPageDTO.rotaPerson != null and comSwRotaPageDTO.rotaPerson != ""'>
            AND (csr.leader_name LIKE concat('%',#{comSwRotaPageDTO.rotaPerson},'%')
                or csr.person_name LIKE concat('%',#{comSwRotaPageDTO.rotaPerson},'%')

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwSafetyWorkRecordMapper.xml

@@ -39,10 +39,10 @@
        left join com_act t on cspr.community_id = t.community_id
        <where>
            <if test='comSwPatrolRecordDTO.communityId != null and comSwPatrolRecordDTO.communityId != 0'>
                AND cspr.community_id = #{comSwPatrolRecordDTO.communityId}
                AND cspr.community_id = ${comSwPatrolRecordDTO.communityId}
            </if>
            <if test='comSwPatrolRecordDTO.communityId == 0'>
                AND t.area_code = '510423'
            <if test='comSwPatrolRecordDTO.areaCode != null'>
                AND t.area_code = #{comSwPatrolRecordDTO.areaCode}
            </if>
            <if test='comSwPatrolRecordDTO.patrolPerson != null and comSwPatrolRecordDTO.patrolPerson != ""'>
                AND cspr.person_name LIKE concat('%',#{comSwPatrolRecordDTO.patrolPerson},'%')
@@ -62,22 +62,22 @@

    <select id="patrolRecordStatistics" resultType="com.panzhihua.common.model.vos.community.ComSwPatrolRecordStatisticsVO">
        select count(id) as patrolRecordTotal
             ,(select count(id) from com_sw_patrol_record where 1=1 <if test="communityId !=null and communityId !=0"> and  community_id = #{communityId} </if> and patrol_type LIKE concat('%','1','%')) as huoTotal
             ,(select count(id) from com_sw_patrol_record where 1=1 <if test="communityId !=null and communityId !=0"> and  community_id = #{communityId} </if> and patrol_type LIKE concat('%','2','%')) as xunTotal
             ,(select count(id) from com_sw_patrol_record where 1=1 <if test="communityId !=null and communityId !=0"> and  community_id = #{communityId} </if> and patrol_type LIKE concat('%','3','%')) as yiTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_safety_work_record t2 on t1.report_id = t2.id where 1=1 <if test="communityId !=null and communityId !=0"> and  t.community_id = #{communityId} </if>) as safetyWorkTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where 1=1 <if test="communityId !=null and communityId !=0"> and  t.community_id = #{communityId} </if>) as dangerTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where 1=1 <if test="communityId !=null and communityId !=0"> and  t.community_id = #{communityId} </if> and status = '3') as handledDangerTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where 1=1 <if test="communityId !=null and communityId !=0"> and  t.community_id = #{communityId} </if> and danger_type like CONCAT('%','1','%')) as huoDangerTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where 1=1 <if test="communityId !=null and communityId !=0"> and  t.community_id = #{communityId} </if> and danger_type like CONCAT('%','2','%')) as xunDangerTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where 1=1 <if test="communityId !=null and communityId !=0"> and  t.community_id = #{communityId} </if> and danger_type like CONCAT('%','3','%')) as yiDangerTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where 1=1 <if test="communityId !=null and communityId !=0"> and  t.community_id = #{communityId} </if> and danger_type like CONCAT('%','1','%') and status = '3' ) as huoHandledDangerTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where 1=1 <if test="communityId !=null and communityId !=0"> and  t.community_id = #{communityId} </if> and danger_type like CONCAT('%','1','%') and status in ('1','2')) as huoHandlingDangerTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where 1=1 <if test="communityId !=null and communityId !=0"> and  t.community_id = #{communityId} </if> and danger_type like CONCAT('%','2','%') and status = '3' ) as xunHandledDangerTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where 1=1 <if test="communityId !=null and communityId !=0"> and  t.community_id = #{communityId} </if> and danger_type like CONCAT('%','2','%') and status in ('1','2')) as xunHandlingDangerTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where 1=1 <if test="communityId !=null and communityId !=0"> and  t.community_id = #{communityId} </if> and danger_type like CONCAT('%','3','%') and status = '3' ) as yiHandledDangerTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where 1=1 <if test="communityId !=null and communityId !=0"> and  t.community_id = #{communityId} </if> and danger_type like CONCAT('%','3','%') and status in ('1','2')) as yiHandlingDangerTotal
        from com_sw_patrol_record as cmp where 1=1 <if test="communityId !=null and communityId !=0"> and  community_id = #{communityId} </if>
             ,(select count(id) from com_sw_patrol_record where community_id = ${communityId} and patrol_type LIKE concat('%','1','%')) as huoTotal
             ,(select count(id) from com_sw_patrol_record where community_id = ${communityId} and patrol_type LIKE concat('%','2','%')) as xunTotal
             ,(select count(id) from com_sw_patrol_record where community_id = ${communityId} and patrol_type LIKE concat('%','3','%')) as yiTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_safety_work_record t2 on t1.report_id = t2.id where t.community_id = ${communityId}) as safetyWorkTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where t.community_id = ${communityId}) as dangerTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where t.community_id = ${communityId} and status = '3') as handledDangerTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where t.community_id = ${communityId} and danger_type like CONCAT('%','1','%')) as huoDangerTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where t.community_id = ${communityId} and danger_type like CONCAT('%','2','%')) as xunDangerTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where t.community_id = ${communityId} and danger_type like CONCAT('%','3','%')) as yiDangerTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where t.community_id = ${communityId} and danger_type like CONCAT('%','1','%') and status = '3' ) as huoHandledDangerTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where t.community_id = ${communityId} and danger_type like CONCAT('%','1','%') and status in ('1','2')) as huoHandlingDangerTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where t.community_id = ${communityId} and danger_type like CONCAT('%','2','%') and status = '3' ) as xunHandledDangerTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where t.community_id = ${communityId} and danger_type like CONCAT('%','2','%') and status in ('1','2')) as xunHandlingDangerTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where t.community_id = ${communityId} and danger_type like CONCAT('%','3','%') and status = '3' ) as yiHandledDangerTotal
             ,(select count(t2.id) from com_sw_patrol_record t INNER JOIN com_sw_patrol_record_report t1  on t.id = t1.patrol_record_id INNER JOIN com_sw_danger_report t2 on t1.report_id = t2.id where t.community_id = ${communityId} and danger_type like CONCAT('%','3','%') and status in ('1','2')) as yiHandlingDangerTotal
        from com_sw_patrol_record as cmp where community_id = ${communityId}
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ConvenientMerchantMapper.xml

@@ -48,7 +48,7 @@
            AND su.status = #{pageConvenientMerchantDTO.accountStatus}
        </if>
        <if test="pageConvenientMerchantDTO.communityId != null and pageConvenientMerchantDTO.communityId != 0">
            AND ccm.community_id = #{pageConvenientMerchantDTO.communityId}
            AND ccm.community_id = ${pageConvenientMerchantDTO.communityId}
        </if>
        <if test="pageConvenientMerchantDTO.businessStatus != null">
            AND ccm.business_status = #{pageConvenientMerchantDTO.businessStatus}
@@ -101,7 +101,7 @@
                    statistic_date LIKE #{currentMon}) cccs ON ccm.id = cccs.merchant_id
                    LEFT JOIN com_convenient_service_scope ccss ON ccm.id = ccss.merchant_id
                WHERE
                    ( ccm.community_id = #{communityId} or ccm.community_id = 0)  AND ccm.business_status = 1 and ccm.is_del = 0 and ccm.`name` = '犇师傅维修中心' GROUP BY cccs.id
                    ( ccm.community_id = ${communityId} or ccm.community_id = 0)  AND ccm.business_status = 1 and ccm.is_del = 0 and ccm.`name` = '犇师傅维修中心' GROUP BY cccs.id
                    ) temp
                GROUP BY
                    temp.id
@@ -119,7 +119,7 @@
            FROM com_convenient_merchants ccm
            LEFT JOIN (SELECT * FROM com_convenient_consultation_statistics WHERE statistic_date LIKE #{currentMon}) cccs ON ccm.id = cccs.merchant_id
            LEFT JOIN com_convenient_service_scope ccss ON ccm.id = ccss.merchant_id
            WHERE ( ccm.community_id = #{communityId} or ccm.community_id = 0)  AND ccm.business_status = 1 and ccm.is_del = 0 and ccm.`name` != '犇师傅维修中心' GROUP BY cccs.id
            WHERE ( ccm.community_id = ${communityId} or ccm.community_id = 0)  AND ccm.business_status = 1 and ccm.is_del = 0 and ccm.`name` != '犇师傅维修中心' GROUP BY cccs.id
        ) temp GROUP BY temp.id ORDER BY SUM(temp.consultation_volume) DESC
    </select>
    <select id="getClassifyMerchants" resultType="com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO">
@@ -132,7 +132,7 @@
            FROM com_convenient_merchants ccm
            LEFT JOIN (SELECT * FROM com_convenient_consultation_statistics WHERE statistic_date LIKE #{currentMon}) cccs ON ccm.id = cccs.merchant_id
            LEFT JOIN com_convenient_service_scope ccss ON ccm.id = ccss.merchant_id
            WHERE (ccm.community_id = #{pageClassifyMerchantDTO.communityId} or ccm.community_id = 0) and ccm.is_del = 0  AND ccm.business_status = 1 AND ccss.service_category_id = #{pageClassifyMerchantDTO.serviceId}
            WHERE (ccm.community_id = ${pageClassifyMerchantDTO.communityId} or ccm.community_id = 0) and ccm.is_del = 0  AND ccm.business_status = 1 AND ccss.service_category_id = #{pageClassifyMerchantDTO.serviceId}
                GROUP BY cccs.id
        ) temp GROUP BY temp.id ORDER BY SUM(temp.consultation_volume) DESC
    </select>
@@ -161,7 +161,7 @@
            FROM com_convenient_merchants ccm
            LEFT JOIN (SELECT * FROM com_convenient_consultation_statistics WHERE statistic_date LIKE #{currentMon}) cccs ON ccm.id = cccs.merchant_id
            LEFT JOIN com_convenient_service_scope ccss ON ccm.id = ccss.merchant_id
            WHERE (ccm.community_id = #{pageSearchDTO.communityId} or ccm.community_id = 0) AND ccm.business_status = 1 AND ccm.`name` LIKE CONCAT('%', #{pageSearchDTO.keyword}, '%')
            WHERE (ccm.community_id = ${pageSearchDTO.communityId} or ccm.community_id = 0) AND ccm.business_status = 1 AND ccm.`name` LIKE CONCAT('%', #{pageSearchDTO.keyword}, '%')
                AND ccm.is_del = 0 GROUP BY cccs.id
        ) temp GROUP BY temp.id ORDER BY SUM(temp.consultation_volume) DESC
    </select>
@@ -171,7 +171,7 @@
        FROM  com_convenient_merchants ccm
        LEFT JOIN sys_user su ON ccm.user_id = su.user_id
        LEFT JOIN com_convenient_service_scope ccss ON ccm.id = ccss.merchant_id
        WHERE ccm.community_id = #{exportMerchantDTO.communityId} AND ccm.is_del = 0
        WHERE ccm.community_id = ${exportMerchantDTO.communityId} AND ccm.is_del = 0
        <if test="exportMerchantDTO.serviceId != null and exportMerchantDTO.serviceId != 0">
            AND ccss.service_category_id = #{exportMerchantDTO.serviceId}
        </if>
@@ -202,6 +202,78 @@
            </foreach>
        GROUP BY ccm.id
    </select>
    <select id="selectMerchantListByCommunity"
            resultType="com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO">
        SELECT id, `name`, logo, lat, lon FROM com_convenient_merchants WHERE community_id = ${communityId} AND is_del = 0
    </select>
    <select id="getScreenPopularMerchants"
            resultType="com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO">
        SELECT * FROM (
        SELECT id, `name`, consultation_volume, view_num
        FROM com_convenient_merchants
        WHERE (community_id = ${pagePopularMerchantDTO.communityId} OR community_id = 0) AND is_del = 0 ORDER BY (consultation_volume + consultation_volume) DESC LIMIT 100
        ) temp
    </select>
    <select id="getIndexMerchantBaseData"
            resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenMerchantStatisticsInfo">
        SELECT
        (SELECT 0) AS resourceTypeNum,
        (SELECT COUNT(id) FROM com_convenient_merchants WHERE (community_id = ${communityId} OR community_id = 0) AND is_del = 0) AS merchantNum,
        (SELECT SUM(t1.consultation_volume)
        FROM com_convenient_consultation_statistics t1
        LEFT JOIN com_convenient_merchants t2 ON t1.merchant_id = t2.id
        WHERE (t2.community_id = ${communityId} OR t2.community_id = 0)) AS serviceTimes
    </select>
    <select id="selectServiceTypeCircleData"
            resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT t1.`name` AS filed, COUNT(t3.id) AS num
        FROM com_convenient_service_categories t1
        LEFT JOIN com_convenient_service_scope t2 ON t1.id = t2.service_category_id
        LEFT JOIN com_convenient_merchants t3 ON t2.merchant_id = t3.id
        WHERE (t3.community_id = ${communityId} OR t3.community_id = 0) AND t3.is_del = 0 GROUP BY t1.id
    </select>
    <select id="getServiceTimesAddPolylineData"
            resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT filed, SUM(num) AS num FROM (
        SELECT DATE_FORMAT( t1.statistic_date, '%Y-%m' ) AS filed, SUM(t1.consultation_volume) AS num
        FROM com_convenient_consultation_statistics t1
        LEFT JOIN com_convenient_merchants t2 ON t1.merchant_id = t2.id
        WHERE (t2.community_id = ${communityId} OR t2.community_id = 0) AND DATE_FORMAT( t1.statistic_date, '%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="getServiceTimesTotalPolylineDate"
            resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT IF(SUM(t1.consultation_volume) IS NULL,0,SUM(t1.consultation_volume)) AS num
        FROM com_convenient_consultation_statistics t1
        LEFT JOIN com_convenient_merchants t2 ON t1.merchant_id = t2.id
        WHERE (t2.community_id = ${communityId} OR t2.community_id = 0) AND DATE_FORMAT( t1.statistic_date, '%Y-%m' ) &lt;= #{date}
    </select>
    <select id="indexMerchantList"
            resultType="com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO">
        SELECT t1.id, t1.`name`, t1.logo, t1.introduction, GROUP_CONCAT(t2.`service_name`) serviceScope
        FROM com_convenient_merchants t1
        LEFT JOIN com_convenient_service_scope t2 ON t1.id = t2.merchant_id
        WHERE (t1.community_id = ${pageBaseDTO.communityId} OR t1.community_id = 0)
        <if test="pageBaseDTO.paramId != null">
            AND t2.service_category_id = #{pageBaseDTO.paramId}
        </if>
        GROUP BY t1.id ORDER BY t1.id DESC
    </select>
    <update id="deleteMerchantById">
        UPDATE com_convenient_merchants SET is_del = 1, updated_by = #{operator} WHERE id = #{merchantId}
    </update>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ConvenientProductMapper.xml

@@ -78,7 +78,7 @@
        FROM com_convenient_products ccp
        LEFT JOIN com_convenient_merchants ccm  ON  ccp.merchant_id = ccm.id
        INNER JOIN com_convenient_product_specifications ccps ON ccp.id = ccps.product_id
        WHERE (ccm.community_id = #{pageSearchDTO.communityId} or ccm.community_id = 0) AND ccp.is_del = 0
        WHERE (ccm.community_id = ${pageSearchDTO.communityId} or ccm.community_id = 0) AND ccp.is_del = 0
        AND ccp.on_shelf = 1 AND ccps.is_del = 0 AND ccp.`name` LIKE CONCAT('%', #{pageSearchDTO.keyword}, '%') GROUP BY ccp.id
    </select>
</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ConvenientServiceCategoryMapper.xml

@@ -34,6 +34,9 @@
            <if test="pageConvenientServiceCategoryDTO.name != null and pageConvenientServiceCategoryDTO.name.trim() != &quot;&quot;">
                AND `name` LIKE concat('%', #{pageConvenientServiceCategoryDTO.name}, '%' )
            </if>
        <if test="pageConvenientServiceCategoryDTO.areaCode != null and pageConvenientServiceCategoryDTO.areaCode.trim() != &quot;&quot;">
            AND area_code = #{pageConvenientServiceCategoryDTO.name}
        </if>
        ORDER BY weight DESC
    </select>
    <select id="selectServiceScopeByMerchantId" resultType="java.lang.String">
@@ -50,6 +53,6 @@
        FROM com_convenient_service_categories ccsc
        INNER JOIN com_convenient_service_scope ccss ON ccsc.id = ccss.service_category_id
        LEFT JOIN com_convenient_merchants ccm ON ccss.merchant_id = ccm.id
        WHERE ccsc.is_del = 0 AND ccm.is_del = 0 AND( ccm.community_id = #{communityId} or ccm.community_id =0) AND ccm.business_status = 1 GROUP BY ccsc.id ORDER BY ccsc.weight desc
        WHERE ccsc.is_del = 0 AND ccm.is_del = 0 AND( ccm.community_id = ${communityId} or ccm.community_id =0) AND ccm.business_status = 1 GROUP BY ccsc.id ORDER BY ccsc.weight desc
    </select>
</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/RentingHourseOrderMapper.xml

@@ -48,7 +48,7 @@
        <where>
            1=1 and t2.type=1 and classification = 1
            <if test="commonPage.communityId!=null and commonPage.communityId!=0">
                and t.community_id = #{commonPage.communityId}
                and t.community_id = ${commonPage.communityId}
            </if>
            <if test="commonPage.userId!=null">
                and t.create_user=#{commonPage.userId}
@@ -65,7 +65,7 @@
        <where>
            1=1
            <if test="communityId !=null and communityId !=0">
                and community_id = #{communityId}
                and community_id = ${communityId}
            </if>
        </where>
    </select>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/RentingHoursePreOrderMapper.xml

@@ -24,7 +24,7 @@
        <where>
            1=1 and t2.type=1 and classification = 1
            <if test="commonPage.communityId!=null and commonPage.communityId!=0">
                and t.community_id = #{commonPage.communityId}
                and t.community_id = ${commonPage.communityId}
            </if>
            <if test="commonPage.userId!=null">
                and t.create_user=#{commonPage.userId}
@@ -38,11 +38,11 @@

    <select id="statics" resultType="com.panzhihua.common.model.vos.community.rentHouse.PreOrderStatics">
        select * from (
                           (select count(ding_money) as allOrder from  renting_hourse_pre_order where 1=1 <if test="communityId !=null and communityId !=0">and community_id=#{communityId}</if> ) allOrder,
                          (select count(ding_money) as allRefuse from  renting_hourse_pre_order where (status = 3 or status =4) <if test="communityId !=null and communityId !=0">and community_id=#{communityId}</if>) allRefuse,
                          (select count(*)  as refuseNum from  renting_hourse_pre_order where (status = 3 or status =4) <if test="communityId !=null and communityId !=0">and community_id=#{communityId}</if>)  refuseNum,
                          (select count(ding_money) as settledOrder from  renting_hourse_pre_order where status = 2 <if test="communityId !=null and communityId !=0">and community_id=#{communityId}</if>)  settledOrder,
                          (select count(ding_money) as deductOrder from  renting_hourse_pre_order where status = 1 <if test="communityId !=null and communityId !=0">and community_id=#{communityId}</if>) deductOrder )
                           (select count(ding_money) as allOrder from  renting_hourse_pre_order where 1=1 <if test="communityId !=null and communityId !=0">and community_id = ${communityId}</if> ) allOrder,
                          (select count(ding_money) as allRefuse from  renting_hourse_pre_order where (status = 3 or status =4) <if test="communityId !=null and communityId !=0">and community_id = ${communityId}</if>) allRefuse,
                          (select count(*)  as refuseNum from  renting_hourse_pre_order where (status = 3 or status =4) <if test="communityId !=null and communityId !=0">and community_id = ${communityId}</if>)  refuseNum,
                          (select count(ding_money) as settledOrder from  renting_hourse_pre_order where status = 2 <if test="communityId !=null and communityId !=0">and community_id = ${communityId}</if>)  settledOrder,
                          (select count(ding_money) as deductOrder from  renting_hourse_pre_order where status = 1 <if test="communityId !=null and communityId !=0">and community_id = ${communityId}</if>) deductOrder )
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/RentingHourseRegisterMapper.xml

@@ -60,7 +60,7 @@
        t1.label, t1.address, t1.monthly_rent_money, t1.`status`, t1.detail_status, t1.auth_status, t1.auth_code, t2.url
        FROM renting_hourse_register t1
        LEFT JOIN (SELECT * FROM renting_hourse_file WHERE classification = 1 AND `type` = 1) t2 ON t1.id = t2.ref_id
        WHERE t1.community_id = #{pageRegisterDTO.communityId} AND t1.`status` = #{pageRegisterDTO.status}
        WHERE t1.community_id = ${pageRegisterDTO.communityId} AND t1.`status` = #{pageRegisterDTO.status}
        <if test="pageRegisterDTO.brn != null">
            <if test="pageRegisterDTO.moreBrn == null">
                AND t1.brn = #{pageRegisterDTO.brn}
@@ -101,18 +101,19 @@

    <select id="nearby" resultType="com.panzhihua.common.model.vos.community.rentingHouses.RentingHouseRegisterVO">
        select t.id,title, brn, construct_area, floor, orientation, decoration, label, address, monthly_rent_money,
               `status`, detail_status, auth_status,t1.url
               `status`, detail_status, auth_status,t1.url,
               (POWER(MOD(ABS(longitude - #{nearbyDTO.longitude}),360),2) + POWER(ABS(latitude - #{nearbyDTO.latitude}),2)) AS distance
        from   renting_hourse_register t
        LEFT JOIN (SELECT * FROM renting_hourse_file WHERE classification = 1 AND `type` = 1) t1 ON t.id = t1.ref_id
        WHERE t.community_id = #{communityId} and t.status=2 and t.detail_status=3
          <if test="keyword !=null and keyword!=''">
        WHERE t.community_id = ${nearbyDTO.communityId} and t.status=2 and t.detail_status=3
          <if test="nearbyDTO.keyword !=null and nearbyDTO.keyword!=''">
              AND (
              village_name LIKE CONCAT('%', #{keyword}, '%')
              OR address LIKE CONCAT('%', #{keyword}, '%')
              village_name LIKE CONCAT('%', #{nearbyDTO.keyword}, '%')
              OR address LIKE CONCAT('%', #{nearbyDTO.keyword}, '%')
              )
          </if>
          and (longitude BETWEEN ${minX} AND ${maxX})
          and (latitude BETWEEN ${minY} AND ${maxY}) group by t.id
          and (latitude BETWEEN ${minY} AND ${maxY}) group by t.id order by distance ASC
    </select>

    <select id="pageRentingHouseApplet"
@@ -125,7 +126,7 @@
        FROM renting_hourse_register t
        LEFT JOIN (SELECT * FROM renting_hourse_file WHERE classification = 1 AND `type` = 1) t1 ON t.id = t1.ref_id
        LEFT JOIN sys_user t2 ON t.tenant_user_id = t2.user_id
        WHERE t.community_id = #{pageRegisterDTO.communityId}
        WHERE t.community_id = ${pageRegisterDTO.communityId}
        <if test="pageRegisterDTO.status == null and pageRegisterDTO.isMy == null">
            AND t.`status` = 2
        </if>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/SysConfMapper.xml

@@ -52,7 +52,7 @@
                AND create_by = #{pageSysConfDTO.createBy}
            </if>
           <if test="pageSysConfDTO.communityId!=null">
                AND community_id = #{pageSysConfDTO.communityId}
                AND community_id = ${pageSysConfDTO.communityId}
            </if>
        </where>
        <if test="pageSysConfDTO.sortColumns!=null">
@@ -62,7 +62,7 @@

    <select id="getSysConfValue" resultType="string">
        SELECT `value` FROM `sys_conf` where `code` = #{key}
        <if test="communityId != null"> and community_id = #{communityId} </if>
        <if test="communityId != null"> and community_id = ${communityId} </if>
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/SysTemplateConfigMapper.xml

New file
@@ -0,0 +1,12 @@
<?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.SysTemplateConfigDao">

    <resultMap type="com.panzhihua.service_community.entity.SysTemplateConfig" id="SysTemplateConfigBaseResultMap">
        <result property="id" column="id"/>
        <result property="templateId" column="template_id"/>
        <result property="type" column="type"/>
        <result property="areaCode" column="area_code"/>
    </resultMap>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/BigScreenApi.java

@@ -68,6 +68,16 @@
    }

    /**
     * 新版绘制多边形统计数据
     * @param eventListDTO
     * @return
     */
    @PostMapping("/getCivilDrawListNew")
    public R getCivilDrawListNew(@RequestBody ScreenDrawEventListDTO eventListDTO) {
        return eventService.getCivilDrawListNew(eventListDTO);
    }

    /**
     * 大屏-根据小区id查询小区统计人数
     * 
     * @param villageId
@@ -89,4 +99,25 @@
        return eventGridMemberRelationService.getGridsMemberTrajectory(communityId);
    }

    /**
     * 西区大数据分析平台-综合治理栏
     * @return
     */
    @GetMapping("/comprehensive/governance")
    public R getComprehensiveGovernanceStatics() {
        return eventService.getComprehensiveGovernanceStatics();
    }

    /**
     * 大屏-新根据小区id查询小区统计人数
     *
     * @param villageId
     *            小区id
     * @return 小区统计数据
     */
    @GetMapping("/village/statistics-new")
    public R civilVillageStatisticsNew(@RequestParam("villageId") Long villageId) {
        return eventService.civilVillageStatisticsNew(villageId);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/config/MybatisHmkInterceptor.java

New file
@@ -0,0 +1,24 @@
package com.panzhihua.service_grid.config;

import com.baomidou.mybatisplus.core.toolkit.PluginUtils;
import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor;
import org.apache.ibatis.executor.Executor;
import org.apache.ibatis.mapping.BoundSql;
import org.apache.ibatis.mapping.MappedStatement;
import org.apache.ibatis.session.ResultHandler;
import org.apache.ibatis.session.RowBounds;

import java.sql.SQLException;

public class MybatisHmkInterceptor implements InnerInterceptor {
    @Override
    public void beforeQuery(Executor executor, MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler, BoundSql boundSql) throws SQLException {
        String sql=boundSql.getSql();
            if(sql.contains("community_id = 10086")){
                sql=sql.replace("community_id = 10086","community_id in (30,31)");
                PluginUtils.mpBoundSql(boundSql).sql(sql);
        }
        InnerInterceptor.super.beforeQuery(executor, ms, parameter, rowBounds, resultHandler, boundSql);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/config/MybatisPlusConfig.java

@@ -25,6 +25,7 @@
    @Bean
    public MybatisPlusInterceptor mybatisPlusInterceptor() {
        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
        interceptor.addInnerInterceptor(new MybatisHmkInterceptor());
        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.H2));
        return interceptor;
    }

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventMapper.java

@@ -3,6 +3,8 @@
import java.util.List;
import java.util.Map;

import com.panzhihua.common.model.vos.community.screen.event.EventComprehensiveGovernanceStatisticsVO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

@@ -164,4 +166,16 @@
    List<Map<String, Object>> getMemberBuildName(@Param("userId") Long userId);

    Integer getPopulationByLabelCount(@Param("floor") String floor, @Param("villageId") Long villageId);

    /**
     * 西区大数据分析平台-综合治理栏数据
     * @return
     */
    EventComprehensiveGovernanceStatisticsVO selectComprehensiveGovernanceStatics();

    List<EventGridIncidentStatisticsVO> getGridsGovernanceEventList(@Param("communityId") Long communityId);

    ScreenDrawEventPopulationTotalVO getVillagePopulationTotalNew(@Param("villageId") Long villageId);

    List<StatisticsCommVO> selectStatisticsForAge(@Param("villageIds") List<Long> villageIds);
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventService.java

@@ -335,6 +335,15 @@
    R getCivilDrawList(ScreenDrawEventListDTO eventListDTO);

    /**
     * 新版绘制多边形统计数据
     *
     * @param eventListDTO
     *            请求参数
     * @return 统计数据
     */
    R getCivilDrawListNew(ScreenDrawEventListDTO eventListDTO);

    /**
     * 大屏-根据小区id查询小区统计人数
     * 
     * @param villageId
@@ -351,4 +360,19 @@
     * @return 网格员工作汇总数据
     */
    R gridMemberStatisticsAll(MemberStatisticsAdminDTO statisticsAdminDTO);

    /**
     * 西区大数据分析平台-综合治理栏
     * @return
     */
    R getComprehensiveGovernanceStatics();

    /**
     * 大屏-新根据小区id查询小区统计人数
     *
     * @param villageId
     *            小区id
     * @return 小区统计数据
     */
    R civilVillageStatisticsNew(Long villageId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java

@@ -1,10 +1,15 @@
package com.panzhihua.service_grid.service.impl;

import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;

import javax.annotation.Resource;

import com.panzhihua.common.model.vos.community.screen.event.EventComprehensiveGovernanceStatisticsVO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import com.panzhihua.common.model.vos.community.bigscreen.GridsGovernanceStatisticsVO;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -1295,7 +1300,7 @@

    @Override
    public R<ComActVO> actList() {
        return communityService.listCommunityAll();
        return communityService.listCommunityAll(null);
    }

    @Override
@@ -2619,6 +2624,173 @@
        return R.ok(drawEventVO);
    }

    @Override
    public R getCivilDrawListNew(ScreenDrawEventListDTO eventListDTO) {
        GridsGovernanceStatisticsVO statisticsVO = new GridsGovernanceStatisticsVO();
        // 返回事件列表结果集
        List<EventGridIncidentStatisticsVO> eventResultList = new ArrayList<>();
        // 返回小区列表结果集
        List<CivilVillageStatisticsVO> villageResultList = new ArrayList<>();
        // 返回人口统计
        ScreenDrawEventPopulationTotalVO drawEventPopulationTotalVO = new ScreenDrawEventPopulationTotalVO();
        //年龄段统计
        List<StatisticsCommVO> ageGroupStatistics = new ArrayList<>();
        // 查询所有事件
        List<EventGridIncidentStatisticsVO> gridIncidentList =
                this.baseMapper.getGridsGovernanceEventList(eventListDTO.getCommunityId());
        if (!gridIncidentList.isEmpty()) {
            gridIncidentList.forEach(gridIncident -> {
                // 拆分事件经纬度
                Double lng = 0.0;// 经度
                Double lat = 0.0;// 纬度
                String[] lngLatString = gridIncident.getLatLng().split(",");
                if (gridIncident.getEventType().equals(1)) {
                    lat = Double.parseDouble(lngLatString[0]);
                    lng = Double.parseDouble(lngLatString[1]);
                } else {
                    lat = Double.parseDouble(lngLatString[1]);
                    lng = Double.parseDouble(lngLatString[0]);
                }
                // 判断绘制的图形类型
                if (eventListDTO.getType().equals(ScreenDrawEventListDTO.type.yx)) {
                    // 判断这个点是否在圆形范围内
                    if (GisPointUtil.isInCircle(eventListDTO.getCenterLng(), eventListDTO.getCenterLat(), lng, lat,
                            eventListDTO.getRadius())) {
                        if (eventResultList.size() <= eventListDTO.getCount()) {
                            eventResultList.add(gridIncident);
                        }
                        countGridIncidentData(statisticsVO, gridIncident);
                    }
                } else {// 多边形类型
                    if (GisPointUtil.isInPolygon(lng, lat, eventListDTO.getLngLatList())) {
                        if (eventResultList.size() <= eventListDTO.getCount()) {
                            eventResultList.add(gridIncident);
                        }
                        countGridIncidentData(statisticsVO, gridIncident);
                    }
                }
            });
        }
        // 查询所有小区
        List<CivilVillageStatisticsVO> villageStatisticsList =
                this.baseMapper.getCivilScreenVillageList(eventListDTO.getCommunityId());
        if (!villageStatisticsList.isEmpty()) {
            List<Long> villageIds = villageStatisticsList.stream().map(CivilVillageStatisticsVO::getVillageId).collect(Collectors.toList());
            ageGroupStatistics = this.baseMapper.selectStatisticsForAge(villageIds);
            villageStatisticsList.forEach(village -> {
                // 判断绘制的图形类型
                if (eventListDTO.getType().equals(ScreenDrawEventListDTO.type.yx)) {
                    // 判断这个点是否在圆形范围内
                    if (GisPointUtil.isInCircle(eventListDTO.getCenterLng(), eventListDTO.getCenterLat(),
                            Double.parseDouble(village.getLng()), Double.parseDouble(village.getLat()),
                            eventListDTO.getRadius())) {
                        fillVillageResultList(villageResultList, drawEventPopulationTotalVO, village);
                    }
                } else {// 多边形类型
                    if (GisPointUtil.isInPolygon(Double.parseDouble(village.getLng()),
                            Double.parseDouble(village.getLat()), eventListDTO.getLngLatList())) {
                        fillVillageResultList(villageResultList, drawEventPopulationTotalVO, village);
                    }
                }
            });
        }
        statisticsVO.setVillageStatisticsList(villageResultList);
        statisticsVO.setDrawEventPopulationTotalVO(drawEventPopulationTotalVO);
        statisticsVO.setAgeGroupStatistics(ageGroupStatistics);
        statisticsVO.generateStatisticsData();
        List<StatisticsCommVO> eventTypeCircleDrawData = new ArrayList<>();
        if (!eventResultList.isEmpty()) {
            Map<Integer, List<EventGridIncidentStatisticsVO>> collect = eventResultList.stream().collect(Collectors.groupingBy(EventGridIncidentStatisticsVO::getType));
            for (Map.Entry<Integer, List<EventGridIncidentStatisticsVO>> entry : collect.entrySet()) {
                StatisticsCommVO temp = new StatisticsCommVO();
                int size = entry.getValue().size();
                Integer eventTotal = statisticsVO.getEventTotal();
                temp.setFiled(entry.getKey().toString());
                temp.setNum(size);
                temp.setPercent(new BigDecimal(size/eventTotal).setScale(2));
                eventTypeCircleDrawData.add(temp);
            }
        }
        statisticsVO.setEventTypeCircleDrawData(eventTypeCircleDrawData);
        return R.ok(statisticsVO);
    }

    private void fillVillageResultList(List<CivilVillageStatisticsVO> villageResultList,
                                       ScreenDrawEventPopulationTotalVO drawEventPopulationTotalVO, CivilVillageStatisticsVO village) {
        villageResultList.add(village);
        ScreenDrawEventPopulationTotalVO populationTotalVO =
                this.baseMapper.getVillagePopulationTotalNew(village.getVillageId());
        if (populationTotalVO != null) {
            drawEventPopulationTotalVO.setVillageTotal(drawEventPopulationTotalVO.getVillageTotal() + 1);
            drawEventPopulationTotalVO.setPopulationTotal(drawEventPopulationTotalVO.getPopulationTotal() + populationTotalVO.getPopulationTotal());
            drawEventPopulationTotalVO.setBuildTotal(drawEventPopulationTotalVO.getBuildTotal() + populationTotalVO.getBuildTotal());
            drawEventPopulationTotalVO.setHouseTotal(drawEventPopulationTotalVO.getHouseTotal() + populationTotalVO.getHouseTotal());
            drawEventPopulationTotalVO.setLocalTotal(drawEventPopulationTotalVO.getLocalTotal() + populationTotalVO.getLocalTotal());
            drawEventPopulationTotalVO.setOutTotal(drawEventPopulationTotalVO.getOutTotal() + populationTotalVO.getOutTotal());
            drawEventPopulationTotalVO.setDisabilityTotal(drawEventPopulationTotalVO.getDisabilityTotal() + populationTotalVO.getDisabilityTotal());
            drawEventPopulationTotalVO.setLowSecurityTotal(drawEventPopulationTotalVO.getLowSecurityTotal() + populationTotalVO.getLowSecurityTotal());
            drawEventPopulationTotalVO.setElderTotal(drawEventPopulationTotalVO.getElderTotal() + populationTotalVO.getElderTotal());
            drawEventPopulationTotalVO.setSpecialSituationTotal(drawEventPopulationTotalVO.getSpecialSituationTotal() + populationTotalVO.getSpecialSituationTotal());
            drawEventPopulationTotalVO.setOtherTotal(drawEventPopulationTotalVO.getOtherTotal() + populationTotalVO.getOtherTotal());
            drawEventPopulationTotalVO.setSpecialHelpTotal(drawEventPopulationTotalVO.getSpecialHelpTotal() + populationTotalVO.getSpecialHelpTotal());
            drawEventPopulationTotalVO.setVeteransTotal(drawEventPopulationTotalVO.getVeteransTotal() + populationTotalVO.getVeteransTotal());
            drawEventPopulationTotalVO.setOldTotal(drawEventPopulationTotalVO.getOldTotal() + populationTotalVO.getOldTotal());
            drawEventPopulationTotalVO.setPensionTotal(drawEventPopulationTotalVO.getPensionTotal() + populationTotalVO.getPensionTotal());
            drawEventPopulationTotalVO.setRentingHouseTotal(drawEventPopulationTotalVO.getRentingHouseTotal() + populationTotalVO.getRentingHouseTotal());
            drawEventPopulationTotalVO.setVolunteerTotal(drawEventPopulationTotalVO.getVolunteerTotal() + populationTotalVO.getVolunteerTotal());
            drawEventPopulationTotalVO.setAverageAge(drawEventPopulationTotalVO.getAverageAge() + populationTotalVO.getAverageAge());
        }
    }

    private void countGridIncidentData(GridsGovernanceStatisticsVO statisticsVO, EventGridIncidentStatisticsVO gridIncident) {
        switch (gridIncident.getType()) {
            case 1:
                statisticsVO.setEventZATotal(statisticsVO.getEventZATotal() + 1);
                if (gridIncident.getStatus().equals(1)) {
                    statisticsVO.setEventZADeal(statisticsVO.getEventZADeal() + 1);
                }
                break;
            case 2:
                statisticsVO.setEventMSTotal(statisticsVO.getEventMSTotal() + 1);
                if (gridIncident.getStatus().equals(1)) {
                    statisticsVO.setEventMSDeal(statisticsVO.getEventMSDeal() + 1);
                }
                break;
            case 3:
                statisticsVO.setEventMDTotal(statisticsVO.getEventMDTotal() + 1);
                if (gridIncident.getStatus().equals(1)) {
                    statisticsVO.setEventMDDeal(statisticsVO.getEventMDDeal() + 1);
                }
                break;
            case 5:
                statisticsVO.setEventTFTotal(statisticsVO.getEventTFTotal() + 1);
                if (gridIncident.getStatus().equals(1)) {
                    statisticsVO.setEventTFDeal(statisticsVO.getEventTFDeal() + 1);
                }
                break;
            case 6:
                statisticsVO.setEventTSTotal(statisticsVO.getEventTSTotal() + 1);
                if (gridIncident.getStatus().equals(1)) {
                    statisticsVO.setEventTSDeal(statisticsVO.getEventTSDeal() + 1);
                }
                break;
            case 9:
                statisticsVO.setEventFJTotal(statisticsVO.getEventFJTotal() + 1);
                if (gridIncident.getStatus().equals(1)) {
                    statisticsVO.setEventFJDeal(statisticsVO.getEventFJDeal() + 1);
                }
                break;
            case 10:
                statisticsVO.setOtherTotal(statisticsVO.getOtherTotal() + 1);
                if (gridIncident.getStatus().equals(1)) {
                    statisticsVO.setOtherDeal(statisticsVO.getOtherDeal() + 1);
                }
                break;
            default:
                break;
        }
    }

    /**
     * 大屏-根据小区id查询小区统计人数
     * 
@@ -2644,4 +2816,34 @@
    public R gridMemberStatisticsAll(MemberStatisticsAdminDTO statisticsAdminDTO) {
        return R.ok(eventGridMemberRelationMapper.gridMemberStatisticsAll(statisticsAdminDTO));
    }

    /**
     * 大屏-新根据小区id查询小区统计人数
     *
     * @param villageId
     *            小区id
     * @return 小区统计数据
     */
    @Override
    public R civilVillageStatisticsNew(Long villageId) {
        GridsGovernanceStatisticsVO statisticsVO = new GridsGovernanceStatisticsVO();
        List<Long> villageIds = new ArrayList<>();
        villageIds.add(villageId);
        List<StatisticsCommVO> ageGroupStatistics = this.baseMapper.selectStatisticsForAge(villageIds);
        ScreenDrawEventPopulationTotalVO populationTotalVO = this.baseMapper.getVillagePopulationTotalNew(villageId);
        statisticsVO.setAgeGroupStatistics(ageGroupStatistics);
        statisticsVO.setDrawEventPopulationTotalVO(populationTotalVO);
        return R.ok(statisticsVO);
    }

    /**
     * 西区大数据分析平台-综合治理栏
     * @return
     */
    @Override
    public R getComprehensiveGovernanceStatics() {
        EventComprehensiveGovernanceStatisticsVO governanceStatisticsVO = this.baseMapper.selectComprehensiveGovernanceStatics();
        governanceStatisticsVO.generateGovernanceTotal();
        return R.ok(governanceStatisticsVO);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/ComActEasyPhotoMapper.xml

@@ -57,7 +57,7 @@
        <where>
            AND caep.del_tag = 0
            <if test="easyAppDTO.communityId!=null">
                AND caep.community_id = #{easyAppDTO.communityId}
                AND caep.community_id = ${easyAppDTO.communityId}
            </if>
           <if test="easyAppDTO.isReport!=null">
                AND caep.is_report = #{easyAppDTO.isReport}
@@ -125,7 +125,7 @@
        <where>
            AND caep.del_tag = 0
            <if test="easyAppDTO.communityId!=null">
                AND caep.community_id = #{easyAppDTO.communityId}
                AND caep.community_id = ${easyAppDTO.communityId}
            </if>
            <if test="easyAppDTO.streetId!=null">
                and ca.street_id = #{easyAppDTO.streetId}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridDataMapper.xml

@@ -59,7 +59,7 @@
                AND egd.grid_street_id = #{pageEventGridDataDTO.gridStreetId}
            </if>
            <if test="pageEventGridDataDTO.gridCommunityId!=null">
                AND egd.grid_community_id = #{pageEventGridDataDTO.gridCommunityId}
                AND egd.grid_community_id = ${pageEventGridDataDTO.gridCommunityId}
            </if>

           <if test="pageEventGridDataDTO.keyWord != null and pageEventGridDataDTO.keyWord != &quot;&quot;">
@@ -90,7 +90,7 @@
                AND gd.grid_street_id = #{pageEventGridDataDTO.gridStreetId}
            </if>
            <if test="pageEventGridDataDTO.gridCommunityId!=null">
                AND gd.grid_community_id = #{pageEventGridDataDTO.gridCommunityId}
                AND gd.grid_community_id = ${pageEventGridDataDTO.gridCommunityId}
            </if>
            <if test="pageEventGridDataDTO.gridName!=null">
                AND gd.grid_name = #{pageEventGridDataDTO.gridName}
@@ -283,7 +283,7 @@
    </select>

    <select id="getComActByActId" resultType="com.panzhihua.common.model.vos.grid.ComGridActVO">
        select community_id,street_id,name,address,province_code,city_code,area_code from com_act where community_id = #{communityId}
        select community_id,street_id,name,address,province_code,city_code,area_code from com_act where community_id = ${communityId}
    </select>
    <select id="getGridMemberListsByGrid" resultType="com.panzhihua.common.model.vos.grid.EventGridMemberAdminVO">
        SELECT
@@ -302,7 +302,7 @@
        FROM event_grid_data gd LEFT JOIN com_mng_struct_area_district ad ON gd.zone_id = ad.district_adcode
            LEFT JOIN com_street st ON gd.grid_street_id = st.street_id
            LEFT JOIN com_act act ON gd.grid_community_id = act.community_id
        WHERE gd.grid_community_id = #{communityId}
        WHERE gd.grid_community_id = ${communityId}
    </select>
    <select id="selectGridWithArea" resultType="com.panzhihua.common.model.vos.grid.EventGridDataAreaVO"  parameterType="long">
        SELECT

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridMemberGpsLogMapper.xml

@@ -36,7 +36,7 @@
                AND grid_street_id = #{pageEventGridMemberGpsLogDTO.gridStreetId}
            </if>
           <if test="pageEventGridMemberGpsLogDTO.gridCommunityId!=null">
                AND grid_community_id = #{pageEventGridMemberGpsLogDTO.gridCommunityId}
                AND grid_community_id = ${pageEventGridMemberGpsLogDTO.gridCommunityId}
            </if>
           <if test="pageEventGridMemberGpsLogDTO.gridId!=null">
                AND grid_id = #{pageEventGridMemberGpsLogDTO.gridId}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridMemberRelationMapper.xml

@@ -34,7 +34,7 @@
                AND grid_street_id = #{pageEventGridMemberRelationDTO.gridStreetId}
            </if>
           <if test="pageEventGridMemberRelationDTO.gridCommunityId!=null">
                AND grid_community_id = #{pageEventGridMemberRelationDTO.gridCommunityId}
                AND grid_community_id = ${pageEventGridMemberRelationDTO.gridCommunityId}
            </if>
           <if test="pageEventGridMemberRelationDTO.gridId!=null">
                AND grid_id = #{pageEventGridMemberRelationDTO.gridId}
@@ -309,7 +309,7 @@
        WHERE
            su.type = 6
            <if test="statisticsAdminDTO.communityId!=null">
                AND su.community_id = #{statisticsAdminDTO.communityId}
                AND su.community_id = ${statisticsAdminDTO.communityId}
            </if>
            <if test="statisticsAdminDTO.nickName!=null and statisticsAdminDTO.nickName != &quot;&quot;">
                AND su.nick_name like concat (#{statisticsAdminDTO.nickName},'%')
@@ -326,7 +326,7 @@
            select community_id as id,`name` from com_act where state = 0
        </if>
        <if test="type != null and type == 2">
            select village_id as id,`name` from com_mng_village where community_id = #{id}
            select village_id as id,`name` from com_mng_village where community_id = ${id}
        </if>
        <if test="type != null and type == 3">
            select id,`name` from com_mng_building where village_id = #{id}
@@ -334,7 +334,7 @@
    </select>

    <select id="getVillageCount" resultType="Integer">
        select count(village_id) from com_mng_village where community_id = #{communityId}
        select count(village_id) from com_mng_village where community_id = ${communityId}
    </select>

    <select id="getBuildingCount" resultType="Integer">
@@ -355,7 +355,7 @@
        </if>

        <if test="cascadeListDTO.type != null and cascadeListDTO.type == 2">
            select id as gridId,grid_name AS gridName from event_grid_member_relation as egmr where grid_member_id = #{cascadeListDTO.userId} and grid_community_id = #{cascadeListDTO.communityId}
            select id as gridId,grid_name AS gridName from event_grid_member_relation as egmr where grid_member_id = #{cascadeListDTO.userId} and grid_community_id = ${cascadeListDTO.communityId}
        </if>

    </select>
@@ -380,7 +380,7 @@
            FROM
            event_grid_member_relation AS egmr
            left join event_grid_data as egd on egd.id = egmr.grid_id
            where egmr.grid_member_id = #{userId} and egd.grid_community_id = #{communityId}
            where egmr.grid_member_id = #{userId} and egd.grid_community_id = ${communityId}
        </if>
    </select>

@@ -622,7 +622,7 @@
        WHERE
        su.type = 6
        <if test="statisticsAdminDTO.communityId!=null">
            AND su.community_id = #{statisticsAdminDTO.communityId}
            AND su.community_id = ${statisticsAdminDTO.communityId}
        </if>
        <if test="statisticsAdminDTO.nickName!=null and statisticsAdminDTO.nickName != &quot;&quot;">
            AND su.nick_name like concat (#{statisticsAdminDTO.nickName},'%')
@@ -640,7 +640,7 @@
            left join event_grid_data as egd on egd.id = egmr.grid_id
            INNER JOIN sys_user AS su ON su.user_id = egmr.grid_member_id

            where egd.grid_community_id = #{communityId}
            where egd.grid_community_id = ${communityId}
    </select>

    <select id="getGridsMemberTrajectory" resultType="String">

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridMemberWarnLogMapper.xml

@@ -36,7 +36,7 @@
                AND grid_street_id = #{pageEventGridMemberWarnLogDTO.gridStreetId}
            </if>
           <if test="pageEventGridMemberWarnLogDTO.gridCommunityId!=null">
                AND grid_community_id = #{pageEventGridMemberWarnLogDTO.gridCommunityId}
                AND grid_community_id = ${pageEventGridMemberWarnLogDTO.gridCommunityId}
            </if>
           <if test="pageEventGridMemberWarnLogDTO.gridId!=null">
                AND grid_id = #{pageEventGridMemberWarnLogDTO.gridId}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml

@@ -243,7 +243,7 @@
        <where>
            e.event_status != 3 AND e.event_category = 2
            <if test="pagePublicityEventDTO.communityId!=null">
                AND egd.grid_community_id = #{pagePublicityEventDTO.communityId}
                AND egd.grid_community_id = ${pagePublicityEventDTO.communityId}
            </if>

            <if test="pagePublicityEventDTO.revokeType!=null">
@@ -448,7 +448,7 @@
        <where>
            e.event_status != 3 AND e.event_category = 1
            <if test="pageEventManageDTO.communityId!=null">
                AND egd.grid_community_id = #{pageEventManageDTO.communityId}
                AND egd.grid_community_id = ${pageEventManageDTO.communityId}
            </if>
            <if test='pageEventManageDTO.keyWord != null and pageEventManageDTO.keyWord != &quot;&quot;'>
                AND (
@@ -524,7 +524,7 @@
                AND ( e.revoke_type = #{pagePublicityEventCommunityDTO.revokeType} OR e.revoke_type is null )
            </if>
            <if test="pagePublicityEventCommunityDTO.communityId!=null">
                AND egd.grid_community_id = #{pagePublicityEventCommunityDTO.communityId}
                AND egd.grid_community_id = ${pagePublicityEventCommunityDTO.communityId}
            </if>
            <if test="pagePublicityEventCommunityDTO.eventDealStatus!=null">
                AND e.event_deal_status = #{pagePublicityEventCommunityDTO.eventDealStatus}
@@ -946,6 +946,7 @@
            e.urgent,
            e.danger_level,
            e.major,
            e.process_desc,
            e.event_des,
            e.event_category,
            e.event_type,
@@ -962,7 +963,7 @@
            <where>
                and event_status = 2
                <if test='eventListDTO.communityId != null'>
                    and egd.grid_community_id = #{eventListDTO.communityId}
                    and egd.grid_community_id = ${eventListDTO.communityId}
                </if>

                <if test='eventListDTO.startTime != null and eventListDTO.startTime != &quot;&quot;'>
@@ -1023,7 +1024,7 @@
            <where>
                and cmpct.label IS NOT NULL
                <if test='specialPopulationDTO.communityId != null'>
                    and cmpct.community_id = #{specialPopulationDTO.communityId}
                    and cmpct.community_id = ${specialPopulationDTO.communityId}
                </if>
                <if test="specialPopulationDTO.keyWord!=null and specialPopulationDTO.keyWord!= &quot;&quot;">
                    AND (cmp.name like concat(#{specialPopulationDTO.keyWord},'%') or cmp.card_no_str like concat(#{specialPopulationDTO.keyWord},'%'))
@@ -1043,7 +1044,7 @@
                `event` AS e1
                LEFT JOIN event_grid_data AS egd1 ON egd1.id = e1.grid_id
            WHERE
                egd1.grid_community_id = #{communityId}
                egd1.grid_community_id = ${communityId}
                AND e1.event_category = 1
                AND e1.event_process_status = 1
                AND e1.event_status = 2
@@ -1056,7 +1057,7 @@
                `event` AS e2
                LEFT JOIN event_grid_data AS egd2 ON egd2.id = e2.grid_id
            WHERE
                egd2.grid_community_id = #{communityId}
                egd2.grid_community_id = ${communityId}
                AND e2.event_category = 2
                AND e2.event_status = 2
            ) AS propagandaNum,
@@ -1069,13 +1070,13 @@
            WHERE
                e3.event_status = 2
                AND e3.create_at LIKE CONCAT(#{nowDate},'%')) as currentNum,
                (select count(id) from com_act_easy_photo where community_id = 2 and del_tag = 0 and create_at LIKE CONCAT(#{nowDate},'%')) as sspCurrentNum
                (select count(id) from com_act_easy_photo where community_id = ${communityId} and del_tag = 0 and create_at LIKE CONCAT(#{nowDate},'%')) as sspCurrentNum

                FROM
                    `event` AS e
                    LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id
                WHERE
                    egd.grid_community_id = #{communityId}
                    egd.grid_community_id = ${communityId}
                    AND e.event_category = 1
                AND e.event_process_status = 2
            AND e.event_deal_status = 4
@@ -1090,7 +1091,7 @@
                `event` AS e1
                LEFT JOIN event_grid_data AS egd1 ON egd1.id = e1.grid_id
            WHERE
                egd1.grid_community_id = #{communityId}
                egd1.grid_community_id = ${communityId}
                AND e1.event_process_status = 2
            ORDER BY
                e1.create_at DESC
@@ -1100,7 +1101,7 @@
            `event` AS e
            LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id
        WHERE
            egd.grid_community_id = #{communityId}
            egd.grid_community_id = ${communityId}
            AND e.event_process_status = 2
        ORDER BY
            e.create_at ASC
@@ -1130,7 +1131,7 @@
            LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id
            LEFT JOIN sys_user AS su ON su.user_id = e.grid_member_id
        WHERE
            egd.grid_community_id = #{communityId}
            egd.grid_community_id = ${communityId}
            AND e.event_status = 2
            AND e.event_deal_status in (1,2,3,4,6,8)
        ORDER BY
@@ -1147,10 +1148,10 @@
        `event` AS e
        LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id
        WHERE
        egd.grid_community_id = #{communityId} and e.event_status = 2 AND e.create_at <![CDATA[<=]]> #{end}) AS eventTotal,
        (select count(id) from com_act_easy_photo where community_id = #{communityId} and del_tag = 0 and create_at <![CDATA[<=]]> #{end}) as sspTotal,
        (select count(id) from com_act_easy_photo where community_id = #{communityId} and del_tag = 0 and #{start} <![CDATA[<=]]> create_at AND create_at <![CDATA[<=]]> #{end}) as sspAdd,
        (select count(id) from com_act_easy_photo where community_id = #{communityId} and handle_status = 2 and del_tag = 0 and #{start} <![CDATA[<=]]> create_at AND create_at <![CDATA[<=]]> #{end}) as sspSolve,
        egd.grid_community_id = ${communityId} and e.event_status = 2 AND e.create_at <![CDATA[<=]]> #{end}) AS eventTotal,
        (select count(id) from com_act_easy_photo where community_id = ${communityId} and del_tag = 0 and create_at <![CDATA[<=]]> #{end}) as sspTotal,
        (select count(id) from com_act_easy_photo where community_id = ${communityId} and del_tag = 0 and #{start} <![CDATA[<=]]> create_at AND create_at <![CDATA[<=]]> #{end}) as sspAdd,
        (select count(id) from com_act_easy_photo where community_id = ${communityId} and handle_status = 2 and del_tag = 0 and #{start} <![CDATA[<=]]> create_at AND create_at <![CDATA[<=]]> #{end}) as sspSolve,
        (
        SELECT
        COUNT( e1.id )
@@ -1158,7 +1159,7 @@
        `event` AS e1
        LEFT JOIN event_grid_data AS egd1 ON egd1.id = e1.grid_id
        WHERE
        egd1.grid_community_id = #{communityId} and e1.event_status = 2 AND #{start} <![CDATA[<=]]> e1.create_at AND e1.create_at <![CDATA[<=]]> #{end}) AS eventAdd,
        egd1.grid_community_id = ${communityId} and e1.event_status = 2 AND #{start} <![CDATA[<=]]> e1.create_at AND e1.create_at <![CDATA[<=]]> #{end}) AS eventAdd,
        (
        SELECT
        COUNT( e2.id )
@@ -1166,7 +1167,7 @@
        `event` AS e2
        LEFT JOIN event_grid_data AS egd2 ON egd2.id = e2.grid_id
        WHERE
        egd2.grid_community_id = #{communityId} and e2.event_process_status = 2 AND #{start} <![CDATA[<=]]> e2.create_at AND e2.create_at <![CDATA[<=]]> #{end}) AS eventSolve
        egd2.grid_community_id = ${communityId} and e2.event_process_status = 2 AND #{start} <![CDATA[<=]]> e2.create_at AND e2.create_at <![CDATA[<=]]> #{end}) AS eventSolve
        FROM
        DUAL
    </select>
@@ -1183,7 +1184,7 @@
                e1.event_category = 1
                AND e1.event_process_status = 2
                AND e1.event_type = 2
                AND egd1.grid_community_id = #{communityId}
                AND egd1.grid_community_id = ${communityId}
                ) AS ggTotal,(
            SELECT
                count( e2.id )
@@ -1194,7 +1195,7 @@
                e2.event_category = 1
                AND e2.event_process_status = 2
                AND e2.event_type = 3
                AND egd2.grid_community_id = #{communityId}
                AND egd2.grid_community_id = ${communityId}
                ) AS mdTotal,(
            SELECT
                count( e3.id )
@@ -1205,7 +1206,7 @@
                e3.event_category = 1
                AND e3.event_process_status = 2
                AND e3.event_type = 4
                AND egd3.grid_community_id = #{communityId}
                AND egd3.grid_community_id = ${communityId}
                ) AS bwdTotal,(
            SELECT
                count( e4.id )
@@ -1216,7 +1217,7 @@
                e4.event_category = 1
                AND e4.event_process_status = 2
                AND e4.event_type = 5
                AND egd4.grid_community_id = #{communityId}
                AND egd4.grid_community_id = ${communityId}
                ) AS tfTotal,(
            SELECT
                count( e5.id )
@@ -1227,9 +1228,9 @@
                e5.event_category = 1
                AND e5.event_process_status = 2
                AND e5.event_type = 6
                AND egd5.grid_community_id = #{communityId}
                AND egd5.grid_community_id = ${communityId}
            ) AS tsTotal,
            (select count(id) from com_act_easy_photo as caep where community_id = #{communityId} and del_tag = 0 and status = 4) as sspTotal
            (select count(id) from com_act_easy_photo as caep where community_id = ${communityId} and del_tag = 0 and status = 4) as sspTotal
        FROM
            `event` AS e
            LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id
@@ -1237,7 +1238,7 @@
            e.event_category = 1
            AND e.event_process_status = 2
            AND e.event_type = 1
            AND egd.grid_community_id = #{communityId}
            AND egd.grid_community_id = ${communityId}
    </select>

    <select id="getNoComplete" resultType="com.panzhihua.common.model.vos.screen.EventTypeWorkVO">
@@ -1253,7 +1254,7 @@
                AND e1.event_process_status = 1
                AND e1.event_status = 2
                AND e1.event_type = 2
                AND egd1.grid_community_id = #{communityId}
                AND egd1.grid_community_id = ${communityId}
                ) AS ggTotal,(
            SELECT
                count( e2.id )
@@ -1265,7 +1266,7 @@
                AND e2.event_process_status = 1
                AND e2.event_status = 2
                AND e2.event_type = 3
                AND egd2.grid_community_id = #{communityId}
                AND egd2.grid_community_id = ${communityId}
                ) AS mdTotal,(
            SELECT
                count( e3.id )
@@ -1277,7 +1278,7 @@
                AND e3.event_process_status = 1
                AND e3.event_status = 2
                AND e3.event_type = 4
                AND egd3.grid_community_id = #{communityId}
                AND egd3.grid_community_id = ${communityId}
                ) AS bwdTotal,(
            SELECT
                count( e4.id )
@@ -1289,7 +1290,7 @@
                AND e4.event_process_status = 1
                AND e4.event_status = 2
                AND e4.event_type = 5
                AND egd4.grid_community_id = #{communityId}
                AND egd4.grid_community_id = ${communityId}
                ) AS tfTotal,(
            SELECT
                count( e5.id )
@@ -1301,9 +1302,9 @@
                AND e5.event_process_status = 1
                AND e5.event_status = 2
                AND e5.event_type = 6
                AND egd5.grid_community_id = #{communityId}
                AND egd5.grid_community_id = ${communityId}
            ) AS tsTotal,
            (select count(id) from com_act_easy_photo as caep where community_id = #{communityId} and del_tag = 0 and status in (1,2)) as sspTotal
            (select count(id) from com_act_easy_photo as caep where community_id = ${communityId} and del_tag = 0 and status in (1,2)) as sspTotal
        FROM
            `event` AS e
            LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id
@@ -1312,18 +1313,18 @@
            AND e.event_process_status = 1
            AND e.event_status = 2
            AND e.event_type = 1
            AND egd.grid_community_id = #{communityId}
            AND egd.grid_community_id = ${communityId}
    </select>

    <select id="getSSPEventTotal" resultType="Map">
        SELECT
            count( id ) as noEventSSPTotal,
            ( SELECT count( id ) FROM com_act_easy_photo WHERE handle_status = 2 and del_tag = 0 AND community_id = #{communityId} ) AS eventSSPTotal
            ( SELECT count( id ) FROM com_act_easy_photo WHERE handle_status = 2 and del_tag = 0 AND community_id = ${communityId} ) AS eventSSPTotal
        FROM
            com_act_easy_photo
        WHERE
            handle_status = 1 and del_tag = 0
            AND community_id = #{communityId}
            AND community_id = ${communityId}
    </select>

    <select id="getEventListByCommunityId" parameterType="Long"
@@ -1339,22 +1340,22 @@
        WHERE
            e.event_category = 1
            AND e.event_status = 2
            AND egd.grid_community_id = #{communityId}
            AND egd.grid_community_id = ${communityId}
            AND e.event_deal_status IN (1,2,3,4)
            union all
            select id,7 as type,lng_lat as latLng,handle_status as status from com_act_easy_photo as caep where community_id = #{communityId} and lng_lat is not null
            select id,7 as type,lng_lat as latLng,handle_status as status from com_act_easy_photo as caep where community_id = ${communityId} and lng_lat is not null
    </select>

    <select id="getCivilScreenVillageList" parameterType="Long"  resultType="com.panzhihua.common.model.vos.community.screen.civil.CivilVillageStatisticsVO">
        SELECT `NAME`,  user_sum,  lng,  lat,  village_images,  village_id  FROM  com_mng_village AS cmv  WHERE  community_id = #{communityId}
        SELECT `NAME`,  user_sum,  lng,  lat,  village_images,  village_id  FROM  com_mng_village AS cmv  WHERE  community_id = ${communityId}
    </select>

    <select id="getVillagePopulationTotal" parameterType="Long" resultType="com.panzhihua.common.model.vos.screen.ScreenDrawEventPopulationTotalVO">
        SELECT
            count( id ) as populationTotal,
            (select count(id) from com_mng_population where village_id = #{villageId} and out_or_local = 1) as localTotal,
            (select count(id) from com_mng_population where village_id = #{villageId} and out_or_local = 2) as localTotal,
            (select count(id) from com_mng_population_community_tags as cmpct left join com_mng_population as cmp on cmpct.population_id = cmp.id where cmp.village_id = #{villageId} and cmpct.label is not null) as specialTotal,
            (select count(id) from com_mng_population where village_id = #{villageId} and out_or_local = 2) as outTotal,
            (select count(cmp.id) from com_mng_population_community_tags as cmpct left join com_mng_population as cmp on cmpct.population_id = cmp.id where cmp.village_id = #{villageId} and cmpct.label is not null) as specialTotal,
            (select count(id) from com_mng_building where village_id = #{villageId}) as buildTotal
        FROM
            com_mng_population AS cmp
@@ -1377,5 +1378,132 @@
              left join com_mng_population AS cmp on cmp.id = cmpct.population_id
        where cmtct.label is not null and cmp.village_id = #{villageId} and floor = #{floor}
    </select>
    <select id="selectComprehensiveGovernanceStatics"
            resultType="com.panzhihua.common.model.vos.community.screen.event.EventComprehensiveGovernanceStatisticsVO">
        SELECT
        (SELECT COUNT( e.id ) FROM `event` AS e
        LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id
        LEFT JOIN com_act AS a ON egd.grid_community_id = a.community_id
        WHERE e.event_category = 1 AND e.event_type = 5 AND e.event_deal_status = 4 AND a.area_code = 510423) AS eventTFTotal,

        (SELECT COUNT( e1.id ) FROM `event` AS e1
        LEFT JOIN event_grid_data AS egd1 ON egd1.id = e1.grid_id
        LEFT JOIN com_act AS a1 ON egd1.grid_community_id = a1.community_id
        WHERE event_category = 1 AND event_type = 1 AND e1.event_deal_status = 4 AND a1.area_code = 510423) AS eventZATotal,

        (SELECT COUNT( e2.id ) FROM `event` AS e2
        LEFT JOIN event_grid_data AS egd2 ON egd2.id = e2.grid_id
        LEFT JOIN com_act AS a2 ON egd2.grid_community_id = a2.community_id
        WHERE event_category = 1 AND event_type = 3 AND e2.event_deal_status = 4 AND a2.area_code = 510423) AS eventMDTotal,

        (SELECT COUNT( e3.id ) FROM `event` AS e3
        LEFT JOIN event_grid_data AS egd3 ON egd3.id = e3.grid_id
        LEFT JOIN com_act AS a3 ON egd3.grid_community_id = a3.community_id
        WHERE event_category = 1 AND event_type = 6 AND e3.event_deal_status = 4 AND a3.area_code = 510423) AS eventTSTotal,

        (SELECT COUNT( e5.id ) FROM `event` AS e5
        LEFT JOIN event_grid_data AS egd5 ON egd5.id = e5.grid_id
        LEFT JOIN com_act AS a5 ON egd5.grid_community_id = a5.community_id
        WHERE event_category = 1 AND event_type = 2 AND e5.event_deal_status = 4 AND a5.area_code = 510423) AS eventMSTotal,

        (SELECT COUNT(p.id) FROM com_act_easy_photo p
        LEFT JOIN com_act AS a ON p.community_id = a.community_id
        WHERE p.`status` = 4 AND p.del_tag = 0 AND a.area_code = 510423) AS eventSSPTotal
    </select>
    <select id="getGridsGovernanceEventList"
            resultType="com.panzhihua.common.model.vos.community.screen.event.EventGridIncidentStatisticsVO">
        SELECT event_type AS type, IFNULL( NULL, 1 ) AS eventType, e.id AS eventId, happent_lat_lng AS latLng, event_des AS content,
        (SELECT url FROM event_resource WHERE ref_id = e.id AND classification = 1 AND `type` = 1 LIMIT 1) AS cover, e.create_at,
        CASE
        WHEN event_deal_status = 4 THEN 1
        ELSE 2 END `status`
        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_type IN ( 1, 2, 3, 5, 6 ) AND e.event_status = 2 AND egd.grid_community_id = ${communityId}
        UNION ALL SELECT
        CASE
        WHEN classify_id = 4 THEN 1
        WHEN classify_id = 6 THEN 2
        WHEN classify_id = 5 THEN 3
        WHEN classify_id = 7 THEN 5
        WHEN classify_id = 3 THEN 6
        WHEN classify_id = 8 THEN 9
        WHEN classify_id = 1 THEN 10
        END type, IFNULL( NULL, 2 ) AS eventType, id AS eventId, lng_lat AS latLng, detail AS content, substring_index(photo_path_list, ',', 1) AS cover, create_at,
        CASE
        WHEN `status` = 4 THEN 1
        ELSE 2 END `status`
        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)
    </select>
    <select id="getVillagePopulationTotalNew"
            resultType="com.panzhihua.common.model.vos.screen.ScreenDrawEventPopulationTotalVO">
        SELECT
        (SELECT count(id) FROM com_mng_population WHERE village_id = #{villageId}) as populationTotal,
        (SELECT count(id) from com_mng_building where village_id = #{villageId}) as buildTotal,
        (SELECT count(id) FROM com_mng_population_house WHERE village_id = #{villageId}) as houseTotal,
        (select count(id) from com_mng_population where village_id = #{villageId} and out_or_local = 1) as localTotal,
        (select count(id) from com_mng_population where village_id = #{villageId} and out_or_local = 2) as outTotal,
        (SELECT COUNT(t1.id) FROM com_disability_population t1 LEFT JOIN com_mng_population t2 ON t1.population_id = t2.id WHERE t2.village_id = #{villageId}) as disabilityTotal,
        (SELECT COUNT(t1.id) FROM com_low_security_population t1 LEFT JOIN com_mng_population t2 ON t1.population_id = t2.id WHERE t2.village_id = #{villageId}) as lowSecurityTotal,
        (SELECT COUNT(id) FROM com_mng_population WHERE village_id = #{villageId} AND TIMESTAMPDIFF(YEAR, SUBSTRING(card_no_str, 7, 8), NOW()) > 80) as elderTotal,
        (SELECT COUNT(t1.id) FROM com_mng_population t1 LEFT JOIN com_mng_population_community_tags t2 ON t1.id = t2.population_id WHERE t1.village_id = #{villageId} AND t2.label LIKE '%特殊情况%') as specialSituationTotal,
        (SELECT COUNT(id) FROM
        (SELECT t1.id FROM com_drug_population t1 LEFT JOIN com_mng_population t2 ON t1.population_id = t2.id WHERE t2.village_id = #{villageId}
        UNION ALL
        SELECT t1.id FROM com_correct_population t1 LEFT JOIN com_mng_population t2 ON t1.population_id = t2.id WHERE t2.village_id = #{villageId}
        UNION ALL
        SELECT t1.id FROM com_cult_population t1 LEFT JOIN com_mng_population t2 ON t1.population_id = t2.id WHERE t2.village_id = #{villageId}
        UNION ALL
        SELECT t1.id FROM com_rehabilitation_population t1 LEFT JOIN com_mng_population t2 ON t1.population_id = t2.id WHERE t2.village_id = #{villageId}
        UNION ALL
        SELECT t1.id FROM com_key_population t1 LEFT JOIN com_mng_population t2 ON t1.population_id = t2.id WHERE t2.village_id = #{villageId}
        UNION ALL
        SELECT t1.id FROM com_major_population t1 LEFT JOIN com_mng_population t2 ON t1.population_id = t2.id WHERE t2.village_id = #{villageId}
        ) temp) as otherTotal,
        (SELECT COUNT(t1.id) FROM com_mng_population t1 LEFT JOIN com_mng_population_community_tags t2 ON t1.id = t2.population_id WHERE t1.village_id = #{villageId} AND t2.label LIKE '%特扶家庭%') as specialHelpTotal,
        (SELECT COUNT(t1.id) FROM com_veterans_population t1 LEFT JOIN com_mng_population t2 ON t1.population_id = t2.id WHERE t2.village_id = #{villageId}) as veteransTotal,
        (SELECT COUNT(id) FROM com_mng_population WHERE village_id = #{villageId} AND TIMESTAMPDIFF(YEAR, SUBSTRING(card_no_str, 7, 8), NOW()) > 60) as oldTotal,
        (SELECT COUNT(t1.id) FROM com_pension_auth_pensioners t1 LEFT JOIN com_mng_population t2 ON t1.population_id = t2.id WHERE t2.village_id = #{villageId}) as pensionTotal,
        (SELECT COUNT(id) FROM renting_hourse_register WHERE village_id = #{villageId} AND auth_status = 2) as rentingHouseTotal,
        (SELECT COUNT(id) FROM com_mng_population t1 LEFT JOIN sys_user t2 ON t1.card_no_str = t2.id_card WHERE t1.village_id = #{villageId} AND t2.is_volunteer = 1) as volunteerTotal,
        (SELECT ROUND(AVG(TIMESTAMPDIFF(YEAR, SUBSTRING(card_no_str, 7, 8), NOW()))) FROM com_mng_population) as averageAge
    </select>
    <select id="selectStatisticsForAge" 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(card_no_str, 7, 8), NOW()) BETWEEN 0 AND 18 THEN '0-18岁'
            WHEN TIMESTAMPDIFF(YEAR, SUBSTRING(card_no_str, 7, 8), NOW()) BETWEEN 19 AND 30 THEN '19-30岁'
            WHEN TIMESTAMPDIFF(YEAR, SUBSTRING(card_no_str, 7, 8), NOW()) BETWEEN 31 AND 40 THEN '31-40岁'
            WHEN TIMESTAMPDIFF(YEAR, SUBSTRING(card_no_str, 7, 8), NOW()) BETWEEN 41 AND 50 THEN '41-50岁'
            WHEN TIMESTAMPDIFF(YEAR, SUBSTRING(card_no_str, 7, 8), NOW()) BETWEEN 51 AND 60 THEN '51-60岁'
            WHEN TIMESTAMPDIFF(YEAR, SUBSTRING(card_no_str, 7, 8), NOW()) BETWEEN 61 AND 79 THEN '61-79岁'
            WHEN TIMESTAMPDIFF(YEAR, SUBSTRING(card_no_str, 7, 8), NOW()) BETWEEN 80 AND 89 THEN '80-89岁'
            WHEN TIMESTAMPDIFF(YEAR, SUBSTRING(card_no_str, 7, 8), NOW()) > 89 THEN '89岁以上'
            END filed
            FROM com_mng_population WHERE village_id IN
            <foreach collection="villageIds" index="index" item="item" open="(" separator="," close=")">
                #{item}
            </foreach>
            ) 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>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventVisitingTasksMapper.xml

@@ -64,7 +64,7 @@
        left join event_grid_data egd on egd.id = vt.grid_id
        where 1=1
        <if test = "query.communityId != null">
            and cmpct.community_id = #{query.communityId}
            and cmpct.community_id = ${query.communityId}
        </if>
        <if test = "query.status != null and query.status != 0">
            and vt.event_status = #{query.status}
@@ -158,7 +158,7 @@
    <select id="findUserByCommunityId" resultType="java.util.Map">
        SELECT u.user_id,u.name,u.phone,a.street_id FROM sys_user u
        LEFT JOIN com_act a ON u.community_id = a.community_id
        WHERE u.community_id = #{communityId} and u.type = #{type} limit 1
        WHERE u.community_id = ${communityId} and u.type = #{type} limit 1
    </select>

    <select id="findUserById" resultType="java.util.Map">

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/config/MybatisHmkInterceptor.java

New file
@@ -0,0 +1,24 @@
package com.panzhihua.service_dangjian.config;

import com.baomidou.mybatisplus.core.toolkit.PluginUtils;
import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor;
import org.apache.ibatis.executor.Executor;
import org.apache.ibatis.mapping.BoundSql;
import org.apache.ibatis.mapping.MappedStatement;
import org.apache.ibatis.session.ResultHandler;
import org.apache.ibatis.session.RowBounds;

import java.sql.SQLException;

public class MybatisHmkInterceptor implements InnerInterceptor {
    @Override
    public void beforeQuery(Executor executor, MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler, BoundSql boundSql) throws SQLException {
        String sql=boundSql.getSql();
            if(sql.contains("community_id = 10086")){
                sql=sql.replace("community_id = 10086","community_id in (30,31)");
                PluginUtils.mpBoundSql(boundSql).sql(sql);
        }
        InnerInterceptor.super.beforeQuery(executor, ms, parameter, rowBounds, resultHandler, boundSql);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/config/MybatisPlusConfig.java

@@ -23,6 +23,7 @@
    @Bean
    public MybatisPlusInterceptor mybatisPlusInterceptor() {
        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
        interceptor.addInnerInterceptor(new MybatisHmkInterceptor());
        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.H2));
        return interceptor;
    }

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

@@ -48,7 +48,7 @@
        + "a.activity_time_begin,\n" + "a.activity_time_end,\n" + "a.enroll_time_begin,\n" + "a.cover,\n"
        + "if(u.type=3 ,'管理员',u.name)createByName,\n" + "a.enroll_time_end \n" + "FROM\n" + "com_pb_activity a\n"
        + "left join sys_user u on a.create_by=u.user_id \n"
        + "where a.community_id=#{partyBuildingActivityVO.communityId}\n"
        + "where a.community_id = ${partyBuildingActivityVO.communityId}\n"
        + "<if test='partyBuildingActivityVO.name != null and partyBuildingActivityVO.name.trim() != &quot;&quot;'>"
        + "and a.name = #{partyBuildingActivityVO.name} \n" + " </if> "
        + "<if test='partyBuildingActivityVO.isAppliets != null and partyBuildingActivityVO.isAppliets==1'>"
@@ -107,6 +107,6 @@
     *            社区id
     * @return 社区名字
     */
    @Select("select name from com_act where community_id=#{communityId}")
    @Select("select name from com_act where community_id = ${communityId}")
    String selectCommunityNameByCommunityId(Long communityId);
}

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

@@ -51,7 +51,7 @@
        + "m.activity_id =#{id}")
    List<Long> selectAllPartyBuildingActivityMembers(Long id);

    @Select("select m.id from sys_user u join com_pb_member m on u.id_card=m.id_card and u.community_id=#{communityId} and u.user_id=#{userId} ")
    @Select("select m.id from sys_user u join com_pb_member m on u.id_card=m.id_card and u.community_id = ${communityId} and u.user_id=#{userId} ")
    Long selectMemberIdByUserId(@Param("userId") Long userId, @Param("communityId") Long communityId);

    @Select("select type from sys_user where user_id=#{createBy}")

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

@@ -31,11 +31,11 @@
    // "</script>")

    @Select("<script> " + "SELECT\n" + "d.id,\n" + "d.title, d.jump_url, d.jump_type,\n" + "COUNT( u.id ) readingVolume,\n" + "d.`status`,\n"
        + "d.publish_at,\n" + "d.content,\n" + "d.cover,\n" + "d.cover_mode,\n" + "d.dyn_type,\n" + "d.create_at \n"
        + "FROM\n" + "com_pb_dyn d\n" + "LEFT JOIN com_pb_dyn_user u ON d.id = u.dyn_id \n"
        + "d.publish_at,\n" + "d.content,\n" + "d.cover,\n" + "d.cover_mode,\n" + "d.dyn_type,\n" + "d.create_at,t.name as communityName \n"
        + "FROM\n" + "com_pb_dyn d\n" + "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\n"
        + "where d.type=#{partyBuildingComPbDynVO.type}  \n"
        + "<if test='partyBuildingComPbDynVO.communityId != null and partyBuildingComPbDynVO.communityId != 0'>"
        + "and d.community_id = #{partyBuildingComPbDynVO.communityId} \n" + " </if> "
        + "and d.community_id = ${partyBuildingComPbDynVO.communityId} \n" + " </if> "
        + "<if test='partyBuildingComPbDynVO.dynType != null and partyBuildingComPbDynVO.dynType != 0'>"
        + "and d.dyn_type = #{partyBuildingComPbDynVO.dynType} \n" + " </if> "
        + "<if test='partyBuildingComPbDynVO.title != null and partyBuildingComPbDynVO.title.trim() != &quot;&quot;'>"

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

@@ -41,7 +41,7 @@
        + "DATE_FORMAT( NOW(), '%Y-%m-%d' )) partyAge,\n" + "m.join_time,\n" + "m.employment_time,\n" + "CASE\n"
        + "WHEN u.id_card IS NULL THEN\n" + "'未注册' ELSE '已注册' \n" + "END STATUS \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.community_id=#{pagePartyOrganizationVO.communityId} and m.audit_result='1' "
        + " where m.community_id = ${pagePartyOrganizationVO.communityId} and m.audit_result='1' "
        + "<if test='pagePartyOrganizationVO.orgName != null and pagePartyOrganizationVO.orgName != &quot;&quot;'>"
        + "and o.name like concat(#{pagePartyOrganizationVO.orgName},'%') " + " </if> "
        + "<if test='pagePartyOrganizationVO.orgId != null'>" + " and o.id = #{pagePartyOrganizationVO.orgId} "
@@ -92,7 +92,7 @@
        + "<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 "
        + " and m.community_id = ${pagePartyBuildingMemberVO.communityId}" + " </if> " + " order by m.join_time desc "
        + "</script>")
    IPage<PartyBuildingMemberVO> pagePartyBuildingMembersVO(Page page,
        @Param("pagePartyBuildingMemberVO") PagePartyBuildingMemberVO pagePartyBuildingMemberVO);
@@ -101,7 +101,7 @@
        + "select cpm.name as comName,cpm.id_card,cpm.join_time,cpm.employment_time,ca.`name` as communityName,cpo.name as orgName from com_pb_member as cpm "
        + " left join com_act as ca on ca.community_id = cpm.community_id "
        + " left join com_pb_org as cpo on cpo.id = cpm.org_id " + " LEFT JOIN sys_user u ON cpm.id_card = u.id_card "
        + " where cpm.community_id = #{organizationVO.communityId} and cpm.audit_result = 1 "
        + " where cpm.community_id = ${organizationVO.communityId} and cpm.audit_result = 1 "
        + "<if test='organizationVO.orgName != null'>" + " and cpo.name LIKE CONCAT('%',#{organizationVO.orgName},'%') "
        + " </if> " + "<if test='organizationVO.account != null and organizationVO.account != &quot;&quot;'>"
        + " and u.phone like concat (#{organizationVO.account},'%')" + " </if> "

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

@@ -32,7 +32,7 @@
    // "</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>")
        + "t.community_id = ${partyCommitteeVO.communityId} \n" + "</script>")
    IPage<PartyCommitteeVO> pagePartyOrganization(Page page,
        @Param("partyCommitteeVO") PartyCommitteeVO partyCommitteeVO);


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

@@ -19,7 +19,7 @@
@Mapper
public interface ComPbOrgDAO extends BaseMapper<ComPbOrgDO> {

    @Select("select id,`name`,`status` from com_pb_org where community_id = #{partyOrganizationVO.communityId}")
    @Select("select id,`name`,`status` from com_pb_org where community_id = ${partyOrganizationVO.communityId}")
    IPage<PartyOrganizationVO> listPartyOrganizationAll(Page page,
        @Param("partyOrganizationVO") PartyOrganizationVO partyOrganizationVO);


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

@@ -23,7 +23,7 @@
public interface ComPbServiceTeamDAO extends BaseMapper<ComPbServiceTeamDO> {

    @Select("<script> " + "SELECT\n" + "* \n" + "FROM\n" + "com_pb_service_team \n"
        + " where community_id=#{pageComPbServiceTeamDTO.communityId}"
        + " where community_id = ${pageComPbServiceTeamDTO.communityId}"
        + "<if test='pageComPbServiceTeamDTO.name != null and pageComPbServiceTeamDTO.name.trim() != &quot;&quot;'>"
        + " and name LIKE concat( #{pageComPbServiceTeamDTO.name}, '%' ) \n" + " </if> "
        + "<if test='pageComPbServiceTeamDTO.job != null and pageComPbServiceTeamDTO.job.trim() != &quot;&quot;'>"
@@ -35,7 +35,7 @@
    ComPbServiceTeamDO selectComPbServiceTeamById(@Param("id") Long id);

    @Select("<script> " + "SELECT\n" + "* \n" + "FROM\n" + "com_pb_service_team \n"
        + " where community_id=#{communityId}" + "<if test='param != null and param != &quot;&quot;'>"
        + " where community_id = ${communityId}" + "<if test='param != null and param != &quot;&quot;'>"
        + " and name LIKE concat( #{param}, '%' ) \n" + " </if> " + "</script>")
    List<ComPbServiceTeamVO> getTotlePerson(@Param("param") String param, @Param("communityId") Long communityId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/mapper/ComPropertyAlarmMapper.xml

@@ -26,7 +26,7 @@
        <where>
            1=1
            <if test="commonPage.paramId !=null">
                and t1.community_id =#{commonPage.paramId}
                and t1.community_id = ${commonPage.paramId}
            </if>
            <if test="commonPage.type !=null">
                and t.type =#{commonPage.type}

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/mapper/ComPropertyAlarmSettingMapper.xml

@@ -11,7 +11,7 @@
    </resultMap>

    <select id="getByCommunityId" resultMap="ComPropertyAlarmSettingBaseResultMap">
        select * from com_property_alarm_setting where community_id =#{community_id} order by create_time desc limit 1
        select * from com_property_alarm_setting where community_id = ${community_id} order by create_time desc limit 1
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/mapper/ComPropertyEquipmentMapper.xml

@@ -25,7 +25,7 @@
                and type =#{commonPage.type}
            </if>
            <if test="commonPage.paramId !=null">
                and community_id =#{commonPage.paramId}
                and community_id = ${commonPage.paramId}
            </if>
            <if test="commonPage.name!=null and commonPage.name!=''">
                and name like concat(#{commonPage.name},'%')

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/mapper/ComPropertyHelpMapper.xml

@@ -21,7 +21,7 @@
                and status =#{commonPage.status}
            </if>
            <if test="commonPage.paramId !=null">
                and community_id =#{commonPage.paramId}
                and community_id = ${commonPage.paramId}
            </if>
        </where>
        order by create_time desc

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/mapper/ComPropertyRepairMapper.xml

@@ -49,7 +49,7 @@
                and t1.name like concat(#{commonPage.systemName},'%')
            </if>
            <if test="commonPage.paramId !=null and commonPage.paramId !=0">
                and t2.community_id =#{commonPage.paramId}
                and t2.community_id = ${commonPage.paramId}
            </if>
            <if test="commonPage.areaId !=null and commonPage.areaId !=0">
                and t2.area_id =#{commonPage.areaId}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/RoleApi.java

@@ -66,8 +66,8 @@
     * @return 角色集合
     */
    @PostMapping("listrolebackstage")
    public R listRoleBackstage(@RequestParam("communityId") Long communityId,@RequestParam("pageNum")Integer pageNum,@RequestParam("pageSize")Integer pageSize) {
        return roleService.listRoleBackstage(communityId,pageNum,pageSize);
    public R listRoleBackstage(@RequestParam("communityId") Long communityId,@RequestParam("pageNum")Integer pageNum,@RequestParam("pageSize")Integer pageSize,@RequestParam("areaCode")String areaCode) {
        return roleService.listRoleBackstage(communityId,pageNum,pageSize,areaCode);
    }

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/SysAppConfigApi.java

New file
@@ -0,0 +1,101 @@
package com.panzhihua.service_user.api;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.user.SysAppConfigVO;
import com.panzhihua.service_user.entity.SysAppConfig;
import com.panzhihua.service_user.service.SysAppConfigService;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.io.Serializable;
import java.util.List;

/**
 * (SysAppConfig)表控制层
 *
 * @author makejava
 * @since 2022-01-13 10:10:19
 */
@RestController
@RequestMapping("sysAppConfig")
public class SysAppConfigApi {
    /**
     * 服务对象
     */
    @Resource
    private SysAppConfigService sysAppConfigService;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return this.sysAppConfigService.pageList(commonPage);
    }

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return R.ok(this.sysAppConfigService.getById(id));
    }

    /**
     * 新增数据
     *
     * @param sysAppConfig 实体对象
     * @return 新增结果
     */
    @PostMapping
    public R insert(@RequestBody SysAppConfig sysAppConfig) {
        return R.ok(this.sysAppConfigService.save(sysAppConfig));
    }

    /**
     * 修改数据
     *
     * @param sysAppConfig 实体对象
     * @return 修改结果
     */
    @PostMapping("/update")
    public R update(@RequestBody SysAppConfig sysAppConfig) {
        return R.ok(this.sysAppConfigService.updateById(sysAppConfig));
    }

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return R.ok(this.sysAppConfigService.removeById(id));
    }


    @GetMapping("/selectByAppid")
    public R<SysAppConfigVO> selectByAppid(@RequestParam("appId")String appId){
        SysAppConfig sysAppConfig=this.sysAppConfigService.getOne(new QueryWrapper<SysAppConfig>().lambda().eq(SysAppConfig::getAppId,appId));
        if(sysAppConfig!=null){
            SysAppConfigVO  sysAppConfigVO=new SysAppConfigVO();
            BeanUtils.copyProperties(sysAppConfig,sysAppConfigVO);
            return R.ok(sysAppConfigVO);
        }

        return R.fail();
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/SysTemplateConfigApi.java

New file
@@ -0,0 +1,99 @@
package com.panzhihua.service_user.api;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
import com.panzhihua.service_user.entity.SysTemplateConfig;
import com.panzhihua.service_user.service.SysTemplateConfigService;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.io.Serializable;
import java.util.List;

/**
 * (SysTemplateConfig)表控制层
 *
 * @author makejava
 * @since 2022-01-13 14:29:57
 */
@RestController
@RequestMapping("sysTemplateConfig")
public class SysTemplateConfigApi {
    /**
     * 服务对象
     */
    @Resource
    private SysTemplateConfigService sysTemplateConfigService;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return this.sysTemplateConfigService.pageList(commonPage);
    }

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Serializable id) {
        return R.ok(this.sysTemplateConfigService.getById(id));
    }

    /**
     * 新增数据
     *
     * @param sysTemplateConfig 实体对象
     * @return 新增结果
     */
    @PostMapping
    public R insert(@RequestBody SysTemplateConfig sysTemplateConfig) {
        return R.ok(this.sysTemplateConfigService.save(sysTemplateConfig));
    }

    /**
     * 修改数据
     *
     * @param sysTemplateConfig 实体对象
     * @return 修改结果
     */
    @PostMapping("/update")
    public R update(@RequestBody SysTemplateConfig sysTemplateConfig) {
        return R.ok(this.sysTemplateConfigService.updateById(sysTemplateConfig));
    }

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return R.ok(this.sysTemplateConfigService.removeById(id));
    }

    @GetMapping("/selectTemplate")
    public R<SysTemplateConfigVO> selectTemplate(@RequestParam("areaCode")String areaCode,@RequestParam("type")Integer type){
        SysTemplateConfig sysTemplateConfig=this.sysTemplateConfigService.getOne(new QueryWrapper<SysTemplateConfig>().lambda().eq(SysTemplateConfig::getAreaCode,areaCode).eq(SysTemplateConfig::getType,type));
        if(sysTemplateConfig!=null){
            SysTemplateConfigVO sysTemplateConfigVO=new SysTemplateConfigVO();
            BeanUtils.copyProperties(sysTemplateConfig,sysTemplateConfigVO);
            return R.ok(sysTemplateConfigVO);
        }
        return R.fail();
    }
}

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

@@ -628,8 +628,8 @@
     * @return 运营后台数据看板
     */
    @PostMapping("datakanban")
    public R dataKanban() {
        return userService.dataKanban();
    public R dataKanban(@RequestParam("areaCode")String areaCode) {
        return userService.dataKanban(areaCode);
    }

    /**
@@ -1218,13 +1218,23 @@
     * @return  用户数据统计汇总
     */
    @GetMapping("community/statistics")
    public R communityStatistics() {
        return userService.communityStatistics();
    public R communityStatistics(@RequestParam("areaCode") String areaCode) {
        return userService.communityStatistics(areaCode);
    }

    @GetMapping("community/statistics/export")
    public R communityStatisticsExport() {
        return userService.communityStatisticsExport();
    public R communityStatisticsExport(@RequestParam("areaCode") String areaCode) {
        return userService.communityStatisticsExport(areaCode);
    }

    /**
     * 通过UnionId获取用户信息
     * @param unionId
     * @return
     */
    @GetMapping("/getByUnionId")
    public R getUserInfoByUnionId(@RequestParam("unionId") String unionId) {
        return userService.getUserInfoByUnionId(unionId);
    }

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysAppConfigDao.java

New file
@@ -0,0 +1,16 @@
package com.panzhihua.service_user.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_user.entity.SysAppConfig;

/**
 * (SysAppConfig)表数据库访问层
 *
 * @author makejava
 * @since 2022-01-13 10:10:18
 */
@Mapper
public interface SysAppConfigDao extends BaseMapper<SysAppConfig> {

}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysTemplateConfigDao.java

New file
@@ -0,0 +1,16 @@
package com.panzhihua.service_user.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_user.entity.SysTemplateConfig;

/**
 * (SysTemplateConfig)表数据库访问层
 *
 * @author makejava
 * @since 2022-01-13 14:29:55
 */
@Mapper
public interface SysTemplateConfigDao extends BaseMapper<SysTemplateConfig> {

}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java

@@ -65,17 +65,17 @@
    IPage<SysUserNoticeVO> pageNotice(Page page, @Param("pageDTO") PageDTO pageDTO);


    IndexDataKanbanVO selectIndexDataKanban();
    IndexDataKanbanVO selectIndexDataKanban(@Param("areaCode") String areaCode);


    List<DataKanbanDTO> selectCommunityUserOrder();
    List<DataKanbanDTO> selectCommunityUserOrder(@Param("areaCode")String areaCode);

    List<DataKanbanDTO> selectCommunityUserOrderMonth();
    List<DataKanbanDTO> selectCommunityUserOrderMonth(@Param("areaCode")String areaCode);


    DataKanbanDTO selectCommunityActiveUserOrder(Date date1);

    DataKanbanDTO selectCommunityAddUserOrder(Date date1);
    DataKanbanDTO selectCommunityAddUserOrder(@Param("areaCode")String areaCode,@Param("date1")Date date1);


    IndexDataVO indexDataCommunityBackstage(Long communityId);
@@ -196,7 +196,7 @@
     * 查询西区所有街道列表以及统计人数
     * @return  西区所有街道列表以及统计人数
     */
    List<IndexUserStreetVo> getUserStreetList();
    List<IndexUserStreetVo> getUserStreetList(@Param("areaCode") String areaCode);

    /**
     * 查询街道下社区列表以及统计人数
@@ -209,7 +209,7 @@
     * 查询街道下社区注册人数统计数据导出
     * @return  社区注册人数统计数据导出
     */
    List<IndexUserStreetExcelExportVo> getUserCommunityExcelExport();
    List<IndexUserStreetExcelExportVo> getUserCommunityExcelExport(String areaCode);

    /**
     * 查看是否是社区物业人员

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/entity/SysAppConfig.java

New file
@@ -0,0 +1,54 @@
package com.panzhihua.service_user.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.io.Serializable;
import java.util.Date;


/**
 * (SysAppConfig)表实体类
 *
 * @author makejava
 * @since 2022-01-13 10:10:15
 */
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("")
public class SysAppConfig implements Serializable {

    private static final long serialVersionUID = -90981038076389842L;

    @TableId(type = IdType.AUTO)
    private Long id;

    /**
     * appid
     */
    @ApiModelProperty(value = "appid")
    private String appId;

    /**
     * secret
     */
    @ApiModelProperty(value = "secret")
    private String secret;

    /**
     * 小程序名字
     */
    @ApiModelProperty(value = "小程序名字")
    private String name;

    private String areaCode;

}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/entity/SysTemplateConfig.java

New file
@@ -0,0 +1,51 @@
package com.panzhihua.service_user.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.io.Serializable;
import java.util.Date;


/**
 * (SysTemplateConfig)表实体类
 *
 * @author makejava
 * @since 2022-01-13 14:29:55
 */
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("")
public class SysTemplateConfig implements Serializable {

    private static final long serialVersionUID = -29178409799302189L;

    @TableId(type = IdType.AUTO)
    private Long id;

    /**
     * 模板id
     */
    @ApiModelProperty(value = "模板id")
    private String templateId;

    /**
     * 模板类型 1活动变更 2留言回复 3活动取消 4审核状态 5认证审核 6调研问卷 7奖励发放 8报名成功 9活动即将开始 10预约提醒
     */
    @ApiModelProperty(value = "模板类型 1活动变更 2留言回复 3活动取消 4审核状态 5认证审核 6调研问卷 7奖励发放 8报名成功 9活动即将开始 10预约提醒 ")
    private Integer type;

    /**
     * 区域编码
     */
    @ApiModelProperty(value = "区域编码")
    private String areaCode;
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysRoleDO.java

@@ -90,4 +90,6 @@
     */
    private Long communityId;

    private String areaCode;

}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/RoleService.java

@@ -46,7 +46,7 @@
     *            对应社区 0 表示运营后台
     * @return 角色集合
     */
    R listRoleBackstage(Long communityId,Integer pageNum,Integer pageSize);
    R listRoleBackstage(Long communityId,Integer pageNum,Integer pageSize,String areaCode);

    /**
     * 新增角色

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/SysAppConfigService.java

New file
@@ -0,0 +1,22 @@
package com.panzhihua.service_user.service;

import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_user.entity.SysAppConfig;

/**
 * (SysAppConfig)表服务接口
 *
 * @author makejava
 * @since 2022-01-13 10:10:18
 */
public interface SysAppConfigService extends IService<SysAppConfig> {
    /**
     * 分页查询
     *
     * @param commonPage
     * @return
     */
    R pageList(CommonPage commonPage);
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/SysTemplateConfigService.java

New file
@@ -0,0 +1,22 @@
package com.panzhihua.service_user.service;

import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_user.entity.SysTemplateConfig;

/**
 * (SysTemplateConfig)表服务接口
 *
 * @author makejava
 * @since 2022-01-13 14:29:56
 */
public interface SysTemplateConfigService extends IService<SysTemplateConfig> {
    /**
     * 分页查询
     *
     * @param commonPage
     * @return
     */
    R pageList(CommonPage commonPage);
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java

@@ -414,7 +414,7 @@
     * 
     * @return 展示数据
     */
    R dataKanban();
    R dataKanban(String areaCode);

    /**
     * 社区管理后台数据看板
@@ -746,9 +746,9 @@
     * 运营后台-用户数据统计汇总
     * @return  用户数据统计汇总
     */
    R communityStatistics();
    R communityStatistics(String areaCode);

    R communityStatisticsExport();
    R communityStatisticsExport(String areaCode);

    /**
     * 通过UnionId获取用户信息

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java

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

import javax.annotation.Resource;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.beans.BeanUtils;
@@ -108,8 +109,13 @@
     * @return 角色集合
     */
    @Override
    public R listRoleBackstage(Long communityId,Integer pageNum,Integer pageSize) {
        IPage<SysRoleDO> sysRoleDOIPage=this.roleDAO.selectPage(new Page<>(pageNum,pageSize),new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getCommunityId, communityId).orderByDesc(SysRoleDO::getCreateAt));
    public R listRoleBackstage(Long communityId,Integer pageNum,Integer pageSize,String areaCode) {
        LambdaQueryWrapper<SysRoleDO> queryWrapper=new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getCommunityId, communityId);
        if(com.panzhihua.common.utlis.StringUtils.isNotEmpty(areaCode)){
            queryWrapper.eq(SysRoleDO::getAreaCode,areaCode);
        }
        queryWrapper.orderByDesc(SysRoleDO::getCreateAt);
        IPage<SysRoleDO> sysRoleDOIPage=this.roleDAO.selectPage(new Page<>(pageNum,pageSize),queryWrapper);
        if (ObjectUtils.isEmpty(sysRoleDOIPage.getRecords())) {
            return R.fail("角色列表为空");
        }

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/SysAppConfigServiceImpl.java

New file
@@ -0,0 +1,26 @@
package com.panzhihua.service_user.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_user.entity.SysAppConfig;
import com.panzhihua.service_user.dao.SysAppConfigDao;
import com.panzhihua.service_user.service.SysAppConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

/**
 * (SysAppConfig)表服务实现类
 *
 * @author makejava
 * @since 2022-01-13 10:10:18
 */
@Slf4j
@Service
public class SysAppConfigServiceImpl extends ServiceImpl<SysAppConfigDao, SysAppConfig> implements SysAppConfigService {

    @Override
    public R pageList(CommonPage commonPage) {
        return null;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/SysTemplateConfigServiceImpl.java

New file
@@ -0,0 +1,26 @@
package com.panzhihua.service_user.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_user.entity.SysTemplateConfig;
import com.panzhihua.service_user.dao.SysTemplateConfigDao;
import com.panzhihua.service_user.service.SysTemplateConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

/**
 * (SysTemplateConfig)表服务实现类
 *
 * @author makejava
 * @since 2022-01-13 14:29:56
 */
@Slf4j
@Service
public class SysTemplateConfigServiceImpl extends ServiceImpl<SysTemplateConfigDao, SysTemplateConfig> implements SysTemplateConfigService {

    @Override
    public R pageList(CommonPage commonPage) {
        return null;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -14,6 +14,9 @@

import javax.annotation.Resource;

import com.panzhihua.service_user.dao.*;
import com.panzhihua.service_user.entity.SysAppConfig;
import com.panzhihua.service_user.entity.SysTemplateConfig;
import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.BeanUtils;
@@ -85,21 +88,6 @@
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.common.utlis.WxUtil;
import com.panzhihua.common.utlis.WxXCXTempSend;
import com.panzhihua.service_user.dao.ComActFourMemberDao;
import com.panzhihua.service_user.dao.ComMngFamilyInfoDAO;
import com.panzhihua.service_user.dao.ComMngUserTagDAO;
import com.panzhihua.service_user.dao.EventGridMemberBuildingRelationMapper;
import com.panzhihua.service_user.dao.LcCompareMemberCodeMapper;
import com.panzhihua.service_user.dao.RoleDAO;
import com.panzhihua.service_user.dao.SysMenuDAO;
import com.panzhihua.service_user.dao.SysOperLogDAO;
import com.panzhihua.service_user.dao.SysRoleMenuDAO;
import com.panzhihua.service_user.dao.SysUserAgreementDAO;
import com.panzhihua.service_user.dao.SysUserFeedbackDAO;
import com.panzhihua.service_user.dao.SysUserInputDAO;
import com.panzhihua.service_user.dao.SysUserNoticeDAO;
import com.panzhihua.service_user.dao.SysUserRoleDAO;
import com.panzhihua.service_user.dao.UserDao;
import com.panzhihua.service_user.model.dos.ComActFourMember;
import com.panzhihua.service_user.model.dos.ComMngFamilyInfoDO;
import com.panzhihua.service_user.model.dos.ComMngUserTagDO;
@@ -167,6 +155,10 @@
    private LcCompareMemberCodeMapper lcCompareMemberCodeMapper;
    @Resource
    private ComActFourMemberDao comActFourMemberDao;
    @Resource
    private SysAppConfigDao sysAppConfigDao;
    @Resource
    private SysTemplateConfigDao sysTemplateConfigDao;
    // @Resource
    // private GridService gridService;

@@ -318,7 +310,16 @@
        loginUserInfoVO.setType(sysUserDO.getType());
        loginUserInfoVO.setIsRealNamed(sysUserDO.getIdCard() != null);// 暂时 身份证判断实名制
        if(sysUserDO.getCommunityId()!=null){
            ComActVO comActVO = userDao.selectCommunity(sysUserDO.getCommunityId());
            loginUserInfoVO.setCommunityId(sysUserDO.getCommunityId());
            if(comActVO!=null){
                loginUserInfoVO.setComActVO(comActVO);
                SysAppConfig sysAppConfig=sysAppConfigDao.selectOne(new QueryWrapper<SysAppConfig>().lambda().eq(SysAppConfig::getAreaCode,comActVO.getAreaCode()));
                if(sysAppConfig!=null){
                    loginUserInfoVO.setAppId(sysAppConfig.getAppId());
                    loginUserInfoVO.setAppSecret(sysAppConfig.getSecret());
                }
            }
        }
        List<SysRoleDO> roleDOList = roleDAO.selectByUserId(sysUserDO.getUserId());
        Set<String> set = new HashSet<>();
@@ -365,6 +366,12 @@
            ComActVO comActVO = userDao.selectCommunity(userCommunityId);
            if (comActVO != null) {
                loginUserInfoVO.setCommunityName(comActVO.getName());
                loginUserInfoVO.setComActVO(comActVO);
                SysAppConfig sysAppConfig=sysAppConfigDao.selectOne(new QueryWrapper<SysAppConfig>().lambda().eq(SysAppConfig::getAreaCode,comActVO.getAreaCode()));
                if(sysAppConfig!=null){
                    loginUserInfoVO.setAppId(sysAppConfig.getAppId());
                    loginUserInfoVO.setAppSecret(sysAppConfig.getSecret());
                }
            }
        }
        if (!ObjectUtils.isEmpty(phone)) {
@@ -861,9 +868,10 @@
                try {
                    WxXCXTempSend util = new WxXCXTempSend();
                    String accessToken = util.getAppAccessToken();
                    SysTemplateConfig sysTemplateConfig=sysTemplateConfigDao.selectOne(new QueryWrapper<SysTemplateConfig>().lambda().eq(SysTemplateConfig::getAreaCode, loginUserInfoVO.getComActVO()).eq(SysTemplateConfig::getType,5));
                    // 用户实名认证推送消息
                    WxUtil.sendSubscribeRZSH(user.getOpenid(), accessToken, "实名认证",
                        com.panzhihua.common.utlis.DateUtils.getCurrentDateStr(), "认证成功");
                        com.panzhihua.common.utlis.DateUtils.getCurrentDateStr(), "认证成功",sysTemplateConfig.getTemplateId());
                } catch (Exception e) {
                    log.error("推送用户订阅消息失败，失败原因：" + e.getMessage());
                }
@@ -1707,9 +1715,9 @@
     * @return 展示数据
     */
    @Override
    public R dataKanban() {
        IndexDataKanbanVO indexDataKanbanVO = userDao.selectIndexDataKanban();
        List<DataKanbanDTO> dataKanbanDTOS = userDao.selectCommunityUserOrder();
    public R dataKanban(String areaCode) {
        IndexDataKanbanVO indexDataKanbanVO = userDao.selectIndexDataKanban(areaCode);
        List<DataKanbanDTO> dataKanbanDTOS = userDao.selectCommunityUserOrder(areaCode);

        List<String> communityUserX = new ArrayList<>();
        List<Integer> communityUserY = new ArrayList<>();
@@ -2723,7 +2731,7 @@
     */
    @Override
    public R dataKanBans(DataKanBansDto dataKanBansDto){
        IndexDataKanbanVO indexDataKanbanVO = userDao.selectIndexDataKanban();
        IndexDataKanbanVO indexDataKanbanVO = userDao.selectIndexDataKanban(dataKanBansDto.getAreaCode());
        List<String> communityUserX = new ArrayList<>();
        List<Integer> communityUserY = new ArrayList<>();

@@ -2733,9 +2741,9 @@

        List<DataKanbanDTO> dataKanbanDTOS = null;
        if(dataKanBansDto.getType() != null && dataKanBansDto.getType().equals(DataKanBansDto.type.by)){
            dataKanbanDTOS = userDao.selectCommunityUserOrderMonth();
            dataKanbanDTOS = userDao.selectCommunityUserOrderMonth(dataKanBansDto.getAreaCode());
        }else{
            dataKanbanDTOS = userDao.selectCommunityUserOrder();
            dataKanbanDTOS = userDao.selectCommunityUserOrder(dataKanBansDto.getAreaCode());
        }
        if (!ObjectUtils.isEmpty(dataKanbanDTOS)) {
            dataKanbanDTOS.forEach(dataKanbanDTO -> {
@@ -2748,7 +2756,7 @@
        List<Date> serverndays = com.panzhihua.common.utlis.DateUtils.getOldDays();
        serverndays.forEach(date -> {
            // 查询社区活动数量
            DataKanbanDTO dataKanbanDTO = userDao.selectCommunityAddUserOrder(date);
            DataKanbanDTO dataKanbanDTO = userDao.selectCommunityAddUserOrder(dataKanBansDto.getAreaCode(),date);
            communityActiveUserX.add(DateFormatUtils.format(date, "MM-dd"));
            communityActiveUserY.add(dataKanbanDTO.getNum());
            communityActiveUserZ.add(dataKanbanDTO.getDayNum());
@@ -2766,11 +2774,11 @@
     * @return  用户数据统计汇总
     */
    @Override
    public R communityStatistics(){
    public R communityStatistics(String areaCode){
        //返回结果数据
        IndexUserStatisticsVo userStatisticsVo = new IndexUserStatisticsVo();
        //查询所有街道
        List<IndexUserStreetVo> streetList = userDao.getUserStreetList();
        List<IndexUserStreetVo> streetList = userDao.getUserStreetList(areaCode);
        streetList.forEach(street -> {
            List<IndexUserCommunityVo> communityList = userDao.getUserCommunityList(street.getStreetId());
            street.setCommunityList(communityList);
@@ -2780,8 +2788,8 @@
    }

    @Override
    public R communityStatisticsExport(){
        return R.ok(userDao.getUserCommunityExcelExport());
    public R communityStatisticsExport(String areaCode){
        return R.ok(userDao.getUserCommunityExcelExport(areaCode));
    }

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/SysAppConfigMapper.xml

New file
@@ -0,0 +1,12 @@
<?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_user.dao.SysAppConfigDao">

    <resultMap type="com.panzhihua.service_user.entity.SysAppConfig" id="SysAppConfigBaseResultMap">
        <result property="id" column="id"/>
        <result property="appId" column="app_id"/>
        <result property="secret" column="secret"/>
        <result property="name" column="name"/>
    </resultMap>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/SysOperLogDAO.xml

@@ -28,7 +28,7 @@


    <select id="pageOperLog" resultType="com.panzhihua.common.model.vos.user.SysOperLogVO">
select * from sys_oper_log where community_id=#{sysOperLogVO.communityId} order by oper_time desc 
select * from sys_oper_log where community_id = #{sysOperLogVO.communityId} order by oper_time desc
    </select>



 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/SysTemplateConfigMapper.xml

New file
@@ -0,0 +1,12 @@
<?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_user.dao.SysTemplateConfigDao">

    <resultMap type="com.panzhihua.service_user.entity.SysTemplateConfig" id="SysTemplateConfigBaseResultMap">
        <result property="id" column="id"/>
        <result property="templateId" column="template_id"/>
        <result property="type" column="type"/>
        <result property="areaCode" column="area_code"/>
    </resultMap>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/SysUserInputDAO.xml

@@ -47,7 +47,7 @@
    </select>

    <select id="selectComMngStructArea" resultType="com.panzhihua.common.model.vos.community.ComMngStructAreaVO">
        select a.id,a.community_id,a.area_name,address_detail from com_mng_struct_area a where a.community_id=#{communityId}
        select a.id,a.community_id,a.area_name,address_detail from com_mng_struct_area a where a.community_id = #{communityId}
    </select>

    <select id="specialUserExport" resultType="com.panzhihua.common.model.dtos.user.EexcelUserDTO">
@@ -59,7 +59,7 @@
        if(u.low_income_households=1,'是','否') lowIncomeHouseholds, if(u.low_income_people=1,'是','否') lowIncomePeople,
        if(u.old_people=1,'是','否') oldPeople, if(u.special_service_family=1,'是','否') specialServiceFamily,
        if(u.key_personnel=1,'是','否') keyPersonnel, u.tags FROM sys_user_input u JOIN com_mng_struct_area c ON u.area_id
        = c.id where u.community_id=#{exportSpecialUserDTO.communityId}
        = c.id where u.community_id = #{exportSpecialUserDTO.communityId}
        <if
                test='exportSpecialUserDTO.areaName != null and exportSpecialUserDTO.areaName.trim() != &quot;&quot;'>
            AND
@@ -87,7 +87,7 @@
        if(u.low_income_households=1,'是','否') lowIncomeHouseholds, if(u.low_income_people=1,'是','否') lowIncomePeople,
        if(u.old_people=1,'是','否') oldPeople, if(u.special_service_family=1,'是','否') specialServiceFamily,
        if(u.key_personnel=1,'是','否') keyPersonnel, u.tags FROM sys_user_input u where
        u.community_id=#{exportUserDTO.communityId}
        u.community_id = #{exportUserDTO.communityId}
        <if
                test='exportUserDTO.areaName != null and exportUserDTO.areaName.trim() != &quot;&quot;'>JOIN
            com_mng_struct_area c ON u.area_id = c.id

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml

@@ -48,14 +48,14 @@
    <select id="indexDataCommunityBackstage" resultType="com.panzhihua.common.model.vos.IndexDataVO">
        SELECT
        COUNT(DISTINCT u.user_id)allUser,
        (select COUNT(m.id) from com_mng_volunteer_mng m where m.community_id=#{communityId} and m.`state`=2)volunteerUser,
        (select COUNT(m.id) from com_mng_volunteer_mng m where m.community_id = #{communityId} and m.`state`=2)volunteerUser,
         (select count(id) from com_pb_member cpm where cpm.audit_result = 1 and cpm.community_id = #{communityId}) partymemberUser,
        COUNT(h.id)house
        FROM
        sys_user u
        JOIN com_act c ON u.community_id = c.community_id
        LEFT JOIN com_mng_struct_house_user h on u.user_id=h.user_id
        WHERE u.community_id =#{communityId} and u.type=1
        WHERE u.community_id = #{communityId} and u.type=1
    </select>

    <update id="timedTaskContinuousLandingDays">
@@ -78,7 +78,7 @@
        FROM
             com_pb_member_role a
        WHERE
             a.phone = #{phone} and community_id=#{userCommunityId}
             a.phone = #{phone} and community_id = #{userCommunityId}
    </select>

    <select id="pageUserAppletsBackstage" resultType="com.panzhihua.common.model.vos.user.SysUserVO">
@@ -100,7 +100,10 @@
            and u.phone=#{pageUserAppletsBackstageDTO.phone}
        </if>
        <if test='pageUserAppletsBackstageDTO.communityId != null and pageUserAppletsBackstageDTO.communityId != 0'>and
            u.community_id=#{pageUserAppletsBackstageDTO.communityId}
            u.community_id = #{pageUserAppletsBackstageDTO.communityId}
        </if>
        <if test='pageUserAppletsBackstageDTO.areaCode != null'>and
            a.area_code = #{pageUserAppletsBackstageDTO.areaCode}
        </if>
        <if test='pageUserAppletsBackstageDTO.status != null and pageUserAppletsBackstageDTO.status != 0'>and
            u.status=#{pageUserAppletsBackstageDTO.status}
@@ -120,10 +123,10 @@
        COUNT(user_id)allUser,
        COUNT(case WHEN DATE_FORMAT(t.create_at,'%m-%d-%Y')=DATE_FORMAT(SYSDATE(),'%m-%d-%Y') then user_id else null end )addUser,
        COUNT(case WHEN DATE_FORMAT(last_login_time,'%m-%d-%Y')=DATE_FORMAT(SYSDATE(),'%m-%d-%Y') then user_id else null end )activeDayUser,
        (SELECT count(user_id) FROM sys_user t left join com_act t1 on t.community_id = t1.community_id WHERE type = 1 and t1.area_code = '510423' AND last_login_time > date_sub(SYSDATE(), INTERVAL 7 DAY))activeWeekUser
        (SELECT count(user_id) FROM sys_user t left join com_act t1 on t.community_id = t1.community_id WHERE type = 1 and t1.area_code = #{areaCode} AND last_login_time > date_sub(SYSDATE(), INTERVAL 7 DAY))activeWeekUser
        FROM
        sys_user t LEFT JOIN com_act t1 on t.community_id = t1.community_id
        where t.type=1 and t.community_id is not null and t1.area_code ='510423'
        where t.type=1 and t.community_id is not null and t1.area_code = #{areaCode}
            </select>

    <select id="selectCommunityUserOrder" resultType="com.panzhihua.service_user.model.dtos.DataKanbanDTO">
@@ -135,7 +138,7 @@
        AND last_login_time > DATE_FORMAT( date_sub( SYSDATE(), INTERVAL 0 DAY ), '%Y-%m-%d 00:00:00')) as dayNum
        FROM
        com_act a
        LEFT JOIN sys_user u ON a.community_id = u.community_id and u.type=1 where a.area_code = '510423'
        LEFT JOIN sys_user u ON a.community_id = u.community_id and u.type=1 where a.area_code = #{areaCode}
        GROUP BY a.community_id)t ORDER BY t.num desc
    </select>

@@ -149,7 +152,7 @@
        FROM
        com_act a
        LEFT JOIN sys_user u ON a.community_id = u.community_id
        and u.type=1 and u.create_at >= DATE_ADD(curdate(),interval -day(curdate())+1 day) where a.area_code = '510423'
        and u.type=1 and u.create_at >= DATE_ADD(curdate(),interval -day(curdate())+1 day) where a.area_code = #{areaCode}
        GROUP BY a.community_id)t ORDER BY t.num desc
    </select>

@@ -169,6 +172,7 @@
        sys_user u
        JOIN sys_user_role r ON u.user_id = r.user_id
        JOIN sys_role e ON r.role_id = e.role_id
        left join com_act ca on u.community_id = ca.community_id
        <if test='administratorsUserVO.roleId != null and administratorsUserVO.roleId!=0'>and
            e.role_id=#{administratorsUserVO.roleId}
        </if>
@@ -181,6 +185,9 @@
            </if>
            <if test='administratorsUserVO.phone != null and administratorsUserVO.phone.trim() != &quot;&quot;'>AND
                u.phone like concat(#{administratorsUserVO.phone},'%')
            </if>
            <if test='administratorsUserVO.areaCode != null '>
                AND ca.area_code = #{administratorsUserVO.areaCode}
            </if>
            <if test='administratorsUserVO.account != null and administratorsUserVO.account.trim() != &quot;&quot;'>AND
                u.account like concat(#{administratorsUserVO.account},'%')
@@ -200,12 +207,12 @@

    <select id="selectCommunityAddUserOrder" resultType="com.panzhihua.service_user.model.dtos.DataKanbanDTO">
        select count(user_id) as num,
        (SELECT count( user_id ) FROM sys_user t LEFT JOIN com_act t1 on t.community_id=t1.community_id WHERE t.type = 1 and t1.area_code = '510423'
        (SELECT count( user_id ) FROM sys_user t LEFT JOIN com_act t1 on t.community_id=t1.community_id WHERE t.type = 1 and t1.area_code = #{areaCode}
        AND last_login_time <![CDATA[ >= ]]> DATE_FORMAT( #{date1}, '%Y-%m-%d 00:00:00')
        AND last_login_time <![CDATA[ <= ]]> DATE_FORMAT( #{date1}, '%Y-%m-%d 23:59:59')) as dayNum from sys_user as su LEFT JOIN com_act t1 on su.community_id = t1.community_id
        where su.create_at <![CDATA[ >= ]]> DATE_SUB(DATE_FORMAT(#{date1},'%Y-%m-%d 00:00:00'),INTERVAL 0 DAY)
        and su.create_at <![CDATA[ <= ]]> DATE_SUB(DATE_FORMAT(#{date1},'%Y-%m-%d 23:59:59'),INTERVAL 0 DAY)
        and su.type = 1 and t1.area_code='510423'
        and su.type = 1 and t1.area_code=#{areaCode}
    </select>

    <update id="gridMemberEditStatus">
@@ -266,7 +273,7 @@
        FROM
             sys_user u LEFT JOIN sys_user_role ur ON u.user_id = ur.user_id
             LEFT JOIN sys_role r ON ur.role_id = r.role_id
        WHERE ur.role_id IS  NOT NULL AND  u.phone = #{phone}  and r.community_id=#{userCommunityId}
        WHERE ur.role_id IS  NOT NULL AND  u.phone = #{phone}  and r.community_id = #{userCommunityId}
    </select>

    <delete id="delGridMemberRelation">
@@ -307,7 +314,7 @@
        <if test='loginUserInfoVO.communityName != null and loginUserInfoVO.communityName.trim() != &quot;&quot;'>
            AND c.`area_name` like concat(#{loginUserInfoVO.communityName},'%')
        </if>
        where u.face_state is not null and u.type=1 and u.community_id=#{loginUserInfoVO.communityId}
        where u.face_state is not null and u.type=1 and u.community_id = #{loginUserInfoVO.communityId}
        <if test='loginUserInfoVO.name != null and loginUserInfoVO.name.trim() != &quot;&quot;'>
            and u.`name` like concat(#{loginUserInfoVO.name},'%')
        </if>
@@ -331,7 +338,7 @@
        FROM
             com_pb_service_team a
        WHERE
             a.phone = #{phone} and community_id=#{userCommunityId}
             a.phone = #{phone} and community_id = #{userCommunityId}
    </select>

    <select id="selectExport" resultType="com.panzhihua.common.model.dtos.user.EexcelUserDTO">
@@ -372,7 +379,7 @@
        <if test='exportUserDTO.areaName != null and exportUserDTO.areaName.trim() != &quot;&quot;'>AND c.`area_name`
            like concat(#{exportUserDTO.areaName},'%')
        </if>
        where u.community_id=#{exportUserDTO.communityId} and u.type=1
        where u.community_id = #{exportUserDTO.communityId} and u.type=1
        <if
                test='exportUserDTO.name != null and exportUserDTO.name.trim() != &quot;&quot;'>and u.`name` like
            concat(#{exportUserDTO.name},'%')
@@ -429,7 +436,7 @@
    </update>

    <select id="selectCommunity" resultType="com.panzhihua.common.model.vos.community.ComActVO">
       select name from com_act where community_id=#{communityId}
       select * from com_act where community_id = #{communityId}
    </select>

    <delete id="delLcMember">
@@ -470,7 +477,7 @@
                AND ca.street_id = cs.street_id
            ) AS userNum
        FROM
            `com_street` AS cs where area_code='510423'
            `com_street` AS cs where area_code=#{areaCode}
            order by userNum desc
    </select>

@@ -511,7 +518,7 @@
            LEFT JOIN com_street AS cs ON cs.street_id = ca.street_id
        WHERE
            su.type = 1
            AND su.community_id IS NOT NULL and ca.area_code = '510423'
            AND su.community_id IS NOT NULL and ca.area_code = #{areaCode}
        GROUP BY
            ca.community_id
        ORDER BY

 springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/CommunityJobHandler.java

@@ -130,7 +130,7 @@
            // 获取待结束的活动列表
            List<Long> activityList = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), Long.class);
            if (!activityList.isEmpty()) {
                log.info("社区活动结束时计算积分");
                log.info("社区活动结束时扣减未参与用户积分");
                activityList.forEach(activityId -> {
                    R r1 = communityService.getTaskActivityPeopleList(activityId);
                    if (R.isOk(r1)) {
@@ -138,15 +138,14 @@
                            JSONArray.parseArray(JSONArray.toJSONString(r1.getData()), ComActActivityPeopleVO.class);
                        if (!peopleList.isEmpty()) {
                            peopleList.forEach(people -> {
                                if (people.getIsVolunteer().equals(1)) {
                                    communityService.addIntegralTradeAdmin(new AddComActIntegralUserDTO(
                                        people.getActivityId(), AddComActIntegralUserDTO.integralType.cyzyzhd,
                                        people.getCommunityId(), people.getUserId()));
                                } else {
                                    communityService.addIntegralTradeAdmin(new AddComActIntegralUserDTO(
                                        people.getActivityId(), AddComActIntegralUserDTO.integralType.cysqhd,
                                        people.getCommunityId(), people.getUserId()));
                                }
                                AddComActIntegralUserDTO addComActIntegralUserDTO = new AddComActIntegralUserDTO();
                                addComActIntegralUserDTO.setUserId(people.getUserId());
                                addComActIntegralUserDTO.setIntegralType(AddComActIntegralUserDTO.integralType.qxhd);
                                addComActIntegralUserDTO.setActivityType(1);
                                addComActIntegralUserDTO.setIsVolunteer(people.getIsVolunteer());
                                addComActIntegralUserDTO.setCommunityId(people.getCommunityId());
                                addComActIntegralUserDTO.setServiceId(activityId);
                                communityService.addIntegralTradeAdmin(addComActIntegralUserDTO);
                            });
                        }
                    }

 springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java

@@ -9,6 +9,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import com.panzhihua.common.model.vos.user.SysAppConfigVO;
import com.panzhihua.common.utlis.StringUtils;
import org.springframework.context.ApplicationContext;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.data.redis.core.ValueOperations;
@@ -271,6 +273,13 @@
                noLoginUrl.add("/api/applets/renting/houses/nearby");
                noLoginUrl.add("/api/applets/renting/houses/houseList");
                noLoginUrl.add("/api/applets/renting/houses/getConfig");
                noLoginUrl.add("/api/communitybackstage/screen/comprehensive/street/list");
                noLoginUrl.add("/api/communitybackstage/screen/comprehensive/population");
                noLoginUrl.add("/api/communitybackstage/screen/getWestScreenStatics");
                noLoginUrl.add("/api/communitybackstage/screen/comprehensive/governance");
                noLoginUrl.add("/api/communitybackstage/screen/comprehensive/partydyn");
                noLoginUrl.add("/api/communitybackstage/screen/comprehensive/pagedynamic");
                noLoginUrl.add("/api/communitybackstage/screen/get/community/password");
                if (noLoginUrl.contains(requestURI)) {
                    List<SimpleGrantedAuthority> authorities = new ArrayList<>();
                    authorities.add(new SimpleGrantedAuthority(SecurityConstants.ROLE_APPLETS));