bug修改

101captain

2022-07-20 c40f8e3d2e08e108780091776437242528bf61d6

bug修改

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

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

import javax.annotation.Resource;
import javax.validation.Valid;

import org.springframework.util.ObjectUtils;
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.JSONObject;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.dpc.PageDpcDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActDpcVO;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoFeedbackVO;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;

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

import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;

/**
 * @title: ComActDpcApi
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 人大代表
 * @author: hans
 * @date: 2022/06/07 10:57
 */
@Slf4j
@Api(tags = {"人大代表相关"})
@RestController
@RequestMapping("/dpc")
public class ComActDpcApi extends BaseController {

    @Resource
    private CommunityService communityService;
    @Resource
    private UserService userService;

    @ApiOperation(value = "获取人大代表详情", response = ComActDpcVO.class)
    @ApiImplicitParam(name = "id", value = "人大代表id", required = true)
    @GetMapping("/detail")
    public R detailDpc(@RequestParam("id") Long id) {
        return communityService.detailDpc(id);
    }

    @ApiOperation(value = "分页查询人大代表", response = ComActDpcVO.class)
    @PostMapping("/page")
    public R pageDpc(@RequestBody @Valid PageDpcDTO pageDpcDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
        if (nonNull(loginUserInfo)) {
            pageDpcDTO.setCommunityId(loginUserInfo.getCommunityId());
        } else if (isNull(pageDpcDTO.getCommunityId())) {
            return R.fail("未指定社区");
        }
        return communityService.pageDpc(pageDpcDTO);
    }

    @ApiOperation(value = "获取人大代表反馈记录", response = ComActEasyPhotoFeedbackVO.class)
    @ApiImplicitParam(name = "id", value = "随手拍id", required = true)
    @GetMapping("/feedback")
    public R getFeedbackList(@RequestParam("id") Long id) {
        return communityService.getFeedbackList(id);
    }

    @ApiOperation(value = "人大代表反馈随手拍")
    @PostMapping("/feedback")
    public R addFeedback(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Integer isDpcMember = loginUserInfo.getIsDpcMember();
        if (isNull(isDpcMember) || !isDpcMember.equals(1)) {
            return R.fail("暂无权限");
        }
        Long userId = loginUserInfo.getUserId();
        Integer type = comActEasyPhotoVO.getType();
        if (null == type || type != 3) {
            return R.fail("操作类型错误");
        }
        Long id = comActEasyPhotoVO.getId();
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("随手拍主键不能为空");
        }
        comActEasyPhotoVO.setUserId(userId);
        R r = communityService.addEasyPhotoFeedbackForDpc(comActEasyPhotoVO);
        if (R.isOk(r)) {
            R r1 = communityService.detailEasyPhoto(id, userId);
            if (R.isOk(r1)) {
                ComActEasyPhotoVO comActEasyPhotoVO1 =
                    JSONObject.parseObject(JSONObject.toJSONString(r1.getData()), ComActEasyPhotoVO.class);
                SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
                sysUserNoticeVO.setUserId(comActEasyPhotoVO1.getSponsorId());
                sysUserNoticeVO.setType(2);
                sysUserNoticeVO.setBusinessType(4);
                sysUserNoticeVO.setBusinessTime(comActEasyPhotoVO1.getExamineAt());
                sysUserNoticeVO.setBusinessId(id);
                sysUserNoticeVO.setStatus(0);
                if (type.intValue() == 3) {
                    sysUserNoticeVO.setTitle("随手拍有反馈");
                    sysUserNoticeVO.setBusinessTitle(comActEasyPhotoVO.getHandleResult());
                    sysUserNoticeVO.setBusinessContent("社区已经处理好了具体的事宜，将变成现在更好看的样子找到更好的自己……");
                    sysUserNoticeVO.setBusinessStatus(2);
                    R r2 = userService.addNotice(sysUserNoticeVO);
                    if (R.isOk(r2)) {
                        log.info("新增随手拍有反馈通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
                    }
                }
            }
        }
        return r;
    }
}

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

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

import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;

import javax.annotation.Resource;
import javax.validation.Valid;

import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.enterprise.AddEnterpriseDTO;
import com.panzhihua.common.model.dtos.community.enterprise.EditEnterpriseDTO;
import com.panzhihua.common.model.dtos.community.enterprise.PageEnterpriseDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActEnterpriseVO;
import com.panzhihua.common.service.community.CommunityService;

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

/**
 * @title: ComActEnterpriseApi
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 社区企业管理
 * @author: hans
 * @date: 2022/05/31 10:22
 */
@Slf4j
@Api(tags = {"社区企业管理"})
@RestController
@RequestMapping("/enterprise")
public class ComActEnterpriseApi extends BaseController {

    @Resource
    private CommunityService communityService;

    @ApiOperation("获取社区企业详情")
    @ApiImplicitParam(name = "id", value = "社区企业id", required = true)
    @GetMapping("/detail")
    public R detailEnterprise(@RequestParam("id") Long id) {
        return communityService.detailEnterprise(id);
    }

    @ApiOperation(value = "分页查询社区企业", response = ComActEnterpriseVO.class)
    @PostMapping("/page")
    public R pageEnterprise(@RequestBody @Valid PageEnterpriseDTO pageEnterpriseDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
        if (nonNull(loginUserInfo)) {
            pageEnterpriseDTO.setCommunityId(loginUserInfo.getCommunityId());
        } else if (isNull(pageEnterpriseDTO.getCommunityId())) {
            return R.fail("未指定社区");
        }
        return communityService.pageEnterprise(pageEnterpriseDTO);
    }
}

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

@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActSocialOrgVO;
import com.panzhihua.common.model.vos.community.ComActVO;
@@ -13,6 +14,9 @@
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;

/**
 * @author zzj
@@ -31,18 +35,23 @@
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "社会组织列表",response = ComActSocialOrgVO.class)
    @ApiOperation(value = "社会组织列表", response = ComActSocialOrgVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        if(this.getCommunityId()!=null){
           R r=communityService.detailCommunity(this.getCommunityId());
           if(R.isOk(r)){
              ComActVO comActVO=JSONObject.parseObject(JSONObject.toJSONString(r.getData()), ComActVO.class);
            if(comActVO!=null){
        LoginUserInfoVO loginUserInfoSureNoLogin = this.getLoginUserInfoSureNoLogin();
        if (nonNull(loginUserInfoSureNoLogin)) {
            commonPage.setCommunityId(loginUserInfoSureNoLogin.getCommunityId());
        } else if (isNull(commonPage.getCommunityId())) {
            return R.fail("缺少社区id");
        }
        R r = communityService.detailCommunity(commonPage.getCommunityId());
        if (R.isOk(r)) {
            ComActVO comActVO = JSONObject.parseObject(JSONObject.toJSONString(r.getData()), ComActVO.class);
            if (comActVO != null) {
                commonPage.setStreetId(comActVO.getStreetId());
            }
           }
        }
        commonPage.setCommunityId(null);
        return this.communityService.comActSocialOrgSelectAll(commonPage);
    }


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

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


import javax.annotation.Resource;

import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.social.HatchAuditProcessDTO;
import com.panzhihua.common.model.dtos.community.social.PageSocialOrgHatchAuditDTO;
import com.panzhihua.common.model.dtos.community.social.SocialOrgHatchAuditDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.social.SocialOrgHatchAuditVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.validated.PutGroup;

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

/**
 * @title: ComActSocialOrgHatchAuditApi
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 社会组织孵化申请相关
 * @author: hans
 * @date: 2022/04/18 14:14
 */
@Slf4j
@Api(tags = {"社会组织孵化申请"})
@RestController
@RequestMapping("/comActSocialOrgHatchAudit")
public class ComActSocialOrgHatchAuditApi extends BaseController {
    /**
     * 服务对象
     */
    @Resource
    private CommunityService communityService;

    @ApiOperation(value = "新增孵化申请")
    @PostMapping("/add")
    public R addHatchAudit(@RequestBody SocialOrgHatchAuditDTO hatchAuditDTO) {
        hatchAuditDTO.setUserId(this.getUserId());
        return communityService.addHatchAudit(hatchAuditDTO);
    }

    @ApiOperation(value = "查看孵化申请审核进度", response = SocialOrgHatchAuditVO.class)
    @GetMapping("/schedule")
    public R getHatchAuditSchedule() {
        return communityService.getHatchAuditSchedule(this.getUserId());
    }

    @ApiOperation(value = "修改孵化申请")
    @PostMapping("/update")
    public R updateHatchAudit(@RequestBody @Validated(PutGroup.class) SocialOrgHatchAuditDTO hatchAuditDTO) {
        return communityService.updateHatchAudit(hatchAuditDTO);
    }

    @ApiOperation(value = "获取孵化流程配置", response = String.class)
    @GetMapping("/process")
    public R getHatchAuditProcess() {
        return communityService.getHatchAuditProcess();
    }
}


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

@@ -2,16 +2,24 @@


import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.social.PageProjectSignListDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActSocialOrgVO;
import com.panzhihua.common.model.vos.community.social.SocialProjectVO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import javax.validation.Valid;

import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;

/**
 * 三社联动项目表(ComActSocialProject)表控制层
@@ -39,8 +47,14 @@
    @ApiOperation(value = "分页查询接口",response =SocialProjectVO.class )
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        commonPage.setCommunityId(this.getCommunityId());
        LoginUserInfoVO loginUserInfoSureNoLogin = this.getLoginUserInfoSureNoLogin();
        if (nonNull(loginUserInfoSureNoLogin)) {
            commonPage.setCommunityId(loginUserInfoSureNoLogin.getCommunityId());
        } else if (isNull(commonPage.getCommunityId())) {
            return R.fail("缺少社区id");
        }
        commonPage.setParamId2(0);
        commonPage.setIsPublicity(1);
        return communityService.selectAllComActSocialProject(commonPage);
    }

@@ -53,7 +67,12 @@
    @ApiOperation(value = "平台详情接口",response =SocialProjectVO.class )
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return communityService.getAppletComActSocialProject(id);
        LoginUserInfoVO userInfo = this.getLoginUserInfoSureNoLogin();
        Long userId = null;
        if (nonNull(userInfo)) {
            userId = userInfo.getUserId();
        }
        return communityService.getAppletComActSocialProject(id, userId);
    }
    /**
     * 根据项目id分页获取关联项目
@@ -100,4 +119,16 @@
        return communityService.deleteComActSocialProject(id);
    }

    @ApiOperation(value = "项目公开报名")
    @ApiImplicitParam(name = "projectId", value = "项目id", required = true)
    @GetMapping("/sign")
    public R signProject(@RequestParam("projectId") Long projectId) {
        return communityService.signProject(projectId, this.getUserId());
    }

    @ApiOperation(value = "分页查询项目报名列表", response = ComActSocialOrgVO.class)
    @PostMapping("signList")
    public R pageProjectSignList(@RequestBody @Valid PageProjectSignListDTO pageProjectSignListDTO) {
        return communityService.pageProjectSignList(pageProjectSignListDTO);
    }
}

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

@@ -3,6 +3,7 @@

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.social.ComActSocialProjectPublicityVO;
import com.panzhihua.common.service.community.CommunityService;
@@ -13,6 +14,9 @@

import javax.annotation.Resource;
import java.util.List;

import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;

/**
 * 项目宣传表(ComActSocialProjectPublicity)表控制层
@@ -40,7 +44,12 @@
    @ApiOperation(value = "分页查询",response = ComActSocialProjectPublicityVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        commonPage.setCommunityId(this.getCommunityId());
        LoginUserInfoVO loginUserInfoSureNoLogin = this.getLoginUserInfoSureNoLogin();
        if (nonNull(loginUserInfoSureNoLogin)) {
            commonPage.setCommunityId(loginUserInfoSureNoLogin.getCommunityId());
        } else if (isNull(commonPage.getCommunityId())) {
            return R.fail("缺少社区id");
        }
        return communityService.selectAllComActSocialProjectPublicity(commonPage);
    }


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

@@ -5,6 +5,7 @@
import com.panzhihua.common.listen.ComActSocialWorkerExcelListen;
import com.panzhihua.common.model.dtos.civil.*;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerDetailsVO;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
@@ -21,6 +22,9 @@
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.io.InputStream;

import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;

/**
 *
@@ -75,7 +79,12 @@
    @ApiOperation(value = "查询社工", response= ComActSocialWorkerVO.class)
    R query(@Validated @ModelAttribute PageComActSocialWorkerDTO pageComActSocialWorkerDTO){
        ClazzUtils.setIfStringIsEmpty(pageComActSocialWorkerDTO);
        pageComActSocialWorkerDTO.setCommunityId(this.getCommunityId());
        LoginUserInfoVO loginUserInfoSureNoLogin = this.getLoginUserInfoSureNoLogin();
        if (nonNull(loginUserInfoSureNoLogin)) {
            pageComActSocialWorkerDTO.setCommunityId(loginUserInfoSureNoLogin.getCommunityId());
        } else if (isNull(pageComActSocialWorkerDTO.getCommunityId())) {
            return R.fail("缺少社区id");
        }
        return communityService.queryComactsocialworker(pageComActSocialWorkerDTO);
    }

@@ -124,7 +133,7 @@
    }


//    @GetMapping("/getTemplate")
    //    @GetMapping("/getTemplate")
//    @ApiOperation("获取模板")
//    public R getTemplate(){
//        return R.ok(comactsocialworkerUrl);

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

@@ -16,6 +16,7 @@
import com.panzhihua.applets.umf.UmfPayUtil;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.MimeTypeUtils;
import net.coobird.thumbnailator.Thumbnails;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.RandomUtils;
@@ -42,6 +43,8 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;

import static com.panzhihua.common.utlis.FileTypeUploadUtils.assertAllowed;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -156,6 +159,7 @@
    @PostMapping(value = "/uploadimages", consumes = "multipart/*", headers = "content-type=multipart/form-date")
    public R uploadImages(@RequestParam MultipartFile file, HttpServletRequest request) {
        try {
            assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
            String extension = FilenameUtils.getExtension(file.getOriginalFilename());
            String name = UUID.randomUUID().toString().replaceAll("-", "") + "." + extension;
            String imageUrl = minioUtil.upload(file, name);
@@ -170,6 +174,7 @@
    @PostMapping(value = "/uploadimagescompress", consumes = "multipart/*", headers = "content-type=multipart/form-date")
    public R uploadImagesComPress(@RequestParam MultipartFile file, HttpServletRequest request) {
        try {
            assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
            String extension = FilenameUtils.getExtension(file.getOriginalFilename());
            String uuid=UUID.randomUUID().toString().replaceAll("-", "");
            String name = uuid  + "."+ extension;

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

@@ -7,6 +7,8 @@
import com.panzhihua.common.model.dtos.common.PageComMngVolunteerOrgTeamDto;
import com.panzhihua.common.model.dtos.common.PageComMngVolunteerServiceTypeDto;
import com.panzhihua.common.model.dtos.common.PageComMngVolunteerSkillDto;
import com.panzhihua.common.model.dtos.community.PageComStreetDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.common.ComMngVolunteerOrgTeamVo;
import com.panzhihua.common.model.vos.common.ComMngVolunteerServiceTypeVo;
import com.panzhihua.common.model.vos.common.ComMngVolunteerSkillVo;
@@ -14,6 +16,7 @@
import com.panzhihua.common.model.vos.neighbor.ActivityAnalysisVO;
import com.panzhihua.common.model.vos.neighbor.ActivityAnalysisVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAnalysisVO;
import com.panzhihua.common.service.community.CommunityWestService;
import io.swagger.annotations.*;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
@@ -46,6 +49,8 @@
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;

import static java.util.Objects.isNull;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 社区服务
@@ -59,6 +64,8 @@
public class CommunityApi extends BaseController {
    @Resource
    private CommunityService communityService;
    @Resource
    private CommunityWestService communityWestService;
    @Resource
    private UserService userService;
    @Resource
@@ -85,6 +92,10 @@
        comActDynVO.setIsTopping(null);
        comActDynVO.setStatus(1);
        comActDynVO.setAreaCode(this.getAreaCode());
        Integer category = comActDynVO.getCategory();
        if (isNull(category)) {
            comActDynVO.setCategory(1);
        }
        return communityService.pageDynamic(comActDynVO);
    }

@@ -123,6 +134,7 @@
            comActActivityVO.setCommunityId(loginUserInfo.getCommunityId());
        }
        comActActivityVO.setIsApplets(1);
        comActActivityVO.setAreaCode(this.getAreaCode());
        Integer status = comActActivityVO.getStatus();
        if (null != status && status.intValue() == 4) {
            comActActivityVO.setIsIng(1);
@@ -343,7 +355,7 @@
    @GetMapping(value = "arealist")
    public R getAllArea(@ApiParam(name = "城市编码:四川510000",
        required = true) @RequestParam(value = "provinceAdcode") Integer provinceAdcode) {
        return communityService.getCityTreeByProvinceCode(provinceAdcode);
        return communityService.getCityTreeByProvinceCode(provinceAdcode, null);
    }
    @ApiOperation(value = "社区详情", response = ComActVO.class)
    @GetMapping("community")
@@ -359,6 +371,20 @@
        }
        return communityService.listActivitySign(activitySignVO);
    }

    @ApiOperation(value = "查询社区列表")
    @GetMapping("actList")
    public R getWestCommunityLists() {
        return communityService.getWestCommunityLists(this.getAreaCode());
    }

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

    @ApiOperation(value = "新增服务活动")
    @PostMapping("activity")
    public R addActivity(@RequestBody @Validated(AddGroup.class) ComActActivityVO comActActivityVO) {
@@ -383,4 +409,28 @@
    }


    @ApiOperation(value = "分页查询服务范围数据",response = ComActColumnVO.class)
    @PostMapping("comActColumn/queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        if(this.getLoginUserInfo().getStreetId()!=null){
            commonPage.setStreetId(this.getLoginUserInfo().getStreetId());
        } else {
            commonPage.setCommunityId(this.getCommunityId());
        }
        return this.communityService.comActColumnSelectAll(commonPage);
    }

    @ApiOperation(value = "街道详情", response = ComStreetVO.class)
    @ApiImplicitParam(name = "id", value = "街道id", required = true)
    @GetMapping("street")
    public R detailStreet(@RequestParam("id") Long id) {
        return communityWestService.detailStreet(id);
    }

    @ApiOperation(value = "根据id查询社区详情", response = ComActVO.class)
    @ApiImplicitParam(name = "id", value = "社区id", required = true)
    @GetMapping("detail")
    public R detailCommunity(@RequestParam("id") Long id) {
        return communityService.detailCommunity(id);
    }
}

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

@@ -65,6 +65,7 @@
        if (loginUserInfo != null) {
            comActEasyPhotoVO.setCommunityId(loginUserInfo.getCommunityId());
            comActEasyPhotoVO.setLogInUserId(loginUserInfo.getUserId());
            comActEasyPhotoVO.setIsDpcMember(loginUserInfo.getIsDpcMember());
        }
        return communityService.pageEasyPhotoApplets(comActEasyPhotoVO);
    }
@@ -117,6 +118,13 @@
        return this.communityService.editEasyPhotoHandler(comActEasyPhotoHandler);
    }

    @ApiOperation(value = "查询处理详情", response = ComActEasyPhotoHandlerVo.class)
    @ApiImplicitParam(name = "id", value = "处理id", required = true)
    @GetMapping("/easyPhotoHandler")
    public R detailEasyPhotoHandler(@RequestParam("id") Long id) {
        return this.communityService.detailEasyPhotoHandler(id);
    }

    @ApiOperation(value = "查询随手拍是否有活动", response = ComActEasyPhotoActivityVO.class)
    @PostMapping("getEasyPhotoActivity")
    public R getEasyPhotoActivity(@RequestBody CommonDTO commonDTO) {

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

@@ -7,9 +7,11 @@
import java.util.stream.Collectors;

import javax.annotation.Resource;
import javax.validation.Valid;

import com.panzhihua.applets.umf.UmfPayUtil;
import com.panzhihua.common.constants.HttpStatus;
import com.panzhihua.common.model.dtos.community.social.PageProjectDTO;
import com.panzhihua.common.model.vos.community.rentHouse.WxPayOrderVO;
import com.panzhihua.common.utlis.DateUtils;
import org.apache.commons.lang.StringUtils;
@@ -530,4 +532,11 @@
        userArchivesVO.setUserId(userId);
        return userService.updateUserArchives(userArchivesVO);
    }

    @ApiOperation(value = "分页查询用户报名的项目")
    @PostMapping("project")
    public R pageProjectWhichIsSignedByUser(@RequestBody @Valid PageProjectDTO pageProjectDTO) {
        pageProjectDTO.setUserId(this.getUserId());
        return communityService.pageProjectWhichIsSignedByUser(pageProjectDTO);
    }
}

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

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

import com.panzhihua.applets_backstage.config.MinioUtil;
import com.panzhihua.common.utlis.MimeTypeUtils;
import org.apache.commons.io.FilenameUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.util.ObjectUtils;
@@ -29,6 +30,8 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;

import static com.panzhihua.common.utlis.FileTypeUploadUtils.assertAllowed;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -156,6 +159,7 @@
    @PostMapping(value = "/uploadimages", consumes = "multipart/*", headers = "content-type=multipart/form-date")
    public R uploadImages(@RequestParam MultipartFile file, HttpServletRequest request) {
        try {
            assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
            String extension = FilenameUtils.getExtension(file.getOriginalFilename());
            String name = UUID.randomUUID().toString().replaceAll("-", "") + "." + extension;
            String imageUrl = minioUtil.upload(file, name);

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

@@ -79,7 +79,7 @@
    @GetMapping(value = "arealist")
    public R getAllArea(@ApiParam(name = "省份:四川510000",
        required = true) @RequestParam(value = "provinceAdcode") Integer provinceAdcode) {
        return communityService.getCityTreeByProvinceCode(provinceAdcode);
        return communityService.getCityTreeByProvinceCode(provinceAdcode, this.getAreaCode());
    }

    @ApiOperation(value = "特殊群体/分页查询标签列表", response = ComMngTagVO.class)

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

@@ -64,7 +64,7 @@
            administratorsUserVO.setAreaId(null);
            administratorsUserVO.setCommunityId(communityId);
            administratorsUserVO.setStatus(comActVO1.getState() + 1);
            administratorsUserVO.setRoleId(999999999L);
            administratorsUserVO.setRoleId(999999999l);
            administratorsUserVO.setUserId(this.getUserId());
            R r1 = userService.addUserBackstage(administratorsUserVO);
            if (!R.isOk(r1)) {

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

@@ -10,6 +10,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;

import com.panzhihua.common.utlis.MimeTypeUtils;
import org.apache.commons.io.FilenameUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.validation.annotation.Validated;
@@ -59,6 +60,8 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;

import static com.panzhihua.common.utlis.FileTypeUploadUtils.assertAllowed;

/**
 * @description: 社区便民服务商家接口
@@ -224,6 +227,7 @@
        String extension = FilenameUtils.getExtension(file.getOriginalFilename());
        String name = UUID.randomUUID().toString().replaceAll("-", "") + "." + extension;
        try {
            assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
            SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
            sftp.login();
            InputStream is = file.getInputStream();
@@ -240,6 +244,7 @@
    @PostMapping(value = "/upload/files", consumes = "multipart/*", headers = "content-type=multipart/form-date")
    public R uploadImages(@RequestParam MultipartFile file, HttpServletRequest request) {
        try {
            assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
            String extension = FilenameUtils.getExtension(file.getOriginalFilename());
            String name = UUID.randomUUID().toString().replaceAll("-", "") + "." + extension;
            String imageUrl = minioUtil.upload(file, name);

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

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

    @ApiModelProperty(value = "房东的用户ID，用户表记录了房东的详细信息", hidden = true)
    private Long hourseOwnerUserId;

    @ApiModelProperty(value = "areaCode", hidden = true)
    private String areaCode;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddNeighborCircleTopicAdminDTO.java

@@ -19,6 +19,9 @@
    @ApiModelProperty(value = "登录用户id", hidden = true)
    private Long userId;

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

    @ApiModelProperty("话题id")
    private Long id;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleTopicAdminDTO.java

@@ -25,6 +25,9 @@
    private Integer belongType;

    private Long communityId;

    @ApiModelProperty(value = "发布状态(1.启用 2.禁用)")
    private Integer status;
    /**
     * 使用类型（1.邻里圈 2.问题清单 3.需求清单）
     */

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

@@ -33,5 +33,6 @@
    @ApiModelProperty(value = "社区id", hidden = true)
    private Long communityId;

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

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

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

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

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

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

@@ -34,6 +34,8 @@
    private String phone;
    @ApiModelProperty("是否注册")
    private Integer isReg;

    @ApiModelProperty(value = "街道id", hidden = true)
    private Long streetId;
    @ApiModelProperty("关键字")
    private String keyword;
}

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

@@ -34,7 +34,7 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date endTime;
    @ApiModelProperty("系统用户姓名")
    private String systemName;
    private Date systemName;
    @ApiModelProperty("用户Id")
    private Long userId;
    @ApiModelProperty("参数id")
@@ -69,4 +69,10 @@
    private Integer columnId;
    @ApiModelProperty("二级分类")
    private Integer secondColumnId;
    @ApiModelProperty(value = "是否公示（1.是 2.否）")
    private Integer isPublicity;
    @ApiModelProperty(value = "账号类型 1街道 2社区 3社会组织", hidden = true)
    private Integer userType;
    @ApiModelProperty(value = "社会组织id", hidden = true)
    private Long orgId;
}

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

@@ -86,6 +86,9 @@
    @ApiModelProperty(value = "所属组织")
    private String orgName;

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

    /**
     * 用户id
     */

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

@@ -197,7 +197,11 @@
    private Integer isFmsMember;
    @ApiModelProperty("是否网格员 1.是 2.否")
    private Integer isEasyPhotoMember;
    @ApiModelProperty("是否社会组织联系人 1.是 2.否")
    private Integer isOrgContactPeople;

    @ApiModelProperty("是否人大代表成员 1.是 2.否")
    private Integer isDpcMember;
    @ApiModelProperty("appid")
    private String appId;
    @ApiModelProperty("appSecret")
@@ -210,6 +214,9 @@
    @ApiModelProperty("账号类型 1街道 2社区 3社会组织")
    private Integer userType;

    @ApiModelProperty("社会组织Id")
    private Long orgId;

    @ApiModelProperty("是否是防疫工作人员 1.是 2.否")
    private Integer isAcidMember;


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

@@ -54,6 +54,7 @@
    private Integer serviceType;

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

    @ApiModelProperty(value = "状态")
@@ -62,4 +63,18 @@
    @ApiModelProperty(value = "发起人名称")
    private String senderName;

    @ApiModelProperty(value = "得分")
    private Integer score;
    /**
     * 汇报内容
     */
    @ApiModelProperty(value = "汇报内容")
    private String resultContent;
    /**
     * 汇报图片
     */
    @ApiModelProperty(value = "汇报图片")
    private String resultUrl;


}

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

@@ -294,4 +294,6 @@
    @ApiModelProperty("单位id")
    private Long checkUnitId;

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

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

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

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

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

    @ApiModelProperty("人大代表id")
    private Long id;

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

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

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

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

    @ApiModelProperty("选区")
    private String area;

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

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

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

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

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

@@ -100,6 +100,9 @@

    private String areaCode;

    @ApiModelProperty("类型（1.社区动态 2.党务公开 3.花城资讯）")
    @ApiModelProperty("是否培训公共")
    private Integer isOrgHatch;

    @ApiModelProperty("类别（1.社区动态 2.招募公告 3.考察记录 4.评审公示 5.孵化培育 6.出壳成果）")
    private Integer category;
}

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

@@ -9,6 +9,7 @@

import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.model.vos.common.ComActEasyPhotoEvaluateVo;
import com.panzhihua.common.model.vos.common.ComActEasyPhotoHandlerVo;
import com.panzhihua.common.validated.AddGroup;

import io.swagger.annotations.ApiModel;
@@ -169,8 +170,14 @@
    @ApiModelProperty(value = "反馈信息列表")
    private List<ComActEasyPhotoFeedbackVO> photoFeedbackList;

    @ApiModelProperty(value = "人大代表反馈信息列表")
    private List<ComActEasyPhotoFeedbackVO> photoFeedbackListForDpc;

    @ApiModelProperty(value = "完成人名称")
    private String completeName;

    @ApiModelProperty(value = "是否上报到人大代表（ 0未上报 1已上报）")
    private Integer isReportDpc;

    @ApiModelProperty(value = "是否上报城管 0未上报 1已上报 2已退回")
    private Integer isReportUrban;
@@ -224,4 +231,13 @@
    @ApiModelProperty(value = "微心愿分配人员集合")
    private List<ComActMicroWishHandleVO> handleList;

    @ApiModelProperty(value = "人大代表是否反馈（1.未反馈 2.已反馈）")
    private Integer isFeedBackForDpc;

    @ApiModelProperty(value = "是否人大代表成员 1.是 2.否", hidden = true)
    private Integer isDpcMember;

    @ApiModelProperty(value = "处理记录")
    private List<ComActEasyPhotoHandlerVo> handleRecordList;

}

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

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

import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;

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

/**
 * @title: ComActEnterpriseTypeVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 社区企业服务分类信息
 * @author: hans
 * @date: 2022/06/06 16:05
 */
@Data
@ApiModel("社区企业服务分类信息")
public class ComActEnterpriseTypeVO {

    @ApiModelProperty("分类id")
    private Long id;

    @ApiModelProperty("服务分类名称")
    private String name;

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

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

    @ApiModelProperty("创建人")
    private String createdBy;

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

    @ApiModelProperty("由谁更新")
    private String updatedBy;

    @ApiModelProperty("最后更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updatedAt;
}

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

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

import java.util.Date;

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

/**
 * @title: ComActEnterpriseVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 社区企业信息
 * @author: hans
 * @date: 2022/05/31 13:42
 */
@Data
@ApiModel("社区企业信息")
public class ComActEnterpriseVO {

    @ApiModelProperty("企业id")
    private Long id;

    @ApiModelProperty("企业名称")
    private String name;

    @ApiModelProperty("统一社会信用代码")
    private String agencyCode;

    @ApiModelProperty("法定代表人")
    private String legalRepresentative;

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

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

    @ApiModelProperty("所属社区")
    private Long communityId;

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

    @ApiModelProperty("地址")
    private String address;

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

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

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

    @ApiModelProperty("服务类型名称")
    private String typeName;

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

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

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

    @ApiModelProperty(value = "社区主键", hidden = true)
    private Long communityId;
    @ApiModelProperty(value = "留言对象 1社区团队2社区团委", hidden = false)
    @ApiModelProperty(value = "留言对象 1社区团队 2社区团委 3人大代表", hidden = false)
    private Long type;
    @ApiModelProperty(value = "回复时间", hidden = true)
    private Date createAt;

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

@@ -256,7 +256,7 @@
    private String latitude;

    @ApiModelProperty("服务类型")
    private Long serviceType;
    private String serviceType;

    @ApiModelProperty("街道id")
    private Long streetId;
@@ -278,4 +278,31 @@

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

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

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

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

    @ApiModelProperty("挂靠单位")
    private Long affiliatedUnit;

    @ApiModelProperty("挂靠单位类型（1.街道 2.社区）")
    private Integer affiliatedUnitType;

    @ApiModelProperty("挂靠单位名称")
    private String affiliatedUnitName;

    @ApiModelProperty("承办项目数")
    private Integer undertakeProjectNum;

    @ApiModelProperty("开展活动数")
    private Integer startActNum;

    @ApiModelProperty("孵化进度（1.已进驻 2.孵化中 3.通过评估 4.出壳）")
    private Integer hatchSchedule;
}

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

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

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

    @ApiModelProperty("行政区域")
    private String administrativeRegions;
}

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

@@ -54,4 +54,7 @@
    @ApiModelProperty("账号密码")
    @NotBlank(groups = {AddGroup.class}, message = "账号密码不能为空")
    private String password;

    @ApiModelProperty("行政区域")
    private String administrativeRegions;
}

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

@@ -26,5 +26,7 @@
    private Integer volunteer;
    @ApiModelProperty("党组织")
    private Integer partyOrg;
    @ApiModelProperty("人大代表")
    private Integer dpcNum;
}


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

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

    @ApiModelProperty("人大个数")
    private Integer dpcNum;

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

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

    @ApiModelProperty("社区数")
    private Integer communityNum;

    @ApiModelProperty("社会组织数")
    private Integer socialOrgNum;

    @ApiModelProperty("社区企业数")
    private Integer enterpriseNum;

    @ApiModelProperty("社区工作者数")
    private Integer socialWorkerNum;

    @ApiModelProperty("社区志愿者数")
    private Integer volunteerNum;

    @ApiModelProperty("社会组织承接项目数")
    private Integer acceptProjectTotal;

    @ApiModelProperty(value = "社区企业服务分类占比圆形图数据")
    private List<StatisticsCommVO> enterpriseServiceTypeCircleData;

    @ApiModelProperty(value = "社区工作者年龄段占比圆形图数据")
    private List<StatisticsCommVO> socialWorkerAgeStageCircleData;

    @ApiModelProperty(value = "社区工作者服务分类占比圆形图数据")
    private List<StatisticsCommVO> socialWorkerServiceTypeCircleData;
}

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

New file
@@ -0,0 +1,39 @@
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: BigScreenHatchStatisticsInfo
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 孵化中心大屏统计数据
 * @author: hans
 * @date: 2022/05/31 17:50
 */
@Data
@ApiModel("孵化中心大屏统计数据")
public class BigScreenHatchStatisticsInfo {

    @ApiModelProperty("孵化中心数量/孵化进度数量")
    private Integer hatchCenterTotal;

    @ApiModelProperty("西区社区组织数量")
    private Integer westAreaOrgTotal;

    @ApiModelProperty("孵化成果数量")
    private Integer hatchResultTotal;

    @ApiModelProperty(value = "孵化进程占比圆形图数据")
    private List<StatisticsCommVO> hatchScheduleCircleData;

    @ApiModelProperty(value = "孵化状态占比柱形数据")
    private List<StatisticsCommVO> hatchStatusColumnData;

    @ApiModelProperty(value = "街道组织占比柱形数据")
    private List<StatisticsCommVO> streetOrgColumnData;
}

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

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

    @ApiModelProperty(value = "街道名字")
    private String streetName;

    @ApiModelProperty("发布人")
    private String releaseName;
}

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

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

import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;

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

/**
 * @title: SocialOrgHatchAuditScheduleVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 社会组织孵化审核进度信息
 * @author: hans
 * @date: 2022/04/19 10:25
 */
@Data
@ApiModel("社会组织孵化审核进度信息")
public class SocialOrgHatchAuditScheduleVO {

    @ApiModelProperty("审核进度id")
    private Long id;

    @ApiModelProperty("社会组织孵化申请关联id")
    private Long auditId;

    @ApiModelProperty("审核阶段")
    private String stage;

    @ApiModelProperty("阶段详情")
    private String detail;

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

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

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

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

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

/**
 * @title: SocialOrgHatchAuditVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 社会组织孵化申请信息
 * @author: hans
 * @date: 2022/04/18 14:33
 */
@Data
@ApiModel("社会组织孵化申请信息")
public class SocialOrgHatchAuditVO {

    @ApiModelProperty("孵化申请id")
    private Long id;

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

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

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

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

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

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

    @ApiModelProperty("申请用户")
    private Long userId;

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

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

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

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

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

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

    @ApiModelProperty("服务范围名称")
    private String serviceScopeName;

    @ApiModelProperty("审核进度")
    private List<SocialOrgHatchAuditScheduleVO> scheduleVOList;
}

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

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

import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;

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

/**
 * @title: SocialOrgHatchAuditVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 社会组织孵化申请信息
 * @author: hans
 * @date: 2022/04/18 14:33
 */
@Data
@ApiModel("社会组织孵化申请信息")
public class SocialOrgHatchVO {

    @ApiModelProperty("孵化申请id")
    private Long id;

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

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

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

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

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

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

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

    @ApiModelProperty("开始孵化日期")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createdAt;

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

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

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

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

    @ApiModelProperty("服务范围名称")
    private String serviceScopeName;
}

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

@@ -6,6 +6,7 @@
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.math.BigDecimal;
import java.util.Date;

/**
@@ -32,7 +33,7 @@
    /**
     * 项目状态  1初创项目 2公开发布 3运作中 4 已结束
     */
    @ApiModelProperty(value = "项目状态  1初创项目 2公开发布 3运作中 4 已结束")
    @ApiModelProperty(value = "项目状态  1待发布 2公示中 3实施中 4 已完成")
    private Integer status;

    /**
@@ -149,4 +150,23 @@

    @ApiModelProperty(value = "责任方id")
    private Long responsibilityId;

    @ApiModelProperty(value = "项目联系电话")
    private String phone;

    @ApiModelProperty(value = "项目资金")
    private BigDecimal funds;

    @ApiModelProperty(value = "项目报名截止时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date signUpEnd;

    @ApiModelProperty(value = "公示状态 1报名中 2报名截止 3结果公布")
    private Integer signUpStatus;

    @ApiModelProperty(value = "是否可以进行报名 1是 2否")
    private Integer isCouldSign;

    @ApiModelProperty(value = "是否公示（1.是 2.否）")
    private Integer isPublicity;
}

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

@@ -79,25 +79,25 @@
    private Integer participateVolunteerActivityNum;

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

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

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

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

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

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

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

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

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

@@ -46,4 +46,7 @@
    private String phone;
    @ApiModelProperty("是否注册")
    private Integer isReg;

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

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

@@ -26,4 +26,7 @@
    private Long pageSize;
    @ApiModelProperty(value = "社区id", hidden = true)
    private Long communityId;

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

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

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

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

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

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

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

    @ApiModelProperty(value = "手机号")

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

@@ -6,6 +6,10 @@
import com.panzhihua.common.model.dtos.civil.*;
import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.dtos.community.acid.*;
import com.panzhihua.common.model.dtos.community.dpc.AddDpcDTO;
import com.panzhihua.common.model.dtos.community.dpc.EditDpcDTO;
import com.panzhihua.common.model.dtos.community.dpc.PageDpcDTO;
import com.panzhihua.common.model.dtos.community.enterprise.PageEnterpriseTypeDTO;
import com.panzhihua.common.model.dtos.community.reserve.*;
import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseApplyDTO;
import com.panzhihua.common.model.dtos.community.GetIdentityEidTokenDTO;
@@ -61,6 +65,17 @@
import com.panzhihua.common.model.dtos.civil.ComActSocialWorkerEditDTO;
import com.panzhihua.common.model.dtos.civil.ComActSocialWorkerExcelVO;
import com.panzhihua.common.model.dtos.civil.PageComActSocialWorkerDTO;
import com.panzhihua.common.model.dtos.common.AddComMngVolunteerOrgTeamDto;
import com.panzhihua.common.model.dtos.common.AddComMngVolunteerServiceTypeDto;
import com.panzhihua.common.model.dtos.common.AddComMngVolunteerSkillDto;
import com.panzhihua.common.model.dtos.common.EditComActEasyPhotoHandlerDto;
import com.panzhihua.common.model.dtos.common.EditComMngVolunteerOrgTeamDto;
import com.panzhihua.common.model.dtos.common.EditComMngVolunteerServiceTypeDto;
import com.panzhihua.common.model.dtos.common.EditComMngVolunteerSkillDto;
import com.panzhihua.common.model.dtos.common.PageComActEasyPhotoHandlerDto;
import com.panzhihua.common.model.dtos.common.PageComMngVolunteerOrgTeamDto;
import com.panzhihua.common.model.dtos.common.PageComMngVolunteerServiceTypeDto;
import com.panzhihua.common.model.dtos.common.PageComMngVolunteerSkillDto;
import com.panzhihua.common.model.dtos.community.AddComActDynTypeDTO;
import com.panzhihua.common.model.dtos.community.AddIdentityAuthDTO;
import com.panzhihua.common.model.dtos.community.CancelRecordDTO;
@@ -192,6 +207,9 @@
import com.panzhihua.common.model.dtos.community.elder.PageElderAuthStatisticDTO;
import com.panzhihua.common.model.dtos.community.elder.PagePensionAuthStatisticDTO;
import com.panzhihua.common.model.dtos.community.elder.SignElderAuthStatisticDTO;
import com.panzhihua.common.model.dtos.community.enterprise.AddEnterpriseDTO;
import com.panzhihua.common.model.dtos.community.enterprise.EditEnterpriseDTO;
import com.panzhihua.common.model.dtos.community.enterprise.PageEnterpriseDTO;
import com.panzhihua.common.model.dtos.community.fms.AddFmsClassroomAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.AddFmsServiceAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.AddTeamDTO;
@@ -244,6 +262,24 @@
import com.panzhihua.common.model.dtos.community.rentingHouses.ReleaseOrCancelHouseDTO;
import com.panzhihua.common.model.dtos.community.rentingHouses.RentingHouseRegisterDTO;
import com.panzhihua.common.model.dtos.community.rentingHouses.RentingHousesConfigDTO;
import com.panzhihua.common.model.dtos.community.reserve.AddReserveAdminDTO;
import com.panzhihua.common.model.dtos.community.reserve.CancelReserveRecordDTO;
import com.panzhihua.common.model.dtos.community.reserve.ComActReserveMakeStatisticsDTO;
import com.panzhihua.common.model.dtos.community.reserve.ComActReserveRegisterStatisticsDTO;
import com.panzhihua.common.model.dtos.community.reserve.EditComActReserveInfoDTO;
import com.panzhihua.common.model.dtos.community.reserve.EditComActReserveStatusDTO;
import com.panzhihua.common.model.dtos.community.reserve.EditReserveAdminDTO;
import com.panzhihua.common.model.dtos.community.reserve.MakeHandleAdminDTO;
import com.panzhihua.common.model.dtos.community.reserve.PageReserveAdminDTO;
import com.panzhihua.common.model.dtos.community.reserve.PageReserveMakeAdminDTO;
import com.panzhihua.common.model.dtos.community.reserve.PageReserveMakeHandleAdminDTO;
import com.panzhihua.common.model.dtos.community.reserve.PageReserveRegisterDetailedAdminDTO;
import com.panzhihua.common.model.dtos.community.social.HatchAuditProcessDTO;
import com.panzhihua.common.model.dtos.community.social.PageProjectDTO;
import com.panzhihua.common.model.dtos.community.social.PageProjectSignListDTO;
import com.panzhihua.common.model.dtos.community.social.PageSocialOrgHatchAuditDTO;
import com.panzhihua.common.model.dtos.community.social.PageSocialOrgHatchDTO;
import com.panzhihua.common.model.dtos.community.social.SocialOrgHatchAuditDTO;
import com.panzhihua.common.model.dtos.community.switchs.SearchCommunityDTO;
import com.panzhihua.common.model.dtos.community.wallet.ComActWalletDetailDTO;
import com.panzhihua.common.model.dtos.community.wallet.ComActWalletSettlementAdminDTO;
@@ -320,7 +356,7 @@
import com.panzhihua.common.model.vos.DictionaryVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerDetailsVO;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
import com.panzhihua.common.model.vos.community.ActivitySignVO;
import com.panzhihua.common.model.vos.community.BatchhouseVO;
import com.panzhihua.common.model.vos.community.ComActActEvaluateVO;
@@ -2269,10 +2305,11 @@
     *
     * @param provinceAdcode
     *            省份code
     * @param areaCode
     * @return 查询结果
     */
    @GetMapping("/common/data/area/all")
    R getCityTreeByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode);
    R getCityTreeByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode, @RequestParam(value = "areaCode", required = false) String areaCode);

    /**
     * 分页查询街道
@@ -7650,7 +7687,7 @@

    @GetMapping("/rentingHourseRegister/updateAllHouseUnionAppCode")
    @Async
    void updateAllHouseUnionAppCode();
    void updateAllHouseUnionAppCode(@RequestParam("areaCode") String areaCode);

    /**
     * 西区大屏治理数据
@@ -8784,10 +8821,11 @@
    /**
     * 小程序详情接口
     * @param id
     * @param userId
     * @return
     */
    @GetMapping("/comActSocialProject/getApplet")
    R getAppletComActSocialProject(@RequestParam("id") Long id);
    R getAppletComActSocialProject(@RequestParam("id") Long id, @RequestParam(value = "userId", required = false) Long userId);

    /**
     * 分页查询所有数据
@@ -9900,4 +9938,98 @@
                                       @RequestParam(value = "belongTo",required = false) String  belongTo,
                                       @RequestParam(value = "unitId",required = false) Long unitId);

    /**
     * 分页查询服务分类
     * @param pageEnterpriseTypeDTO
     * @return
     */
    @PostMapping("/enterpriseType/page")
    R pageEnterpriseType(@RequestBody PageEnterpriseTypeDTO pageEnterpriseTypeDTO);

    /**
     * 获取服务分类列表
     * @param communityId
     * @return
     */
    @GetMapping("/enterpriseType/list")
    R getEnterpriseTypeList(@RequestParam("communityId") Long communityId);

    /**
     * 新增人大代表
     * @param addDpcDTO
     * @return
     */
    @PostMapping("/dpc/add")
    R addDpc(@RequestBody AddDpcDTO addDpcDTO);

    /**
     * 修改人大代表
     * @param editDpcDTO
     * @return
     */
    @PostMapping("/dpc/edit")
    R editDpc(@RequestBody EditDpcDTO editDpcDTO);

    /**
     * 删除人大代表
     * @param id
     * @return
     */
    @DeleteMapping("/dpc/delete")
    R deleteDpc(@RequestParam("id") Long id);

    /**
     * 获取人大代表详情
     * @param id
     * @return
     */
    @GetMapping("/dpc/detail")
    R detailDpc(@RequestParam("id") Long id);

    /**
     * 分页查询人大代表
     * @param pageDpcDTO
     * @return
     */
    @PostMapping("/dpc/page")
    R pageDpc(@RequestBody PageDpcDTO pageDpcDTO);

    /**
     * 获取人大代表反馈记录
     * @param id
     * @return
     */
    @GetMapping("/dpc/feedback")
    R getFeedbackList(@RequestParam("id") Long id);

    /**
     * 人大代表反馈随手拍
     * @param comActEasyPhotoVO
     * @return
     */
    @PostMapping("/dpc/feedback")
    R addEasyPhotoFeedbackForDpc(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);

    /**
     * 人大代表
     * @param communityId
     * @return
     */
    @GetMapping("/screen/dpc/base")
    R dpcBase(@RequestParam("communityId") Long communityId);

    /**
     * 人大代表-随手拍展示列表
     * @return
     */
    @PostMapping("/screen/dpc/easyPhotoList")
    R dpcEasyPhotoList(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 查询详情
     * @param id
     * @return
     */
    @GetMapping("/comActEasyPhotoHandler/detail")
    R detailEasyPhotoHandler(@RequestParam("id") Long id);
}

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

@@ -46,7 +46,8 @@
    @ApiOperation(value = "查询社区动态分类列表", response = ComActDynTypeVO.class)
    @PostMapping("/list")
    public R list(@RequestBody PageComActDynTypeDTO comActDynTypeDTO) {
        comActDynTypeDTO.setCommunityId(this.getCommunityId());
        Long communityId = this.getCommunityId();
        comActDynTypeDTO.setCommunityId(communityId);
        return communityService.getDynTypeListByAdmin(comActDynTypeDTO);
    }


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

@@ -132,6 +132,7 @@
        PagePartyOrganizationVO pagePartyOrganizationVO = new PagePartyOrganizationVO();
        BeanUtils.copyProperties(pagePartyOrganizationMemberVO, pagePartyOrganizationVO);
        pagePartyOrganizationVO.setCommunityId(id);
        pagePartyOrganizationVO.setAreaCode(this.getAreaCode());
        return partyBuildingService.pagePartyOrganization(pagePartyOrganizationVO);
    }


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

@@ -4,8 +4,13 @@

import javax.annotation.Resource;

import com.panzhihua.common.model.vos.community.ComActSocialOrgVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenCourtyardStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenDpcStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenFiveAssociationsStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHatchStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.EquipmentPointMapDataVO;
import com.panzhihua.common.model.vos.community.social.SocialProjectVO;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -678,4 +683,57 @@
    public R getCourtyardBaseData() {
        return communityService.getCourtyardBaseData(this.getCommunityId());
    }

    @ApiOperation(value = "孵化中心-基础数据", response = BigScreenHatchStatisticsInfo.class)
    @GetMapping("/hatch/base")
    public R getHatchBaseData() {
        return communityService.getHatchBaseData(this.getCommunityId());
    }

    @ApiOperation(value = "孵化中心-孵化成果展示列表", response = ComActSocialOrgVO.class)
    @PostMapping("/hatchResult/list")
    public R pageHatchResult(@RequestBody PageBaseDTO pageBaseDTO) {
        pageBaseDTO.setCommunityId(this.getCommunityId());
        return communityService.pageHatchResult(pageBaseDTO);
    }

    @ApiOperation(value = "孵化中心-孵化进度展示列表", response = ComActSocialOrgVO.class)
    @PostMapping("/hatchSchedule/list")
    public R pageHatchSchedule(@RequestBody PageBaseDTO pageBaseDTO) {
        pageBaseDTO.setCommunityId(this.getCommunityId());
        return communityService.pageHatchSchedule(pageBaseDTO);
    }

    @ApiOperation(value = "五社联动基础数据", response = BigScreenFiveAssociationsStatisticsInfo.class)
    @GetMapping("/fiveAssociations/base")
    public R getFiveAssociationsBaseData() {
        return communityService.getFiveAssociationsBaseData(this.getCommunityId());
    }

    @ApiOperation(value = "五社联动项目展示列表", response = SocialProjectVO.class)
    @PostMapping("/socialProject/list")
    public R pageSocialProjectList(@RequestBody PageBaseDTO pageBaseDTO) {
        pageBaseDTO.setCommunityId(this.getCommunityId());
        return communityService.pageSocialProjectList(pageBaseDTO);
    }

    @ApiOperation(value = "五社联动社会组织展示列表", response = ComActSocialOrgVO.class)
    @PostMapping("/socialOrg/list")
    public R pageSocialOrgList(@RequestBody PageBaseDTO pageBaseDTO) {
        pageBaseDTO.setCommunityId(this.getCommunityId());
        return communityService.pageSocialOrgList(pageBaseDTO);
    }

    @ApiOperation(value = "人大代表", response = BigScreenDpcStatisticsInfo.class)
    @GetMapping("/dpc/base")
    public R dpcBase() {
        return communityService.dpcBase(this.getCommunityId());
    }

    @ApiOperation(value = "人大代表-随手拍展示列表", response = ComActEasyPhotoVO.class)
    @PostMapping("/dpc/easyPhotoList")
    public R dpcEasyPhotoList(@RequestBody PageBaseDTO pageBaseDTO) {
        pageBaseDTO.setCommunityId(this.getCommunityId());
        return communityService.dpcEasyPhotoList(pageBaseDTO);
    }
}

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

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

import javax.annotation.Resource;
import javax.validation.Valid;

import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.dpc.AddDpcDTO;
import com.panzhihua.common.model.dtos.community.dpc.EditDpcDTO;
import com.panzhihua.common.model.dtos.community.dpc.PageDpcDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActDpcVO;
import com.panzhihua.common.service.community.CommunityService;

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

/**
 * @title: ComActDpcApi
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 人大代表
 * @author: hans
 * @date: 2022/06/07 10:57
 */
@Slf4j
@Api(tags = {"人大代表相关"})
@RestController
@RequestMapping("/dpc")
public class ComActDpcApi extends BaseController {

    @Resource
    private CommunityService communityService;

    @ApiOperation("新增人大代表")
    @PostMapping("/add")
    public R addDpc(@RequestBody @Valid AddDpcDTO addDpcDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        addDpcDTO.setCreatedBy(loginUserInfo.getUserId());
        addDpcDTO.setUpdatedBy(loginUserInfo.getUserId());
        addDpcDTO.setCommunityId(loginUserInfo.getCommunityId());
        return communityService.addDpc(addDpcDTO);
    }

    @ApiOperation("修改人大代表")
    @PostMapping("/edit")
    public R editDpc(@RequestBody @Valid EditDpcDTO editDpcDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        editDpcDTO.setUpdatedBy(loginUserInfo.getUserId());
        return communityService.editDpc(editDpcDTO);
    }

    @ApiOperation("删除人大代表")
    @ApiImplicitParam(name = "id", value = "人大代表id", required = true)
    @DeleteMapping("/delete")
    public R deleteDpc(@RequestParam("id") Long id) {
        return communityService.deleteDpc(id);
    }

    @ApiOperation(value = "获取人大代表详情", response = ComActDpcVO.class)
    @ApiImplicitParam(name = "id", value = "人大代表id", required = true)
    @GetMapping("/detail")
    public R detailDpc(@RequestParam("id") Long id) {
        return communityService.detailDpc(id);
    }

    @ApiOperation(value = "分页查询人大代表", response = ComActDpcVO.class)
    @PostMapping("/page")
    public R pageDpc(@RequestBody @Valid PageDpcDTO pageDpcDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        pageDpcDTO.setCommunityId(loginUserInfo.getCommunityId());
        return communityService.pageDpc(pageDpcDTO);
    }
}

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

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

import javax.annotation.Resource;
import javax.validation.Valid;

import com.panzhihua.common.model.dtos.community.enterprise.AddEnterpriseDTO;
import com.panzhihua.common.model.dtos.community.enterprise.EditEnterpriseDTO;
import com.panzhihua.common.model.dtos.community.enterprise.PageEnterpriseDTO;
import com.panzhihua.common.model.vos.community.ComActEnterpriseVO;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.fms.AddTeamTypeDTO;
import com.panzhihua.common.model.dtos.community.fms.EditTeamTypeDTO;
import com.panzhihua.common.model.dtos.community.fms.PageTeamMemberDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.fms.ComFmsTeamMemberVO;
import com.panzhihua.common.model.vos.community.fms.ComFmsTeamTypeVO;
import com.panzhihua.common.service.community.CommunityService;

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

import static java.util.Objects.nonNull;

/**
 * @title: ComActEnterpriseApi
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 社区企业管理
 * @author: hans
 * @date: 2022/05/31 10:22
 */
@Slf4j
@Api(tags = {"社区企业管理"})
@RestController
@RequestMapping("/enterprise")
public class ComActEnterpriseApi extends BaseController {

    @Resource
    private CommunityService communityService;

    @ApiOperation("新增社区企业")
    @PostMapping("/add")
    public R addEnterprise(@RequestBody @Valid AddEnterpriseDTO addEnterpriseDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        addEnterpriseDTO.setCreatedBy(loginUserInfo.getUserId());
        addEnterpriseDTO.setUpdatedBy(loginUserInfo.getUserId());
        return communityService.addEnterprise(addEnterpriseDTO);
    }

    @ApiOperation("修改社区企业")
    @PostMapping("/edit")
    public R editEnterprise(@RequestBody @Valid EditEnterpriseDTO editEnterpriseDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        editEnterpriseDTO.setUpdatedBy(loginUserInfo.getUserId());
        return communityService.editEnterprise(editEnterpriseDTO);
    }

    @ApiOperation("删除社区企业")
    @ApiImplicitParam(name = "id", value = "社区企业id", required = true)
    @DeleteMapping("/delete")
    public R deleteEnterprise(@RequestParam("id") Long id) {
        return communityService.deleteEnterprise(id);
    }

    @ApiOperation(value = "获取社区企业详情", response = ComActEnterpriseVO.class)
    @ApiImplicitParam(name = "id", value = "社区企业id", required = true)
    @GetMapping("/detail")
    public R detailEnterprise(@RequestParam("id") Long id) {
        return communityService.detailEnterprise(id);
    }

    @ApiOperation(value = "分页查询社区企业", response = ComActEnterpriseVO.class)
    @PostMapping("/page")
    public R pageEnterprise(@RequestBody @Valid PageEnterpriseDTO pageEnterpriseDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        if (nonNull(loginUserInfo.getStreetId())) {
            pageEnterpriseDTO.setStreetId(loginUserInfo.getStreetId());
        } else {
            pageEnterpriseDTO.setCommunityId(loginUserInfo.getCommunityId());
        }
        return communityService.pageEnterprise(pageEnterpriseDTO);
    }
}

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

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

import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;

import javax.annotation.Resource;
import javax.validation.Valid;

import com.panzhihua.common.model.dtos.community.enterprise.AddEnterpriseDTO;
import com.panzhihua.common.model.dtos.community.enterprise.AddEnterpriseTypeDTO;
import com.panzhihua.common.model.dtos.community.enterprise.EditEnterpriseDTO;
import com.panzhihua.common.model.dtos.community.enterprise.EditEnterpriseTypeDTO;
import com.panzhihua.common.model.dtos.community.enterprise.PageEnterpriseTypeDTO;
import com.panzhihua.common.model.vos.community.ComActEnterpriseTypeVO;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.enterprise.PageEnterpriseDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActEnterpriseVO;
import com.panzhihua.common.service.community.CommunityService;

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

/**
 * @title: ComActEnterpriseTypeApi
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 社区企业服务分类管理
 * @author: hans
 * @date: 2022/06/06 15:47
 */
@Slf4j
@Api(tags = {"社区企业服务分类管理"})
@RestController
@RequestMapping("/enterpriseType")
public class ComActEnterpriseTypeApi extends BaseController {

    @Resource
    private CommunityService communityService;

    @ApiOperation("新增服务分类")
    @PostMapping("/add")
    public R addEnterpriseType(@RequestBody @Valid AddEnterpriseTypeDTO addEnterpriseTypeDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        addEnterpriseTypeDTO.setCreatedBy(loginUserInfo.getUserId());
        addEnterpriseTypeDTO.setUpdatedBy(loginUserInfo.getUserId());
        addEnterpriseTypeDTO.setCommunityId(loginUserInfo.getCommunityId());
        return communityService.addEnterpriseType(addEnterpriseTypeDTO);
    }

    @ApiOperation("修改服务分类")
    @PostMapping("/edit")
    public R editEnterpriseType(@RequestBody @Valid EditEnterpriseTypeDTO enterpriseTypeDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        enterpriseTypeDTO.setUpdatedBy(loginUserInfo.getUserId());
        enterpriseTypeDTO.setCommunityId(loginUserInfo.getCommunityId());
        return communityService.editEnterpriseType(enterpriseTypeDTO);
    }

    @ApiOperation("删除服务分类")
    @ApiImplicitParam(name = "id", value = "服务分类id", required = true)
    @DeleteMapping("/delete")
    public R deleteEnterpriseType(@RequestParam("id") Long id) {
        return communityService.deleteEnterpriseType(id);
    }

    @ApiOperation(value = "获取服务分类详情", response = ComActEnterpriseTypeVO.class)
    @ApiImplicitParam(name = "id", value = "服务分类id", required = true)
    @GetMapping("/detail")
    public R detailEnterpriseType(@RequestParam("id") Long id) {
        return communityService.detailEnterpriseType(id);
    }

    @ApiOperation(value = "分页查询服务分类", response = ComActEnterpriseTypeVO.class)
    @PostMapping("/page")
    public R pageEnterpriseType(@RequestBody @Valid PageEnterpriseTypeDTO pageEnterpriseTypeDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        pageEnterpriseTypeDTO.setCommunityId(loginUserInfo.getCommunityId());
        return communityService.pageEnterpriseType(pageEnterpriseTypeDTO);
    }

    @ApiOperation(value = "获取服务分类列表", response = ComActEnterpriseTypeVO.class)
    @GetMapping("/list")
    public R getEnterpriseTypeList() {
        return communityService.getEnterpriseTypeList(this.getCommunityId());
    }
}

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

@@ -4,6 +4,7 @@
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.ComActSocialMemberVO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.social.ComActSocialProjectMemberVO;
import com.panzhihua.common.service.community.CommunityService;
@@ -40,8 +41,11 @@
    @ApiOperation(value = "分页查询所有数据",response = ComActSocialMemberVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        if(this.getLoginUserInfo().getStreetId()!=null){
            commonPage.setStreetId(this.getLoginUserInfo().getStreetId());
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        commonPage.setUserType(loginUserInfo.getUserType());
        commonPage.setUserId(loginUserInfo.getUserId());
        if(loginUserInfo.getStreetId()!=null){
            commonPage.setStreetId(loginUserInfo.getStreetId());
        }
        else {
            commonPage.setCommunityId(this.getCommunityId());

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

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


import javax.annotation.Resource;

import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.social.PageSocialOrgHatchDTO;
import com.panzhihua.common.model.dtos.community.social.SocialOrgHatchAuditDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.social.SocialOrgHatchVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.validated.PutGroup;

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

/**
 * @title: ComActSocialOrgHatchApi
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 社会组织孵化相关
 * @author: hans
 * @date: 2022/04/18 16:57
 */
@Slf4j
@Api(tags = {"社会组织孵化"})
@RestController
@RequestMapping("/comActSocialOrgHatch")
public class ComActSocialOrgHatchApi extends BaseController {
    /**
     * 服务对象
     */
    @Resource
    private CommunityService communityService;


    @ApiOperation(value = "分页查询孵化数据", response = SocialOrgHatchVO.class)
    @PostMapping("/page")
    public R pageOrgHatch(@RequestBody PageSocialOrgHatchDTO pageHatchDTO) {
        return communityService.pageOrgHatch(pageHatchDTO);
    }

    @ApiOperation(value = "查看孵化数据详情", response = SocialOrgHatchVO.class)
    @ApiImplicitParam(name = "id", value = "孵化id", required = true)
    @GetMapping("/detail")
    public R detailOrgHatch(@RequestParam("id") Long id) {
        return communityService.detailOrgHatch(id);
    }

    @ApiOperation(value = "修改孵化状态")
    @PutMapping("/update/{id}/{status}")
    public R updateOrgHatchStatus(@PathVariable("id") Long id, @PathVariable("status") Integer status) {
        return communityService.updateOrgHatchStatus(id, status);
    }

    @ApiOperation(value = "删除孵化数据")
    @ApiImplicitParam(name = "id", value = "孵化id", required = true)
    @GetMapping("/delete")
    public R deleteOrgHatch(@RequestParam("id") Long id) {
        return communityService.deleteOrgHatch(id);
    }
}


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

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


import javax.annotation.Resource;

import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.social.HatchAuditProcessDTO;
import com.panzhihua.common.model.dtos.community.social.PageSocialOrgHatchAuditDTO;
import com.panzhihua.common.model.dtos.community.social.SocialOrgHatchAuditDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.social.SocialOrgHatchAuditVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.validated.PutGroup;

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

/**
 * @title: ComActSocialOrgHatchAuditApi
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 社会组织孵化申请相关
 * @author: hans
 * @date: 2022/04/18 14:14
 */
@Slf4j
@Api(tags = {"社会组织孵化申请"})
@RestController
@RequestMapping("/comActSocialOrgHatchAudit")
public class ComActSocialOrgHatchAuditApi extends BaseController {
    /**
     * 服务对象
     */
    @Resource
    private CommunityService communityService;

    @ApiOperation(value = "分页查询孵化申请", response = SocialOrgHatchAuditVO.class)
    @PostMapping("/page")
    public R pageHatchAudit(@RequestBody PageSocialOrgHatchAuditDTO pageHatchAuditDTO) {
        return communityService.pageHatchAudit(pageHatchAuditDTO);
    }

    @ApiOperation(value = "查看孵化申请详情", response = SocialOrgHatchAuditVO.class)
    @ApiImplicitParam(name = "id", value = "孵化申请id", required = true)
    @GetMapping("/detail")
    public R detailHatchAudit(@RequestParam("id") Long id) {
        return communityService.detailHatchAudit(id);
    }

    @ApiOperation(value = "修改孵化申请")
    @PostMapping("/update")
    public R updateHatchAudit(@RequestBody @Validated(PutGroup.class) SocialOrgHatchAuditDTO hatchAuditDTO) {
        return communityService.updateHatchAudit(hatchAuditDTO);
    }

    @ApiOperation(value = "获取孵化流程配置", response = String.class)
    @GetMapping("/process")
    public R getHatchAuditProcess() {
        return communityService.getHatchAuditProcess();
    }

    @ApiOperation(value = "修改孵化流程配置")
    @PutMapping("/process")
    public R putHatchAuditProcess(@RequestBody HatchAuditProcessDTO processDTO) {
        return communityService.putHatchAuditProcess(processDTO);
    }

    @ApiOperation(value = "删除孵化申请")
    @ApiImplicitParam(name = "id", value = "孵化申请id", required = true)
    @GetMapping("/delete")
    public R deleteHatchAudit(@RequestParam("id") Long id) {
        return communityService.deleteHatchAudit(id);
    }
}


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

@@ -2,8 +2,11 @@


import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.social.PageProjectSignListDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActSocialOrgVO;
import com.panzhihua.common.model.vos.community.social.SocialProjectVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.StringUtils;
@@ -42,10 +45,12 @@
    @ApiOperation(value = "分页查询接口",response =SocialProjectVO.class )
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        if(this.getLoginUserInfo().getStreetId()!=null){
            commonPage.setStreetId(this.getLoginUserInfo().getStreetId());
        }
        else {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        commonPage.setUserType(loginUserInfo.getUserType());
        commonPage.setUserId(loginUserInfo.getUserId());
        if(loginUserInfo.getStreetId()!=null){
            commonPage.setStreetId(loginUserInfo.getStreetId());
        } else {
            commonPage.setCommunityId(this.getCommunityId());
        }
        return communityService.selectAllComActSocialProject(commonPage);
@@ -60,7 +65,7 @@
    @ApiOperation(value = "平台详情接口",response =SocialProjectVO.class )
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return communityService.getAppletComActSocialProject(id);
        return communityService.selectOneComActSocialProject(id);
    }
    /**
     * 根据项目id分页获取关联项目
@@ -119,4 +124,10 @@
        return communityService.deleteComActSocialProject(id);
    }

    @ApiOperation(value = "分页查询项目报名列表", response = ComActSocialOrgVO.class)
    @PostMapping("signList")
    public R pageProjectSignList(@RequestBody @Valid PageProjectSignListDTO pageProjectSignListDTO) {
        return communityService.pageProjectSignList(pageProjectSignListDTO);
    }

}

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

@@ -1,6 +1,7 @@
package com.panzhihua.community_backstage.api;


import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.social.ComActSocialProjectPublicityVO;
@@ -25,7 +26,7 @@
@Api(tags = {"项目宣传管理"})
@RestController
@RequestMapping("comActSocialProjectPublicity")
public class ComActSocialProjectPublicityApi {
public class ComActSocialProjectPublicityApi extends BaseController {
    /**
     * 服务对象
     */
@@ -65,6 +66,7 @@
    @ApiOperation("新增数据")
    @PostMapping
    public R insert(@RequestBody ComActSocialProjectPublicityVO comActSocialProjectPublicityVO) {
        comActSocialProjectPublicityVO.setReleaseName(this.getLoginUserInfo().getName());
        return communityService.insertComActSocialProjectPublicity(comActSocialProjectPublicityVO);
    }


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

@@ -19,6 +19,7 @@
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.ClazzUtils;
import com.panzhihua.common.utlis.SFTPUtil;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.community_backstage.excel.CustomSheetWriteHandler;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

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

@@ -153,9 +153,9 @@
    @ApiOperation("新增团队")
    @PostMapping("/team/add")
    public R addFmsTeam(@RequestBody @Valid AddTeamDTO addTeamDTO) {
        if (isNotBlank(addTeamDTO.getPhone()) && !ValidateUtils.assertPhoneIsValid(addTeamDTO.getPhone())) {
            return R.fail("手机号格式错误");
        }
        // if (isNotBlank(addTeamDTO.getPhone()) && !ValidateUtils.assertPhoneIsValid(addTeamDTO.getPhone())) {
        //     return R.fail("手机号格式错误");
        // }
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        addTeamDTO.setCommunityId(loginUserInfo.getCommunityId());
        addTeamDTO.setCreatedBy(loginUserInfo.getUserId());
@@ -166,9 +166,9 @@
    @ApiOperation("修改团队信息")
    @PostMapping("/team/edit")
    public R editFmsTeam(@RequestBody @Valid EditTeamDTO editTeamDTO) {
        if (isNotBlank(editTeamDTO.getPhone()) && !ValidateUtils.assertPhoneIsValid(editTeamDTO.getPhone())) {
            return R.fail("手机号格式错误");
        }
        // if (isNotBlank(editTeamDTO.getPhone()) && !ValidateUtils.assertPhoneIsValid(editTeamDTO.getPhone())) {
        //     return R.fail("手机号格式错误");
        // }
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        editTeamDTO.setCommunityId(loginUserInfo.getCommunityId());
        editTeamDTO.setUpdatedBy(loginUserInfo.getUserId());

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

@@ -909,4 +909,41 @@
        return communityService.getDistrictByCityCode(cityAdcode);
    }

    @ApiOperation(value = "获取树结构区域信息")
    @GetMapping(value = "arealist")
    public R getAllArea(@ApiParam(name = "省份:四川510000",
            required = true) @RequestParam(value = "provinceAdcode") Integer provinceAdcode) {
        return communityService.getCityTreeByProvinceCode(provinceAdcode, null);
    }

    @ApiOperation(value = "社区详情", response = ComActVO.class)
    @ApiImplicitParam(name = "id", value = "社区id", required = true)
    @GetMapping("community")
    public R detailCommunity(@RequestParam("id") Long id) {
        return communityService.detailCommunity(id);
    }

    @ApiOperation(value = "街道详情", response = ComStreetVO.class)
    @ApiImplicitParam(name = "id", value = "街道id", required = true)
    @GetMapping("street")
    public R detailStreet(@RequestParam("id") Long id) {
        return communityService.detailStreet(id);
    }

    @ApiOperation(value = "查询街道", response = ComStreetVO.class)
    @PostMapping("liststreet")
    public R listStreet(@RequestBody ComStreetVO comStreetVO) {
        return communityService.listStreet(comStreetVO);
    }

    @ApiOperation("编辑社区")
    @PutMapping("community")
    public R putCommunity(@RequestBody ComActVO comActVO) {
        Long communityId = comActVO.getCommunityId();
        if (null == communityId || 0 == communityId) {
            return R.fail("社区主键不能为空");
        }
        return communityService.putCommunity(comActVO);
    }

}

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

@@ -119,9 +119,13 @@
    @ApiOperation(value = "新增社区活动")
    @PostMapping("activity")
    public R addActivity(@RequestBody @Validated(AddGroup.class) ComActActivityVO comActActivityVO) {
        Long communityId = this.getCommunityId();
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long communityId = null;
        if (isNull(loginUserInfo.getStreetId())) {
            communityId = this.getCommunityId();
        }
        comActActivityVO.setCommunityId(communityId);
        comActActivityVO.setUserId(this.getLoginUserInfo().getUserId());
        comActActivityVO.setUserId(loginUserInfo.getUserId());
        return communityService.addActivity(comActActivityVO);
    }

@@ -132,7 +136,11 @@
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("活动id主键不能为空");
        }
        Long communityId = this.getCommunityId();
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long communityId = null;
        if (isNull(loginUserInfo.getStreetId())) {
            communityId = this.getCommunityId();
        }
        ComActActivityVO.setCommunityId(communityId);
        return communityService.putActivity(ComActActivityVO);
    }
@@ -149,11 +157,14 @@

    @ApiOperation(value = "分页查询社区活动")
    @PostMapping("pageactivity")
    public R pageActivity(@RequestBody ComActActivityVO ComActActivityVO) {
        Long communityId = this.getCommunityId();
        ComActActivityVO.setCommunityId(communityId);
    public R pageActivity(@RequestBody ComActActivityVO comActActivityVO) {
        Long projectId = comActActivityVO.getProjectId();
        if (isNull(projectId)) {
            Long communityId = this.getCommunityId();
            comActActivityVO.setCommunityId(communityId);
        }
        // return communityService.pageActivity(ComActActivityVO);
        return communityService.pageActivityCommunityBack(ComActActivityVO);
        return communityService.pageActivityCommunityBack(comActActivityVO);
    }

    @ApiOperation(value = "发布活动")
@@ -739,6 +750,10 @@
    public R pageDynamic(@RequestBody ComActDynVO comActDynVO) {
        Long communityId = this.getCommunityId();
        comActDynVO.setCommunityId(communityId);
        Integer category = comActDynVO.getCategory();
        if (isNull(category)) {
            comActDynVO.setCategory(1);
        }
        return communityService.pageDynamicByAdmin(comActDynVO);
    }

@@ -1286,6 +1301,11 @@
        }
        return R.fail("未查询到用户");
    }
    @ApiOperation(value = "批量删除活动")
    @PostMapping("delete")
    public R deleteActivities(@RequestBody List<Long> ids) {
        return communityService.deleteActivities(ids);
    }

    @ApiOperation(value = "单位活动统计",response = ActivityAnalysisVO.class)
    @GetMapping("/analysis")

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

@@ -14,6 +14,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.utlis.MimeTypeUtils;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.community_backstage.util.BaseUtils;
import lombok.Data;
@@ -58,6 +59,8 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;

import static com.panzhihua.common.utlis.FileTypeUploadUtils.assertAllowed;

/**
 * @description: 社区便民服务商家接口
@@ -204,6 +207,7 @@
        String extension = FilenameUtils.getExtension(file.getOriginalFilename());
        String name = UUID.randomUUID().toString().replaceAll("-", "") + "." + extension;
        try {
            assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
            SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
            sftp.login();
            InputStream is = file.getInputStream();
@@ -240,6 +244,7 @@
    @PostMapping(value = "/minio/upload/file", consumes = "multipart/*", headers = "content-type=multipart/form-date")
    public R minipuploadImage(@RequestParam MultipartFile file, HttpServletRequest request) {
        try {
            assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
            log.info("开始上传文件" + DateUtils.getCurrentDateStr_MS());
            String extension = FilenameUtils.getExtension(file.getOriginalFilename());
            String name = UUID.randomUUID().toString().replaceAll("-", "") + "." + extension;

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

@@ -25,6 +25,7 @@
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbMemberRoleErrorExcelVo;
import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
import com.panzhihua.common.service.partybuilding.ComDataStatisticsFeign;
import com.panzhihua.common.utlis.*;
import com.panzhihua.community_backstage.config.MinioUtil;
import com.panzhihua.community_backstage.config.SFTPConfig;
import org.apache.commons.io.FilenameUtils;
@@ -72,6 +73,9 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;

import static com.panzhihua.common.utlis.FileTypeUploadUtils.assertAllowed;
import static java.util.Objects.nonNull;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -255,6 +259,7 @@
    @PostMapping(value = "/uploadimages", consumes = "multipart/*", headers = "content-type=multipart/form-date")
    public R uploadImages(@RequestParam MultipartFile file, HttpServletRequest request) {
        try {
            assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
            String extension = FilenameUtils.getExtension(file.getOriginalFilename());
            String name = UUID.randomUUID().toString().replaceAll("-", "") + "." + extension;
            String imageUrl = minioUtil.upload(file, name);
@@ -296,6 +301,7 @@
    @PostMapping("exportPartyMember")
    public R exportPartyMember(@RequestBody PagePartyOrganizationVO pagePartyOrganizationVO) {
        pagePartyOrganizationVO.setCommunityId(this.getCommunityId());
        pagePartyOrganizationVO.setAreaCode(this.getAreaCode());
        String url = userurl;
        String name = "党员时长信息数据.xlsx";
        String ftpUrl = "/mnt/data/web/excel/";
@@ -614,7 +620,11 @@
    @ApiOperation(value = "分页查询服务团队成员", response = ComPbServiceTeamVO.class)
    @PostMapping("pageserviceteam")
    public R pageServiceTeam(@RequestBody PageComPbServiceTeamDTO pageComPbServiceTeamDTO) {
        pageComPbServiceTeamDTO.setCommunityId(this.getCommunityId());
        if(nonNull(this.getLoginUserInfo().getStreetId())) {
            pageComPbServiceTeamDTO.setStreetId(this.getLoginUserInfo().getStreetId());
        } else {
            pageComPbServiceTeamDTO.setCommunityId(this.getCommunityId());
        }
        return partyBuildingService.pageServiceTeam(pageComPbServiceTeamDTO);
    }


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

@@ -52,6 +52,7 @@
        LoginUserInfoVO loginUserInfo = getLoginUserInfo();
        registerDTO.setUserId(loginUserInfo.getUserId());
        registerDTO.setCommunityId(loginUserInfo.getCommunityId());
        registerDTO.setAreaCode(this.getAreaCode());
        return communityService.registerRentingHouse(registerDTO);
    }

@@ -103,7 +104,7 @@
    @ApiOperation(value = "方便开发阶段手动调用批量更新小程序码")
    @GetMapping("/updateAllHouseUnionAppCode")
    public R updateAllHouseUnionAppCode() {
        communityService.updateAllHouseUnionAppCode();
        communityService.updateAllHouseUnionAppCode(this.getAreaCode());
        return R.ok();
    }
}

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

@@ -31,6 +31,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/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/KaphtchaApi.java

New file
@@ -0,0 +1,80 @@
package com.panzhihua.grid_backstage.api;

import com.google.code.kaptcha.impl.DefaultKaptcha;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.utlis.StringUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import javax.imageio.ImageIO;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream;
import java.time.Duration;

/**
 * @author zzj
 */
@Api(tags = {"验证码接口"})
@RestController
@RequestMapping("/kaphtcha/")
public class KaphtchaApi extends BaseController {
    @Resource
    private DefaultKaptcha defaultKaptcha;
    @Resource
    private StringRedisTemplate stringRedisTemplate;

    @ApiOperation("生成验证码")
    @GetMapping("/verification")
    public void defaultKaptcha(@RequestParam("uuid")String uuid,HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse)
            throws Exception {
        byte[] captchaChallengeAsJpeg = null;
        ByteArrayOutputStream jpegOutputStream = new ByteArrayOutputStream();
        try {
            // 生产验证码字符串并保存到session中，分布式环境存redis中
            String createText = defaultKaptcha.createText();
            stringRedisTemplate.opsForValue().set("verifyCode_"+uuid,createText, Duration.ofMinutes(5));
            // 使用生产的验证码字符串返回一个BufferedImage对象并转为byte写入到byte数组中
            BufferedImage challenge = defaultKaptcha.createImage(createText);
            ImageIO.write(challenge, "jpg", jpegOutputStream);

        } catch (IllegalArgumentException e) {
            httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND);
            return;
        }

        // 定义response输出类型为image/jpeg类型，使用response输出流输出图片的byte数组
        captchaChallengeAsJpeg = jpegOutputStream.toByteArray();
        httpServletResponse.setHeader("Cache-Control", "no-store");
        httpServletResponse.setHeader("Pragma", "no-cache");
        httpServletResponse.setDateHeader("Expires", 0);
        httpServletResponse.setContentType("image/jpeg");
        ServletOutputStream responseOutputStream = httpServletResponse.getOutputStream();
        responseOutputStream.write(captchaChallengeAsJpeg);
        responseOutputStream.flush();
        responseOutputStream.close();
    }
    @ApiOperation("验证码核对")
    @GetMapping("/checkVerifyCode")
    public R checkVerifyCode(@RequestParam("verifyCode")String verifyCode,@RequestParam("uuid")String uuid){
        String text=stringRedisTemplate.opsForValue().get("verifyCode_"+uuid);
        if(StringUtils.isNotEmpty(text)){
            if(verifyCode.equals(text)){
                stringRedisTemplate.delete("verifyCode_"+uuid);
                return R.ok();
            }
            return R.fail("验证码错误");
        }
        return R.fail("验证码失效");
    }

}

 springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/config/KaptchaConfig.java

New file
@@ -0,0 +1,45 @@
package com.panzhihua.grid_backstage.config;

import com.google.code.kaptcha.Constants;
import com.google.code.kaptcha.impl.DefaultKaptcha;
import com.google.code.kaptcha.util.Config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

import java.util.Properties;

/**
 * @author zzj
 */
@Configuration
public class KaptchaConfig {
    /**
     * 验证码配置
     * @return
     */
    @Bean
    public DefaultKaptcha getDefaultKaptcha(){
        DefaultKaptcha defaultKaptcha=new DefaultKaptcha();
        Properties properties=new Properties();
        //是否有边框
        properties.setProperty(Constants.KAPTCHA_BORDER,"yes");
        //验证码文本颜色
        properties.setProperty(Constants.KAPTCHA_TEXTPRODUCER_FONT_COLOR,"red");
        //验证码图片宽度
        properties.setProperty(Constants.KAPTCHA_IMAGE_WIDTH,"180");
        //验证码图片高度
        properties.setProperty(Constants.KAPTCHA_IMAGE_HEIGHT,"80");
        //文本字符大小
        properties.setProperty(Constants.KAPTCHA_TEXTPRODUCER_FONT_SIZE,"39");
        //验证码session的值
        properties.setProperty(Constants.KAPTCHA_SESSION_CONFIG_KEY,"kaptchaCode");
        //验证码文本长度
        properties.setProperty(Constants.KAPTCHA_TEXTPRODUCER_CHAR_LENGTH,"4");
        //字体
        properties.setProperty(Constants.KAPTCHA_TEXTPRODUCER_FONT_NAMES, "宋体,楷体,微软雅黑");

        Config config=new Config(properties);
        defaultKaptcha.setConfig(config);
        return defaultKaptcha;
    }
}

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

@@ -513,4 +513,83 @@
    public R getCourtyardBaseData(@RequestParam("communityId") Long communityId) {
        return bigScreenStatisticsService.getCourtyardBaseData(communityId);
    }

    /**
     * 孵化中心-基础数据
     * @param communityId
     * @return
     */
    @GetMapping("/hatch/base")
    public R getHatchBaseData(@RequestParam("communityId") Long communityId) {
        return bigScreenStatisticsService.getHatchBaseData(communityId);
    }

    /**
     * 孵化中心-孵化成果展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/hatchResult/list")
    public R pageHatchResult(@RequestBody PageBaseDTO pageBaseDTO) {
        return bigScreenStatisticsService.pageHatchResult(pageBaseDTO);
    }

    /**
     * 孵化中心-孵化进度展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/hatchSchedule/list")
    public R pageHatchSchedule(@RequestBody PageBaseDTO pageBaseDTO) {
        return bigScreenStatisticsService.pageHatchSchedule(pageBaseDTO);
    }

    /**
     * 五社联动基础数据
     * @param communityId
     * @return
     */
    @GetMapping("/fiveAssociations/base")
    public R getFiveAssociationsBaseData(@RequestParam("communityId") Long communityId) {
        return bigScreenStatisticsService.getFiveAssociationsBaseData(communityId);
    }

    /**
     * 五社联动项目展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/socialProject/list")
    public R pageSocialProjectList(@RequestBody PageBaseDTO pageBaseDTO) {
        return bigScreenStatisticsService.pageSocialProjectList(pageBaseDTO);
    }

    /**
     * 五社联动社会组织展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/socialOrg/list")
    public R pageSocialOrgList(@RequestBody PageBaseDTO pageBaseDTO) {
        return bigScreenStatisticsService.pageSocialOrgList(pageBaseDTO);
    }

    /**
     * 人大代表
     * @param communityId
     * @return
     */
    @GetMapping("/dpc/base")
    public R dpcBase(@RequestParam("communityId") Long communityId) {
        return bigScreenStatisticsService.dpcBase(communityId);
    }

    /**
     * 人大代表-随手拍展示列表
     * @return
     */
    @PostMapping("/dpc/easyPhotoList")
    public R dpcEasyPhotoList(@RequestBody PageBaseDTO pageBaseDTO) {
        return bigScreenStatisticsService.dpcEasyPhotoList(pageBaseDTO);
    }
}

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

@@ -61,9 +61,7 @@
     */
    @PostMapping
    public R insert(@RequestBody ComActColumnVO comActColumnVO) {
        ComActColumn comActColumn=new ComActColumn();
        BeanUtils.copyProperties(comActColumnVO,comActColumn);
        return R.ok(this.comActColumnService.save(comActColumn));
        return R.ok(this.comActColumnService.addColumn(comActColumnVO));
    }

    /**
@@ -74,9 +72,7 @@
     */
    @PostMapping("/update")
    public R update(@RequestBody ComActColumnVO comActColumnVO) {
        ComActColumn comActColumn=new ComActColumn();
        BeanUtils.copyProperties(comActColumnVO,comActColumn);
        return R.ok(this.comActColumnService.updateById(comActColumn));
        return R.ok(this.comActColumnService.updateColumn(comActColumnVO));
    }

    /**

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

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

import javax.annotation.Resource;

import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import com.panzhihua.common.model.dtos.community.dpc.AddDpcDTO;
import com.panzhihua.common.model.dtos.community.dpc.EditDpcDTO;
import com.panzhihua.common.model.dtos.community.dpc.PageDpcDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.service.ComActDpcService;

import lombok.extern.slf4j.Slf4j;

/**
 * @title: ComActDpcApi
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 人大代表
 * @author: hans
 * @date: 2022/06/07 10:57
 */
@Slf4j
@RestController
@RequestMapping("/dpc")
public class ComActDpcApi {

    @Resource
    private ComActDpcService comActDpcService;

    /**
     * 新增人大代表
     * @param addDpcDTO
     * @return
     */
    @PostMapping("/add")
    public R addDpc(@RequestBody AddDpcDTO addDpcDTO) {
        return comActDpcService.addDpc(addDpcDTO);
    }

    /**
     * 修改人大代表
     * @param editDpcDTO
     * @return
     */
    @PostMapping("/edit")
    public R editDpc(@RequestBody EditDpcDTO editDpcDTO) {
        return comActDpcService.editDpc(editDpcDTO);
    }

    /**
     * 删除人大代表
     * @param id
     * @return
     */
    @DeleteMapping("/delete")
    public R deleteDpc(@RequestParam("id") Long id) {
        return comActDpcService.deleteDpc(id);
    }

    /**
     * 获取人大代表详情
     * @param id
     * @return
     */
    @GetMapping("/detail")
    public R detailDpc(@RequestParam("id") Long id) {
        return comActDpcService.detailDpc(id);
    }

    /**
     * 分页查询人大代表
     * @param pageDpcDTO
     * @return
     */
    @PostMapping("/page")
    public R pageDpc(@RequestBody PageDpcDTO pageDpcDTO) {
        return comActDpcService.pageDpc(pageDpcDTO);
    }
}

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

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

import javax.annotation.Resource;

import com.panzhihua.common.model.dtos.community.enterprise.AddEnterpriseDTO;
import com.panzhihua.common.model.dtos.community.enterprise.EditEnterpriseDTO;
import com.panzhihua.common.model.dtos.community.enterprise.PageEnterpriseDTO;
import com.panzhihua.common.model.vos.R;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import com.panzhihua.service_community.service.ComActEnterpriseService;

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

/**
 * @title: ComActEnterpriseApi
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 社区企业管理
 * @author: hans
 * @date: 2022/05/31 10:22
 */
@Slf4j
@RestController
@RequestMapping("/enterprise")
public class ComActEnterpriseApi {

    @Resource
    private ComActEnterpriseService enterpriseService;

    /**
     * 新增社区企业
     * @param addEnterpriseDTO
     * @return
     */
    @PostMapping("/add")
    public R addEnterprise(@RequestBody AddEnterpriseDTO addEnterpriseDTO) {
        return enterpriseService.addEnterprise(addEnterpriseDTO);
    }

    /**
     * 修改社区企业
     * @param editEnterpriseDTO
     * @return
     */
    @PostMapping("/edit")
    public R editEnterprise(@RequestBody EditEnterpriseDTO editEnterpriseDTO) {
        return enterpriseService.editEnterprise(editEnterpriseDTO);
    }

    /**
     * 删除社区企业
     * @param id
     * @return
     */
    @DeleteMapping("/delete")
    public R deleteEnterprise(@RequestParam("id") Long id) {
        return enterpriseService.deleteEnterprise(id);
    }

    /**
     * 获取社区企业详情
     * @param id
     * @return
     */
    @GetMapping("/detail")
    public R detailEnterprise(@RequestParam("id") Long id) {
        return enterpriseService.detailEnterprise(id);
    }

    /**
     * 分页查询社区企业
     * @param pageEnterpriseDTO
     * @return
     */
    @PostMapping("/page")
    public R pageEnterprise(@RequestBody PageEnterpriseDTO pageEnterpriseDTO) {
        return enterpriseService.pageEnterprise(pageEnterpriseDTO);
    }
}

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

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

import javax.annotation.Resource;

import com.panzhihua.common.model.dtos.community.enterprise.AddEnterpriseTypeDTO;
import com.panzhihua.common.model.dtos.community.enterprise.EditEnterpriseTypeDTO;
import com.panzhihua.common.model.dtos.community.enterprise.PageEnterpriseTypeDTO;
import com.panzhihua.common.model.vos.R;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import com.panzhihua.service_community.service.ComActEnterpriseTypeService;

import lombok.extern.slf4j.Slf4j;

/**
 * @title: ComActEnterpriseTypeApi
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 社区企业服务分类管理
 * @author: hans
 * @date: 2022/06/06 15:47
 */
@Slf4j
@RestController
@RequestMapping("/enterpriseType")
public class ComActEnterpriseTypeApi {

    @Resource
    private ComActEnterpriseTypeService comActEnterpriseTypeService;

    /**
     * 新增服务分类
     * @param addEnterpriseTypeDTO
     * @return
     */
    @PostMapping("/add")
    public R addEnterpriseType(@RequestBody AddEnterpriseTypeDTO addEnterpriseTypeDTO) {
        return comActEnterpriseTypeService.addEnterpriseType(addEnterpriseTypeDTO);
    }

    /**
     * 修改服务分类
     * @param enterpriseTypeDTO
     * @return
     */
    @PostMapping("/edit")
    public R editEnterpriseType(@RequestBody EditEnterpriseTypeDTO enterpriseTypeDTO) {
        return comActEnterpriseTypeService.editEnterpriseType(enterpriseTypeDTO);
    }

    /**
     * 删除服务分类
     * @param id
     * @return
     */
    @DeleteMapping("/delete")
    public R deleteEnterpriseType(@RequestParam("id") Long id) {
        return comActEnterpriseTypeService.deleteEnterpriseType(id);
    }

    /**
     * 获取服务分类详情
     * @param id
     * @return
     */
    @GetMapping("/detail")
    public R detailEnterpriseType(@RequestParam("id") Long id) {
        return comActEnterpriseTypeService.detailEnterpriseType(id);
    }

    /**
     * 分页查询服务分类
     * @param pageEnterpriseTypeDTO
     * @return
     */
    @PostMapping("/page")
    public R pageEnterpriseType(@RequestBody PageEnterpriseTypeDTO pageEnterpriseTypeDTO) {
        return comActEnterpriseTypeService.pageEnterpriseType(pageEnterpriseTypeDTO);
    }

    /**
     * 获取服务分类列表
     * @param communityId
     * @return
     */
    @GetMapping("/list")
    public R getEnterpriseTypeList(@RequestParam("communityId") Long communityId) {
        return comActEnterpriseTypeService.getEnterpriseTypeList(communityId);
    }
}

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

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


import javax.annotation.Resource;

import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import com.panzhihua.common.model.dtos.community.social.PageSocialOrgHatchDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.service.ComActSocialOrgHatchService;

/**
 * 社会组织孵化表(ComActSocialOrgHatch)表控制层
 *
 * @author makejava
 * @since 2022-04-18 14:12:27
 */
@RestController
@RequestMapping("comActSocialOrgHatch")
public class ComActSocialOrgHatchApi {
    /**
     * 服务对象
     */
    @Resource
    private ComActSocialOrgHatchService comActSocialOrgHatchService;

    /**
     * 分页查询孵化数据
     * @param pageHatchDTO
     * @return
     */
    @PostMapping("/page")
    public R pageOrgHatch(@RequestBody PageSocialOrgHatchDTO pageHatchDTO) {
        return comActSocialOrgHatchService.pageOrgHatch(pageHatchDTO);
    }

    /**
     * 查看孵化数据详情
     * @param id
     * @return
     */
    @GetMapping("/detail")
    public R detailOrgHatch(@RequestParam("id") Long id) {
        return comActSocialOrgHatchService.detailOrgHatch(id);
    }

    /**
     * 修改孵化状态
     * @param id
     * @param status
     * @return
     */
    @PutMapping("/updateStatus")
    public R updateOrgHatchStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status) {
        return comActSocialOrgHatchService.updateOrgHatchStatus(id, status);
    }

    /**
     * 删除孵化数据
     * @param id
     * @return
     */
    @GetMapping("/delete")
    public R deleteOrgHatch(@RequestParam("id") Long id) {
        return comActSocialOrgHatchService.deleteOrgHatch(id);
    }
}


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

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


import javax.annotation.Resource;

import com.panzhihua.common.model.dtos.community.social.HatchAuditProcessDTO;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import com.panzhihua.common.model.dtos.community.social.PageSocialOrgHatchAuditDTO;
import com.panzhihua.common.model.dtos.community.social.SocialOrgHatchAuditDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.service.ComActSocialOrgHatchAuditService;

/**
 * 社会组织孵化申请表(ComActSocialOrgHatchAudit)表控制层
 *
 * @author makejava
 * @since 2022-04-18 14:12:27
 */
@RestController
@RequestMapping("comActSocialOrgHatchAudit")
public class ComActSocialOrgHatchAuditApi {
    /**
     * 服务对象
     */
    @Resource
    private ComActSocialOrgHatchAuditService comActSocialOrgHatchAuditService;

    /**
     * 分页查询孵化申请
     * @param pageHatchAuditDTO
     * @return
     */
    @PostMapping("/page")
    public R pageHatchAudit(@RequestBody PageSocialOrgHatchAuditDTO pageHatchAuditDTO) {
        return comActSocialOrgHatchAuditService.pageHatchAudit(pageHatchAuditDTO);
    }

    /**
     * 查看孵化申请详情
     * @param id
     * @return
     */
    @GetMapping("/detail")
    public R detailHatchAudit(@RequestParam("id") Long id) {
        return comActSocialOrgHatchAuditService.detailHatchAudit(id);
    }

    /**
     * 修改孵化申请
     * @param hatchAuditDTO
     * @return
     */
    @PostMapping("/update")
    public R updateHatchAudit(@RequestBody SocialOrgHatchAuditDTO hatchAuditDTO) {
        return comActSocialOrgHatchAuditService.updateHatchAudit(hatchAuditDTO);
    }

    /**
     * 获取孵化流程配置
     * @return
     */
    @GetMapping("/process")
    public R getHatchAuditProcess() {
        return comActSocialOrgHatchAuditService.getHatchAuditProcess();
    }

    /**
     * 修改孵化流程配置
     * @param processDTO
     * @return
     */
    @PutMapping("/process")
    public R putHatchAuditProcess(@RequestBody HatchAuditProcessDTO processDTO) {
        return comActSocialOrgHatchAuditService.putHatchAuditProcess(processDTO);
    }

    /**
     * 新增孵化申请
     * @param hatchAuditDTO
     * @return
     */
    @PostMapping("/add")
    public R addHatchAudit(@RequestBody SocialOrgHatchAuditDTO hatchAuditDTO) {
        return comActSocialOrgHatchAuditService.addHatchAudit(hatchAuditDTO);
    }

    /**
     * 查看孵化申请审核进度
     * @param userId
     * @return
     */
    @GetMapping("/schedule")
    public R getHatchAuditSchedule(@RequestParam("userId") Long userId) {
        return comActSocialOrgHatchAuditService.getHatchAuditSchedule(userId);
    }

    /**
     * 删除孵化申请详情
     * @param id
     * @return
     */
    @GetMapping("/delete")
    public R deleteHatchAudit(@RequestParam("id") Long id) {
        return comActSocialOrgHatchAuditService.deleteHatchAudit(id);
    }
}


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

@@ -3,6 +3,8 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.panzhihua.common.model.dtos.community.social.PageProjectDTO;
import com.panzhihua.common.model.dtos.community.social.PageProjectSignListDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -88,9 +90,7 @@
     */
    @PostMapping("/update")
    public R update(@RequestBody SocialProjectVO socialProjectVO) {
        ComActSocialProject comActSocialProject=new ComActSocialProject();
        BeanUtils.copyProperties(socialProjectVO,comActSocialProject);
        return R.ok(this.comActSocialProjectService.updateById(comActSocialProject));
        return R.ok(this.comActSocialProjectService.updateProject(socialProjectVO));
    }

    /**
@@ -107,10 +107,42 @@
    /**
     * 小程序详情接口
     * @param id
     * @param userId
     * @return
     */
    @GetMapping("/getApplet")
    public R getApplet(@RequestParam("id") Long id){
        return this.comActSocialProjectService.getByApplet(id);
    public R getApplet(@RequestParam("id") Long id, @RequestParam(value = "userId", required = false) Long userId){
        return this.comActSocialProjectService.getByApplet(id, userId);
    }

    /**
     * 分页查询项目报名列表
     * @param pageProjectSignListDTO
     * @return
     */
    @PostMapping("/signList")
    public R pageProjectSignList(@RequestBody PageProjectSignListDTO pageProjectSignListDTO) {
        return comActSocialProjectService.pageProjectSignList(pageProjectSignListDTO);
    }

    /**
     * 项目公开报名
     * @param projectId
     * @param userId
     * @return
     */
    @GetMapping("/sign")
    public R signProject(@RequestParam("projectId") Long projectId, @RequestParam("userId") Long userId) {
        return comActSocialProjectService.signProject(projectId, userId);
    }

    /**
     * 分页查询用户报名的项目
     * @param pageProjectDTO
     * @return
     */
    @PostMapping("/project")
    public R pageProjectWhichIsSignedByUser(@RequestBody PageProjectDTO pageProjectDTO) {
        return comActSocialProjectService.pageProjectWhichIsSignedByUser(pageProjectDTO);
    }
}

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

@@ -319,8 +319,9 @@
     * @return
     */
    @GetMapping("/area/all")
    R getCityTreeByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode) {
        return comMngProvinceService.getCityTreeByProvinceCode(provinceAdcode);
    R getCityTreeByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode,
                                @RequestParam(value = "areaCode", required = false) String areaCode) {
        return comMngProvinceService.getCityTreeByProvinceCode(provinceAdcode, areaCode);
    }

    /**

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

@@ -2603,4 +2603,34 @@
    public R exportPartyMemberDetail(@RequestBody CommonPage commonPage){
        return comActActivityService.exportPartyMemberDetail(commonPage);
    }

    /**
     * 批量删除活动
     * @param ids
     * @return
     */
    @PostMapping("batchDel")
    public R deleteActivities(@RequestBody List<Long> ids) {
        return R.ok(comActActivityService.removeByIds(ids));
    }

    /**
     * 获取人大代表反馈记录
     * @param id
     * @return
     */
    @GetMapping("dpc/feedback")
    public R getFeedbackList(@RequestParam("id") Long id) {
        return comActEasyPhotoService.getFeedbackList(id);
    }

    /**
     * 人大代表反馈随手拍
     * @param comActEasyPhotoVO
     * @return
     */
    @PostMapping("dpc/feedback")
    public R addEasyPhotoFeedbackForDpc(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
        return comActEasyPhotoService.addEasyPhotoFeedbackForDpc(comActEasyPhotoVO);
    }
}

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

@@ -112,7 +112,7 @@
    }

    @GetMapping("/updateAllHouseUnionAppCode")
    public void updateAllHouseUnionAppCode() {
        rentingHourseRegisterService.updateAllHouseUnionAppCode();
    public void updateAllHouseUnionAppCode(@RequestParam("areaCode") String areaCode) {
        rentingHourseRegisterService.updateAllHouseUnionAppCode(areaCode);
    }
}

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

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

import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import com.panzhihua.common.model.dtos.community.PageComStreetDTO;
@@ -81,4 +83,14 @@
        return r;
    }

    /**
     * 街道详情
     * @param id
     * @return
     */
    @GetMapping("detailStreet")
    public R detailStreet(@RequestParam("id") Long id) {
        return comStreetService.detailStreet(id);
    }

}

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

@@ -287,10 +287,10 @@
    /**
     * 根据社工id查询活动列表
     * @param page
     * @param id
     * @param commonPage
     * @return
     */
    IPage<ActActivityListVO> selectActivityBySocialWorker(Page page,@Param("id")Long id);
    IPage<ComActActivityVO> selectActivityBySocialWorker(Page page,@Param("commonPage") CommonPage commonPage);

    /**
     * [方法描述] 根据社区ID查询所属城市所在区区域代码，
@@ -349,4 +349,12 @@
     * @return 活动列表
     */
    List<ComActActivityVO> selectListByCommunityId(@Param("communityId") Long communityId,@Param("date") String date,@Param("phone")String phone);

    /**
     * 获取项目活动
     * @param page
     * @param comActActivityVO
     * @return
     */
    IPage<ComActActivityVO> pageProjectActivity(@Param("page") Page page, @Param("comActActivityVO") ComActActivityVO comActActivityVO);
}

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

@@ -41,7 +41,8 @@

    @Select("<script> " + "SELECT\n" + "c.community_id,\n" + "c.`name`,\n"
        + "ST_Distance_Sphere ( Point ( #{lng}, #{lat} ), Point ( c.lng, c.lat ) ) AS distance \n" + "FROM\n"
        + "com_act c \n" + "ORDER BY\n" + "distance ASC"
        + "com_act c \n" + " <where>" + "<if test='areaCode != null and areaCode.trim() != &quot;&quot;'>"
        + "c.area_code = #{areaCode} \n" + " </if> " + " </where>" + "ORDER BY\n" + "distance ASC"
        + "<if test='lng != null and lng.trim() != &quot;&quot;'>" + " limit 100 " + " </if> " + "</script>")
    List<ComActVO> listCommunity(ComActVO comActVO);

@@ -51,6 +52,8 @@
    @Select("<script> " + "SELECT\n" + "a.* \n" + "FROM\n" + "com_act a \n" + " <where>"
        + "<if test='pageComActDTO.name != null and pageComActDTO.name.trim() != &quot;&quot;'>"
        + "and a.name LIKE concat( #{pageComActDTO.name}, '%' ) \n" + " </if> "
        + "<if test='pageComActDTO.areaCode != null and pageComActDTO.areaCode.trim() != &quot;&quot;'>"
        + "AND a.area_code = #{pageComActDTO.areaCode} \n" + " </if> "
        + "<if test='pageComActDTO.createAtBegin != null '>" + "AND a.create_at BETWEEN "
        + "#{pageComActDTO.createAtBegin} \n" + "AND #{pageComActDTO.createAtEnd}" + " </if> " + " </where>"
        + " order by a.create_at desc" + "</script>")
@@ -70,7 +73,7 @@
        + "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 order by area_code asc")
    @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}")
@@ -79,16 +82,17 @@
    @Select("<script> 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 concat('%',#{name},'%') </script> ")
            "where ca.state = 0 and ca.name like concat('%',#{name},'%') <if test='areaCode !=null and areaCode !=&quot;&quot;'> and cs.area_code = #{areaCode} </if> </script> ")
    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 = #{communityDTO.areaCode} " +
            "HAVING distance >= 0 and distance <= #{communityDTO.distance}   ORDER BY    distance ASC")
    List<CommunitySwitchAllAppletsVO> getCommunityListByNearby(@Param("communityDTO") SearchCommunityDTO communityDTO);

    @Select("<script> select community_id,name,lng,lat from com_act  where state = 0  </script>")
    @Select("<script> select community_id,name,lng,lat from com_act  where state = 0 <if test='areaCode !=null and areaCode !=&quot;&quot;'> and area_code = #{areaCode} </if> </script>")
    List<EventGridCommunityAdminVO> getWestCommunityLists(@Param("areaCode") String areCode);

    @Select("select account,plaintext_password as password from com_act where community_id = ${communityId}")

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

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

import java.util.List;

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.dpc.PageDpcDTO;
import com.panzhihua.common.model.vos.community.ComActDpcVO;
import com.panzhihua.common.model.vos.user.SysUserVO;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComActDpc;

/**
 * 人大代表(ComActDpc)表数据库访问层
 *
 * @author makejava
 * @since 2022-06-07 10:55:30
 */
@Mapper
public interface ComActDpcDAO extends BaseMapper<ComActDpc> {

    /**
     * 批量新增数据（MyBatis原生foreach方法）
     *
     * @param entities
     *            List<ComActDpc> 实例对象列表
     * @return 影响行数
     */
    int insertBatch(@Param("entities") List<ComActDpc> entities);

    /**
     * 批量新增或按主键更新数据（MyBatis原生foreach方法）
     *
     * @param entities
     *            List<ComActDpc> 实例对象列表
     * @return 影响行数
     * @throws org.springframework.jdbc.BadSqlGrammarException
     *             入参是空List的时候会抛SQL语句错误的异常，请自行校验入参
     */
    int insertOrUpdateBatch(@Param("entities") List<ComActDpc> entities);

    /**
     * 获取人大代表详情
     * @param id
     * @return
     */
    ComActDpcVO detailDpc(@Param("id") Long id);

    /**
     * 分页查询人大代表
     * @param page
     * @param pageDpcDTO
     * @return
     */
    IPage<ComActDpcVO> pageDpc(@Param("page") Page page, @Param("pageDpcDTO") PageDpcDTO pageDpcDTO);

    /**
     * 根据手机号获取小程序用户
     * @param phone
     * @return
     */
    SysUserVO selectUser(@Param("phone") String phone);
}

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

@@ -8,6 +8,7 @@
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.BigScreenDpcStatisticsInfo;
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;
@@ -211,6 +212,7 @@
            "c.name communityName," +
            "p.transfer_time," +
            "p.is_report_urban," +
            "p.is_report_dpc," +
            "p.transfer_reason," +
            "ca.`name` as classifyName," +
            "p.urban_status, " +
@@ -251,61 +253,61 @@
            )
    List<TodoEventsVO> selectNeedToDo(@Param("communityId") Long communityId, @Param("userId") Long userId);

    @Select("<script> " +
            "SELECT " +
            "p.id, " +
            "u.`name` sponsor_name, " +
            "u.`nick_name` userNickName, " +
            "u.phone sponsor_phone, " +
            "count(DISTINCT pu.id)giveThumbsUpNum, " +
            "count(DISTINCT c.id)commentNum, " +
            "u.image_url, " +
            "p.happen_addr, " +
            "p.addr_remark, " +
            "su.`name` handler_name, " +
            "p.`status`, " +
            "p.`is_hide`, " +
            "p.`detail`, " +
            "p.`is_need_feed_back`, " +
            "p.`photo_path_list`, " +
            "p.create_at, " +
            "p.feedback_at, " +
            "p.activity_type, " +
            "p.activity_amount, " +
            "p.classify_id, " +
            "class.`name` as classifyName, " +
            "p.img_width, " +
            "p.img_height, " +
            "p.examine_at  " +
            "FROM " +
            "com_act_easy_photo p " +
            "JOIN sys_user u ON p.sponsor_id = u.user_id  " +
            "left join  com_act_easy_photo_user pu ON p.id = pu.easy_photo_id  " +
            "left JOIN sys_user su ON p.handler_id = su.user_id  " +
            "left JOIN com_act_easy_photo_comment c ON p.id = c.easy_photo_id  " +
            "left JOIN com_act_easy_photo_classify class ON p.classify_id = class.id  " +
            " <where>" +
            " p.del_tag = 0 "  +
            "<if test='comActEasyPhotoVO.communityId != null and comActEasyPhotoVO.communityId != 0'>" +
            "  and p.community_id = ${comActEasyPhotoVO.communityId} " +
            " </if> " +
            "<if test='comActEasyPhotoVO.status != null and comActEasyPhotoVO.status!=0' >" +
            "AND p.`status` = #{comActEasyPhotoVO.status}  " +
            " </if> " +
            "<if test='comActEasyPhotoVO.sponsorId != null and comActEasyPhotoVO.sponsorId != 0'>" +
            "AND p.sponsor_id =#{comActEasyPhotoVO.sponsorId}  " +
            " </if> " +
            "<if test='comActEasyPhotoVO.sponsorId == null or comActEasyPhotoVO.sponsorId==0'>" +
            "AND p.`status` in (2,5) and p.is_publicity = 1 " +
            " </if> " +
            "<if test='comActEasyPhotoVO.keyWord != null and comActEasyPhotoVO.keyWord != &quot;&quot;'>" +
            "AND (class.`name` like concat(#{comActEasyPhotoVO.keyWord},'%') or p.detail like concat(#{comActEasyPhotoVO.keyWord},'%'))   " +
            " </if> " +
            "group by p.id "+
            "order by p.create_at desc "+
            " </where>" +
            "</script>"
    )
//    @Select("<script> " +
//            "SELECT " +
//            "p.id, " +
//            "u.`name` sponsor_name, " +
//            "u.`nick_name` userNickName, " +
//            "u.phone sponsor_phone, " +
//            "count(DISTINCT pu.id)giveThumbsUpNum, " +
//            "count(DISTINCT c.id)commentNum, " +
//            "u.image_url, " +
//            "p.happen_addr, " +
//            "p.addr_remark, " +
//            "su.`name` handler_name, " +
//            "p.`status`, " +
//            "p.`is_hide`, " +
//            "p.`detail`, " +
//            "p.`is_need_feed_back`, " +
//            "p.`photo_path_list`, " +
//            "p.create_at, " +
//            "p.feedback_at, " +
//            "p.activity_type, " +
//            "p.activity_amount, " +
//            "p.classify_id, " +
//            "class.`name` as classifyName, " +
//            "p.img_width, " +
//            "p.img_height, " +
//            "p.examine_at  " +
//            "FROM " +
//            "com_act_easy_photo p " +
//            "JOIN sys_user u ON p.sponsor_id = u.user_id  " +
//            "left join  com_act_easy_photo_user pu ON p.id = pu.easy_photo_id  " +
//            "left JOIN sys_user su ON p.handler_id = su.user_id  " +
//            "left JOIN com_act_easy_photo_comment c ON p.id = c.easy_photo_id  " +
//            "left JOIN com_act_easy_photo_classify class ON p.classify_id = class.id  " +
//            " <where>" +
//            " p.del_tag = 0 "  +
//            "<if test='comActEasyPhotoVO.communityId != null and comActEasyPhotoVO.communityId != 0'>" +
//            "  and p.community_id = ${comActEasyPhotoVO.communityId} " +
//            " </if> " +
//            "<if test='comActEasyPhotoVO.status != null and comActEasyPhotoVO.status!=0' >" +
//            "AND p.`status` = #{comActEasyPhotoVO.status}  " +
//            " </if> " +
//            "<if test='comActEasyPhotoVO.sponsorId != null and comActEasyPhotoVO.sponsorId != 0'>" +
//            "AND p.sponsor_id =#{comActEasyPhotoVO.sponsorId}  " +
//            " </if> " +
//            "<if test='comActEasyPhotoVO.sponsorId == null or comActEasyPhotoVO.sponsorId==0'>" +
//            "AND p.`status` in (2,4) and p.is_publicity = 1 " +
//            " </if> " +
//            "<if test='comActEasyPhotoVO.keyWord != null and comActEasyPhotoVO.keyWord != &quot;&quot;'>" +
//            "AND (class.`name` like concat(#{comActEasyPhotoVO.keyWord},'%') or p.detail like concat(#{comActEasyPhotoVO.keyWord},'%'))   " +
//            " </if> " +
//            "group by p.id "+
//            "order by p.create_at desc "+
//            " </where>" +
//            "</script>"
//    )
    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 " +
@@ -421,4 +423,34 @@
     * @return
     */
    List<ComActEasyPhotoVO> getPartyBuildIngRecord(@Param("communityId") Long communityId, @Param("pageSize") Integer pageSize);

    /**
     * 获取上报人大代表的随手拍新增数据
     * @param communityId
     * @return
     */
    List<StatisticsCommVO> getEasyPhotoAddPolylineDataForDpc(@Param("communityId") Long communityId);

    /**
     * 上报人大代表的随手拍累计折线数据
     * @param communityId
     * @param date
     * @return
     */
    StatisticsCommVO getEasyPhotoTotalPolylineDateForDpc(@Param("communityId") Long communityId, @Param("date") String date);

    /**
     * 人大代表-随手拍展示列表
     * @param page
     * @param pageBaseDTO
     * @return
     */
    IPage<ComActEasyPhotoVO> dpcEasyPhotoList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);

    /**
     * 获取人大代表基础数据
     * @param communityId
     * @return
     */
    BigScreenDpcStatisticsInfo selectDpcBaseData(@Param("communityId") Long communityId);
}

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

@@ -19,4 +19,10 @@

    List<ComActEasyPhotoFeedbackVO> getPhotoFeedbackList(@Param("easyId") Long easyId);

    /**
     * 获取人大代表反馈记录
     * @param easyId
     * @return
     */
    List<ComActEasyPhotoFeedbackVO> getPhotoFeedbackListForDpc(@Param("easyId") Long easyId);
}

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

@@ -54,5 +54,13 @@
     * @date 2022-03-01 13:45:11
     */
    List<ComActEasyPhotoHandlerVo> queryAllByList(@Param("dto") PageComActEasyPhotoHandlerDto comActEasyPhotoHandler);

    /**
     * 获取处理记录
     * @param serviceId
     * @param serviceType
     * @return
     */
    List<ComActEasyPhotoHandlerVo> selectHandleRecord(@Param("serviceId") Long serviceId, @Param("serviceType") Integer serviceType);
}


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

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

import java.util.List;

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.enterprise.PageEnterpriseDTO;
import com.panzhihua.common.model.vos.community.ComActEnterpriseVO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComActEnterprise;

/**
 * (ComActEnterprise)表数据库访问层
 *
 * @author makejava
 * @since 2022-05-31 10:17:01
 */
@Mapper
public interface ComActEnterpriseDAO extends BaseMapper<ComActEnterprise> {

    /**
     * 批量新增数据（MyBatis原生foreach方法）
     *
     * @param entities
     *            List<ComActEnterprise> 实例对象列表
     * @return 影响行数
     */
    int insertBatch(@Param("entities") List<ComActEnterprise> entities);

    /**
     * 批量新增或按主键更新数据（MyBatis原生foreach方法）
     *
     * @param entities
     *            List<ComActEnterprise> 实例对象列表
     * @return 影响行数
     * @throws org.springframework.jdbc.BadSqlGrammarException
     *             入参是空List的时候会抛SQL语句错误的异常，请自行校验入参
     */
    int insertOrUpdateBatch(@Param("entities") List<ComActEnterprise> entities);

    /**
     * 获取社区企业详情
     * @param id
     * @return
     */
    ComActEnterpriseVO detailEnterprise(@Param("id") Long id);

    /**
     * 分页查询社区企业
     * @param page
     * @param pageEnterpriseDTO
     * @return
     */
    IPage<ComActEnterpriseVO> pageEnterprise(@Param("page") Page page, @Param("pageEnterpriseDTO") PageEnterpriseDTO pageEnterpriseDTO);

    /**
     * 社区企业服务分类占比圆形图数据
     * @param communityId
     * @return
     */
    List<StatisticsCommVO> getEnterpriseServiceTypeCircleData(@Param("communityId") Long communityId);

    /**
     * 社区工作者年龄段占比圆形图数据
     * @param communityId
     * @return
     */
    List<StatisticsCommVO> getSocialWorkerAgeStageCircleData(@Param("communityId") Long communityId);

    /**
     * 社区工作者服务分类占比圆形图数据
     * @param communityId
     * @return
     */
    List<StatisticsCommVO> getSocialWorkerServiceTypeCircleData(@Param("communityId") Long communityId);
}

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

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

import java.util.List;

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.enterprise.PageEnterpriseTypeDTO;
import com.panzhihua.common.model.vos.community.ComActEnterpriseTypeVO;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComActEnterpriseType;

/**
 * (ComActEnterpriseType)表数据库访问层
 *
 * @author makejava
 * @since 2022-06-06 15:30:47
 */
@Mapper
public interface ComActEnterpriseTypeDAO extends BaseMapper<ComActEnterpriseType> {

    /**
     * 批量新增数据（MyBatis原生foreach方法）
     *
     * @param entities
     *            List<ComActEnterpriseType> 实例对象列表
     * @return 影响行数
     */
    int insertBatch(@Param("entities") List<ComActEnterpriseType> entities);

    /**
     * 批量新增或按主键更新数据（MyBatis原生foreach方法）
     *
     * @param entities
     *            List<ComActEnterpriseType> 实例对象列表
     * @return 影响行数
     * @throws org.springframework.jdbc.BadSqlGrammarException
     *             入参是空List的时候会抛SQL语句错误的异常，请自行校验入参
     */
    int insertOrUpdateBatch(@Param("entities") List<ComActEnterpriseType> entities);

    /**
     * 获取服务分类详情
     * @param id
     * @return
     */
    ComActEnterpriseTypeVO detailEnterpriseType(@Param("id") Long id);

    /**
     * 分页查询服务分类
     * @param page
     * @param pageEnterpriseTypeDTO
     * @return
     */
    IPage<ComActEnterpriseTypeVO> pageEnterpriseType(@Param("page") Page page, @Param("pageEnterpriseTypeDTO") PageEnterpriseTypeDTO pageEnterpriseTypeDTO);

    /**
     * 获取服务分类列表
     * @param communityId
     * @return
     */
    List<ComActEnterpriseTypeVO> getEnterpriseTypeList(@Param("communityId") Long communityId);
}

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

@@ -30,8 +30,9 @@
    List<ComActMessageBackVO> selectMsgBackList(@Param("id") Long id);

    @Select("<script>" + "select * from com_act_message " + " where "
        + " ((sendto_user_id in (select id from com_pb_member_role t1 where t1.phone=#{comActMessageVO.phone})) "
        + " or (sendto_user_id in (select id from com_pb_service_team t2 where t2.phone=#{comActMessageVO.phone})))"
        + " ((sendto_user_id in (select id from com_pb_member_role t1 where t1.phone=#{comActMessageVO.phone}) AND type = 2) "
        + " or (sendto_user_id in (select id from com_pb_service_team t2 where t2.phone=#{comActMessageVO.phone}) AND type = 1) "
        + " or (sendto_user_id in (select id from com_act_dpc t3 where t3.phone=#{comActMessageVO.phone}) AND type = 3)) "
        + "<if test='comActMessageVO.status != null'>" + " and status=#{comActMessageVO.status} \n" + " </if> "
        + " order by create_at desc" + "</script>")
    IPage<PageComActMessageVO> pageSendMeMessageApplets(Page page,

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

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.ComActSocialMemberVO;
import com.panzhihua.common.model.vos.partybuilding.ComPbServiceTeamVO;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComActSocialMember;
import org.apache.ibatis.annotations.Param;
@@ -30,4 +31,11 @@
     * @return
     */
    ComActSocialMemberVO detail(Long id);

    /**
     * 查询社区工作人员
     * @param id
     * @return
     */
    ComPbServiceTeamVO selectPbServiceTeamById(@Param("id") Long id);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialOrgDao.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.PageBaseDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.community.ComActSocialOrgVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkProjectTypeInfo;
@@ -48,4 +49,38 @@
     * @return
     */
    List<BigScreenHmkProjectTypeInfo> selectType(Long communityId);

    /**
     * 根据userID查询管理社会组织
     * @param userId
     * @return
     */
    ComActSocialOrg selectOrgByUserId(@Param("userId") Long userId);

    /**
     * 孵化中心-孵化成果展示列表
     * @param page
     * @param pageBaseDTO
     * @param streetId
     * @return
     */
    IPage<ComActSocialOrgVO> pageHatchResult(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO, @Param("streetId") Long streetId);

    /**
     * 孵化中心-孵化进度展示列表
     * @param page
     * @param pageBaseDTO
     * @param streetId
     * @return
     */
    IPage<ComActSocialOrgVO> pageHatchSchedule(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO, @Param("streetId") Long streetId);

    /**
     * 五社联动社会组织展示列表
     * @param page
     * @param pageBaseDTO
     * @param streetId
     * @return
     */
    IPage<ComActSocialOrgVO> pageSocialOrgList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO, @Param("streetId") Long streetId);
}

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

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

import java.util.List;

import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

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.social.PageSocialOrgHatchAuditDTO;
import com.panzhihua.common.model.vos.community.social.SocialOrgHatchAuditVO;
import com.panzhihua.service_community.entity.ComActSocialOrgHatchAudit;

/**
 * 社会组织孵化申请表(ComActSocialOrgHatchAudit)表数据库访问层
 *
 * @author makejava
 * @since 2022-04-18 14:09:53
 */
@Mapper
public interface ComActSocialOrgHatchAuditDAO extends BaseMapper<ComActSocialOrgHatchAudit> {

    /**
     * 批量新增数据（MyBatis原生foreach方法）
     *
     * @param entities
     *            List<ComActSocialOrgHatchAudit> 实例对象列表
     * @return 影响行数
     */
    int insertBatch(@Param("entities") List<ComActSocialOrgHatchAudit> entities);

    /**
     * 批量新增或按主键更新数据（MyBatis原生foreach方法）
     *
     * @param entities
     *            List<ComActSocialOrgHatchAudit> 实例对象列表
     * @return 影响行数
     * @throws org.springframework.jdbc.BadSqlGrammarException
     *             入参是空List的时候会抛SQL语句错误的异常，请自行校验入参
     */
    int insertOrUpdateBatch(@Param("entities") List<ComActSocialOrgHatchAudit> entities);

    /**
     * 分页查询社会组织孵化申请
     * @param page
     * @param pageHatchAuditDTO
     * @return
     */
    IPage<SocialOrgHatchAuditVO> pageHatchAudit(@Param("page") Page page, @Param("pageHatchAuditDTO") PageSocialOrgHatchAuditDTO pageHatchAuditDTO);

    /**
     * 查看孵化申请详情
     * @param id
     * @return
     */
    SocialOrgHatchAuditVO detailHatchAudit(@Param("id") Long id);

    /**
     * 查看孵化申请审核进度
     * @param userId
     * @return
     */
    SocialOrgHatchAuditVO getHatchAuditSchedule(@Param("userId") Long userId);
}

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

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

import java.util.List;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComActSocialOrgHatchAuditSchedule;

/**
 * 社会组织孵化申请进度表(ComActSocialOrgHatchAuditSchedule)表数据库访问层
 *
 * @author makejava
 * @since 2022-04-18 15:10:47
 */
@Mapper
public interface ComActSocialOrgHatchAuditScheduleDAO extends BaseMapper<ComActSocialOrgHatchAuditSchedule> {

    /**
     * 批量新增数据（MyBatis原生foreach方法）
     *
     * @param entities
     *            List<ComActSocialOrgHatchAuditSchedule> 实例对象列表
     * @return 影响行数
     */
    int insertBatch(@Param("entities") List<ComActSocialOrgHatchAuditSchedule> entities);

    /**
     * 批量新增或按主键更新数据（MyBatis原生foreach方法）
     *
     * @param entities
     *            List<ComActSocialOrgHatchAuditSchedule> 实例对象列表
     * @return 影响行数
     * @throws org.springframework.jdbc.BadSqlGrammarException
     *             入参是空List的时候会抛SQL语句错误的异常，请自行校验入参
     */
    int insertOrUpdateBatch(@Param("entities") List<ComActSocialOrgHatchAuditSchedule> entities);

}

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

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

import java.util.List;

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.social.PageSocialOrgHatchDTO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenFiveAssociationsStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHatchStatisticsInfo;
import com.panzhihua.common.model.vos.community.social.SocialOrgHatchVO;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComActSocialOrgHatch;

/**
 * 社会组织孵化表(ComActSocialOrgHatch)表数据库访问层
 *
 * @author makejava
 * @since 2022-04-18 14:09:53
 */
@Mapper
public interface ComActSocialOrgHatchDAO extends BaseMapper<ComActSocialOrgHatch> {

    /**
     * 批量新增数据（MyBatis原生foreach方法）
     *
     * @param entities
     *            List<ComActSocialOrgHatch> 实例对象列表
     * @return 影响行数
     */
    int insertBatch(@Param("entities") List<ComActSocialOrgHatch> entities);

    /**
     * 批量新增或按主键更新数据（MyBatis原生foreach方法）
     *
     * @param entities
     *            List<ComActSocialOrgHatch> 实例对象列表
     * @return 影响行数
     * @throws org.springframework.jdbc.BadSqlGrammarException
     *             入参是空List的时候会抛SQL语句错误的异常，请自行校验入参
     */
    int insertOrUpdateBatch(@Param("entities") List<ComActSocialOrgHatch> entities);

    /**
     * 分页查询孵化数据
     * @param page
     * @param pageHatchDTO
     * @return
     */
    IPage<SocialOrgHatchVO> pageOrgHatch(@Param("page") Page page, @Param("pageHatchDTO") PageSocialOrgHatchDTO pageHatchDTO);

    /**
     * 查看孵化数据详情
     * @param id
     * @return
     */
    SocialOrgHatchVO detailOrgHatch(@Param("id") Long id);

    /**
     * 获取孵化中心基础统计数据
     * @param communityId
     * @param streetId
     * @return
     */
    BigScreenHatchStatisticsInfo getHatchBaseData(@Param("communityId") Long communityId, @Param("streetId") Long streetId);

    /**
     * 孵化进程占比圆形图数据
     * @param streetId
     * @return
     */
    List<StatisticsCommVO> getHatchScheduleCircleData(@Param("streetId") Long streetId);

    /**
     * 孵化状态占比柱形数据
     * @param streetId
     * @return
     */
    List<StatisticsCommVO> getHatchStatusColumnData(@Param("streetId") Long streetId);

    /**
     * 街道组织占比柱形数据
     * @param streetId
     * @return
     */
    List<StatisticsCommVO> getStreetOrgColumnData(@Param("streetId") Long streetId);

    /**
     * 根据街道名称获取街道组织分类统计
     * @param streetName
     * @return
     */
    List<StatisticsCommVO> getStreetOrgChildData(@Param("streetName") String streetName);
}

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

@@ -3,8 +3,13 @@
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.social.PageProjectDTO;
import com.panzhihua.common.model.dtos.community.social.PageProjectSignListDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.community.ComActSocialOrgVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenActivityLine;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenFiveAssociationsStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkBaseInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkProjectInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkProjectTypeInfo;
@@ -80,4 +85,36 @@
     * @return
     */
    SocialProjectVO selectByLevel(Long id);

    /**
     * 分页查询项目报名列表
     * @param page
     * @param pageProjectSignListDTO
     * @return
     */
    IPage<ComActSocialOrgVO> pageProjectSignList(@Param("page") Page page, @Param("pageProjectSignListDTO") PageProjectSignListDTO pageProjectSignListDTO);

    /**
     * 分页查询用户报名的项目
     * @param page
     * @param pageProjectDTO
     * @return
     */
    IPage<SocialProjectVO> pageProjectWhichIsSignedByUser(@Param("page") Page page, @Param("pageProjectDTO") PageProjectDTO pageProjectDTO);

    /**
     * 五社联动项目展示列表
     * @param pageBaseDTO
     * @param streetId
     * @return
     */
    IPage<SocialProjectVO> pageSocialProjectList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO, @Param("streetId") Long streetId);

    /**
     * 五社联动基础数据
     * @param communityId
     * @param streetId
     * @return
     */
    BigScreenFiveAssociationsStatisticsInfo getFiveAssociationsBaseData(@Param("communityId") Long communityId, @Param("streetId") Long streetId);
}

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

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

import java.util.List;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComActSocialProjectSign;

/**
 * (ComActSocialProjectSign)表数据库访问层
 *
 * @author makejava
 * @since 2022-04-19 13:30:42
 */
@Mapper
public interface ComActSocialProjectSignDAO extends BaseMapper<ComActSocialProjectSign> {

    /**
     * 批量新增数据（MyBatis原生foreach方法）
     *
     * @param entities
     *            List<ComActSocialProjectSign> 实例对象列表
     * @return 影响行数
     */
    int insertBatch(@Param("entities") List<ComActSocialProjectSign> entities);

    /**
     * 批量新增或按主键更新数据（MyBatis原生foreach方法）
     *
     * @param entities
     *            List<ComActSocialProjectSign> 实例对象列表
     * @return 影响行数
     * @throws org.springframework.jdbc.BadSqlGrammarException
     *             入参是空List的时候会抛SQL语句错误的异常，请自行校验入参
     */
    int insertOrUpdateBatch(@Param("entities") List<ComActSocialProjectSign> entities);

}

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

@@ -63,4 +63,11 @@
     * @return
     */
    ComActSocialWorkerVO selectOneById(Long id);

    /**
     * 根据技能id查询社工列表
     * @param id
     * @return
     */
    List<ComActSocialWorker> selectIncludeSkillWorkerList(@Param("id") Long id);
}

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

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

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.ComStreetDO;
import org.apache.ibatis.annotations.Param;

/**
 * @author: llming
@@ -12,4 +13,10 @@
@Mapper
public interface ComStreetDAO extends BaseMapper<ComStreetDO> {

    /**
     * 获取行政区域
     * @param areaCode
     * @return
     */
    String retrieveRegions(@Param("areaCode") String areaCode);
}

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

@@ -90,4 +90,11 @@
     * @return
     */
    Integer updateIsPauseStatus(@Param("needDealIds") List<Long> needDealIds);

    /**
     * 设置相关联用户为启用状态
     * @param userId
     * @return
     */
    Integer enableUserStatus(@Param("userId") Long userId);
}

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

@@ -29,6 +29,6 @@
     */
    IPage<SysConfVO> findByPage(Page page, @Param("pageSysConfDTO") PageSysConfDTO pageSysConfDTO);

        String getSysConfValue(@Param("key")String key,@Param("communityId") Long communityId);
    String getSysConfValue(@Param("key") String key, @Param("communityId") Long communityId);

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActDpc.java

New file
@@ -0,0 +1,85 @@
package com.panzhihua.service_community.entity;

import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

/**
 * 人大代表(ComActDpc)表实体类
 *
 * @author makejava
 * @since 2022-06-07 11:02:04
 */
@Data
@TableName(value = "com_act_dpc")
@SuppressWarnings("serial")
public class ComActDpc implements Serializable {
    private static final long serialVersionUID = 853854468470571468L;
    /**
     * 主键
     */
    private Long id;
    /**
     * 姓名
     */
    private String name;
    /**
     * 手机号
     */
    private String phone;
    /**
     * 民族
     */
    private String nation;
    /**
     * 性别（1.男 2.女 3.未知）
     */
    private Integer sex;
    /**
     * 选区
     */
    private String area;
    /**
     * 所属家/站
     */
    private String belong;
    /**
     * 代表类别
     */
    private String category;
    /**
     * 单位职务
     */
    private String position;
    /**
     * 照片
     */
    private String photo;
    /**
     * 是否删除
     */
    private Boolean isDel;
    /**
     * 创建人
     */
    private Long createdBy;
    /**
     * 创建时间
     */
    private Date createdAt;
    /**
     * 由谁更新
     */
    private Long updatedBy;
    /**
     * 最后更新时间
     */
    private Date updatedAt;
    /**
     * 社区id
     */
    private Long communityId;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActEnterprise.java

New file
@@ -0,0 +1,89 @@
package com.panzhihua.service_community.entity;

import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

/**
 * (ComActEnterprise)表实体类
 *
 * @author makejava
 * @since 2022-05-31 13:53:55
 */
@Data
@TableName(value = "com_act_enterprise")
@SuppressWarnings("serial")
public class ComActEnterprise implements Serializable {
    private static final long serialVersionUID = 484549866500196049L;
    /**
     * 主键
     */
    private Long id;
    /**
     * 企业名称
     */
    private String name;
    /**
     * 统一社会信用代码
     */
    private String agencyCode;
    /**
     * 法定代表人
     */
    private String legalRepresentative;
    /**
     * 联系电话
     */
    private String phone;
    /**
     * 注册时间
     */
    private Date registeAt;
    /**
     * 所属社区
     */
    private Long communityId;
    /**
     * 地址
     */
    private String address;
    /**
     * 企业介绍
     */
    private String introduct;
    /**
     * 企业logo
     */
    private String logo;
    /**
     * 创建人
     */
    private Long createdBy;
    /**
     * 创建时间
     */
    private Date createdAt;
    /**
     * 由谁更新
     */
    private Long updatedBy;
    /**
     * 最后更新时间
     */
    private Date updatedAt;
    /**
     * 状态（1.启用 2.禁用）
     */
    private Integer status;
    /**
     * 所属街道
     */
    private Long streetId;
    /**
     * 服务类型
     */
    private Long type;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActEnterpriseType.java

New file
@@ -0,0 +1,61 @@
package com.panzhihua.service_community.entity;

import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

/**
 * (ComActEnterpriseType)表实体类
 *
 * @author makejava
 * @since 2022-06-06 15:30:48
 */
@Data
@TableName(value = "com_act_enterprise_type")
@SuppressWarnings("serial")
public class ComActEnterpriseType implements Serializable {
    private static final long serialVersionUID = 259040183344787442L;
    /**
     * 主键
     */
    private Long id;
    /**
     * 社区id
     */
    private Long communityId;
    /**
     * 服务分类名称
     */
    private String name;
    /**
     * 描述
     */
    private String description;
    /**
     * 状态（1.启用 2.停用）
     */
    private Integer status;
    /**
     * 是否删除
     */
    private Boolean isDel;
    /**
     * 创建人
     */
    private Long createdBy;
    /**
     * 创建时间
     */
    private Date createdAt;
    /**
     * 由谁更新
     */
    private Long updatedBy;
    /**
     * 最后更新时间
     */
    private Date updatedAt;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialMember.java

@@ -104,4 +104,6 @@
     */
    private Long userId;

    private Long communityId;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialOrg.java

@@ -264,7 +264,7 @@
    private String latitude;

    @ApiModelProperty("服务类型")
    private Long serviceType;
    private String serviceType;

    @ApiModelProperty("街道id")
    private Long streetId;
@@ -272,4 +272,22 @@
    @ApiModelProperty("是否三社 0否1是")
    private Integer isSociety;

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

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

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

    @ApiModelProperty("挂靠单位")
    private Long affiliatedUnit;

    @ApiModelProperty("挂靠单位类型（1.街道 2.社区）")
    private Integer affiliatedUnitType;

    @ApiModelProperty("挂靠单位名称")
    private String affiliatedUnitName;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialOrgHatch.java

New file
@@ -0,0 +1,81 @@
package com.panzhihua.service_community.entity;

import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

/**
 * 社会组织孵化表(ComActSocialOrgHatch)表实体类
 *
 * @author makejava
 * @since 2022-04-18 15:10:07
 */
@Data
@TableName(value = "com_act_social_org_hatch")
@SuppressWarnings("serial")
public class ComActSocialOrgHatch implements Serializable {
    private static final long serialVersionUID = -29246013392324151L;
    /**
     * 主键
     */
    private Long id;
    /**
     * 准社会组织名称
     */
    private String name;
    /**
     * 负责人
     */
    private String responsibility;
    /**
     * 联系电话
     */
    private String phone;
    /**
     * 孵化单位
     */
    private Long hatchUnit;
    /**
     * 孵化单位类型（1.街道 2.社区）
     */
    private Integer hatchUnitType;
    /**
     * 孵化单位名称
     */
    private String hatchUnitName;
    /**
     * 孵化状态（1.孵化中 2.孵化成功）
     */
    private Integer status;
    /**
     * 开始孵化日期
     */
    private Date createdAt;
    /**
     * 更新时间
     */
    private Date updatedAt;
    /**
     * 组织介绍
     */
    private String introduction;
    /**
     * 组织标识
     */
    private String logo;
    /**
     * 申请原因
     */
    private String applyReason;
    /**
     * 服务范围
     */
    private String serviceScope;
    /**
     * 申请关联id
     */
    private Long auditId;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialOrgHatchAudit.java

New file
@@ -0,0 +1,81 @@
package com.panzhihua.service_community.entity;

import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

/**
 * 社会组织孵化申请表(ComActSocialOrgHatchAudit)表实体类
 *
 * @author makejava
 * @since 2022-04-18 15:10:10
 */
@Data
@TableName(value = "com_act_social_org_hatch_audit")
@SuppressWarnings("serial")
public class ComActSocialOrgHatchAudit implements Serializable {
    private static final long serialVersionUID = -12554435202494916L;
    /**
     * 主键
     */
    private Long id;
    /**
     * 准社会组织名称
     */
    private String name;
    /**
     * 负责人
     */
    private String responsibility;
    /**
     * 联系电话
     */
    private String phone;
    /**
     * 孵化单位
     */
    private Long hatchUnit;
    /**
     * 孵化单位类型（1.街道 2.社区）
     */
    private Integer hatchUnitType;
    /**
     * 孵化单位名称
     */
    private String hatchUnitName;
    /**
     * 申请用户
     */
    private Long userId;
    /**
     * 申请状态（1.待审核 2.审核通过 3.已驳回）
     */
    private Integer status;
    /**
     * 申请时间
     */
    private Date createdAt;
    /**
     * 更新时间
     */
    private Date updatedAt;
    /**
     * 组织介绍
     */
    private String introduction;
    /**
     * 组织标识
     */
    private String logo;
    /**
     * 申请原因
     */
    private String applyReason;
    /**
     * 服务范围
     */
    private String serviceScope;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialOrgHatchAuditSchedule.java

New file
@@ -0,0 +1,48 @@
package com.panzhihua.service_community.entity;

import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

/**
 * 社会组织孵化申请进度表(ComActSocialOrgHatchAuditSchedule)表实体类
 *
 * @author makejava
 * @since 2022-04-18 15:10:47
 */
@Data
@TableName(value = "com_act_social_org_hatch_audit_schedule")
@SuppressWarnings("serial")
public class ComActSocialOrgHatchAuditSchedule implements Serializable {
    private static final long serialVersionUID = 779830361079215649L;
    /**
     * 主键
     */
    private Long id;
    /**
     * 社会组织孵化申请关联id
     */
    private Long auditId;
    /**
     * 审核阶段
     */
    private String stage;
    /**
     * 阶段详情
     */
    private String detail;
    /**
     * 创建时间
     */
    private Date createdAt;

    public interface Stage {
        String tjzl = "提交资料";
        String ybh = "已驳回";
        String cxtj = "重新提交";
        String shtg = "审核通过";
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialProject.java

@@ -1,9 +1,12 @@
package com.panzhihua.service_community.entity;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;

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;
@@ -128,4 +131,24 @@

    @ApiModelProperty(value = "责任方id")
    private Long responsibilityId;

    /**
     * 联系电话
     */
    private String phone;

    /**
     * 项目资金
     */
    private BigDecimal funds;

    /**
     * 项目报名截止时间
     */
    private Date signUpEnd;

    /**
     * 是否公示（1.是 2.否）
     */
    private Integer isPublicity;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialProjectPublicity.java

@@ -74,4 +74,6 @@
     */
    @ApiModelProperty(value = "是否置顶")
    private Integer isTop;

    private String releaseName;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialProjectSign.java

New file
@@ -0,0 +1,42 @@
package com.panzhihua.service_community.entity;


import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

/**
 * (ComActSocialProjectSign)表实体类
 *
 * @author makejava
 * @since 2022-04-19 15:42:56
 */
@Data
@TableName(value = "com_act_social_project_sign")
@SuppressWarnings("serial")
public class ComActSocialProjectSign implements Serializable {
    private static final long serialVersionUID = 204246835752273001L;
    /**
     * 主键
     */
    private Long id;
    /**
     * 社会组织id
     */
    private Long orgId;
    /**
     * 项目id
     */
    private Long projectId;
    /**
     * 报名时间
     */
    private Date createdAt;
    /**
     * 报名用户
     */
    private Long userId;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialWorker.java

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

import java.util.Date;

import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -129,6 +131,7 @@
     * 图片
     */
    @ApiModelProperty(value = "图片")
    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String image;

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java

@@ -211,7 +211,7 @@
    private String activityType;

    /**
     * 是否居民活动
     * 是否项目
     */
    private Integer isProject;


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java

@@ -4,7 +4,11 @@
import java.math.BigDecimal;
import java.util.Date;

import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

import lombok.Data;

@@ -145,6 +149,10 @@
     */
    private Long completeId;
    /**
     * 是否上报到人大代表（ 0未上报 1已上报）
     */
    private Integer isReportDpc;
    /**
     * 是否上报到城管（ 0未上报 1已上报 2已退回）
     */
    private Integer isReportUrban;

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoFeedbackDO.java

@@ -52,6 +52,11 @@
     */
    private Long createBy;

    /**
     * 反馈人员类型（1.普通反馈 2.人大代表反馈）
     */
    private Integer type;

    @Override
    public String toString() {
        return "ComActEasyPhotoFeedbackDO{" + "id=" + id + ", easyId=" + easyId + ", feedbackContent=" + feedbackContent

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/BigScreenStatisticsService.java

@@ -291,4 +291,59 @@
     * @return
     */
    R getCourtyardBaseData(Long communityId);

    /**
     * 孵化中心-基础数据
     * @param communityId
     * @return
     */
    R getHatchBaseData(Long communityId);

    /**
     * 孵化中心-孵化成果展示列表
     * @param pageBaseDTO
     * @return
     */
    R pageHatchResult(PageBaseDTO pageBaseDTO);

    /**
     * 孵化中心-孵化进度展示列表
     * @param pageBaseDTO
     * @return
     */
    R pageHatchSchedule(PageBaseDTO pageBaseDTO);

    /**
     * 五社联动基础数据
     * @param communityId
     * @return
     */
    R getFiveAssociationsBaseData(Long communityId);

    /**
     * 五社联动项目展示列表
     * @param pageBaseDTO
     * @return
     */
    R pageSocialProjectList(PageBaseDTO pageBaseDTO);

    /**
     * 五社联动社会组织展示列表
     * @param pageBaseDTO
     * @return
     */
    R pageSocialOrgList(PageBaseDTO pageBaseDTO);

    /**
     * 人大代表
     * @param communityId
     * @return
     */
    R dpcBase(Long communityId);

    /**
     * 人大代表-随手拍展示列表
     * @return
     */
    R dpcEasyPhotoList(PageBaseDTO pageBaseDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActColumnService.java

@@ -33,4 +33,20 @@
     * @param comActColumnVO
     */
    R queryLevel(ComActColumnVO comActColumnVO);

    /**
     * 修改数据
     *
     * @param comActColumnVO 实体对象
     * @return 修改结果
     */
    R updateColumn(ComActColumnVO comActColumnVO);

    /**
     * 新增数据
     *
     * @param comActColumnVO 实体对象
     * @return 新增结果
     */
    R addColumn(ComActColumnVO comActColumnVO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActDpcService.java

New file
@@ -0,0 +1,52 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.dpc.AddDpcDTO;
import com.panzhihua.common.model.dtos.community.dpc.EditDpcDTO;
import com.panzhihua.common.model.dtos.community.dpc.PageDpcDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.entity.ComActDpc;

/**
 * 人大代表(ComActDpc)表服务接口
 *
 * @author makejava
 * @since 2022-06-07 10:55:32
 */
public interface ComActDpcService extends IService<ComActDpc> {

    /**
     * 新增人大代表
     * @param addDpcDTO
     * @return
     */
    R addDpc(AddDpcDTO addDpcDTO);

    /**
     * 修改人大代表
     * @param editDpcDTO
     * @return
     */
    R editDpc(EditDpcDTO editDpcDTO);

    /**
     * 删除人大代表
     * @param id
     * @return
     */
    R deleteDpc(Long id);

    /**
     * 获取人大代表详情
     * @param id
     * @return
     */
    R detailDpc(Long id);

    /**
     * 分页查询人大代表
     * @param pageDpcDTO
     * @return
     */
    R pageDpc(PageDpcDTO pageDpcDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActEasyPhotoHandlerService.java

@@ -2,6 +2,9 @@

import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.common.ComActEasyPhotoHandlerVo;

import java.util.List;

/**
 * title: 随手拍、微心愿处理人绑定表表服务接口
@@ -86,4 +89,11 @@
     */
    void addHandleRecord(Long communityId,Long userId,Long serviceId,Integer type,Integer serviceType,Long sponsorId);

    /**
     * 获取处理记录
     * @param serviceId
     * @param serviceType
     * @return
     */
    List<ComActEasyPhotoHandlerVo> selectHandleRecord(Long serviceId, Integer serviceType);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActEasyPhotoService.java

@@ -186,4 +186,18 @@
     * @return 社区待处理随手拍id集合
     */
    R easyPhotoNoHandleList(Long communityId);

    /**
     * 获取人大代表反馈记录
     * @param id
     * @return
     */
    R getFeedbackList(Long id);

    /**
     * 人大代表反馈随手拍
     * @param comActEasyPhotoVO
     * @return
     */
    R addEasyPhotoFeedbackForDpc(ComActEasyPhotoVO comActEasyPhotoVO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActEnterpriseService.java

New file
@@ -0,0 +1,52 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.enterprise.AddEnterpriseDTO;
import com.panzhihua.common.model.dtos.community.enterprise.EditEnterpriseDTO;
import com.panzhihua.common.model.dtos.community.enterprise.PageEnterpriseDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.entity.ComActEnterprise;

/**
 * (ComActEnterprise)表服务接口
 *
 * @author makejava
 * @since 2022-05-31 10:17:02
 */
public interface ComActEnterpriseService extends IService<ComActEnterprise> {

    /**
     * 新增社区企业
     * @param addEnterpriseDTO
     * @return
     */
    R addEnterprise(AddEnterpriseDTO addEnterpriseDTO);

    /**
     * 修改社区企业
     * @param editEnterpriseDTO
     * @return
     */
    R editEnterprise(EditEnterpriseDTO editEnterpriseDTO);

    /**
     * 删除社区企业
     * @param id
     * @return
     */
    R deleteEnterprise(Long id);

    /**
     * 获取社区企业详情
     * @param id
     * @return
     */
    R detailEnterprise(Long id);

    /**
     * 分页查询社区企业
     * @param pageEnterpriseDTO
     * @return
     */
    R pageEnterprise(PageEnterpriseDTO pageEnterpriseDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActEnterpriseTypeService.java

New file
@@ -0,0 +1,59 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.enterprise.AddEnterpriseTypeDTO;
import com.panzhihua.common.model.dtos.community.enterprise.EditEnterpriseTypeDTO;
import com.panzhihua.common.model.dtos.community.enterprise.PageEnterpriseTypeDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.entity.ComActEnterpriseType;

/**
 * (ComActEnterpriseType)表服务接口
 *
 * @author makejava
 * @since 2022-06-06 15:30:52
 */
public interface ComActEnterpriseTypeService extends IService<ComActEnterpriseType> {

    /**
     * 新增服务分类
     * @param addEnterpriseTypeDTO
     * @return
     */
    R addEnterpriseType(AddEnterpriseTypeDTO addEnterpriseTypeDTO);

    /**
     * 修改服务分类
     * @param enterpriseTypeDTO
     * @return
     */
    R editEnterpriseType(EditEnterpriseTypeDTO enterpriseTypeDTO);

    /**
     * 删除服务分类
     * @param id
     * @return
     */
    R deleteEnterpriseType(Long id);

    /**
     * 获取服务分类详情
     * @param id
     * @return
     */
    R detailEnterpriseType(Long id);

    /**
     * 分页查询服务分类
     * @param pageEnterpriseTypeDTO
     * @return
     */
    R pageEnterpriseType(PageEnterpriseTypeDTO pageEnterpriseTypeDTO);

    /**
     * 获取服务分类列表
     * @param communityId
     * @return
     */
    R getEnterpriseTypeList(Long communityId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialOrgHatchAuditScheduleService.java

New file
@@ -0,0 +1,14 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_community.entity.ComActSocialOrgHatchAuditSchedule;

/**
 * 社会组织孵化申请进度表(ComActSocialOrgHatchAuditSchedule)表服务接口
 *
 * @author makejava
 * @since 2022-04-18 15:10:48
 */
public interface ComActSocialOrgHatchAuditScheduleService extends IService<ComActSocialOrgHatchAuditSchedule> {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialOrgHatchAuditService.java

New file
@@ -0,0 +1,73 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.social.HatchAuditProcessDTO;
import com.panzhihua.common.model.dtos.community.social.PageSocialOrgHatchAuditDTO;
import com.panzhihua.common.model.dtos.community.social.SocialOrgHatchAuditDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.entity.ComActSocialOrgHatchAudit;

/**
 * 社会组织孵化申请表(ComActSocialOrgHatchAudit)表服务接口
 *
 * @author makejava
 * @since 2022-04-18 14:09:53
 */
public interface ComActSocialOrgHatchAuditService extends IService<ComActSocialOrgHatchAudit> {

    /**
     * 分页查询孵化申请
     * @param pageHatchAuditDTO
     * @return
     */
    R pageHatchAudit(PageSocialOrgHatchAuditDTO pageHatchAuditDTO);

    /**
     * 查看孵化申请详情
     * @param id
     * @return
     */
    R detailHatchAudit(Long id);

    /**
     * 修改孵化申请
     * @param hatchAuditDTO
     * @return
     */
    R updateHatchAudit(SocialOrgHatchAuditDTO hatchAuditDTO);

    /**
     * 获取孵化流程配置
     * @return
     */
    R getHatchAuditProcess();

    /**
     * 修改孵化流程配置
     * @param processDTO
     * @return
     */
    R putHatchAuditProcess(HatchAuditProcessDTO processDTO);

    /**
     * 新增孵化申请
     * @param hatchAuditDTO
     * @return
     */
    R addHatchAudit(SocialOrgHatchAuditDTO hatchAuditDTO);

    /**
     * 查看孵化申请审核进度
     * @param userId
     * @return
     */
    R getHatchAuditSchedule(Long userId);

    /**
     * 删除孵化申请详情
     * @param id
     * @return
     */
    R deleteHatchAudit(Long id);
}


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialOrgHatchService.java

New file
@@ -0,0 +1,45 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.social.PageSocialOrgHatchDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.entity.ComActSocialOrgHatch;

/**
 * 社会组织孵化表(ComActSocialOrgHatch)表服务接口
 *
 * @author makejava
 * @since 2022-04-18 14:09:53
 */
public interface ComActSocialOrgHatchService extends IService<ComActSocialOrgHatch> {

    /**
     * 分页查询孵化数据
     * @param pageHatchDTO
     * @return
     */
    R pageOrgHatch(PageSocialOrgHatchDTO pageHatchDTO);

    /**
     * 查看孵化数据详情
     * @param id
     * @return
     */
    R detailOrgHatch(Long id);

    /**
     * 修改孵化状态
     * @param id
     * @param status
     * @return
     */
    R updateOrgHatchStatus(Long id, Integer status);

    /**
     * 删除孵化数据
     * @param id
     * @return
     */
    R deleteOrgHatch(Long id);
}


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialProjectService.java

@@ -1,8 +1,11 @@
package com.panzhihua.service_community.service;

import com.panzhihua.common.model.dtos.community.social.PageProjectDTO;
import com.panzhihua.common.model.dtos.community.social.PageProjectSignListDTO;
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.common.model.vos.community.social.SocialProjectVO;
import com.panzhihua.service_community.entity.ComActSocialProject;

/**
@@ -23,9 +26,10 @@
    /**
     * 小程序获取详情
     * @param id
     * @param userId
     * @return
     */
    R getByApplet(Long id);
    R getByApplet(Long id, Long userId);

    /**
     * 小程序获取详情
@@ -40,4 +44,34 @@
     * @return
     */
    R getProject(CommonPage commonPage);

    /**
     * 修改数据
     *
     * @param socialProjectVO 实体对象
     * @return 修改结果
     */
    R updateProject(SocialProjectVO socialProjectVO);

    /**
     * 分页查询项目报名列表
     * @param pageProjectSignListDTO
     * @return
     */
    R pageProjectSignList(PageProjectSignListDTO pageProjectSignListDTO);

    /**
     * 项目公开报名
     * @param projectId
     * @param userId
     * @return
     */
    R signProject(Long projectId, Long userId);

    /**
     * 分页查询用户报名的项目
     * @param pageProjectDTO
     * @return
     */
    R pageProjectWhichIsSignedByUser(PageProjectDTO pageProjectDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngProvinceService.java

@@ -38,5 +38,5 @@
     * @param provinceAdcode
     * @return
     */
    R getCityTreeByProvinceCode(Integer provinceAdcode);
    R getCityTreeByProvinceCode(Integer provinceAdcode, String areaCode);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/RentingHourseRegisterService.java

@@ -73,6 +73,7 @@

    /**
     * 方便手动调用批量更新
     * @param areaCode
     */
    void updateAllHouseUnionAppCode();
    void updateAllHouseUnionAppCode(String areaCode);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java

@@ -14,17 +14,7 @@

import javax.annotation.Resource;

import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenAlarmStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenCourtyardStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenVolunteerStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.EquipmentPointMapDataVO;
import com.panzhihua.common.model.vos.community.bigscreen.VolunteerOrgRelationVO;
import com.panzhihua.common.model.vos.grid.EventVO;
import com.panzhihua.common.model.vos.property.ComPropertyAlarmVO;
import com.panzhihua.common.model.vos.property.ComPropertyEquipmentVO;
import com.panzhihua.service_community.dao.ComMngVolunteerMngDAO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenDpcStatisticsInfo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -36,15 +26,21 @@
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.ComActFourMemberVO;
import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
import com.panzhihua.common.model.vos.community.ComSwPatrolRecordVO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenActivityLine;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenAlarmStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenCommunityStatisticsVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenCourtyardStatisticsInfo;
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.BigScreenFiveAssociationsStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenFmsStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenFourMemberStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHatchStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkBaseInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkProjectInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkProjectTypeInfo;
@@ -57,32 +53,43 @@
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.BigScreenVolunteerStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.EquipmentPointMapDataVO;
import com.panzhihua.common.model.vos.community.bigscreen.FourMemberOrgRelationVO;
import com.panzhihua.common.model.vos.community.bigscreen.GridsGovernanceStatisticsVO;
import com.panzhihua.common.model.vos.community.bigscreen.ResidentAutonomyStatisticsVO;
import com.panzhihua.common.model.vos.community.bigscreen.VolunteerOrgRelationVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import com.panzhihua.common.model.vos.community.fms.ComFmsTeamVO;
import com.panzhihua.common.model.vos.community.screen.civil.CivilVillageStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.event.EventGridIncidentStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.event.EventGridStatisticsVO;
import com.panzhihua.common.model.vos.grid.EventVO;
import com.panzhihua.common.model.vos.property.ComPropertyAlarmVO;
import com.panzhihua.common.model.vos.property.ComPropertyEquipmentVO;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.service_community.dao.ComActActivityDAO;
import com.panzhihua.service_community.dao.ComActCommitteeDao;
import com.panzhihua.service_community.dao.ComActDAO;
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.ComActEnterpriseDAO;
import com.panzhihua.service_community.dao.ComActFourMemberDao;
import com.panzhihua.service_community.dao.ComActMicroWishDAO;
import com.panzhihua.service_community.dao.ComActNeighborCircleDAO;
import com.panzhihua.service_community.dao.ComActQuestnaireDAO;
import com.panzhihua.service_community.dao.ComActSocialOrgDao;
import com.panzhihua.service_community.dao.ComActSocialOrgHatchDAO;
import com.panzhihua.service_community.dao.ComActSocialProjectDao;
import com.panzhihua.service_community.dao.ComActSocialWorkerDao;
import com.panzhihua.service_community.dao.ComActWarehouseDonatesDao;
import com.panzhihua.service_community.dao.ComFmsServiceDAO;
import com.panzhihua.service_community.dao.ComMngPopulationDAO;
import com.panzhihua.service_community.dao.ComMngVolunteerMngDAO;
import com.panzhihua.service_community.dao.ComPropertyDao;
import com.panzhihua.service_community.dao.ConvenientMerchantDAO;
import com.panzhihua.service_community.model.dos.ComActDO;
import com.panzhihua.service_community.service.BigScreenStatisticsService;

import lombok.extern.slf4j.Slf4j;
@@ -150,6 +157,12 @@
    private ComFmsServiceDAO comFmsServiceDAO;
    @Resource
    private ComMngVolunteerMngDAO comMngVolunteerMngDAO;
    @Resource
    private ComActSocialOrgHatchDAO comActSocialOrgHatchDAO;
    @Resource
    private ComActDAO comActDAO;
    @Resource
    private ComActEnterpriseDAO comActEnterpriseDAO;

    /**
     * 大数据分析平台-居民自治
@@ -1217,6 +1230,154 @@
        return R.ok(statisticsInfo);
    }

    /**
     * 孵化中心-基础数据
     * @param communityId
     * @return
     */
    @Override
    public R getHatchBaseData(Long communityId) {
        ComActDO comActDO = comActDAO.selectById(communityId);
        BigScreenHatchStatisticsInfo statisticsInfo = comActSocialOrgHatchDAO.getHatchBaseData(communityId, comActDO.getStreetId());
        //孵化进程占比圆形图数据
        List<StatisticsCommVO> hatchScheduleCircleData = comActSocialOrgHatchDAO.getHatchScheduleCircleData(comActDO.getStreetId());
        statisticsInfo.setHatchScheduleCircleData(hatchScheduleCircleData);
        //孵化状态占比柱形数据
        List<StatisticsCommVO> hatchStatusColumnData = comActSocialOrgHatchDAO.getHatchStatusColumnData(comActDO.getStreetId());
        statisticsInfo.setHatchStatusColumnData(hatchStatusColumnData);
        //街道组织占比柱形数据
        List<StatisticsCommVO> streetOrgColumnData = comActSocialOrgHatchDAO.getStreetOrgColumnData(comActDO.getStreetId());
        if (nonNull(streetOrgColumnData) && !streetOrgColumnData.isEmpty()) {
            streetOrgColumnData.forEach(e -> e.setStatisticsCommVOS(comActSocialOrgHatchDAO.getStreetOrgChildData(e.getFiled())));
        }
        statisticsInfo.setStreetOrgColumnData(streetOrgColumnData);
        return R.ok(statisticsInfo);
    }

    /**
     * 孵化中心-孵化成果展示列表
     * @param pageBaseDTO
     * @return
     */
    @Override
    public R pageHatchResult(PageBaseDTO pageBaseDTO) {
        ComActDO comActDO = comActDAO.selectById(pageBaseDTO.getCommunityId());
        Page page = retrievePage(pageBaseDTO);
        return R.ok(comActSocialOrgDao.pageHatchResult(page, pageBaseDTO, comActDO.getStreetId()));
    }

    /**
     * 孵化中心-孵化进度展示列表
     * @param pageBaseDTO
     * @return
     */
    @Override
    public R pageHatchSchedule(PageBaseDTO pageBaseDTO) {
        ComActDO comActDO = comActDAO.selectById(pageBaseDTO.getCommunityId());
        Page page = retrievePage(pageBaseDTO);
        return R.ok(comActSocialOrgDao.pageHatchSchedule(page, pageBaseDTO, comActDO.getStreetId()));
    }

    /**
     * 五社联动基础数据
     * @param communityId
     * @return
     */
    @Override
    public R getFiveAssociationsBaseData(Long communityId) {
        ComActDO comActDO = comActDAO.selectById(communityId);
        BigScreenFiveAssociationsStatisticsInfo statisticsInfo = comActSocialProjectDao.getFiveAssociationsBaseData(communityId, comActDO.getStreetId());
        //社区企业服务分类占比圆形图数据
        Integer enterpriseNum = statisticsInfo.getEnterpriseNum();
        List<StatisticsCommVO> enterpriseServiceTypeCircleData = comActEnterpriseDAO.getEnterpriseServiceTypeCircleData(communityId);
        if (nonNull(enterpriseServiceTypeCircleData) && !enterpriseServiceTypeCircleData.isEmpty() && enterpriseNum > 0) {
            enterpriseServiceTypeCircleData.forEach(e -> {
                e.setPercent(new BigDecimal(e.getNum())
                        .divide(new BigDecimal(enterpriseNum), 2, BigDecimal.ROUND_HALF_UP)
                        .multiply(new BigDecimal(100)).setScale(0));
            });
        }
        statisticsInfo.setEnterpriseServiceTypeCircleData(enterpriseServiceTypeCircleData);
        //社区工作者年龄段占比圆形图数据
        List<StatisticsCommVO> socialWorkerAgeStageCircleData = comActEnterpriseDAO.getSocialWorkerAgeStageCircleData(communityId);
        Integer socialWorkerNum = statisticsInfo.getSocialWorkerNum();
        if (nonNull(socialWorkerAgeStageCircleData) && !socialWorkerAgeStageCircleData.isEmpty() && socialWorkerNum > 0) {
            socialWorkerAgeStageCircleData.forEach(e -> {
                e.setPercent(new BigDecimal(e.getNum())
                        .divide(new BigDecimal(socialWorkerNum), 2, BigDecimal.ROUND_HALF_UP)
                        .multiply(new BigDecimal(100)).setScale(0));
            });
        }
        statisticsInfo.setSocialWorkerAgeStageCircleData(socialWorkerAgeStageCircleData);
        //社区工作者服务分类占比圆形图数据
        List<StatisticsCommVO> socialWorkerServiceTypeCircleData = comActEnterpriseDAO.getSocialWorkerServiceTypeCircleData(communityId);
        if (nonNull(socialWorkerServiceTypeCircleData) && !socialWorkerServiceTypeCircleData.isEmpty() && socialWorkerNum > 0) {
            socialWorkerServiceTypeCircleData.forEach(e -> {
                e.setPercent(new BigDecimal(e.getNum())
                        .divide(new BigDecimal(socialWorkerNum), 2, BigDecimal.ROUND_HALF_UP)
                        .multiply(new BigDecimal(100)).setScale(0));
            });
        }
        statisticsInfo.setSocialWorkerServiceTypeCircleData(socialWorkerServiceTypeCircleData);
        return R.ok(statisticsInfo);
    }

    /**
     * 五社联动项目展示列表
     * @param pageBaseDTO
     * @return
     */
    @Override
    public R pageSocialProjectList(PageBaseDTO pageBaseDTO) {
        ComActDO comActDO = comActDAO.selectById(pageBaseDTO.getCommunityId());
        Page page = retrievePage(pageBaseDTO);
        return R.ok(comActSocialProjectDao.pageSocialProjectList(page, pageBaseDTO, comActDO.getStreetId()));
    }

    /**
     * 五社联动社会组织展示列表
     * @param pageBaseDTO
     * @return
     */
    @Override
    public R pageSocialOrgList(PageBaseDTO pageBaseDTO) {
        ComActDO comActDO = comActDAO.selectById(pageBaseDTO.getCommunityId());
        Page page = retrievePage(pageBaseDTO);
        return R.ok(comActSocialOrgDao.pageSocialOrgList(page, pageBaseDTO, comActDO.getStreetId()));
    }

    /**
     * 人大代表
     * @param communityId
     * @return
     */
    @Override
    public R dpcBase(Long communityId) {
        BigScreenDpcStatisticsInfo statisticsInfo = comActEasyPhotoDAO.selectDpcBaseData(communityId);
        //随手拍新增折线数据
        List<StatisticsCommVO> easyPhotoAddPolylineData = comActEasyPhotoDAO.getEasyPhotoAddPolylineDataForDpc(communityId);
        statisticsInfo.setEasyPhotoAddPolylineData(easyPhotoAddPolylineData);
        //随手拍累计折线数据
        List<StatisticsCommVO> easyPhotoTotalPolylineData = new ArrayList<>();
        easyPhotoAddPolylineData.forEach(e -> {
            StatisticsCommVO temp = comActEasyPhotoDAO.getEasyPhotoTotalPolylineDateForDpc(communityId, e.getFiled());
            temp.setFiled(e.getFiled());
            easyPhotoTotalPolylineData.add(temp);
        });
        statisticsInfo.setEasyPhotoTotalPolylineData(easyPhotoTotalPolylineData);
        return R.ok(statisticsInfo);
    }

    /**
     * 人大代表-随手拍展示列表
     * @return
     */
    @Override
    public R dpcEasyPhotoList(PageBaseDTO pageBaseDTO) {
        Page page = retrievePage(pageBaseDTO);
        return R.ok(comActEasyPhotoDAO.dpcEasyPhotoList(page, pageBaseDTO));
    }

    private Page retrievePage(PageBaseDTO pageBaseDTO) {
        Long pageNum = pageBaseDTO.getPageNum();
        Long size = pageBaseDTO.getPageSize();

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java

@@ -91,7 +91,10 @@
    private ComActDAO comActDAO;
    @Resource
    private ComPbCheckUnitDao comPbCheckUnitDao;

    @Resource
    private ComActSocialProjectDao comActSocialProjectDao;
    @Resource
    private ComStreetDAO comStreetDAO;

    /**
     * 新增社区活动
@@ -236,7 +239,19 @@
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<ComActActivityVO> iPage = comActActivityDAO.pageActivity(page, comActActivityVO);
        Integer type = comActActivityVO.getType();
        IPage<ComActActivityVO> iPage = null;
        if (nonNull(type) && type.equals(4)) {
            if (nonNull(comActActivityVO.getCommunityId())) {
                ComActDO comActDO = comActDAO.selectById(comActActivityVO.getCommunityId());
                if (nonNull(comActDO)) {
                    comActActivityVO.setStreetId(comActDO.getStreetId());
                }
            }
            iPage = comActActivityDAO.pageProjectActivity(page, comActActivityVO);
        } else {
            iPage = comActActivityDAO.pageActivity(page, comActActivityVO);
        }
//        List<ComActActivityVO> records = iPage.getRecords();
//        if (!ObjectUtils.isEmpty(records)) {
//            records.forEach(comActActivityVO1 -> {

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActColumnServiceImpl.java

@@ -1,5 +1,19 @@
package com.panzhihua.service_community.service.impl;

import static java.util.Objects.nonNull;
import static org.apache.commons.lang3.StringUtils.isNotBlank;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

import javax.annotation.Resource;

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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -7,10 +21,13 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActColumnVO;
import com.panzhihua.service_community.dao.ComActAnnouncementDao;
import com.panzhihua.service_community.dao.ComActColumnDao;
import com.panzhihua.service_community.dao.ComActSocialWorkerDao;
import com.panzhihua.service_community.entity.ComActAnnouncement;
import com.panzhihua.service_community.entity.ComActColumn;
import com.panzhihua.service_community.dao.ComActColumnDao;
import com.panzhihua.service_community.entity.ComActSocialWorker;
import com.panzhihua.service_community.service.ComActColumnService;

import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

@@ -29,6 +46,10 @@
    private ComActColumnDao comActColumnDao;
    @Resource
    private ComActAnnouncementDao comActAnnouncementDao;
    @Resource
    private ComActSocialWorkerDao comActSocialWorkerDao;
    @Resource
    private ComActDAO comActDAO;
    @Override
    public R pageList(CommonPage commonPage) {
        return R.ok(this.comActColumnDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
@@ -39,12 +60,102 @@
        if(!comActAnnouncementDao.selectList(new QueryWrapper<ComActAnnouncement>().lambda().eq(ComActAnnouncement::getColumnId,id)).isEmpty()){
            return R.fail("当前类型无法删除，请先处理绑定数据");
        }
        ComActColumn comActColumn = comActColumnDao.selectById(id);
        if (nonNull(comActColumn) && comActColumn.getType().equals(2)) {
            //社工技能
            updateWorkerSkill(id);
        }
        return R.ok(comActColumnDao.deleteById(id));
    }

    @Override
    public R queryLevel(ComActColumnVO comActColumnVO) {
        Integer type = comActColumnVO.getType();
        Long communityId = comActColumnVO.getCommunityId();
        if (nonNull(type) && type.equals(4) && nonNull(communityId)) {
            ComActDO comActDO = comActDAO.selectById(communityId);
            if (nonNull(comActDO)) {
                comActColumnVO.setStreetId(comActDO.getStreetId());
            }
        }
        return R.ok(this.comActColumnDao.queryLevel(comActColumnVO));
    }

    /**
     * 修改数据
     *
     * @param comActColumnVO 实体对象
     * @return 修改结果
     */
    @Override
    public R updateColumn(ComActColumnVO comActColumnVO) {
        ComActColumn comActColumn = this.baseMapper.selectById(comActColumnVO.getId());
        BeanUtils.copyProperties(comActColumnVO, comActColumn);
        int result = this.baseMapper.updateById(comActColumn);
        if (result > 0) {
            if (comActColumn.getType().equals(2)) {
                //社工技能
                updateWorkerSkill(comActColumn.getId());
            }
            return R.ok();
        }
        return R.fail("操作失败，请重新尝试");
    }

    /**
     * 新增数据
     *
     * @param comActColumnVO 实体对象
     * @return 新增结果
     */
    @Override
    public R addColumn(ComActColumnVO comActColumnVO) {
        ComActColumn comActColumn = new ComActColumn();
        BeanUtils.copyProperties(comActColumnVO, comActColumn);
        Long communityId = comActColumnVO.getCommunityId();
        if (nonNull(communityId)) {
            ComActDO comActDO = comActDAO.selectById(communityId);
            if (nonNull(comActDO)) {
                comActColumn.setStreetId(comActDO.getStreetId());
            }
        }
        int result = this.baseMapper.insert(comActColumn);
        if (result > 0) {
            return R.ok();
        }
        return R.fail("操作失败，请重新尝试");
    }

    private void updateWorkerSkill(Long id) {
        List<ComActSocialWorker> workerList = comActSocialWorkerDao.selectIncludeSkillWorkerList(id);
        if (!workerList.isEmpty()) {
            workerList.forEach(e -> {
                String skillType = e.getSkillType();
                if (isNotBlank(skillType)) {
                    List<String> skillList = Arrays.asList(skillType.split(","));
                    List<String> list = new ArrayList<String>(skillList);
                    list.remove(id.toString());
                    StringBuilder sb = new StringBuilder();
                    StringBuilder sb1 = new StringBuilder();
                    for (int i = 0; i < list.size(); i++) {
                        String skillId = list.get(i);
                        ComActColumn skillColumn = comActColumnDao.selectById(skillId);
                        if (i < list.size() - 1) {
                            sb.append(skillId);
                            sb.append(",");
                            sb1.append(skillColumn.getName());
                            sb1.append(",");
                        } else {
                            sb.append(skillId);
                            sb1.append(skillColumn.getName());
                        }
                    }
                    e.setSkillType(sb.toString());
                    e.setSkillTypeName(sb1.toString());
                    comActSocialWorkerDao.updateById(e);
                }
            });
        }
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDpcServiceImpl.java

New file
@@ -0,0 +1,146 @@
package com.panzhihua.service_community.service.impl;

import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.constants.UserConstants;
import com.panzhihua.common.model.vos.user.SysUserVO;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.community.dpc.AddDpcDTO;
import com.panzhihua.common.model.dtos.community.dpc.EditDpcDTO;
import com.panzhihua.common.model.dtos.community.dpc.PageDpcDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.dao.ComActDpcDAO;
import com.panzhihua.service_community.entity.ComActDpc;
import com.panzhihua.service_community.service.ComActDpcService;

import javax.annotation.Resource;

/**
 * 人大代表(ComActDpc)表服务实现类
 *
 * @author makejava
 * @since 2022-06-07 10:55:32
 */
@Service("comActDpcService")
public class ComActDpcServiceImpl extends ServiceImpl<ComActDpcDAO, ComActDpc> implements ComActDpcService {

    @Resource
    private StringRedisTemplate stringRedisTemplate;

    /**
     * 新增人大代表
     * @param addDpcDTO
     * @return
     */
    @Override
    public R addDpc(AddDpcDTO addDpcDTO) {
        ComActDpc dpc = this.baseMapper.selectOne(new LambdaQueryWrapper<ComActDpc>()
                .eq(ComActDpc::getPhone, addDpcDTO.getPhone())
                .eq(ComActDpc::getCommunityId, addDpcDTO.getCommunityId()));
        if (nonNull(dpc)) {
            if (dpc.getIsDel()) {
                this.baseMapper.deleteById(dpc.getId());
            } else {
                return R.fail("手机号已存在");
            }
        }
        dpc = new ComActDpc();
        BeanUtils.copyProperties(addDpcDTO, dpc);
        int result = this.baseMapper.insert(dpc);
        if (result > 0) {
            refreshAssociateUserCash(addDpcDTO.getPhone());
            return R.ok();
        }
        return R.fail("操作失败，请重新尝试");
    }

    /**
     * 修改人大代表
     * @param editDpcDTO
     * @return
     */
    @Override
    public R editDpc(EditDpcDTO editDpcDTO) {
        ComActDpc dpc = this.baseMapper.selectById(editDpcDTO.getId());
        if (isNull(dpc)) {
            return R.fail("资源不存在");
        }
        if (!dpc.getPhone().equals(editDpcDTO.getPhone())) {
            ComActDpc dpc1 = this.baseMapper.selectOne(new LambdaQueryWrapper<ComActDpc>()
                    .eq(ComActDpc::getPhone, editDpcDTO.getPhone())
                    .eq(ComActDpc::getCommunityId, editDpcDTO.getCommunityId()));
            if (nonNull(dpc1)) {
                if (dpc1.getIsDel()) {
                    this.baseMapper.deleteById(dpc1.getId());
                } else {
                    return R.fail("手机号已存在");
                }
            }
        }
        BeanUtils.copyProperties(editDpcDTO, dpc);
        int result = this.baseMapper.updateById(dpc);
        if (result > 0) {
            refreshAssociateUserCash(editDpcDTO.getPhone());
            return R.ok();
        }
        return R.fail("操作失败，请重新尝试");
    }

    /**
     * 删除人大代表
     * @param id
     * @return
     */
    @Override
    public R deleteDpc(Long id) {
        ComActDpc dpc = this.baseMapper.selectById(id);
        if (isNull(dpc)) {
            return R.fail("资源不存在");
        }
        dpc.setIsDel(true);
        int result = this.baseMapper.updateById(dpc);
        if (result > 0) {
            refreshAssociateUserCash(dpc.getPhone());
            return R.ok();
        }
        return R.fail("操作失败，请重新尝试");
    }

    private void refreshAssociateUserCash(String phone) {
        SysUserVO sysUser = this.baseMapper.selectUser(phone);
        if (nonNull(sysUser)) {
            String userKey = UserConstants.LOGIN_USER_INFO + sysUser.getUserId();
            stringRedisTemplate.delete(userKey);
        }
    }

    /**
     * 获取人大代表详情
     * @param id
     * @return
     */
    @Override
    public R detailDpc(Long id) {
        return R.ok(this.baseMapper.detailDpc(id));
    }

    /**
     * 分页查询人大代表
     * @param pageDpcDTO
     * @return
     */
    @Override
    public R pageDpc(PageDpcDTO pageDpcDTO) {
        Page page = new Page<>();
        page.setSize(pageDpcDTO.getPageSize());
        page.setCurrent(pageDpcDTO.getPageNum());
        return R.ok(this.baseMapper.pageDpc(page, pageDpcDTO));
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoHandlerServiceImpl.java

@@ -1,5 +1,6 @@
package com.panzhihua.service_community.service.impl;

import com.panzhihua.common.model.vos.common.ComActEasyPhotoHandlerVo;
import com.panzhihua.service_community.entity.ComActEasyPhotoHandler;
import com.panzhihua.service_community.dao.ComActEasyPhotoHandlerMapper;
import com.panzhihua.service_community.service.ComActEasyPhotoHandlerService;
@@ -11,6 +12,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

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

/**
 * title: 随手拍、微心愿处理人绑定表表服务实现类
@@ -140,4 +142,15 @@
        easyPhotoHandler.setServiceType(serviceType);
        this.baseMapper.insert(easyPhotoHandler);
    }

    /**
     * 获取处理记录
     * @param serviceId
     * @param serviceType
     * @return
     */
    @Override
    public List<ComActEasyPhotoHandlerVo> selectHandleRecord(Long serviceId, Integer serviceType) {
        return this.baseMapper.selectHandleRecord(serviceId, serviceType);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEnterpriseServiceImpl.java

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

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.community.enterprise.AddEnterpriseDTO;
import com.panzhihua.common.model.dtos.community.enterprise.EditEnterpriseDTO;
import com.panzhihua.common.model.dtos.community.enterprise.PageEnterpriseDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.dao.ComActDAO;
import com.panzhihua.service_community.dao.ComActEnterpriseDAO;
import com.panzhihua.service_community.entity.ComActEnterprise;
import com.panzhihua.service_community.model.dos.ComActDO;
import com.panzhihua.service_community.service.ComActEnterpriseService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;

import static java.util.Objects.isNull;

/**
 * (ComActEnterprise)表服务实现类
 *
 * @author makejava
 * @since 2022-05-31 10:17:02
 */
@Service("comActEnterpriseService")
public class ComActEnterpriseServiceImpl extends ServiceImpl<ComActEnterpriseDAO, ComActEnterprise>
    implements ComActEnterpriseService {

    @Resource
    private ComActDAO comActDAO;

    /**
     * 新增社区企业
     * @param addEnterpriseDTO
     * @return
     */
    @Override
    public R addEnterprise(AddEnterpriseDTO addEnterpriseDTO) {
        ComActDO comActDO = comActDAO.selectById(addEnterpriseDTO.getCommunityId());
        ComActEnterprise enterprise = new ComActEnterprise();
        BeanUtils.copyProperties(addEnterpriseDTO, enterprise);
        enterprise.setStreetId(comActDO.getStreetId());
        int result = this.baseMapper.insert(enterprise);
        if (result > 0) {
            return R.ok();
        }
        return R.fail("操作失败，请重新尝试");
    }

    /**
     * 修改社区企业
     * @param editEnterpriseDTO
     * @return
     */
    @Override
    public R editEnterprise(EditEnterpriseDTO editEnterpriseDTO) {
        ComActEnterprise enterprise = this.baseMapper.selectById(editEnterpriseDTO.getId());
        if (isNull(enterprise)) {
            return R.fail("资源不存在");
        }
        ComActDO comActDO = comActDAO.selectById(editEnterpriseDTO.getCommunityId());
        BeanUtils.copyProperties(editEnterpriseDTO, enterprise);
        enterprise.setStreetId(comActDO.getStreetId());
        int result = this.baseMapper.updateById(enterprise);
        if (result > 0) {
            return R.ok();
        }
        return R.fail("操作失败，请重新尝试");
    }

    /**
     * 删除社区企业
     * @param id
     * @return
     */
    @Override
    public R deleteEnterprise(Long id) {
        this.baseMapper.deleteById(id);
        return R.ok();
    }

    /**
     * 获取社区企业详情
     * @param id
     * @return
     */
    @Override
    public R detailEnterprise(Long id) {
        return R.ok(this.baseMapper.detailEnterprise(id));
    }

    /**
     * 分页查询社区企业
     * @param pageEnterpriseDTO
     * @return
     */
    @Override
    public R pageEnterprise(PageEnterpriseDTO pageEnterpriseDTO) {
        Page page = new Page<>();
        page.setSize(pageEnterpriseDTO.getPageSize());
        page.setCurrent(pageEnterpriseDTO.getPageNum());
        return R.ok(this.baseMapper.pageEnterprise(page, pageEnterpriseDTO));
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEnterpriseTypeServiceImpl.java

New file
@@ -0,0 +1,142 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.community.enterprise.AddEnterpriseTypeDTO;
import com.panzhihua.common.model.dtos.community.enterprise.EditEnterpriseTypeDTO;
import com.panzhihua.common.model.dtos.community.enterprise.PageEnterpriseTypeDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.dao.ComActEnterpriseDAO;
import com.panzhihua.service_community.dao.ComActEnterpriseTypeDAO;
import com.panzhihua.service_community.entity.ComActEnterprise;
import com.panzhihua.service_community.entity.ComActEnterpriseType;
import com.panzhihua.service_community.service.ComActEnterpriseTypeService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;

import java.util.List;

import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;

/**
 * (ComActEnterpriseType)表服务实现类
 *
 * @author makejava
 * @since 2022-06-06 15:30:52
 */
@Service("comActEnterpriseTypeService")
public class ComActEnterpriseTypeServiceImpl extends ServiceImpl<ComActEnterpriseTypeDAO, ComActEnterpriseType>
    implements ComActEnterpriseTypeService {

    @Resource
    private ComActEnterpriseDAO comActEnterpriseDAO;

    /**
     * 新增服务分类
     * @param addEnterpriseTypeDTO
     * @return
     */
    @Override
    public R addEnterpriseType(AddEnterpriseTypeDTO addEnterpriseTypeDTO) {
        ComActEnterpriseType enterpriseType = this.baseMapper.selectOne(new LambdaQueryWrapper<ComActEnterpriseType>()
                .eq(ComActEnterpriseType::getCommunityId, addEnterpriseTypeDTO.getCommunityId())
                .eq(ComActEnterpriseType::getName, addEnterpriseTypeDTO.getName()));
        if (nonNull(enterpriseType)) {
            return R.fail("分类名称已存在");
        }
        enterpriseType = new ComActEnterpriseType();
        BeanUtils.copyProperties(addEnterpriseTypeDTO, enterpriseType);
        int result = this.baseMapper.insert(enterpriseType);
        if (result > 0) {
            return R.ok();
        }
        return R.fail("操作失败，请重新尝试");
    }

    /**
     * 修改服务分类
     * @param enterpriseTypeDTO
     * @return
     */
    @Override
    public R editEnterpriseType(EditEnterpriseTypeDTO enterpriseTypeDTO) {
        ComActEnterpriseType enterpriseType = this.baseMapper.selectById(enterpriseTypeDTO.getId());
        if (isNull(enterpriseType)) {
            return R.fail("资源不存在");
        }
        if (!enterpriseType.getName().equals(enterpriseTypeDTO.getName())) {
            ComActEnterpriseType enterpriseType2 = this.baseMapper.selectOne(new LambdaQueryWrapper<ComActEnterpriseType>()
                    .eq(ComActEnterpriseType::getCommunityId, enterpriseTypeDTO.getCommunityId())
                    .eq(ComActEnterpriseType::getName, enterpriseTypeDTO.getName()));
            if (nonNull(enterpriseType2)) {
                return R.fail("分类名称已存在");
            }
        }
        BeanUtils.copyProperties(enterpriseTypeDTO, enterpriseType);
        int result = this.baseMapper.updateById(enterpriseType);
        if (result > 0) {
            return R.ok();
        }
        return R.fail("操作失败，请重新尝试");
    }

    /**
     * 删除服务分类
     * @param id
     * @return
     */
    @Override
    public R deleteEnterpriseType(Long id) {
        ComActEnterpriseType enterpriseType = this.baseMapper.selectById(id);
        if (isNull(enterpriseType)) {
            return R.fail("资源不存在");
        }
        List<ComActEnterprise> enterpriseList = comActEnterpriseDAO.selectList(new LambdaQueryWrapper<ComActEnterprise>().eq(ComActEnterprise::getType, id));
        if (nonNull(enterpriseList) && !enterpriseList.isEmpty()) {
            return R.fail("该分类已被引用，无法删除");
        }
        enterpriseType.setIsDel(true);
        int result = this.baseMapper.updateById(enterpriseType);
        if (result > 0) {
            return R.ok();
        }
        return R.fail("操作失败，请重新尝试");
    }

    /**
     * 获取服务分类详情
     * @param id
     * @return
     */
    @Override
    public R detailEnterpriseType(Long id) {
        return R.ok(this.baseMapper.detailEnterpriseType(id));
    }

    /**
     * 分页查询服务分类
     * @param pageEnterpriseTypeDTO
     * @return
     */
    @Override
    public R pageEnterpriseType(PageEnterpriseTypeDTO pageEnterpriseTypeDTO) {
        Page page = new Page<>();
        page.setSize(pageEnterpriseTypeDTO.getPageSize());
        page.setCurrent(pageEnterpriseTypeDTO.getPageNum());
        return R.ok(this.baseMapper.pageEnterpriseType(page, pageEnterpriseTypeDTO));
    }

    /**
     * 获取服务分类列表
     * @param communityId
     * @return
     */
    @Override
    public R getEnterpriseTypeList(Long communityId) {
        return R.ok(this.baseMapper.getEnterpriseTypeList(communityId));
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActFourMemberServiceImpl.java

@@ -78,7 +78,9 @@
    @Override
    public R insert(ComActFourMemberVO comActFourMemberVO) {
        if(comActFourMemberVO!=null&&comActFourMemberVO.getJurisdiction()!=null){
            if(comActFourMemberDao.selectCount(new QueryWrapper<ComActFourMember>().lambda().eq(ComActFourMember::getIdCard,comActFourMemberVO.getIdCard()))>0){
            if(comActFourMemberDao.selectCount(new QueryWrapper<ComActFourMember>().lambda()
                    .eq(ComActFourMember::getIdCard,comActFourMemberVO.getIdCard())
                    .eq(ComActFourMember::getCommunityId, comActFourMemberVO.getCommunityId()))>0){
                return R.fail("身份证号重复");
            }
            ComActFourMember comActFourMember=new ComActFourMember();

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMessageServiceImpl.java

@@ -6,9 +6,11 @@

import javax.annotation.Resource;

import com.panzhihua.common.model.vos.community.ComActDpcVO;
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.dao.ComActDpcDAO;
import com.panzhihua.service_community.model.dos.ComActDO;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -34,6 +36,8 @@
import com.panzhihua.service_community.model.dos.ComActMessageDO;
import com.panzhihua.service_community.service.ComActMessageService;

import static java.util.Objects.isNull;

@Service
public class ComActMessageServiceImpl extends ServiceImpl<ComActMessageDAO, ComActMessageDO>
    implements ComActMessageService {
@@ -47,6 +51,8 @@
    private ComActDAO comActDAO;
    @Resource
    private UserService userService;
    @Resource
    private ComActDpcDAO comActDpcDAO;

    @Override
    public R addMessage(ComActMessageVO comActMessageVO) {
@@ -66,6 +72,13 @@
                return R.fail();
            phone = party.getPhone();
            sendtoUserName = party.getName();
        } else if (type == 3) {
            ComActDpcVO dpcVO = comActDpcDAO.detailDpc(comActMessageVO.getSendtoUserId());
            if (isNull(dpcVO)) {
                return R.fail();
            }
            phone = dpcVO.getPhone();
            sendtoUserName = dpcVO.getName();
        }
        if (ObjectUtils.isEmpty(phone))
            return R.fail("未找到联系方式");

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActRaffleServiceImpl.java

@@ -59,7 +59,7 @@
        comActRaffle.setStatus(0);
        int count= this.baseMapper.insert(comActRaffle);
        if(count>0){
            rabbitTemplate.convertAndSend("huacheng.raffle.exchange", "huacheng.raffle.key", comActRaffle, message -> {
            rabbitTemplate.convertAndSend("raffle.exchange", "raffle.key", comActRaffle, message -> {
                message.getMessageProperties().setHeader("x-delay", dateToSecond(comActRaffle.getStartTime()));
                return message;
            });

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java

@@ -147,6 +147,13 @@
        ComActVO comActVO = new ComActVO();
        BeanUtils.copyProperties(comActDO, comActVO);
        comActVO.setAreaName(comActDAO.selectAreaName(comActVO.getAreaCode()));
        comActVO.setAccount(null);
        comActVO.setPassword(null);
        comActVO.setAddress(null);
        comActVO.setContacts(null);
        comActVO.setCreateAt(null);
        comActVO.setState(null);
        comActVO.setDistance(null);
        return R.ok(comActVO);
    }


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialMemberServiceImpl.java

@@ -1,6 +1,7 @@
package com.panzhihua.service_community.service.impl;

import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -9,8 +10,10 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_community.dao.ComActSocialOrgDao;
import com.panzhihua.service_community.entity.ComActSocialMember;
import com.panzhihua.service_community.dao.ComActSocialMemberDao;
import com.panzhihua.service_community.entity.ComActSocialOrg;
import com.panzhihua.service_community.service.ComActSocialMemberService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -18,6 +21,8 @@

import javax.annotation.Resource;
import java.util.Date;

import static java.util.Objects.nonNull;

/**
 * 社会组织成员表(ComActSocialMember)表服务实现类
@@ -32,8 +37,18 @@
    private ComActSocialMemberDao comActSocialMemberDao;
    @Resource
    private UserService userService;
    @Resource
    private ComActSocialOrgDao comActSocialOrgDao;
    @Override
    public R pageList(CommonPage commonPage) {
        Integer userType = commonPage.getUserType();
        if (nonNull(userType) && userType.equals(3)) {
            ComActSocialOrg comActSocialOrg = comActSocialOrgDao.selectOne(new LambdaQueryWrapper<ComActSocialOrg>()
                    .eq(ComActSocialOrg::getUserId, commonPage.getUserId()));
            if (nonNull(comActSocialOrg)) {
                commonPage.setParamId(comActSocialOrg.getId());
            }
        }
        return R.ok(this.comActSocialMemberDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
    }

@@ -55,6 +70,7 @@
        if(comActSocialMemberVO.getStreetId()!=null){
            administratorsUserVO.setStreetId(comActSocialMemberVO.getStreetId());
        }
        administratorsUserVO.setCommunityId(comActSocialMemberVO.getCommunityId());
        administratorsUserVO.setName(comActSocialMemberVO.getName());
        administratorsUserVO.setPhone(comActSocialMemberVO.getPhone());
        R r=userService.addUserBackstageProperty(administratorsUserVO);

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialOrgHatchAuditScheduleServiceImpl.java

New file
@@ -0,0 +1,20 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.service_community.dao.ComActSocialOrgHatchAuditScheduleDAO;
import com.panzhihua.service_community.entity.ComActSocialOrgHatchAuditSchedule;
import com.panzhihua.service_community.service.ComActSocialOrgHatchAuditScheduleService;
import org.springframework.stereotype.Service;

/**
 * 社会组织孵化申请进度表(ComActSocialOrgHatchAuditSchedule)表服务实现类
 *
 * @author makejava
 * @since 2022-04-18 15:10:48
 */
@Service("comActSocialOrgHatchAuditScheduleService")
public class ComActSocialOrgHatchAuditScheduleServiceImpl
    extends ServiceImpl<ComActSocialOrgHatchAuditScheduleDAO, ComActSocialOrgHatchAuditSchedule>
    implements ComActSocialOrgHatchAuditScheduleService {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialOrgHatchAuditServiceImpl.java

New file
@@ -0,0 +1,231 @@
package com.panzhihua.service_community.service.impl;

import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;

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

import javax.annotation.Resource;

import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.community.social.HatchAuditProcessDTO;
import com.panzhihua.common.model.dtos.community.social.PageSocialOrgHatchAuditDTO;
import com.panzhihua.common.model.dtos.community.social.SocialOrgHatchAuditDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.social.SocialOrgHatchAuditScheduleVO;
import com.panzhihua.common.model.vos.community.social.SocialOrgHatchAuditVO;
import com.panzhihua.service_community.dao.ComActSocialOrgHatchAuditDAO;
import com.panzhihua.service_community.dao.ComActSocialOrgHatchAuditScheduleDAO;
import com.panzhihua.service_community.dao.ComActSocialOrgHatchDAO;
import com.panzhihua.service_community.dao.SysConfMapper;
import com.panzhihua.service_community.entity.ComActSocialOrgHatch;
import com.panzhihua.service_community.entity.ComActSocialOrgHatchAudit;
import com.panzhihua.service_community.entity.ComActSocialOrgHatchAuditSchedule;
import com.panzhihua.service_community.model.dos.SysConfDO;
import com.panzhihua.service_community.service.ComActSocialOrgHatchAuditService;

/**
 * 社会组织孵化申请表(ComActSocialOrgHatchAudit)表服务实现类
 *
 * @author makejava
 * @since 2022-04-18 14:09:53
 */
@Service("comActSocialOrgHatchAuditService")
public class ComActSocialOrgHatchAuditServiceImpl extends ServiceImpl<ComActSocialOrgHatchAuditDAO, ComActSocialOrgHatchAudit> implements ComActSocialOrgHatchAuditService {

    private static final String SOCIAL_ORG_HATCH_AUDIT_PROCESS_KEY = "SOCIAL_ORG_PROCESS";
    private static final String SOCIAL_ORG_HATCH_AUDIT_PROCESS_NAME = "社会组织孵化流程";

    @Resource
    private ComActSocialOrgHatchDAO comActSocialOrgHatchDAO;
    @Resource
    private ComActSocialOrgHatchAuditScheduleDAO comActSocialOrgHatchAuditScheduleDAO;
    @Resource
    private SysConfMapper sysConfMapper;

    /**
     * 分页查询孵化申请
     * @param pageHatchAuditDTO
     * @return
     */
    @Override
    public R pageHatchAudit(PageSocialOrgHatchAuditDTO pageHatchAuditDTO) {
        Page page = new Page<>();
        page.setSize(pageHatchAuditDTO.getPageSize());
        page.setCurrent(pageHatchAuditDTO.getPageNum());
        return R.ok(this.baseMapper.pageHatchAudit(page, pageHatchAuditDTO));
    }

    /**
     * 查看孵化申请详情
     * @param id
     * @return
     */
    @Override
    public R detailHatchAudit(Long id) {
        return R.ok(this.baseMapper.detailHatchAudit(id));
    }

    /**
     * 修改孵化申请
     * @param hatchAuditDTO
     * @return
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R updateHatchAudit(SocialOrgHatchAuditDTO hatchAuditDTO) {
        ComActSocialOrgHatchAudit hatchAudit = this.baseMapper.selectById(hatchAuditDTO.getId());
        if (isNull(hatchAudit)) {
            return R.fail("资源不存在");
        }
        Integer preStatus = hatchAudit.getStatus();
        Integer status = hatchAuditDTO.getStatus();
        BeanUtils.copyProperties(hatchAuditDTO, hatchAudit);
        int result = this.baseMapper.updateById(hatchAudit);
        if (nonNull(status) && !preStatus.equals(status) && status.equals(1)) {
            //重新提交
            if (result > 0) {
                //创建申请进度记录
                ComActSocialOrgHatchAuditSchedule hatchAuditSchedule = new ComActSocialOrgHatchAuditSchedule();
                hatchAuditSchedule.setAuditId(hatchAuditDTO.getId());
                hatchAuditSchedule.setStage(ComActSocialOrgHatchAuditSchedule.Stage.cxtj);
                comActSocialOrgHatchAuditScheduleDAO.insert(hatchAuditSchedule);
            }
        } else if (nonNull(status) && !preStatus.equals(status) && status.equals(2)) {
            //审核通过
            if (result > 0) {
                //创建孵化数据
                ComActSocialOrgHatchAudit newHatchAudit = this.baseMapper.selectById(hatchAuditDTO.getId());
                ComActSocialOrgHatch socialOrgHatch = new ComActSocialOrgHatch();
                BeanUtils.copyProperties(newHatchAudit, socialOrgHatch);
                socialOrgHatch.setCreatedAt(null);
                socialOrgHatch.setId(null);
                socialOrgHatch.setStatus(1);
                socialOrgHatch.setUpdatedAt(null);
                socialOrgHatch.setAuditId(hatchAudit.getId());
                comActSocialOrgHatchDAO.insert(socialOrgHatch);
                //创建申请进度记录
                ComActSocialOrgHatchAuditSchedule hatchAuditSchedule = new ComActSocialOrgHatchAuditSchedule();
                hatchAuditSchedule.setAuditId(hatchAuditDTO.getId());
                hatchAuditSchedule.setStage(ComActSocialOrgHatchAuditSchedule.Stage.shtg);
                comActSocialOrgHatchAuditScheduleDAO.insert(hatchAuditSchedule);
            }
        } else if (nonNull(status) && !preStatus.equals(status) && status.equals(3)) {
            //驳回申请
            if (result > 0) {
                //创建申请进度记录
                ComActSocialOrgHatchAuditSchedule hatchAuditSchedule = new ComActSocialOrgHatchAuditSchedule();
                hatchAuditSchedule.setAuditId(hatchAuditDTO.getId());
                hatchAuditSchedule.setStage(ComActSocialOrgHatchAuditSchedule.Stage.ybh);
                hatchAuditSchedule.setDetail(hatchAuditDTO.getRefuseReason());
                comActSocialOrgHatchAuditScheduleDAO.insert(hatchAuditSchedule);
            }
        }
        return result > 0 ? R.ok() : R.fail("操作失败，请重新尝试");
    }

    /**
     * 获取孵化流程配置
     * @return
     */
    @Override
    public R getHatchAuditProcess() {
        return R.ok(sysConfMapper.getSysConfValue(SOCIAL_ORG_HATCH_AUDIT_PROCESS_KEY, null));
    }

    /**
     * 修改孵化流程配置
     * @param processDTO
     * @return
     */
    @Override
    public R putHatchAuditProcess(HatchAuditProcessDTO processDTO) {
        SysConfDO sysConfDO = sysConfMapper.selectOne(new LambdaQueryWrapper<SysConfDO>().eq(SysConfDO::getCode, SOCIAL_ORG_HATCH_AUDIT_PROCESS_KEY));
        int result = 0;
        if (isNull(sysConfDO)) {
            sysConfDO=new SysConfDO();
            //创建
            sysConfDO.setName(SOCIAL_ORG_HATCH_AUDIT_PROCESS_NAME);
            sysConfDO.setCode(SOCIAL_ORG_HATCH_AUDIT_PROCESS_KEY);
            sysConfDO.setDescription(SOCIAL_ORG_HATCH_AUDIT_PROCESS_NAME);
            sysConfDO.setCreateAt(new Date());
            result = sysConfMapper.insert(sysConfDO);
        } else {
            sysConfDO.setValue(processDTO.getProcess());
            result = sysConfMapper.update(sysConfDO, new LambdaQueryWrapper<SysConfDO>().eq(SysConfDO::getCode, SOCIAL_ORG_HATCH_AUDIT_PROCESS_KEY));
        }
        return result > 0 ? R.ok() : R.fail("操作失败，请重新尝试");
    }

    /**
     * 新增孵化申请
     * @param hatchAuditDTO
     * @return
     */
    @Override
    public R addHatchAudit(SocialOrgHatchAuditDTO hatchAuditDTO) {
        SocialOrgHatchAuditVO orgHatchAuditVO = this.baseMapper.getHatchAuditSchedule(hatchAuditDTO.getUserId());
        if (nonNull(orgHatchAuditVO)) {
            return R.fail("请勿重复申请");
        }
        ComActSocialOrgHatchAudit orgHatchAudit = new ComActSocialOrgHatchAudit();
        BeanUtils.copyProperties(hatchAuditDTO, orgHatchAudit);
        orgHatchAudit.setStatus(1);
        int result = this.baseMapper.insert(orgHatchAudit);
        if (result > 0) {
            //创建申请进度记录
            ComActSocialOrgHatchAuditSchedule hatchAuditSchedule = new ComActSocialOrgHatchAuditSchedule();
            hatchAuditSchedule.setAuditId(orgHatchAudit.getId());
            hatchAuditSchedule.setStage(ComActSocialOrgHatchAuditSchedule.Stage.tjzl);
            comActSocialOrgHatchAuditScheduleDAO.insert(hatchAuditSchedule);
            return R.ok();
        }
        return R.fail("操作失败，请重新尝试");
    }

    /**
     * 查看孵化申请审核进度
     * @param userId
     * @return
     */
    @Override
    public R getHatchAuditSchedule(Long userId) {
        SocialOrgHatchAuditVO orgHatchAuditVO = this.baseMapper.getHatchAuditSchedule(userId);
        if (nonNull(orgHatchAuditVO)) {
            List<ComActSocialOrgHatchAuditSchedule> schedules = comActSocialOrgHatchAuditScheduleDAO.selectList(new LambdaQueryWrapper<ComActSocialOrgHatchAuditSchedule>()
                    .eq(ComActSocialOrgHatchAuditSchedule::getAuditId, orgHatchAuditVO.getId()).orderByAsc(ComActSocialOrgHatchAuditSchedule::getCreatedAt));
            if (!schedules.isEmpty()) {
                List<SocialOrgHatchAuditScheduleVO> scheduleVOList = new ArrayList<>();
                schedules.stream().forEach(e -> {
                    SocialOrgHatchAuditScheduleVO scheduleVO = new SocialOrgHatchAuditScheduleVO();
                    BeanUtils.copyProperties(e, scheduleVO);
                    scheduleVOList.add(scheduleVO);
                });
                orgHatchAuditVO.setScheduleVOList(scheduleVOList);
            }
        }
        return R.ok(orgHatchAuditVO);
    }

    /**
     * 删除孵化申请详情
     * @param id
     * @return
     */
    @Override
    public R deleteHatchAudit(Long id) {
        this.baseMapper.deleteById(id);
        comActSocialOrgHatchAuditScheduleDAO.delete(new LambdaQueryWrapper<ComActSocialOrgHatchAuditSchedule>()
                .eq(ComActSocialOrgHatchAuditSchedule::getAuditId, id));
        return R.ok();
    }
}


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialOrgHatchServiceImpl.java

New file
@@ -0,0 +1,95 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.community.social.PageSocialOrgHatchDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.social.SocialOrgHatchVO;
import com.panzhihua.service_community.dao.ComActSocialOrgHatchAuditDAO;
import com.panzhihua.service_community.dao.ComActSocialOrgHatchAuditScheduleDAO;
import com.panzhihua.service_community.dao.ComActSocialOrgHatchDAO;
import com.panzhihua.service_community.entity.ComActSocialOrgHatch;
import com.panzhihua.service_community.entity.ComActSocialOrgHatchAudit;
import com.panzhihua.service_community.entity.ComActSocialOrgHatchAuditSchedule;
import com.panzhihua.service_community.service.ComActSocialOrgHatchService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;

import static java.util.Objects.nonNull;

/**
 * 社会组织孵化表(ComActSocialOrgHatch)表服务实现类
 *
 * @author makejava
 * @since 2022-04-18 14:09:53
 */
@Service("comActSocialOrgHatchService")
public class ComActSocialOrgHatchServiceImpl extends ServiceImpl<ComActSocialOrgHatchDAO, ComActSocialOrgHatch> implements ComActSocialOrgHatchService {

    @Resource
    private ComActSocialOrgHatchAuditDAO comActSocialOrgHatchAuditDAO;
    @Resource
    private ComActSocialOrgHatchAuditScheduleDAO comActSocialOrgHatchAuditScheduleDAO;

    /**
     * 分页查询孵化数据
     * @param pageHatchDTO
     * @return
     */
    @Override
    public R pageOrgHatch(PageSocialOrgHatchDTO pageHatchDTO) {
        Page page = new Page<>();
        page.setSize(pageHatchDTO.getPageSize());
        page.setCurrent(pageHatchDTO.getPageNum());
        return R.ok(this.baseMapper.pageOrgHatch(page, pageHatchDTO));
    }

    /**
     * 查看孵化数据详情
     * @param id
     * @return
     */
    @Override
    public R detailOrgHatch(Long id) {
        return R.ok(this.baseMapper.detailOrgHatch(id));
    }

    /**
     * 修改孵化状态
     * @param id
     * @param status
     * @return
     */
    @Override
    public R updateOrgHatchStatus(Long id, Integer status) {
        ComActSocialOrgHatch socialOrgHatch = new ComActSocialOrgHatch();
        socialOrgHatch.setStatus(status);
        int result = this.baseMapper.update(socialOrgHatch, new LambdaQueryWrapper<ComActSocialOrgHatch>().eq(ComActSocialOrgHatch::getId, id));
        return result > 0 ? R.ok() : R.fail("操作失败，请重新尝试");
    }

    /**
     * 删除孵化数据
     * @param id
     * @return
     */
    @Override
    public R deleteOrgHatch(Long id) {
        ComActSocialOrgHatch orgHatch = this.baseMapper.selectById(id);
        Long auditId = orgHatch.getAuditId();
        if (nonNull(orgHatch)) {
            int result = this.baseMapper.deleteById(id);
            if (result > 0) {
                comActSocialOrgHatchAuditDAO.delete(new LambdaQueryWrapper<ComActSocialOrgHatchAudit>()
                        .eq(ComActSocialOrgHatchAudit::getId, auditId));
                comActSocialOrgHatchAuditScheduleDAO.delete(new LambdaQueryWrapper<ComActSocialOrgHatchAuditSchedule>()
                        .eq(ComActSocialOrgHatchAuditSchedule::getAuditId, auditId));
            }
        }
        return R.ok();
    }
}


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialOrgServiceImpl.java

@@ -8,9 +8,11 @@
import com.panzhihua.common.model.vos.community.ComActSocialOrgVO;
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_community.dao.ComActDAO;
import com.panzhihua.service_community.entity.ComActCommittee;
import com.panzhihua.service_community.entity.ComActSocialOrg;
import com.panzhihua.service_community.dao.ComActSocialOrgDao;
import com.panzhihua.service_community.model.dos.ComActDO;
import com.panzhihua.service_community.service.ComActSocialOrgService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -32,6 +34,8 @@
private ComActSocialOrgDao comActSocialOrgDao;
@Resource
private UserService userService;
@Resource
private ComActDAO comActDAO;
    @Override
    public R pageList(CommonPage commonPage) {
        return R.ok(comActSocialOrgDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
@@ -57,17 +61,23 @@
                administratorsUserVO.setSocialType(2);
                administratorsUserVO.setRoleId(777777777L);
                comActSocialOrg.setIsSociety(1);
            }
            else {
                Long affiliatedUnit = comActSocialOrg.getAffiliatedUnit();
                Integer affiliatedUnitType = comActSocialOrg.getAffiliatedUnitType();
                if (affiliatedUnitType.equals(2)) {
                    administratorsUserVO.setCommunityId(affiliatedUnit);
                    ComActDO comActDO = comActDAO.selectById(affiliatedUnit);
                    comActSocialOrg.setStreetId(comActDO.getStreetId());
                }
                administratorsUserVO.setName(comActSocialOrgVO.getCorporationName());
            } else {
                administratorsUserVO.setRoleId(comActSocialOrgVO.getRoleId());
                if(comActSocialOrg.getCommunityId()!=null){
                    administratorsUserVO.setCommunityId(comActSocialOrg.getCommunityId());
                    ComActDO comActDO = comActDAO.selectById(comActSocialOrg.getCommunityId());
                    comActSocialOrg.setStreetId(comActDO.getStreetId());
                }
                administratorsUserVO.setName(comActSocialOrgVO.getContactName());
            }
            if(comActSocialOrg.getCommunityId()!=null){
                administratorsUserVO.setCommunityId(comActSocialOrg.getCommunityId());
            }
            if(comActSocialOrg.getStreetId()!=null){
                administratorsUserVO.setStreetId(comActSocialOrg.getStreetId());
            }
            administratorsUserVO.setName(comActSocialOrgVO.getContactName());
            administratorsUserVO.setPhone(comActSocialOrgVO.getContactPhone());
            R r=userService.addUserBackstageProperty(administratorsUserVO);
            if(R.isOk(r)){
@@ -84,18 +94,24 @@
    @Override
    public R update(ComActSocialOrgVO comActSocialOrgVO) {
        if(comActSocialOrgVO!=null){
               ComActSocialOrg comActSocialOrg=new ComActSocialOrg();
               BeanUtils.copyProperties(comActSocialOrgVO,comActSocialOrg);
                if(comActSocialOrgVO.getRoleId()!=null){
                    ComActSocialOrg comPropertyBase=this.comActSocialOrgDao.selectById(comActSocialOrgVO.getId());
                    AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
                    administratorsUserVO.setUserId(comPropertyBase.getUserId());
                    administratorsUserVO.setRoleId(comActSocialOrgVO.getRoleId());
                    administratorsUserVO.setLastLoginTime(DateUtil.date());
                    this.userService.putUserBackstage(administratorsUserVO);
                }
               this.comActSocialOrgDao.updateById(comActSocialOrg);
               return R.ok();
            ComActSocialOrg comActSocialOrg=new ComActSocialOrg();
            BeanUtils.copyProperties(comActSocialOrgVO,comActSocialOrg);
            AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
            if(comActSocialOrgVO.getRoleId() == null) {
                administratorsUserVO.setRoleId(777777777L);
            } else {
                administratorsUserVO.setRoleId(comActSocialOrgVO.getRoleId());
            }
            ComActSocialOrg comPropertyBase=this.comActSocialOrgDao.selectById(comActSocialOrgVO.getId());
            administratorsUserVO.setUserId(comPropertyBase.getUserId());
            administratorsUserVO.setLastLoginTime(DateUtil.date());
            administratorsUserVO.setAccount(comActSocialOrgVO.getAccount());
            administratorsUserVO.setPassword(comActSocialOrgVO.getPassword());
            Integer status = comActSocialOrgVO.getStatus();
            administratorsUserVO.setStatus(status.equals(0) ? 2 : 1);
            this.userService.putUserBackstage(administratorsUserVO);
            this.comActSocialOrgDao.updateById(comActSocialOrg);
            return R.ok();
        }
        return R.fail();
    }

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectMemberServiceImpl.java

@@ -1,5 +1,15 @@
package com.panzhihua.service_community.service.impl;

import static java.util.Objects.nonNull;

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

import javax.annotation.Resource;

import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,21 +17,19 @@
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.social.ComActSocialProjectMemberVO;
import com.panzhihua.common.model.vos.partybuilding.ComPbServiceTeamVO;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.service_community.dao.ComActSocialMemberDao;
import com.panzhihua.service_community.dao.ComActSocialProjectMemberDao;
import com.panzhihua.service_community.dao.ComActSocialWorkerDao;
import com.panzhihua.service_community.dao.ComMngVolunteerMngDAO;
import com.panzhihua.service_community.entity.ComActSocialMember;
import com.panzhihua.service_community.entity.ComActSocialProjectMember;
import com.panzhihua.service_community.dao.ComActSocialProjectMemberDao;
import com.panzhihua.service_community.entity.ComActSocialWorker;
import com.panzhihua.service_community.model.dos.ComMngVolunteerMngDO;
import com.panzhihua.service_community.service.ComActSocialProjectMemberService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
import lombok.extern.slf4j.Slf4j;

/**
 * 项目人员(ComActSocialProjectMember)表服务实现类
@@ -39,6 +47,9 @@
    private ComActSocialWorkerDao comActSocialWorkerDao;
    @Resource
    private ComMngVolunteerMngDAO comMngVolunteerMngDAO;
    @Resource
    private ComActSocialMemberDao comActSocialMemberDao;

    @Override
    public R pageList(CommonPage commonPage) {
        return R.ok(this.comActSocialProjectMemberDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
@@ -83,11 +94,12 @@
    @Override
    public R insertBatch(ComActSocialProjectMemberVO comActSocialProjectMemberVO) {
        if(CollectionUtils.isNotEmpty(comActSocialProjectMemberVO.getIds())){
            Integer type = comActSocialProjectMemberVO.getType();
            comActSocialProjectMemberVO.getIds().forEach(id ->{
                if(comActSocialProjectMemberVO.getType()==1){
                if(type ==1) {
                    ComActSocialWorker comActSocialWorker=comActSocialWorkerDao.selectById(id);
                    if(comActSocialWorker!=null){
                        List<ComActSocialProjectMember> list= comActSocialProjectMemberDao.selectList(new QueryWrapper<ComActSocialProjectMember>().lambda().eq(ComActSocialProjectMember::getPhone,comActSocialWorker.getTelephone()).eq(ComActSocialProjectMember::getType,comActSocialProjectMemberVO.getType()).eq(ComActSocialProjectMember::getProjectId,comActSocialProjectMemberVO.getParamId()));
                        List<ComActSocialProjectMember> list= comActSocialProjectMemberDao.selectList(new QueryWrapper<ComActSocialProjectMember>().lambda().eq(ComActSocialProjectMember::getPhone,comActSocialWorker.getTelephone()).eq(ComActSocialProjectMember::getType, type).eq(ComActSocialProjectMember::getProjectId,comActSocialProjectMemberVO.getParamId()));
                        if(CollectionUtils.isEmpty(list)){
                            ComActSocialProjectMember comActSocialProjectMember=new ComActSocialProjectMember();
                            BeanUtils.copyProperties(comActSocialProjectMemberVO,comActSocialProjectMember);
@@ -97,16 +109,15 @@
                            comActSocialProjectMember.setPhone(comActSocialWorker.getTelephone());
                            comActSocialProjectMember.setCreateTime(new Date());
                            comActSocialProjectMember.setType(1);
                            comActSocialProjectMember.setCommunityId(comActSocialProjectMemberVO.getCommunityId());
                            comActSocialProjectMember.setCommunityId(comActSocialWorker.getCommunityId());
                            comActSocialProjectMember.setProjectId(comActSocialProjectMemberVO.getParamId());
                            comActSocialProjectMemberDao.insert(comActSocialProjectMember);
                        }
                    }
                }
                else {
                } else if (type == 2) {
                    ComMngVolunteerMngDO comMngVolunteerMngDO=comMngVolunteerMngDAO.selectById(id);
                    if(comMngVolunteerMngDO!=null){
                        List<ComActSocialProjectMember> list= comActSocialProjectMemberDao.selectList(new QueryWrapper<ComActSocialProjectMember>().lambda().eq(ComActSocialProjectMember::getPhone,comMngVolunteerMngDO.getPhone()).eq(ComActSocialProjectMember::getType,comActSocialProjectMemberVO.getType()).eq(ComActSocialProjectMember::getProjectId,comActSocialProjectMemberVO.getProjectId()));
                        List<ComActSocialProjectMember> list= comActSocialProjectMemberDao.selectList(new QueryWrapper<ComActSocialProjectMember>().lambda().eq(ComActSocialProjectMember::getPhone,comMngVolunteerMngDO.getPhone()).eq(ComActSocialProjectMember::getType, type).eq(ComActSocialProjectMember::getProjectId,comActSocialProjectMemberVO.getParamId()));
                        if(CollectionUtils.isEmpty(list)){
                            ComActSocialProjectMember comActSocialProjectMember=new ComActSocialProjectMember();
                            BeanUtils.copyProperties(comActSocialProjectMemberVO,comActSocialProjectMember);
@@ -116,6 +127,41 @@
                            comActSocialProjectMember.setPhone(comMngVolunteerMngDO.getPhone());
                            comActSocialProjectMember.setCreateTime(new Date());
                            comActSocialProjectMember.setType(2);
                            comActSocialProjectMember.setCommunityId(comMngVolunteerMngDO.getCommunityId());
                            comActSocialProjectMember.setProjectId(comActSocialProjectMemberVO.getParamId());
                            comActSocialProjectMemberDao.insert(comActSocialProjectMember);
                        }
                    }
                } else if (type == 3) {
                    ComPbServiceTeamVO comPbServiceTeamVO = comActSocialMemberDao.selectPbServiceTeamById(id);
                    if (nonNull(comPbServiceTeamVO)) {
                        List<ComActSocialProjectMember> list= comActSocialProjectMemberDao.selectList(new QueryWrapper<ComActSocialProjectMember>().lambda().eq(ComActSocialProjectMember::getPhone,comPbServiceTeamVO.getPhone()).eq(ComActSocialProjectMember::getType, type).eq(ComActSocialProjectMember::getProjectId,comActSocialProjectMemberVO.getParamId()));
                        if(CollectionUtils.isEmpty(list)) {
                            ComActSocialProjectMember comActSocialProjectMember=new ComActSocialProjectMember();
                            BeanUtils.copyProperties(comActSocialProjectMemberVO,comActSocialProjectMember);
                            comActSocialProjectMember.setImage(comPbServiceTeamVO.getUrl());
                            comActSocialProjectMember.setName(comPbServiceTeamVO.getName());
                            comActSocialProjectMember.setPhone(comPbServiceTeamVO.getPhone());
                            comActSocialProjectMember.setCreateTime(new Date());
                            comActSocialProjectMember.setType(3);
                            comActSocialProjectMember.setCommunityId(comPbServiceTeamVO.getCommunityId());
                            comActSocialProjectMember.setProjectId(comActSocialProjectMemberVO.getParamId());
                            comActSocialProjectMemberDao.insert(comActSocialProjectMember);
                        }
                    }
                } else {
                    ComActSocialMember comActSocialMember = comActSocialMemberDao.selectById(id);
                    if (nonNull(comActSocialMember)) {
                        List<ComActSocialProjectMember> list= comActSocialProjectMemberDao.selectList(new QueryWrapper<ComActSocialProjectMember>().lambda().eq(ComActSocialProjectMember::getPhone,comActSocialMember.getPhone()).eq(ComActSocialProjectMember::getType, type).eq(ComActSocialProjectMember::getProjectId,comActSocialProjectMemberVO.getParamId()));
                        if(CollectionUtils.isEmpty(list)) {
                            ComActSocialProjectMember comActSocialProjectMember=new ComActSocialProjectMember();
                            BeanUtils.copyProperties(comActSocialProjectMemberVO,comActSocialProjectMember);
                            comActSocialProjectMember.setAge(getAge(comActSocialMember.getIdCard()));
                            comActSocialProjectMember.setImage(comActSocialMember.getImage());
                            comActSocialProjectMember.setName(comActSocialMember.getName());
                            comActSocialProjectMember.setPhone(comActSocialMember.getPhone());
                            comActSocialProjectMember.setCreateTime(new Date());
                            comActSocialProjectMember.setType(4);
                            comActSocialProjectMember.setCommunityId(comActSocialProjectMemberVO.getCommunityId());
                            comActSocialProjectMember.setProjectId(comActSocialProjectMemberVO.getParamId());
                            comActSocialProjectMemberDao.insert(comActSocialProjectMember);

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectPublicityServiceImpl.java

@@ -4,13 +4,17 @@
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_community.dao.ComActDAO;
import com.panzhihua.service_community.entity.ComActSocialProjectPublicity;
import com.panzhihua.service_community.dao.ComActSocialProjectPublicityDao;
import com.panzhihua.service_community.model.dos.ComActDO;
import com.panzhihua.service_community.service.ComActSocialProjectPublicityService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;

import static java.util.Objects.nonNull;

/**
 * 项目宣传表(ComActSocialProjectPublicity)表服务实现类
@@ -24,8 +28,16 @@

    @Resource
    private ComActSocialProjectPublicityDao comActSocialProjectPublicityDao;
    @Resource
    private ComActDAO comActDAO;
    @Override
    public R pageList(CommonPage commonPage) {
        if (nonNull(commonPage.getCommunityId())) {
            ComActDO comActDO = comActDAO.selectById(commonPage.getCommunityId());
            if (nonNull(comActDO)) {
                commonPage.setStreetId(comActDO.getStreetId());
            }
        }
        return R.ok(comActSocialProjectPublicityDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
    }


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectServiceImpl.java

@@ -1,15 +1,24 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.community.social.PageProjectDTO;
import com.panzhihua.common.model.dtos.community.social.PageProjectSignListDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.social.SocialProjectVO;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.service_community.dao.ComActDAO;
import com.panzhihua.service_community.dao.ComActSocialMemberDao;
import com.panzhihua.service_community.dao.ComActSocialOrgDao;
import com.panzhihua.service_community.dao.ComActSocialProjectSignDAO;
import com.panzhihua.service_community.entity.ComActSocialMember;
import com.panzhihua.service_community.entity.ComActSocialOrg;
import com.panzhihua.service_community.entity.ComActSocialProject;
import com.panzhihua.service_community.dao.ComActSocialProjectDao;
import com.panzhihua.service_community.entity.ComActSocialProjectSign;
import com.panzhihua.service_community.entity.ProjectRelationVO;
import com.panzhihua.service_community.model.dos.ComActDO;
import com.panzhihua.service_community.service.ComActSocialProjectService;
@@ -18,6 +27,13 @@
import org.springframework.stereotype.Service;

import javax.annotation.Resource;

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

import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;

/**
 * 三社联动项目表(ComActSocialProject)表服务实现类
@@ -33,23 +49,75 @@
    private ComActSocialProjectDao comActSocialProjectDao;
    @Resource
    private ComActDAO comActDAO;
    @Resource
    private ComActSocialOrgDao comActSocialOrgDao;
    @Resource
    private ComActSocialProjectSignDAO comActSocialProjectSignDAO;
    @Resource
    private ComActSocialMemberDao comActSocialMemberDao;

    @Override
    public R pageList(CommonPage commonPage) {
        if(commonPage.getParamId2()!=null){
           ComActDO comActDO=comActDAO.selectById(commonPage.getCommunityId());
           if(comActDO!=null){
               commonPage.setStreetId(comActDO.getStreetId());
           }
            ComActDO comActDO=comActDAO.selectById(commonPage.getCommunityId());
            if(comActDO!=null){
                commonPage.setStreetId(comActDO.getStreetId());
            }
        }
        return R.ok(comActSocialProjectDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
        Integer userType = commonPage.getUserType();
        if (nonNull(userType) && userType.equals(3)) {
            ComActSocialOrg comActSocialOrg = comActSocialOrgDao.selectOne(new LambdaQueryWrapper<ComActSocialOrg>()
                    .eq(ComActSocialOrg::getUserId, commonPage.getUserId()));
            if (nonNull(comActSocialOrg)) {
                commonPage.setOrgId(comActSocialOrg.getId());
            }
        }
        if (nonNull(userType) && userType.equals(4)) {
            ComActSocialMember socialMember = comActSocialMemberDao.selectOne(new LambdaQueryWrapper<ComActSocialMember>()
                    .eq(ComActSocialMember::getUserId, commonPage.getUserId()));
            if (nonNull(socialMember)) {
                commonPage.setOrgId(socialMember.getOrgId());
            }
        }
        IPage<SocialProjectVO> pageList = comActSocialProjectDao.pageList(new Page(commonPage.getPage(), commonPage.getSize()), commonPage);
        setSignUpStatus(pageList.getRecords());
        return R.ok(pageList);
    }

    private void setSignUpStatus(List<SocialProjectVO> projectVOList) {
        if (!projectVOList.isEmpty()) {
            projectVOList.forEach(e -> {
                Integer status = e.getStatus();
                Date signUpEnd = e.getSignUpEnd();
                if (status.equals(2) && nonNull(signUpEnd)) {
                    e.setSignUpStatus(signUpEnd.compareTo(new Date()) >= 0 ? 1 : 2);
                } else if (!status.equals(2)) {
                    e.setSignUpStatus(3);
                }
            });
        }
    }

    @Override
    public R getByApplet(Long id) {
    public R getByApplet(Long id, Long userId) {
        ComActSocialProject comActSocialProject=this.comActSocialProjectDao.selectById(id);
        comActSocialProject.setViews(comActSocialProject.getViews()+1);
        comActSocialProjectDao.updateById(comActSocialProject);
        return R.ok(comActSocialProjectDao.getByApplet(id));
        SocialProjectVO projectVO = comActSocialProjectDao.getByApplet(id);
        if (nonNull(projectVO)) {
            List<SocialProjectVO> list = new ArrayList<>();
            list.add(projectVO);
            setSignUpStatus(list);
            ComActSocialOrg socialOrg = comActSocialOrgDao.selectOrgByUserId(userId);
            Integer signCount = nonNull(socialOrg) ? comActSocialProjectSignDAO.selectCount(new LambdaQueryWrapper<ComActSocialProjectSign>()
                    .eq(ComActSocialProjectSign::getProjectId, projectVO.getId()).eq(ComActSocialProjectSign::getOrgId, socialOrg.getId())) : 0;
            if(!projectVO.getSignUpStatus().equals(1) || signCount > 0) {
                projectVO.setIsCouldSign(2);
            } else {
                projectVO.setIsCouldSign(1);
            }
        }
        return R.ok(projectVO);
    }

    @Override
@@ -84,4 +152,90 @@
        projectRelationVO.setSocialProjectVOIPage(socialProjectVOIPage);
        return R.ok(projectRelationVO);
    }

    /**
     * 修改数据
     *
     * @param socialProjectVO 实体对象
     * @return 修改结果
     */
    @Override
    public R updateProject(SocialProjectVO socialProjectVO) {
        Integer status = socialProjectVO.getStatus();
        if (nonNull(status) && status.equals(4)) {
            List<ComActSocialProject> unEndProject = this.baseMapper.selectList(new LambdaQueryWrapper<ComActSocialProject>()
                    .eq(ComActSocialProject::getParentId, socialProjectVO.getId())
                    .notIn(ComActSocialProject::getStatus, 4));
            if (!unEndProject.isEmpty()) {
                return R.fail("该项目尚有子项目未结束");
            }
        }
        ComActSocialProject comActSocialProject=new ComActSocialProject();
        BeanUtils.copyProperties(socialProjectVO,comActSocialProject);
        int result = this.baseMapper.updateById(comActSocialProject);
        if (result > 0) {
            return R.ok();
        }
        return R.fail("操作失败，请重试");
    }

    /**
     * 分页查询项目报名列表
     * @param pageProjectSignListDTO
     * @return
     */
    @Override
    public R pageProjectSignList(PageProjectSignListDTO pageProjectSignListDTO) {
        Page page = new Page<>();
        page.setCurrent(pageProjectSignListDTO.getPageNum());
        page.setSize(pageProjectSignListDTO.getPageSize());
        return R.ok(this.baseMapper.pageProjectSignList(page, pageProjectSignListDTO));
    }

    /**
     * 项目公开报名
     * @param projectId
     * @param userId
     * @return
     */
    @Override
    public R signProject(Long projectId, Long userId) {
        ComActSocialProject project = this.baseMapper.selectById(projectId);
        if (isNull(project)) {
            return R.fail("资源不存在");
        }
        if (!project.getStatus().equals(2)) {
            return R.fail("项目暂未公示");
        }
        ComActSocialOrg socialOrg = comActSocialOrgDao.selectOrgByUserId(userId);
        if (isNull(socialOrg)) {
            return R.fail("您不是组织联系人，暂无法进行报名");
        }
        Integer signCount = comActSocialProjectSignDAO.selectCount(new LambdaQueryWrapper<ComActSocialProjectSign>()
                .eq(ComActSocialProjectSign::getProjectId, projectId).eq(ComActSocialProjectSign::getOrgId, socialOrg.getId()));
        if (signCount > 0) {
            return R.fail("请勿重复报名");
        }
        ComActSocialProjectSign socialProjectSign = new ComActSocialProjectSign();
        socialProjectSign.setProjectId(projectId);
        socialProjectSign.setOrgId(socialOrg.getId());
        socialProjectSign.setUserId(userId);
        int result = comActSocialProjectSignDAO.insert(socialProjectSign);
        return result > 0 ? R.ok() : R.fail("操作失败，请重新尝试");
    }

    /**
     * 分页查询用户报名的项目
     * @param pageProjectDTO
     * @return
     */
    @Override
    public R pageProjectWhichIsSignedByUser(PageProjectDTO pageProjectDTO) {
        Page page = new Page<>();
        page.setCurrent(pageProjectDTO.getPageNum());
        page.setSize(pageProjectDTO.getPageSize());
        IPage<SocialProjectVO> pageList = this.baseMapper.pageProjectWhichIsSignedByUser(page, pageProjectDTO);
        setSignUpStatus(pageList.getRecords());
        return R.ok(pageList);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialWorkerServiceImpl.java

@@ -1,5 +1,6 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -11,6 +12,7 @@
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.entity.ComActColumn;
import com.panzhihua.service_community.entity.ComActSocialOrg;
import com.panzhihua.service_community.entity.ComActSocialWorker;
import com.panzhihua.service_community.model.dos.ComActDO;
@@ -23,8 +25,12 @@

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;

import static java.util.Objects.nonNull;
import static org.apache.commons.lang3.StringUtils.isNotBlank;

/**
 * 社工(ComActSocialWorker)表服务实现类
@@ -45,6 +51,8 @@
    private ComActDAO comActDAO;
    @Resource
    private ComActActivityDAO comActActivityDAO;
    @Resource
    private ComActColumnDao comActColumnDao;
    /**
     * 新增社工
     * @param comActSocialWorkerAddDTO
@@ -52,6 +60,18 @@
     */
    @Override
    public R add(ComActSocialWorkerAddDTO comActSocialWorkerAddDTO){
        ComActSocialWorker comActSocialWorker = comActSocialWorkerMapper.selectOne(new LambdaQueryWrapper<ComActSocialWorker>()
                .eq(ComActSocialWorker::getTelephone, comActSocialWorkerAddDTO.getTelephone())
                .eq(ComActSocialWorker::getCommunityId, comActSocialWorkerAddDTO.getCommunityId()));
        if (nonNull(comActSocialWorker)) {
            return R.fail("手机号已存在");
        }
        ComActSocialWorker comActSocialWorker1 = comActSocialWorkerMapper.selectOne(new LambdaQueryWrapper<ComActSocialWorker>()
                .eq(ComActSocialWorker::getIdCard, comActSocialWorkerAddDTO.getIdCard())
                .eq(ComActSocialWorker::getCommunityId, comActSocialWorkerAddDTO.getCommunityId()));
        if (nonNull(comActSocialWorker1)) {
            return R.fail("当前身份证号码已存在社工");
        }
        ComActSocialWorker comActSocialWorkerDO = new ComActSocialWorker();
        BeanUtils.copyProperties(comActSocialWorkerAddDTO, comActSocialWorkerDO);
        comActSocialWorkerDO.setCreateBy(comActSocialWorkerAddDTO.getUserId());
@@ -72,10 +92,37 @@
        ComActSocialWorker comActSocialWorkerDO = new ComActSocialWorker();
        BeanUtils.copyProperties(comActSocialWorkerEditDTO, comActSocialWorkerDO);
        //comActSocialWorkerDO.setUpdateAt(new Date());
        updateWorkerSkill(comActSocialWorkerDO);
        if(comActSocialWorkerMapper.updateById(comActSocialWorkerDO)>0){
            return R.ok();
        }
        return R.fail();
    }

    private void updateWorkerSkill(ComActSocialWorker socialWorker) {
        String skillType = socialWorker.getSkillType();
        if (isNotBlank(skillType)) {
            List<String> skillList = Arrays.asList(skillType.split(","));
            List<String> list = new ArrayList<String>(skillList);
            list.remove(socialWorker.toString());
            StringBuilder sb = new StringBuilder();
            StringBuilder sb1 = new StringBuilder();
            for (int i = 0; i < list.size(); i++) {
                String skillId = list.get(i);
                ComActColumn skillColumn = comActColumnDao.selectById(skillId);
                if (i < list.size() - 1) {
                    sb.append(skillId);
                    sb.append(",");
                    sb1.append(skillColumn.getName());
                    sb1.append(",");
                } else {
                    sb.append(skillId);
                    sb1.append(skillColumn.getName());
                }
            }
            socialWorker.setSkillType(sb.toString());
            socialWorker.setSkillTypeName(sb1.toString());
        }
    }

    /**
@@ -168,6 +215,6 @@

    @Override
    public R activityList(CommonPage commonPage) {
        return R.ok(comActActivityDAO.selectActivityBySocialWorker(new Page(commonPage.getPage(),commonPage.getSize()),commonPage.getParamId()));
        return R.ok(comActActivityDAO.selectActivityBySocialWorker(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPropertyPublicityServiceImpl.java

@@ -64,7 +64,7 @@
        } else {
            //非物业用户查看是否拥有菜单权限
            List<String> menuList = this.baseMapper.retrieveUserMenuList(userId);
            if (menuList.isEmpty() || !menuList.contains("物业宣传栏")) {
            if (menuList.isEmpty() || !menuList.contains("物业宣传")) {
                return R.fail("暂无权限");
            }
        }

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComStreetServiceImpl.java

@@ -131,10 +131,10 @@
        if (ObjectUtils.isEmpty(comStreetDO)) {
            return R.fail();
        }
        ComActVO comActVO = new ComActVO();
        BeanUtils.copyProperties(comStreetDO, comActVO);
        comActVO.setAreaName(comActDAO.selectAreaName(comActVO.getAreaCode()));
        return R.ok(comActVO);
        ComStreetVO comStreetVO = new ComStreetVO();
        BeanUtils.copyProperties(comStreetDO, comStreetVO);
        comStreetVO.setAdministrativeRegions(comStreetDAO.retrieveRegions(comStreetVO.getAreaCode().toString()));
        return R.ok(comStreetVO);
    }

    /**
@@ -161,6 +161,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/McsMerchantServiceImpl.java

@@ -173,7 +173,10 @@
            return R.fail("商家不存在");
        }
        mcsMerchant.setIsDel(true);
        this.baseMapper.updateById(mcsMerchant);
        int num = this.baseMapper.updateById(mcsMerchant);
        if (num > 0) {
            this.baseMapper.enableUserStatus(mcsMerchant.getUserId());
        }
        return R.ok();
    }


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActColumnMapper.xml

@@ -20,11 +20,13 @@
            <if test="commonPage.type!=null">
                and type = #{commonPage.type}
            </if>
            <if test="commonPage.communityId!=null">
                and community_id = ${commonPage.communityId}
            </if>
            <if test="commonPage.streetId!=null">
                and street_id = #{commonPage.streetId}
            <if test="commonPage.type != 1">
                <if test="commonPage.communityId!=null">
                    and community_id = ${commonPage.communityId}
                </if>
                <if test="commonPage.streetId!=null">
                    and street_id = #{commonPage.streetId}
                </if>
            </if>
            <if test="commonPage.status!=null">
                and status =#{commonPage.status}
@@ -54,15 +56,17 @@
        select t.id,t.name,t1.id as sid,t1.name as sname from com_act_column t left join com_act_column t1 on t.id =t1.parent_id
        <where>
            1=1
            <if test="communityId !=null ">
                and t.community_id =#{communityId}
            </if>
            <if test="streetId !=null ">
                and t.street_id =#{streetId}
            </if>
            <if test="type !=null ">
                and t.type =#{type}
            </if>
            <if test="type != 4">
                <if test="communityId !=null ">
                    and t.community_id =#{communityId}
                </if>
                <if test="streetId !=null ">
                    and t.street_id =#{streetId}
                </if>
            </if>
            <if test="parentId !=null">
                and t.parent_id=#{parentId}
            </if>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDiscussDOMapper.xml

@@ -111,7 +111,7 @@
        d.id,
        d.`discuss_subject`,
        d.type,
        (select count(id) from com_act_discuss_comment where discuss_id = d.id and is_del = 2) as comment_num,
        (select count(id) from com_act_discuss_comment where discuss_id = d.id and is_del = 2 and parent_id = 0) as comment_num,
        d.fabulous_num as signNum,
        d.views_num,
        d.status,

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDpcMapper.xml

New file
@@ -0,0 +1,69 @@
<?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.ComActDpcDAO">

    <resultMap type="com.panzhihua.service_community.entity.ComActDpc" id="ComActDpcMap">
        <result property="id" column="id" jdbcType="INTEGER"/>
        <result property="name" column="name" jdbcType="VARCHAR"/>
        <result property="phone" column="phone" jdbcType="VARCHAR"/>
        <result property="nation" column="nation" jdbcType="VARCHAR"/>
        <result property="sex" column="sex" jdbcType="INTEGER"/>
        <result property="area" column="area" jdbcType="VARCHAR"/>
        <result property="belong" column="belong" jdbcType="VARCHAR"/>
        <result property="category" column="category" jdbcType="VARCHAR"/>
        <result property="position" column="position" jdbcType="VARCHAR"/>
        <result property="photo" column="photo" jdbcType="VARCHAR"/>
        <result property="isDel" column="is_del" jdbcType="VARCHAR"/>
        <result property="createdBy" column="created_by" jdbcType="INTEGER"/>
        <result property="createdAt" column="created_at" jdbcType="TIMESTAMP"/>
        <result property="updatedBy" column="updated_by" jdbcType="INTEGER"/>
        <result property="updatedAt" column="updated_at" jdbcType="TIMESTAMP"/>
        <result property="communityId" column="community_id" jdbcType="INTEGER"/>
    </resultMap>

    <!-- 批量插入 -->
    <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
        insert into smart_life.com_act_dpc(name, phone, nation, sex, area, belong, category, position, photo, is_del,
        created_by, created_at, updated_by, updated_at, community_id)
        values
        <foreach collection="entities" item="entity" separator=",">
            (#{entity.name}, #{entity.phone}, #{entity.nation}, #{entity.sex}, #{entity.area}, #{entity.belong},
            #{entity.category}, #{entity.position}, #{entity.photo}, #{entity.isDel}, #{entity.createdBy},
            #{entity.createdAt}, #{entity.updatedBy}, #{entity.updatedAt}, #{entity.communityId})
        </foreach>
    </insert>
    <!-- 批量插入或按主键更新 -->
    <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
        insert into smart_life.com_act_dpc(name, phone, nation, sex, area, belong, category, position, photo, is_del,
        created_by, created_at, updated_by, updated_at, community_id)
        values
        <foreach collection="entities" item="entity" separator=",">
            (#{entity.name}, #{entity.phone}, #{entity.nation}, #{entity.sex}, #{entity.area}, #{entity.belong},
            #{entity.category}, #{entity.position}, #{entity.photo}, #{entity.isDel}, #{entity.createdBy},
            #{entity.createdAt}, #{entity.updatedBy}, #{entity.updatedAt}, #{entity.communityId})
        </foreach>
        on duplicate key update
        name = values(name) , phone = values(phone) , nation = values(nation) , sex = values(sex) , area = values(area)
        , belong = values(belong) , category = values(category) , position = values(position) , photo = values(photo) ,
        is_del = values(is_del) , created_by = values(created_by) , created_at = values(created_at) , updated_by =
        values(updated_by) , updated_at = values(updated_at) , community_id = values(community_id)
    </insert>
    <select id="detailDpc" resultType="com.panzhihua.common.model.vos.community.ComActDpcVO">
        SELECT * FROM com_act_dpc WHERE id = #{id}
    </select>
    <select id="pageDpc" resultType="com.panzhihua.common.model.vos.community.ComActDpcVO">
        SELECT * FROM com_act_dpc
        WHERE community_id = #{pageDpcDTO.communityId} AND is_del = 0
        <if test="pageDpcDTO.keyword != null and pageDpcDTO.keyword != &quot;&quot;">
            AND (`name` LIKE CONCAT(#{pageDpcDTO.keyword}, '%')
            OR phone LIKE CONCAT(#{pageDpcDTO.keyword}, '%'))
        </if>
        ORDER BY created_at DESC
    </select>
    <select id="selectUser" resultType="com.panzhihua.common.model.vos.user.SysUserVO">
        SELECT user_id, `name`, phone
        FROM sys_user WHERE `type` = 1 AND phone = #{phone}
    </select>

</mapper>


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDynDOMapper.xml

@@ -140,26 +140,41 @@
        SELECT id,person_name,patrol_type,patrol_time FROM com_sw_patrol_record WHERE community_id = #{communityId} LIMIT #{pageSize}
    </select>
    <select id="pageDynamic" resultType="com.panzhihua.common.model.vos.community.ComActDynVO">
        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 ( 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
        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 ( 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.category != null '>
            <if test="comActDynVO.category != 3">
                <if test='comActDynVO.choice == 0 '>
                    and d.community_id = ${comActDynVO.communityId}
                </if>
            </if>
            and d.category = #{comActDynVO.category}
        WHERE
        1 = 1
        <if test='comActDynVO.choice == 0 '>
            AND d.community_id = ${comActDynVO.communityId}
        </if>
        <if test="comActDynVO.category != null">
            AND d.category = #{comActDynVO.category}
        </if>
        <if test='comActDynVO.areaCode !=null and comActDynVO.category == 1 '>
            AND ca.area_code = ${comActDynVO.areaCode}
        </if>
        <if test='comActDynVO.title != null and comActDynVO.title.trim() != &quot;&quot;'>
            AND d.title like
            concat(#{comActDynVO.title},'%')
            AND d.title LIKE concat(#{comActDynVO.title},'%')
        </if>
        <if test='comActDynVO.isTopping != null '>
            AND d.is_topping = #{comActDynVO.isTopping}
@@ -173,7 +188,10 @@
        <if test='comActDynVO.publishAtBegin != null '>
            AND d.publish_at BETWEEN #{comActDynVO.publishAtBegin} AND #{comActDynVO.publishAtEnd}
        </if>
        group by d.id order by d.is_topping desc, d.create_at desc
        <if test="comActDynVO.isOrgHatch == 1">
            AND (cadt.`name` = '社会组织培训' OR cadt.`name` = '社工培训')
        </if>
        GROUP BY d.id ORDER BY d.is_topping DESC, d.create_at DESC
    </select>
    <select id="pageDynamicByAdmin" resultType="com.panzhihua.common.model.vos.community.ComActDynVO">
        SELECT d.id, d.title, COUNT(u.id)readNum, d.`status`, d.`content`, d.`cover`, d.`type`, d.`cover_mode`,
@@ -182,12 +200,9 @@
        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 1=1
        <if test='comActDynVO.category != null '>
            <if test="comActDynVO.category != 3">
                AND d.community_id = ${comActDynVO.communityId}
            </if>
            and d.category = #{comActDynVO.category}
        WHERE d.community_id = ${comActDynVO.communityId}
        <if test="comActDynVO.category != null">
            AND d.category = #{comActDynVO.category}
        </if>
        <if test='comActDynVO.title != null and comActDynVO.title.trim() != &quot;&quot;'>
            AND d.title like concat(#{comActDynVO.title},'%')

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoDOMapper.xml

@@ -63,6 +63,7 @@
            p.activity_amount,
            p.activity_id,
            p.is_report_urban,
            p.is_report_dpc,
            p.classify_id,
            ca.`name` as classifyName,
            p.examine_at,
@@ -89,6 +90,9 @@
        </if>
        <if test='comActEasyPhotoVO.isReportUrban != null' >
            AND p.`is_report_urban` = #{comActEasyPhotoVO.isReportUrban}
        </if>
        <if test='comActEasyPhotoVO.isReportDpc != null' >
            AND p.`is_report_dpc` = #{comActEasyPhotoVO.isReportDpc}
        </if>
        <if test='comActEasyPhotoVO.classifyId != null' >
            AND p.`classify_id` = #{comActEasyPhotoVO.classifyId}
@@ -238,6 +242,7 @@
        p.examine_at,
        c.name  communityName,
        p.is_report_urban,
        p.is_report_dpc,
        p.urban_status,
        ca.`name` as photoType
        FROM
@@ -487,5 +492,120 @@
        LEFT JOIN (SELECT * FROM com_act_easy_photo_evaluate WHERE service_type = 1) t4 ON t1.id = t4.service_id
        WHERE t1.community_id = #{communityId} AND t1.`status` = 5 AND t1.del_tag = 0 LIMIT #{pageSize}
    </select>
    <select id="pageEasyPhotoApplets" resultType="com.panzhihua.common.model.vos.community.ComActEasyPhotoVO">
        SELECT
        p.id,
        u.`name` sponsor_name,
        u.`nick_name` userNickName,
        u.phone sponsor_phone,
        count( DISTINCT pu.id ) giveThumbsUpNum,
        count( DISTINCT c.id ) commentNum,
        u.image_url,
        p.happen_addr,
        p.addr_remark,
        su.`name` handler_name,
        p.`status`,
        p.`is_hide`,
        p.`detail`,
        p.`is_need_feed_back`,
        p.`photo_path_list`,
        p.create_at,
        p.feedback_at,
        p.activity_type,
        p.activity_amount,
        p.classify_id,
        class.`name` AS classifyName,
        p.img_width,
        p.img_height,
        p.examine_at,
        f.id AS fid
        FROM
        com_act_easy_photo p
        JOIN sys_user u ON p.sponsor_id = u.user_id
        LEFT JOIN com_act_easy_photo_user pu ON p.id = pu.easy_photo_id
        LEFT JOIN sys_user su ON p.handler_id = su.user_id
        LEFT JOIN com_act_easy_photo_comment c ON p.id = c.easy_photo_id
        LEFT JOIN com_act_easy_photo_classify class ON p.classify_id = class.id
        LEFT JOIN (SELECT * FROM com_act_easy_photo_feedback WHERE `type` = 2) f ON p.id = f.easy_id
        <where> p.del_tag = 0
        <if test = 'comActEasyPhotoVO.communityId != null and comActEasyPhotoVO.communityId != 0' >
            AND p.community_id = ${comActEasyPhotoVO.communityId}
        </if>
        <if test = 'comActEasyPhotoVO.status != null and comActEasyPhotoVO.status!=0' >
            AND p.`status` = #{comActEasyPhotoVO.status}
        </if>
        <if test='comActEasyPhotoVO.sponsorId != null and comActEasyPhotoVO.sponsorId != 0'>
            AND p.sponsor_id = #{comActEasyPhotoVO.sponsorId}
        </if>
        <if test='comActEasyPhotoVO.sponsorId == null or comActEasyPhotoVO.sponsorId==0'>
            AND p.`status` in (2,4)
            <if test="comActEasyPhotoVO.isFeedBackForDpc == null or comActEasyPhotoVO.isDpcMember == 0">
                AND p.is_publicity = 1
            </if>
        </if>
        <if test='comActEasyPhotoVO.isReportDpc != null' >
            AND p.`is_report_dpc` = #{comActEasyPhotoVO.isReportDpc}
        </if>
        <if test='comActEasyPhotoVO.keyWord != null and comActEasyPhotoVO.keyWord != &quot;&quot;'>
            AND (class.`name` like concat(#{comActEasyPhotoVO.keyWord},'%') or p.detail like concat(#{comActEasyPhotoVO.keyWord},'%'))
        </if>
        </where>
        group by p.id
        <if test="comActEasyPhotoVO.isFeedBackForDpc != null">
            HAVING
            <if test="comActEasyPhotoVO.isFeedBackForDpc == 1">
                fid IS NULL
            </if>
            <if test="comActEasyPhotoVO.isFeedBackForDpc == 2">
                fid IS NOT NULL
            </if>
        </if>
        order by p.create_at desc
    </select>
    <select id="getEasyPhotoAddPolylineDataForDpc"
            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 is_report_dpc = 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="getEasyPhotoTotalPolylineDateForDpc"
            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 is_report_dpc = 1
        AND DATE_FORMAT( create_at, '%Y-%m' ) &lt;= #{date}
    </select>
    <select id="dpcEasyPhotoList" 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` IN(4,5) AND t1.del_tag = 0 AND t1.is_report_dpc = 1
        <if test="pageBaseDTO.paramId != null">
            AND t1.classify_id = #{pageBaseDTO.paramId}
        </if>
        ORDER BY t1.id DESC
    </select>
    <select id="selectDpcBaseData"
            resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenDpcStatisticsInfo">
        SELECT
        (select count(id) from com_act_dpc where community_id = ${communityId} AND is_del = 0) AS dpcNum
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEnterpriseMapper.xml

New file
@@ -0,0 +1,125 @@
<?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.ComActEnterpriseDAO">

    <resultMap type="com.panzhihua.service_community.entity.ComActEnterprise" id="ComActEnterpriseMap">
        <result property="id" column="id" jdbcType="INTEGER"/>
        <result property="name" column="name" jdbcType="VARCHAR"/>
        <result property="agencyCode" column="agency_code" jdbcType="VARCHAR"/>
        <result property="legalRepresentative" column="legal_representative" jdbcType="VARCHAR"/>
        <result property="phone" column="phone" jdbcType="VARCHAR"/>
        <result property="registeAt" column="registe_at" jdbcType="TIMESTAMP"/>
        <result property="communityId" column="community_id" jdbcType="INTEGER"/>
        <result property="address" column="address" jdbcType="VARCHAR"/>
        <result property="introduct" column="introduct" jdbcType="VARCHAR"/>
        <result property="logo" column="logo" jdbcType="VARCHAR"/>
        <result property="createdBy" column="created_by" jdbcType="INTEGER"/>
        <result property="createdAt" column="created_at" jdbcType="TIMESTAMP"/>
        <result property="updatedBy" column="updated_by" jdbcType="INTEGER"/>
        <result property="updatedAt" column="updated_at" jdbcType="TIMESTAMP"/>
        <result property="status" column="status" jdbcType="INTEGER"/>
        <result property="streetId" column="street_id" jdbcType="INTEGER"/>
        <result property="type" column="type" jdbcType="INTEGER"/>
    </resultMap>

    <!-- 批量插入 -->
    <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
        insert into smart_life.com_act_enterprise(name, agency_code, legal_representative, phone, registe_at,
        community_id, address, introduct, logo, created_by, created_at, updated_by, updated_at, status, street_id)
        values
        <foreach collection="entities" item="entity" separator=",">
            (#{entity.name}, #{entity.agencyCode}, #{entity.legalRepresentative}, #{entity.phone}, #{entity.registeAt},
            #{entity.communityId}, #{entity.address}, #{entity.introduct}, #{entity.logo}, #{entity.createdBy},
            #{entity.createdAt}, #{entity.updatedBy}, #{entity.updatedAt}, #{entity.status}, #{entity.streetId})
        </foreach>
    </insert>
    <!-- 批量插入或按主键更新 -->
    <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
        insert into smart_life.com_act_enterprise(name, agency_code, legal_representative, phone, registe_at,
        community_id, address, introduct, logo, created_by, created_at, updated_by, updated_at, status, street_id)
        values
        <foreach collection="entities" item="entity" separator=",">
            (#{entity.name}, #{entity.agencyCode}, #{entity.legalRepresentative}, #{entity.phone}, #{entity.registeAt},
            #{entity.communityId}, #{entity.address}, #{entity.introduct}, #{entity.logo}, #{entity.createdBy},
            #{entity.createdAt}, #{entity.updatedBy}, #{entity.updatedAt}, #{entity.status}, #{entity.streetId})
        </foreach>
        on duplicate key update
        name = values(name) , agency_code = values(agency_code) , legal_representative = values(legal_representative) ,
        phone = values(phone) , registe_at = values(registe_at) , community_id = values(community_id) , address =
        values(address) , introduct = values(introduct) , logo = values(logo) , created_by = values(created_by) ,
        created_at = values(created_at) , updated_by = values(updated_by) , updated_at = values(updated_at) , status =
        values(status) , street_id = values(street_id)
    </insert>
    <select id="detailEnterprise" resultType="com.panzhihua.common.model.vos.community.ComActEnterpriseVO">
        SELECT t1.*, t2.`name` AS communityName, t3.`name` AS typeName
        FROM com_act_enterprise t1
        LEFT JOIN com_act t2 ON t1.community_id = t2.community_id
        LEFT JOIN com_act_enterprise_type t3 ON t1.type = t3.id
        WHERE t1.id = #{id}
    </select>
    <select id="pageEnterprise" resultType="com.panzhihua.common.model.vos.community.ComActEnterpriseVO">
        SELECT t1.*, t2.`name` AS communityName, t3.`name` AS typeName
        FROM com_act_enterprise t1
        LEFT JOIN com_act t2 ON t1.community_id = t2.community_id
        LEFT JOIN com_act_enterprise_type t3 ON t1.type = t3.id
        <where>
            <if test="pageEnterpriseDTO.streetId != null and pageEnterpriseDTO.communityId == null">
                AND t1.street_id = #{pageEnterpriseDTO.streetId}
            </if>
            <if test="pageEnterpriseDTO.communityId != null">
                AND t1.community_id = #{pageEnterpriseDTO.communityId}
            </if>
            <if test="pageEnterpriseDTO.status != null">
                AND t1.status = #{pageEnterpriseDTO.status}
            </if>
            <if test="pageEnterpriseDTO.type != null">
                AND t1.type = #{pageEnterpriseDTO.type}
            </if>
            <if test="pageEnterpriseDTO.keyword != null and pageEnterpriseDTO.keyword != &quot;&quot;">
                AND(t1.`name` LIKE CONCAT(#{pageEnterpriseDTO.keyword}, '%')
                OR t1.legal_representative LIKE CONCAT(#{pageEnterpriseDTO.keyword}, '%')
                OR t1.phone LIKE CONCAT(#{pageEnterpriseDTO.keyword}, '%'))
            </if>
        </where>
        ORDER BY t1.created_at DESC
    </select>
    <select id="getEnterpriseServiceTypeCircleData"
            resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT t1.`name` AS filed, COUNT(t1.`name`) AS num
        FROM com_act_enterprise t
        LEFT JOIN com_act_enterprise_type t1 ON t.type = t1.id
        WHERE t.community_id = ${communityId} AND t.`status` = 1
        GROUP BY filed
    </select>
    <select id="getSocialWorkerAgeStageCircleData"
            resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT filed, SUM(num) AS num FROM (
            SELECT filed, COUNT(filed) AS num FROM (
            SELECT
            CASE
            WHEN TIMESTAMPDIFF(YEAR, SUBSTRING(id_card, 7, 8), NOW()) &lt; 30 THEN '30岁以下'
            WHEN TIMESTAMPDIFF(YEAR, SUBSTRING(id_card, 7, 8), NOW()) BETWEEN 30 AND 59 THEN '30-59岁'
            WHEN TIMESTAMPDIFF(YEAR, SUBSTRING(id_card, 7, 8), NOW()) >= 60 THEN '60岁及以上'
            END filed
            FROM com_act_social_worker WHERE community_id = ${communityId}
            ) temp WHERE filed is not null GROUP BY filed
            UNION ALL
            (SELECT '30岁以下' AS filed, 0 AS num)
            UNION ALL
            (SELECT '30-59岁' AS filed, 0 AS num)
            UNION ALL
            (SELECT '60岁及以上' AS filed, 0 AS num)
        ) t GROUP BY filed
    </select>
    <select id="getSocialWorkerServiceTypeCircleData"
            resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT filed, COUNT(filed) AS num FROM(
            SELECT substring_index( substring_index( t.skill_type_name, ',', b.help_topic_id + 1 ), ',',- 1 ) AS filed
            FROM com_act_social_worker t
            JOIN mysql.help_topic b ON b.help_topic_id &lt; ( length( t.skill_type_name ) - length( REPLACE ( t.skill_type_name, ',', '' ))+ 1 )
            WHERE t.community_id = ${communityId}
        ) temp GROUP BY filed
    </select>

</mapper>


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEnterpriseTypeMapper.xml

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

    <resultMap type="com.panzhihua.service_community.entity.ComActEnterpriseType" id="ComActEnterpriseTypeMap">
        <result property="id" column="id" jdbcType="INTEGER"/>
        <result property="communityId" column="community_id" jdbcType="INTEGER"/>
        <result property="name" column="name" jdbcType="VARCHAR"/>
        <result property="description" column="description" jdbcType="VARCHAR"/>
        <result property="status" column="status" jdbcType="INTEGER"/>
        <result property="isDel" column="is_del" jdbcType="VARCHAR"/>
        <result property="createdBy" column="created_by" jdbcType="INTEGER"/>
        <result property="createdAt" column="created_at" jdbcType="TIMESTAMP"/>
        <result property="updatedBy" column="updated_by" jdbcType="INTEGER"/>
        <result property="updatedAt" column="updated_at" jdbcType="TIMESTAMP"/>
    </resultMap>

    <!-- 批量插入 -->
    <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
        insert into smart_life.com_act_enterprise_type(community_id, name, description, status, is_del, created_by,
        created_at, updated_by, updated_at)
        values
        <foreach collection="entities" item="entity" separator=",">
            (#{entity.communityId}, #{entity.name}, #{entity.description}, #{entity.status}, #{entity.isDel},
            #{entity.createdBy}, #{entity.createdAt}, #{entity.updatedBy}, #{entity.updatedAt})
        </foreach>
    </insert>
    <!-- 批量插入或按主键更新 -->
    <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
        insert into smart_life.com_act_enterprise_type(community_id, name, description, status, is_del, created_by,
        created_at, updated_by, updated_at)
        values
        <foreach collection="entities" item="entity" separator=",">
            (#{entity.communityId}, #{entity.name}, #{entity.description}, #{entity.status}, #{entity.isDel},
            #{entity.createdBy}, #{entity.createdAt}, #{entity.updatedBy}, #{entity.updatedAt})
        </foreach>
        on duplicate key update
        community_id = values(community_id) , name = values(name) , description = values(description) , status =
        values(status) , is_del = values(is_del) , created_by = values(created_by) , created_at = values(created_at) ,
        updated_by = values(updated_by) , updated_at = values(updated_at)
    </insert>
    <select id="detailEnterpriseType"
            resultType="com.panzhihua.common.model.vos.community.ComActEnterpriseTypeVO">
        SELECT t.id, t.`name`, t.description, t.status, t1.`name` AS createdBy, t2.`name` AS updatedBy
        FROM com_act_enterprise_type t
        LEFT JOIN sys_user t1 ON t.created_by = t1.user_id
        LEFT JOIN sys_user t2 ON t.updated_by = t2.user_id
        WHERE t.id = #{id}
    </select>
    <select id="pageEnterpriseType"
            resultType="com.panzhihua.common.model.vos.community.ComActEnterpriseTypeVO">
        SELECT t.id, t.`name`, t.description, t.status, t1.`name` AS createdBy, t2.`name` AS updatedBy
        FROM com_act_enterprise_type t
        LEFT JOIN sys_user t1 ON t.created_by = t1.user_id
        LEFT JOIN sys_user t2 ON t.updated_by = t2.user_id
        WHERE t.community_id = #{pageEnterpriseTypeDTO.communityId} AND t.is_del = 0
        <if test="pageEnterpriseTypeDTO.status != null">
            AND t.status = #{pageEnterpriseTypeDTO.status}
        </if>
        <if test="pageEnterpriseTypeDTO.keyword != null and pageEnterpriseTypeDTO.keyword != &quot;&quot;">
            AND t.`name` LIKE CONCAT(#{pageEnterpriseTypeDTO.keyword}, '%')
        </if>
        ORDER BY t.created_at DESC
    </select>
    <select id="getEnterpriseTypeList"
            resultType="com.panzhihua.common.model.vos.community.ComActEnterpriseTypeVO">
        SELECT t.id, t.`name`, t.description, t.status, t1.`name` AS createdBy, t2.`name` AS updatedBy
        FROM com_act_enterprise_type t
        LEFT JOIN sys_user t1 ON t.created_by = t1.user_id
        LEFT JOIN sys_user t2 ON t.updated_by = t2.user_id
        WHERE t.community_id = #{communityId} AND t.is_del = 0 AND t.status = 1
    </select>

</mapper>


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveMapper.xml

@@ -47,8 +47,11 @@
        select id,title,type,img_type, img_url,adver_position_top, adver_position_application from com_act_reserve
        <where>
            status = 2 and adver_position_application = 1
                and community_id = 1
            <if test="communityId !=null">
                and community_id = ${communityId}
            </if>
        </where>
        order by create_at desc
    </select>


@@ -77,7 +80,7 @@
                <if test="pageReserveDTO.communityId != null and pageReserveDTO.communityId !=0">
                    and t.community_id = ${pageReserveDTO.communityId}
                </if>
                <if test="pageReserveDTO.areaCode !=null and pageReserveDTO.communityId !=1">
                <if test="pageReserveDTO.areaCode !=null">
                    and t1.area_code = #{pageReserveDTO.areaCode}
                </if>
                <if test="pageReserveDTO.type != null and pageReserveDTO.type.size > 0">
@@ -192,6 +195,7 @@
    <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}
        order by create_at desc
    </select>

    <select id="indexBackReserve" resultType="Integer">
@@ -201,7 +205,7 @@
    <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
@@ -227,4 +231,4 @@
    <select id="selectCommunityPhoneByReserveId" resultType="string">
        select contacts_phone from com_act_reserve t left join com_act t1 on t.community_id = t1.community_id where t.id = #{reserveId}
    </select>
</mapper>
</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialMemberMapper.xml

@@ -18,9 +18,9 @@
    </resultMap>

    <select id="pageList" resultType="com.panzhihua.common.model.vos.ComActSocialMemberVO">
        select t.*,t1.name as orgName from com_act_social_member t
        select t.*,t1.name as orgName, TIMESTAMPDIFF(YEAR, SUBSTRING(t.id_card, 7, 8), NOW()) AS age
        from com_act_social_member t
        left join com_act_social_org t1 on t.org_id = t1.id
        left join com_act t2 on t.community_id = t2.community_id
        <where>
            1=1
            <if test="commonPage.keyword!=null and commonPage.keyword !=''">
@@ -33,10 +33,10 @@
                and t.org_id = #{commonPage.paramId}
            </if>
            <if test="commonPage.streetId!=null ">
                and t2.street_id = #{commonPage.streetId}
                and t1.street_id = #{commonPage.streetId}
            </if>
            <if test="commonPage.communityId!=null ">
                and t2.community_id = #{commonPage.communityId}
                and t1.affiliated_unit_type = 2 AND t1.affiliated_unit = #{commonPage.communityId}
            </if>
        </where>
        order by t.create_time desc
@@ -46,5 +46,9 @@
        select t.*,t1.name from com_act_social_member t left join com_street t1 on t.street_id = t1.street_id
        where t.id =#{id}
    </select>
    <select id="selectPbServiceTeamById"
            resultType="com.panzhihua.common.model.vos.partybuilding.ComPbServiceTeamVO">
        SELECT * FROM com_pb_service_team WHERE id = #{id}
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialOrgHatchAuditMapper.xml

New file
@@ -0,0 +1,89 @@
<?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.ComActSocialOrgHatchAuditDAO">

    <resultMap type="com.panzhihua.service_community.entity.ComActSocialOrgHatchAudit"
               id="ComActSocialOrgHatchAuditMap">
        <result property="id" column="id" jdbcType="INTEGER"/>
        <result property="name" column="name" jdbcType="VARCHAR"/>
        <result property="responsibility" column="responsibility" jdbcType="VARCHAR"/>
        <result property="phone" column="phone" jdbcType="VARCHAR"/>
        <result property="hatchUnit" column="hatch_unit" jdbcType="INTEGER"/>
        <result property="hatchUnitType" column="hatch_unit_type" jdbcType="INTEGER"/>
        <result property="hatchUnitName" column="hatch_unit_name" jdbcType="VARCHAR"/>
        <result property="userId" column="user_id" jdbcType="INTEGER"/>
        <result property="status" column="status" jdbcType="INTEGER"/>
        <result property="createdAt" column="created_at" jdbcType="TIMESTAMP"/>
        <result property="updatedAt" column="updated_at" jdbcType="TIMESTAMP"/>
        <result property="introduction" column="introduction" jdbcType="VARCHAR"/>
        <result property="logo" column="logo" jdbcType="VARCHAR"/>
        <result property="applyReason" column="apply_reason" jdbcType="VARCHAR"/>
        <result property="serviceScope" column="service_scope" jdbcType="VARCHAR"/>
    </resultMap>

    <!-- 批量插入 -->
    <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
        insert into smart_life.com_act_social_org_hatch_audit(name, responsibility, phone, hatch_unit, hatch_unit_type,
        hatch_unit_name, user_id, status, created_at, updated_at, introduction, logo, apply_reason, service_scope)
        values
        <foreach collection="entities" item="entity" separator=",">
            (#{entity.name}, #{entity.responsibility}, #{entity.phone}, #{entity.hatchUnit}, #{entity.hatchUnitType},
            #{entity.hatchUnitName}, #{entity.userId}, #{entity.status}, #{entity.createdAt}, #{entity.updatedAt},
            #{entity.introduction}, #{entity.logo}, #{entity.applyReason}, #{entity.serviceScope})
        </foreach>
    </insert>
    <!-- 批量插入或按主键更新 -->
    <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
        insert into smart_life.com_act_social_org_hatch_audit(name, responsibility, phone, hatch_unit, hatch_unit_type,
        hatch_unit_name, user_id, status, created_at, updated_at, introduction, logo, apply_reason, service_scope)
        values
        <foreach collection="entities" item="entity" separator=",">
            (#{entity.name}, #{entity.responsibility}, #{entity.phone}, #{entity.hatchUnit}, #{entity.hatchUnitType},
            #{entity.hatchUnitName}, #{entity.userId}, #{entity.status}, #{entity.createdAt}, #{entity.updatedAt},
            #{entity.introduction}, #{entity.logo}, #{entity.applyReason}, #{entity.serviceScope})
        </foreach>
        on duplicate key update
        name = values(name) , responsibility = values(responsibility) , phone = values(phone) , hatch_unit =
        values(hatch_unit) , hatch_unit_type = values(hatch_unit_type) , hatch_unit_name = values(hatch_unit_name) ,
        user_id = values(user_id) , status = values(status) , created_at = values(created_at) , updated_at =
        values(updated_at) , introduction = values(introduction) , logo = values(logo) , apply_reason =
        values(apply_reason) , service_scope = values(service_scope)
    </insert>
    <select id="pageHatchAudit"
            resultType="com.panzhihua.common.model.vos.community.social.SocialOrgHatchAuditVO">
        SELECT id, `name`, responsibility, phone, hatch_unit_name, created_at, `status`
        FROM com_act_social_org_hatch_audit
        <where>
            <if test="pageHatchAuditDTO.keyword != null and pageHatchAuditDTO.keyword != &quot;&quot;">
                AND (`name` LIKE CONCAT(#{pageHatchAuditDTO.keyword}, '%')
                OR responsibility LIKE CONCAT(#{pageHatchAuditDTO.keyword}, '%')
                OR phone LIKE CONCAT(#{pageHatchAuditDTO.keyword}, '%'))
            </if>
            <if test="pageHatchAuditDTO.hatchUnit != null and pageHatchAuditDTO.hatchUnitType != null">
                AND hatch_unit = #{pageHatchAuditDTO.hatchUnit} AND hatch_unit_type = #{pageHatchAuditDTO.hatchUnitType}
            </if>
            <if test="pageHatchAuditDTO.status != null">
                AND `status` = #{pageHatchAuditDTO.status}
            </if>
        </where>
        ORDER BY created_at DESC
    </select>
    <select id="detailHatchAudit"
            resultType="com.panzhihua.common.model.vos.community.social.SocialOrgHatchAuditVO">
        SELECT a.*, GROUP_CONCAT(c.`name`) AS serviceScopeName
        FROM com_act_social_org_hatch_audit a
        JOIN mysql.help_topic b ON b.help_topic_id &lt; ( length( a.service_scope ) - length( REPLACE ( a.service_scope, ',', '' ))+ 1 )
        LEFT JOIN com_act_column c ON substring_index( substring_index( a.service_scope, ',', b.help_topic_id + 1 ), ',',- 1 ) = c.id
        WHERE a.id = #{id}
    </select>
    <select id="getHatchAuditSchedule"
            resultType="com.panzhihua.common.model.vos.community.social.SocialOrgHatchAuditVO">
        SELECT a.*, GROUP_CONCAT(c.`name`) AS serviceScopeName
        FROM com_act_social_org_hatch_audit a
        JOIN mysql.help_topic b ON b.help_topic_id &lt; ( length( a.service_scope ) - length( REPLACE ( a.service_scope, ',', '' ))+ 1 )
        LEFT JOIN com_act_column c ON substring_index( substring_index( a.service_scope, ',', b.help_topic_id + 1 ), ',',- 1 ) = c.id
        WHERE a.user_id = #{userId}
    </select>

</mapper>


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialOrgHatchAuditScheduleMapper.xml

New file
@@ -0,0 +1,34 @@
<?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.ComActSocialOrgHatchAuditScheduleDAO">

    <resultMap type="com.panzhihua.service_community.entity.ComActSocialOrgHatchAuditSchedule"
               id="ComActSocialOrgHatchAuditScheduleMap">
        <result property="id" column="id" jdbcType="INTEGER"/>
        <result property="auditId" column="audit_id" jdbcType="INTEGER"/>
        <result property="stage" column="stage" jdbcType="VARCHAR"/>
        <result property="detail" column="detail" jdbcType="VARCHAR"/>
        <result property="createdAt" column="created_at" jdbcType="TIMESTAMP"/>
    </resultMap>

    <!-- 批量插入 -->
    <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
        insert into smart_life.com_act_social_org_hatch_audit_schedule(audit_id, stage, detail, created_at)
        values
        <foreach collection="entities" item="entity" separator=",">
            (#{entity.auditId}, #{entity.stage}, #{entity.detail}, #{entity.createdAt})
        </foreach>
    </insert>
    <!-- 批量插入或按主键更新 -->
    <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
        insert into smart_life.com_act_social_org_hatch_audit_schedule(audit_id, stage, detail, created_at)
        values
        <foreach collection="entities" item="entity" separator=",">
            (#{entity.auditId}, #{entity.stage}, #{entity.detail}, #{entity.createdAt})
        </foreach>
        on duplicate key update
        audit_id = values(audit_id) , stage = values(stage) , detail = values(detail) , created_at = values(created_at)
    </insert>

</mapper>


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialOrgHatchMapper.xml

New file
@@ -0,0 +1,193 @@
<?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.ComActSocialOrgHatchDAO">

    <resultMap type="com.panzhihua.service_community.entity.ComActSocialOrgHatch" id="ComActSocialOrgHatchMap">
        <result property="id" column="id" jdbcType="INTEGER"/>
        <result property="name" column="name" jdbcType="VARCHAR"/>
        <result property="responsibility" column="responsibility" jdbcType="VARCHAR"/>
        <result property="phone" column="phone" jdbcType="VARCHAR"/>
        <result property="hatchUnit" column="hatch_unit" jdbcType="INTEGER"/>
        <result property="hatchUnitType" column="hatch_unit_type" jdbcType="INTEGER"/>
        <result property="hatchUnitName" column="hatch_unit_name" jdbcType="VARCHAR"/>
        <result property="status" column="status" jdbcType="INTEGER"/>
        <result property="createdAt" column="created_at" jdbcType="TIMESTAMP"/>
        <result property="updatedAt" column="updated_at" jdbcType="TIMESTAMP"/>
        <result property="introduction" column="introduction" jdbcType="VARCHAR"/>
        <result property="logo" column="logo" jdbcType="VARCHAR"/>
        <result property="applyReason" column="apply_reason" jdbcType="VARCHAR"/>
        <result property="serviceScope" column="service_scope" jdbcType="VARCHAR"/>
    </resultMap>

    <!-- 批量插入 -->
    <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
        insert into smart_life.com_act_social_org_hatch(name, responsibility, phone, hatch_unit, hatch_unit_type,
        hatch_unit_name, status, created_at, updated_at, introduction, logo, apply_reason, service_scope)
        values
        <foreach collection="entities" item="entity" separator=",">
            (#{entity.name}, #{entity.responsibility}, #{entity.phone}, #{entity.hatchUnit}, #{entity.hatchUnitType},
            #{entity.hatchUnitName}, #{entity.status}, #{entity.createdAt}, #{entity.updatedAt}, #{entity.introduction},
            #{entity.logo}, #{entity.applyReason}, #{entity.serviceScope})
        </foreach>
    </insert>
    <!-- 批量插入或按主键更新 -->
    <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
        insert into smart_life.com_act_social_org_hatch(name, responsibility, phone, hatch_unit, hatch_unit_type,
        hatch_unit_name, status, created_at, updated_at, introduction, logo, apply_reason, service_scope)
        values
        <foreach collection="entities" item="entity" separator=",">
            (#{entity.name}, #{entity.responsibility}, #{entity.phone}, #{entity.hatchUnit}, #{entity.hatchUnitType},
            #{entity.hatchUnitName}, #{entity.status}, #{entity.createdAt}, #{entity.updatedAt}, #{entity.introduction},
            #{entity.logo}, #{entity.applyReason}, #{entity.serviceScope})
        </foreach>
        on duplicate key update
        name = values(name) , responsibility = values(responsibility) , phone = values(phone) , hatch_unit =
        values(hatch_unit) , hatch_unit_type = values(hatch_unit_type) , hatch_unit_name = values(hatch_unit_name) ,
        status = values(status) , created_at = values(created_at) , updated_at = values(updated_at) , introduction =
        values(introduction) , logo = values(logo) , apply_reason = values(apply_reason) , service_scope =
        values(service_scope)
    </insert>
    <select id="pageOrgHatch" resultType="com.panzhihua.common.model.vos.community.social.SocialOrgHatchVO">
        SELECT id, `name`, responsibility, phone, hatch_unit_name, created_at, `status`
        FROM com_act_social_org_hatch
        <where>
            <if test="pageHatchDTO.keyword != null and pageHatchDTO.keyword != &quot;&quot;">
                AND (`name` LIKE CONCAT(#{pageHatchDTO.keyword}, '%')
                OR responsibility LIKE CONCAT(#{pageHatchDTO.keyword}, '%')
                OR phone LIKE CONCAT(#{pageHatchDTO.keyword}, '%'))
            </if>
            <if test="pageHatchDTO.hatchUnit != null and pageHatchDTO.hatchUnitType != null">
                AND hatch_unit = #{pageHatchDTO.hatchUnit} AND hatch_unit_type = #{pageHatchDTO.hatchUnitType}
            </if>
            <if test="pageHatchDTO.status != null">
                AND `status` = #{pageHatchDTO.status}
            </if>
        </where>
        ORDER BY created_at DESC
    </select>
    <select id="detailOrgHatch" resultType="com.panzhihua.common.model.vos.community.social.SocialOrgHatchVO">
        SELECT a.*, GROUP_CONCAT(c.`name`) AS serviceScopeName
        FROM com_act_social_org_hatch a
        JOIN mysql.help_topic b ON b.help_topic_id &lt; ( length( a.service_scope ) - length( REPLACE ( a.service_scope, ',', '' ))+ 1 )
        LEFT JOIN com_act_column c ON substring_index( substring_index( a.service_scope, ',', b.help_topic_id + 1 ), ',',- 1 ) = c.id
        WHERE a.id = #{id}
    </select>
    <select id="getHatchBaseData"
            resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenHatchStatisticsInfo">
        SELECT
        (SELECT COUNT(id) FROM (SELECT id
        FROM com_act_social_org_hatch_audit t
        LEFT JOIN com_act t1 ON t.hatch_unit = t1.community_id
        WHERE t.hatch_unit_type = 2 AND t.`status` IN(1,2) AND t1.street_id = #{streetId}
        UNION ALl
        SELECT id
        FROM com_act_social_org_hatch_audit
        WHERE hatch_unit_type = 1 AND `status` IN(1,2) AND hatch_unit = #{streetId}
        UNION ALL
        SELECT id
        FROM com_act_social_org t
        LEFT JOIN com_act t1 ON t.affiliated_unit = t1.community_id
        WHERE t.build_type = 1 AND t.is_society = 1 AND t.affiliated_unit_type = 2 AND t.`status` = 1 AND t1.street_id = #{streetId}
        UNION ALl
        SELECT id
        FROM com_act_social_org
        WHERE build_type = 1 AND is_society = 1 AND affiliated_unit_type = 1 AND `status` = 1 AND affiliated_unit = #{streetId}
        ) temp) AS hatchCenterTotal,
        (SELECT COUNT(id) FROM (SELECT id
        FROM com_act_social_org t
        LEFT JOIN com_act t1 ON t.affiliated_unit = t1.community_id
        WHERE t.build_type = 1 AND t.is_society = 1 AND t.affiliated_unit_type = 2 AND t.`status` = 1 AND t1.street_id = #{streetId}
        UNION ALl
        SELECT id
        FROM com_act_social_org
        WHERE build_type = 1 AND is_society = 1 AND affiliated_unit_type = 1 AND `status` = 1 AND affiliated_unit = #{streetId}) temp) AS hatchResultTotal,
        (SELECT COUNT(id) FROM (SELECT id
        FROM com_act_social_org t
        LEFT JOIN com_act t1 ON t.affiliated_unit = t1.community_id
        WHERE t.build_type = 1 AND t.is_society = 1 AND t.affiliated_unit_type = 2 AND t.`status` = 1 AND t1.area_code = '510423'
        UNION ALL
        SELECT id
        FROM com_act_social_org t
        LEFT JOIN com_street t1 ON t.affiliated_unit = t1.street_id
        WHERE t.build_type = 1 AND t.is_society = 1 AND t.affiliated_unit_type = 1 AND t.`status` = 1 AND t1.area_code = '510423') temp) AS westAreaOrgTotal
    </select>
    <select id="getHatchScheduleCircleData"
            resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT filed, COUNT(filed) AS num FROM (
        SELECT
        CASE
        WHEN t.`status` = 1 THEN '孵化中'
        WHEN t.`status` = 2 THEN '孵化完成'
        END filed
        FROM com_act_social_org_hatch t
        LEFT JOIN com_act t1 ON t.hatch_unit = t1.community_id
        WHERE t.hatch_unit_type = 2 AND t1.street_id = #{streetId}
        UNION ALl
        SELECT
        CASE
        WHEN `status` = 1 THEN '孵化中'
        WHEN `status` = 2 THEN '孵化完成'
        END filed
        FROM com_act_social_org_hatch
        WHERE hatch_unit_type = 1 AND hatch_unit = #{streetId}
        ) temp GROUP BY filed
    </select>
    <select id="getHatchStatusColumnData"
            resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT filed, SUM(num) AS num FROM (
        SELECT '已进驻' AS filed, COUNT(id) AS num
        FROM com_act_social_org_hatch_audit t
        LEFT JOIN com_act t1 ON t.hatch_unit = t1.community_id
        WHERE t.hatch_unit_type = 2 AND t.`status` = 1 AND t1.street_id = #{streetId}
        UNION ALl
        SELECT '已进驻' AS filed, COUNT(id) AS num
        FROM com_act_social_org_hatch_audit
        WHERE hatch_unit_type = 1 AND `status` = 1 AND hatch_unit = #{streetId}
        UNION ALl
        SELECT '孵化中' AS filed, COUNT(id) AS num
        FROM com_act_social_org_hatch t
        LEFT JOIN com_act t1 ON t.hatch_unit = t1.community_id
        WHERE t.hatch_unit_type = 2 AND t.`status` = 1 AND t1.street_id = #{streetId}
        UNION ALL
        SELECT '孵化中' AS filed, COUNT(id) AS num
        FROM com_act_social_org_hatch
        WHERE hatch_unit_type = 1 AND `status` = 1 AND hatch_unit = #{streetId}
        UNION ALl
        SELECT '通过评估' AS filed, COUNT(id) AS num
        FROM com_act_social_org_hatch t
        LEFT JOIN com_act t1 ON t.hatch_unit = t1.community_id
        WHERE t.hatch_unit_type = 2 AND t.`status` = 2 AND t1.street_id = #{streetId}
        UNION ALL
        SELECT '通过评估' AS filed, COUNT(id) AS num
        FROM com_act_social_org_hatch
        WHERE hatch_unit_type = 1 AND `status` = 2 AND hatch_unit = #{streetId}
        UNION ALL
        SELECT '出壳' AS filed, COUNT(id) AS num
        FROM com_act_social_org t
        LEFT JOIN com_act t1 ON t.affiliated_unit = t1.community_id
        WHERE t.build_type = 1 AND t.is_society = 1 AND t.affiliated_unit_type = 2 AND t.`status` = 1 AND t1.street_id = #{streetId}
        UNION ALL
        SELECT '出壳' AS filed, COUNT(id) AS num
        FROM com_act_social_org
        WHERE build_type = 1 AND is_society = 1 AND affiliated_unit_type = 1 AND `status` = 1 AND affiliated_unit = #{streetId}
        ) temp GROUP BY filed
    </select>
    <select id="getStreetOrgColumnData" resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT t2.`name` AS filed, COUNT(t2.`name`) AS num
        FROM com_act_social_org t
        JOIN com_street t2 ON t.street_id = t2.street_id
        WHERE t2.area_code = '510423' AND t.is_society = 1
        GROUP BY filed
    </select>
    <select id="getStreetOrgChildData" resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT filed, COUNT(filed) AS num FROM(
        SELECT substring_index( substring_index( t.service_type, ',', b.help_topic_id + 1 ), ',',- 1 ) AS filed
        FROM com_act_social_org t
        JOIN com_street t2 ON t.street_id = t2.street_id
        JOIN mysql.help_topic b ON b.help_topic_id &lt; ( length( t.service_type ) - length( REPLACE ( t.service_type, ',', '' ))+ 1 )
        WHERE t2.area_code = '510423' AND t.is_society = 1 AND t2.`name` = #{streetName}) temp
        GROUP BY filed
    </select>

</mapper>


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialOrgMapper.xml

@@ -43,12 +43,11 @@
    </resultMap>

    <select id="pageList" resultType="com.panzhihua.common.model.vos.community.ComActSocialOrgVO">
        select t.*,t1.account,t1.password,t2.role_id as roleId,t4.name as streetName,t5.name as serviceName,t6.name as communityName from com_act_social_org t
        select t.*,t1.account,t1.password,t2.role_id as roleId,t4.name as streetName,t6.name as communityName from com_act_social_org t
        left join sys_user t1 on t.user_id = t1.user_id
        left join sys_user_role t2 on t.user_id = t2.user_id
        left join com_street t4 on t.street_id = t4.street_id
        left join com_act t6 on t.community_id = t6.community_id
        left join com_act_column t5 on t.service_type = t5.id
        <where>
            1=1
            <if test="commonPage.type!=null">
@@ -72,12 +71,6 @@
            <if test="commonPage.systemName!=null and commonPage.systemName!=''">
                and t.contact_name like concat(#{commonPage.systemName},'%')
            </if>
            <if test="commonPage.paramId!=null">
                and t.community_id = ${commonPage.paramId}
            </if>
            <if test="commonPage.communityId!=null">
                and t.community_id =#{commonPage.communityId}
            </if>
            <if test="commonPage.streetId!=null">
                and t.street_id =#{commonPage.streetId}
            </if>
@@ -87,22 +80,33 @@
            <if test="commonPage.status!=null">
                and t.status = #{commonPage.status}
            </if>
            <if test="commonPage.paramId2!=null">
            <if test="commonPage.paramId2 == 1">
                and t.is_society = #{commonPage.paramId2}
                <if test="commonPage.communityId!=null">
                    and t.affiliated_unit_type = 2 AND t.affiliated_unit = #{commonPage.communityId}
                </if>
                <if test="commonPage.paramId!=null and commonPage.paramId!=0">
                    and t.affiliated_unit_type = 2 AND t.affiliated_unit = ${commonPage.paramId}
                </if>
            </if>
            <if test="commonPage.paramId2==null">
                and t.is_society is null
                <if test="commonPage.communityId!=null">
                    and t.community_id =#{commonPage.communityId}
                </if>
                <if test="commonPage.paramId!=null">
                    and t.community_id = ${commonPage.paramId}
                </if>
            </if>
        </where>
        order by t.create_at desc
    </select>

    <select id="detail" resultType="com.panzhihua.common.model.vos.community.ComActSocialOrgVO">
        select t.*,t1.account,t1.password,t2.role_id as roleId,t4.name as streetName,t5.name as serviceName from com_act_social_org t
        left join sys_user t1 on t.user_id = t1.user_id
        left join sys_user_role t2 on t.user_id = t2.user_id
        left join com_street t4 on t.street_id = t4.street_id
        left join com_act_column t5 on t.service_type = t5.id
        select t.*,t1.account,t1.password,t2.role_id as roleId,t4.name as streetName from com_act_social_org t
                                                                                              left join sys_user t1 on t.user_id = t1.user_id
                                                                                              left join sys_user_role t2 on t.user_id = t2.user_id
                                                                                              left join com_street t4 on t.street_id = t4.street_id
        where t.id=#{id}
    </select>

@@ -112,5 +116,87 @@
    <select id="selectType" resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkProjectTypeInfo">
        select count(*) count,t1.name from com_act_social_org t INNER JOIN com_act_column t1 on t.service_type = t1.id  where t.street_id = 15 <if test="communityId!=null"> and t.community_id = #{communityId}</if> GROUP BY t1.id
    </select>
    <select id="selectOrgByUserId" resultType="com.panzhihua.service_community.entity.ComActSocialOrg">
        SELECT t1.*
        FROM com_act_social_org t1
                 LEFT JOIN sys_user t2 ON t1.contact_phone = t2.phone AND t2.`type` = 1
        WHERE t2.user_id = #{userId} AND t1.is_society = 1
    </select>
    <select id="pageHatchResult" resultType="com.panzhihua.common.model.vos.community.ComActSocialOrgVO">
        SELECT t.id, t.`name`, t.company_type, t.attach_url, t.streetName, t.create_at, t.service_type,
               (SELECT COUNT(id) FROM com_act_social_member WHERE org_id = t.id) AS staffCount,
               (SELECT COUNT(id) FROM com_act_social_project WHERE responsibility_type = 3 AND responsibility_id = t.id) AS undertakeProjectNum,
               (SELECT COUNT(id) FROM com_act_activity WHERE `type` = 4 AND project_id IN (
                   SELECT id FROM com_act_social_project WHERE responsibility_type = 3 AND responsibility_id = t.id)
               ) AS startActNum
        FROM (
                 SELECT t.*, t2.`name` AS streetName
                 FROM com_act_social_org t
                          LEFT JOIN com_act t1 ON t.affiliated_unit = t1.community_id
                          LEFT JOIN com_street t2 ON t1.street_id = t2.street_id
                 WHERE t.build_type = 1 AND t.is_society = 1 AND t.affiliated_unit_type = 2 AND t.`status` = 1 AND t1.street_id = #{streetId}
                 UNION ALL
                 SELECT t.*, t1.`name` AS streetName
                 FROM com_act_social_org t
                          LEFT JOIN com_street t1 ON t.affiliated_unit = t1.street_id
                 WHERE t.build_type = 1 AND t.is_society = 1 AND t.affiliated_unit_type = 1 AND t.`status` = 1 AND t.affiliated_unit = #{streetId}) t
    </select>
    <select id="pageHatchSchedule" resultType="com.panzhihua.common.model.vos.community.ComActSocialOrgVO">
        SELECT t.id, t.`name`, 1 AS hatchSchedule, null AS affiliated_unit_name
        FROM com_act_social_org_hatch_audit t
                 LEFT JOIN com_act t1 ON t.hatch_unit = t1.community_id
        WHERE t.hatch_unit_type = 2 AND t.`status` = 1 AND t1.street_id = #{streetId}
        UNION ALl
        SELECT id, `name`, 1 AS hatchSchedule, null AS affiliated_unit_name
        FROM com_act_social_org_hatch_audit
        WHERE hatch_unit_type = 1 AND `status` = 1 AND hatch_unit = #{streetId}
        UNION ALl
        SELECT t.id, t.`name`, 2 AS hatchSchedule, null AS affiliated_unit_name
        FROM com_act_social_org_hatch t
                 LEFT JOIN com_act t1 ON t.hatch_unit = t1.community_id
        WHERE t.hatch_unit_type = 2 AND t.`status` = 1 AND t1.street_id = #{streetId}
        UNION ALL
        SELECT id, `name`, 2 AS hatchSchedule, null AS affiliated_unit_name
        FROM com_act_social_org_hatch
        WHERE hatch_unit_type = 1 AND `status` = 1 AND hatch_unit = #{streetId}
        UNION ALl
        SELECT t.id, t.`name`, 3 AS hatchSchedule, null AS affiliated_unit_name
        FROM com_act_social_org_hatch t
                 LEFT JOIN com_act t1 ON t.hatch_unit = t1.community_id
        WHERE t.hatch_unit_type = 2 AND t.`status` = 2 AND t1.street_id = #{streetId}
        UNION ALL
        SELECT id, `name`, 3 AS hatchSchedule, null AS affiliated_unit_name
        FROM com_act_social_org_hatch
        WHERE hatch_unit_type = 1 AND `status` = 2 AND hatch_unit = #{streetId}
        UNION ALL
        SELECT t.id, t.`name`, 4 AS hatchSchedule, affiliated_unit_name
        FROM com_act_social_org t
                 LEFT JOIN com_act t1 ON t.affiliated_unit = t1.community_id
        WHERE t.build_type = 1 AND t.is_society = 1 AND t.affiliated_unit_type = 2 AND t.`status` = 1 AND t1.street_id = #{streetId}
        UNION ALL
        SELECT id, `name`, 4 AS hatchSchedule, affiliated_unit_name
        FROM com_act_social_org
        WHERE build_type = 1 AND is_society = 1 AND affiliated_unit_type = 1 AND `status` = 1 AND affiliated_unit = #{streetId}
    </select>

    <select id="pageSocialOrgList" resultType="com.panzhihua.common.model.vos.community.ComActSocialOrgVO">
        SELECT t.id, t.`name`, t.company_type, t.attach_url, t.streetName, t.create_at, t.service_type,
               (SELECT COUNT(id) FROM com_act_social_member WHERE org_id = t.id) AS staffCount,
               (SELECT COUNT(id) FROM com_act_social_project WHERE responsibility_type = 3 AND responsibility_id = t.id) AS undertakeProjectNum,
               (SELECT COUNT(id) FROM com_act_activity WHERE `type` = 4 AND project_id IN (
                   SELECT id FROM com_act_social_project WHERE responsibility_type = 3 AND responsibility_id = t.id)
               ) AS startActNum
        FROM (
                 SELECT t.*, t2.`name` AS streetName
                 FROM com_act_social_org t
                          LEFT JOIN com_act t1 ON t.affiliated_unit = t1.community_id
                          LEFT JOIN com_street t2 ON t1.street_id = t2.street_id
                 WHERE t.is_society = 1 AND t.affiliated_unit_type = 2 AND t.`status` = 1 AND t1.street_id = #{streetId}
                 UNION ALL
                 SELECT t.*, t1.`name` AS streetName
                 FROM com_act_social_org t
                          LEFT JOIN com_street t1 ON t.affiliated_unit = t1.street_id
                 WHERE t.is_society = 1 AND t.affiliated_unit_type = 1 AND t.`status` = 1 AND t.affiliated_unit = #{streetId}) t
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialProjectMapper.xml

@@ -15,6 +15,7 @@
        <result property="url" column="url"/>
        <result property="image" column="image"/>
        <result property="content" column="content"/>
        <result property="phone" column="phone"/>
    </resultMap>

    <select id="pageList" resultType="com.panzhihua.common.model.vos.community.social.SocialProjectVO">
@@ -24,12 +25,20 @@
        <where>
            1=1
            <if test="commonPage.paramId2==null">
                <if test="commonPage.communityId !=0 and commonPage.communityId !=null">
                    and (t.community_id =#{commonPage.communityId} or t.responsibility_id =#{commonPage.communityId})
                <if test="commonPage.orgId != null">
                    AND t.responsibility_type = 3 AND t.responsibility_id = #{commonPage.orgId}
                </if>
                <if test="commonPage.streetId !=0 and commonPage.streetId !=null">
                    and t.street_id =#{commonPage.streetId}
                <if test="commonPage.orgId == null">
                    <if test="commonPage.communityId !=0 and commonPage.communityId !=null">
                        and t.responsibility_type = 2 AND t.responsibility_id =#{commonPage.communityId}
                    </if>
                    <if test="commonPage.streetId !=0 and commonPage.streetId !=null">
                        and (t.street_id =#{commonPage.streetId} OR (t.responsibility_type = 1 AND t.responsibility_id =#{commonPage.streetId}))
                    </if>
                </if>
            </if>
            <if test="commonPage.isPublicity == 1">
                and t.is_publicity = 1
            </if>
            <if test="commonPage.paramId2!=null">
                and (t.street_id = #{commonPage.streetId} or t.community_id =#{commonPage.communityId})
@@ -150,4 +159,44 @@
                 left join com_act_column t2 on t.second_column_id = t2.id
        where t.id = #{id}
    </select>
    <select id="pageProjectSignList" resultType="com.panzhihua.common.model.vos.community.ComActSocialOrgVO">
        SELECT t1.id, t1.`name`, t1.corporation_name, t1.contact_phone, t1.company_type, t1.attach_url, t3.`name` AS serviceName
        FROM com_act_social_org t1
                 LEFT JOIN com_act_social_project_sign t2 ON t1.id = t2.org_id
                 LEFT JOIN com_act_column t3 ON t1.service_type = t3.id
        WHERE t2.project_id = #{pageProjectSignListDTO.projectId}
        ORDER BY t2.created_at DESC
    </select>
    <select id="pageProjectWhichIsSignedByUser"
            resultType="com.panzhihua.common.model.vos.community.social.SocialProjectVO">
        SELECT t.*, t2.name AS columnName, t3.name AS secondColumnName
        FROM com_act_social_project t
                 INNER JOIN com_act_social_project_sign t1 ON t.id = t1.project_id
                 LEFT JOIN com_act_column t2 ON t.column_id = t2.id
                 LEFT JOIN com_act_column t3 ON t.second_column_id = t3.id
        WHERE t1.user_id = #{pageProjectDTO.userId}
        ORDER BY t1.created_at DESC
    </select>

    <select id="pageSocialProjectList"
            resultType="com.panzhihua.common.model.vos.community.social.SocialProjectVO">
        SELECT id, `name`, image
        FROM com_act_social_project
        WHERE street_id = #{streetId}
    </select>
    <select id="getFiveAssociationsBaseData"
            resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenFiveAssociationsStatisticsInfo">
        SELECT
                (SELECT COUNT(community_id) FROM com_act WHERE street_id = #{streetId}) AS communityNum,
                (SELECT COUNT(id) FROM (SELECT id FROM com_act_social_org t
                                                           LEFT JOIN com_act t1 ON t.affiliated_unit = t1.community_id
                                        WHERE t.is_society = 1 AND t.affiliated_unit_type = 2 AND t.`status` = 1 AND t1.street_id = #{streetId}
                                        UNION ALL
                                        SELECT id FROM com_act_social_org
                                        WHERE is_society = 1 AND affiliated_unit_type = 1 AND `status` = 1 AND affiliated_unit = #{streetId}) temp) AS socialOrgNum,
                (SELECT COUNT(id) FROM com_act_enterprise WHERE street_id = #{streetId}) AS enterpriseNum,
                (SELECT COUNT(id) FROM com_act_social_worker WHERE community_id = ${communityId} OR street_id = #{streetId}) AS socialWorkerNum,
                (SELECT COUNT(id) FROM com_act_social_project WHERE responsibility_type = 3 AND responsibility_id IN (SELECT id FROM com_act_social_org WHERE community_id = ${communityId} AND is_society = 1)) AS acceptProjectTotal,
                (SELECT COUNT(id) FROM com_mng_volunteer_mng WHERE community_id = ${communityId} AND state = 2) AS volunteerNum
    </select>
</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialProjectPublicityMapper.xml

@@ -14,13 +14,15 @@
    </resultMap>

    <select id="pageList" resultType="com.panzhihua.common.model.vos.community.social.ComActSocialProjectPublicityVO">
        select t.*,t1.name,t1.responsibility from com_act_social_project_publicity t left join com_act_social_project t1 on t.project_id = t1.id
        select t.*,t1.name,t1.responsibility
        from com_act_social_project_publicity t
        left join com_act_social_project t1 on t.project_id = t1.id
        <if test="commonPage.streetId != null">
            JOIN (SELECT * FROM com_act_social_project WHERE (street_id = #{commonPage.streetId} OR community_id = #{commonPage.communityId}) AND `status` =3) t2 ON t.project_id = t2.id
        </if>
        <where>
            <if test="commonPage.paramId !=null">
                and t.project_id =#{commonPage.paramId}
            </if>
            <if test="commonPage.communityId !=null">
                and t1.community_id =#{commonPage.communityId}
            </if>
        </where>
        order by is_top desc,create_time desc

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialProjectSignMapper.xml

New file
@@ -0,0 +1,32 @@
<?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.ComActSocialProjectSignDAO">

    <resultMap type="com.panzhihua.service_community.entity.ComActSocialProjectSign" id="ComActSocialProjectSignMap">
        <result property="id" column="id" jdbcType="INTEGER"/>
        <result property="orgId" column="org_id" jdbcType="INTEGER"/>
        <result property="projectId" column="project_id" jdbcType="INTEGER"/>
        <result property="createdAt" column="created_at" jdbcType="TIMESTAMP"/>
        <result property="userId" column="user_id" jdbcType="INTEGER"/>
    </resultMap>

    <!-- 批量插入 -->
    <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
        insert into smart_life.com_act_social_project_sign(org_id, project_id, created_at, user_id)
        values
        <foreach collection="entities" item="entity" separator=",">
        (#{entity.orgId}, #{entity.projectId}, #{entity.createdAt}, #{entity.userId})
        </foreach>
    </insert>
    <!-- 批量插入或按主键更新 -->
    <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
        insert into smart_life.com_act_social_project_sign(org_id, project_id, created_at, user_id)
        values
        <foreach collection="entities" item="entity" separator=",">
            (#{entity.orgId}, #{entity.projectId}, #{entity.createdAt}, #{entity.userId})
        </foreach>
        on duplicate key update
         org_id = values(org_id) , project_id = values(project_id) , created_at = values(created_at) , user_id = values(user_id)     </insert>

</mapper>


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialWorkerMapper.xml

@@ -25,10 +25,17 @@
    <select id="findByPage" resultType="com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO"
            parameterType="com.panzhihua.common.model.dtos.civil.PageComActSocialWorkerDTO">
        SELECT a.*,b.name as socialOrgId,c.name as communityName,e.name as streetId
        FROM com_act_social_worker a left join com_act_social_org b on a.social_org_id = b.id
        FROM com_act_social_worker a
        left join com_act_social_org b on a.social_org_id = b.id
        left join com_act c on a.community_id = c.community_id
        left join com_street e on c.street_id = e.street_id
        <if test="pageComActSocialWorkerDTO.skillType != null">
            JOIN mysql.help_topic h ON h.help_topic_id &lt; ( length( a.skill_type ) - length( REPLACE ( a.skill_type, ',', '' ))+ 1 )
        </if>
        <where>
            <if test="pageComActSocialWorkerDTO.skillType != null">
                AND substring_index( substring_index( a.skill_type, ',', h.help_topic_id + 1 ), ',',- 1 ) = #{pageComActSocialWorkerDTO.skillType}
            </if>
            <if test="pageComActSocialWorkerDTO.id!=null">
                AND a.id = #{pageComActSocialWorkerDTO.id}
            </if>
@@ -130,4 +137,13 @@
                 left join com_street e on c.street_id = e.street_id
        where a.id =#{id}
    </select>
    <select id="selectIncludeSkillWorkerList"
            resultType="com.panzhihua.service_community.entity.ComActSocialWorker">
        SELECT
            a.*
        FROM
            com_act_social_worker a
                JOIN mysql.help_topic b ON b.help_topic_id &lt; ( length( a.skill_type ) - length( REPLACE ( a.skill_type, ',', '' ))+ 1 )
        WHERE substring_index( substring_index( a.skill_type, ',', b.help_topic_id + 1 ), ',',- 1 ) = #{id}
    </select>
</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComStreetMapper.xml

New file
@@ -0,0 +1,26 @@
<?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.ComStreetDAO">

    <resultMap type="com.panzhihua.service_community.model.dos.ComStreetDO" id="baseResultMapper">
        <result property="streetId" column="street_id"/>
        <result property="name" column="name"/>
        <result property="provinceCode" column="province_code"/>
        <result property="cityCode" column="city_code"/>
        <result property="areaCode" column="area_code"/>
        <result property="address" column="address"/>
        <result property="lng" column="lng"/>
        <result property="lat" column="lat"/>
        <result property="account" column="account"/>
        <result property="password" column="password"/>
        <result property="createAt" column="create_at"/>
    </resultMap>
    <select id="retrieveRegions" resultType="java.lang.String">
        SELECT CONCAT(t1.province_name,t2.city_name,t3.district_name)
        FROM com_mng_struct_area_province t1
        LEFT JOIN com_mng_struct_area_city t2 ON t1.id = t2.province_id
        LEFT JOIN com_mng_struct_area_district t3 ON t2.id = t3.city_id
        WHERE t3.district_adcode = #{areaCode}
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/McsMerchantMapper.xml

@@ -61,12 +61,15 @@
            #{item}
        </foreach>
    </update>
    <update id="enableUserStatus">
        UPDATE sys_user SET `status` = 1 WHERE user_id = #{userId}
    </update>
    <select id="getMcsMerchantById"
            resultType="com.panzhihua.common.model.vos.community.microCommercialStreet.McsMerchantVO">
        SELECT t1.id, t1.`name`, t1.phone, t1.account, t1.`level`, t1.expire_at, t1.first_lit_at, t1.publish_limit,
        t1.logo, t1.address, t1.lat, t1.lon, t1.introduction, t2.`status` AS accountStatus
               t1.logo, t1.address, t1.lat, t1.lon, t1.introduction, t2.`status` AS accountStatus
        FROM mcs_merchant t1
        LEFT JOIN sys_user t2 ON t1.user_id = t2.user_id
                 LEFT JOIN sys_user t2 ON t1.user_id = t2.user_id
        WHERE t1.id = #{merchantId} AND t1.is_del = 0
    </select>
    <select id="pageMcsMerchant"
@@ -92,59 +95,59 @@
    <select id="getMcsMerchantByAccount"
            resultType="com.panzhihua.common.model.vos.community.microCommercialStreet.McsMerchantVO">
        SELECT t1.id, t1.`name`, t1.phone, t1.account, t1.`level`, t1.expire_at, t1.first_lit_at, t1.publish_limit,
        t1.logo, t1.address, t1.lat, t1.lon, t1.introduction, t2.`status` AS accountStatus
               t1.logo, t1.address, t1.lat, t1.lon, t1.introduction, t2.`status` AS accountStatus
        FROM mcs_merchant t1
        LEFT JOIN sys_user t2 ON t1.user_id = t2.user_id
                 LEFT JOIN sys_user t2 ON t1.user_id = t2.user_id
        WHERE t1.account = #{account} AND t1.is_del = 0
    </select>
    <select id="getMcsIndexTopData"
            resultType="com.panzhihua.common.model.vos.community.microCommercialStreet.IndexTopStatisticsVO">
        SELECT randomCoinTotal + averageCoinTotal AS coinTotal,appliedTotal,gameTotal,infoTotal FROM(
            SELECT
            (SELECT IF(SUM(coins) IS NULL,0,SUM(coins)) FROM mcs_game t1
            LEFT JOIN mcs_merchant t2 ON t1.merchant_id = t2.id
            LEFT JOIN sys_user t3 ON t2.user_id = t3.user_id
            WHERE t1.is_del = 0 AND t1.`status` = 2 AND t1.expire_at &gt; NOW() AND t1.allocation = 1 AND t2.is_del = 0 AND t3.`status` = 1)  AS randomCoinTotal,
                                                                                                        SELECT
                                                                                                            (SELECT IF(SUM(coins) IS NULL,0,SUM(coins)) FROM mcs_game t1
                                                                                                                                                                 LEFT JOIN mcs_merchant t2 ON t1.merchant_id = t2.id
                                                                                                                                                                 LEFT JOIN sys_user t3 ON t2.user_id = t3.user_id
                                                                                                             WHERE t1.is_del = 0 AND t1.`status` = 2 AND t1.expire_at &gt; NOW() AND t1.allocation = 1 AND t2.is_del = 0 AND t3.`status` = 1)  AS randomCoinTotal,

            (SELECT IF(SUM(t1.coins * t1.coupons) IS NULL,0,SUM(t1.coins * t1.coupons)) FROM mcs_game t1
            LEFT JOIN mcs_merchant t2 ON t1.merchant_id = t2.id
            LEFT JOIN sys_user t3 ON t2.user_id = t3.user_id
            WHERE t1.is_del = 0 AND t1.`status` = 2 AND t1.expire_at &gt; NOW() AND t1.allocation = 2 AND t2.is_del = 0 AND t3.`status` = 1)  AS averageCoinTotal,
                                                                                                            (SELECT IF(SUM(t1.coins * t1.coupons) IS NULL,0,SUM(t1.coins * t1.coupons)) FROM mcs_game t1
                                                                                                                                                                                                 LEFT JOIN mcs_merchant t2 ON t1.merchant_id = t2.id
                                                                                                                                                                                                 LEFT JOIN sys_user t3 ON t2.user_id = t3.user_id
                                                                                                             WHERE t1.is_del = 0 AND t1.`status` = 2 AND t1.expire_at &gt; NOW() AND t1.allocation = 2 AND t2.is_del = 0 AND t3.`status` = 1)  AS averageCoinTotal,

            (SELECT IF(SUM(coin) IS NULL,0,SUM(coin)) FROM mcs_coupon WHERE to_days(created_at) = to_days(now())) AS appliedTotal,
                                                                                                            (SELECT IF(SUM(coin) IS NULL,0,SUM(coin)) FROM mcs_coupon WHERE to_days(created_at) = to_days(now())) AS appliedTotal,

            (SELECT COUNT(t1.id) FROM mcs_game t1
            LEFT JOIN mcs_merchant t2 ON t1.merchant_id = t2.id
            LEFT JOIN sys_user t3 ON t2.user_id = t3.user_id
            WHERE t1.is_del = 0 AND t1.`status` = 2 AND t1.`type` = 1 AND t1.expire_at &gt; NOW() AND t2.is_del = 0 AND t3.`status` = 1) AS gameTotal,
                                                                                                            (SELECT COUNT(t1.id) FROM mcs_game t1
                                                                                                                                          LEFT JOIN mcs_merchant t2 ON t1.merchant_id = t2.id
                                                                                                                                          LEFT JOIN sys_user t3 ON t2.user_id = t3.user_id
                                                                                                             WHERE t1.is_del = 0 AND t1.`status` = 2 AND t1.`type` = 1 AND t1.expire_at &gt; NOW() AND t2.is_del = 0 AND t3.`status` = 1) AS gameTotal,

            (SELECT COUNT(t1.id) FROM mcs_game t1
            LEFT JOIN mcs_merchant t2 ON t1.merchant_id = t2.id
            LEFT JOIN sys_user t3 ON t2.user_id = t3.user_id
            WHERE t1.is_del = 0 AND t1.`status` = 2 AND t1.`type` = 2 AND t1.expire_at &gt; NOW() AND t2.is_del = 0 AND t3.`status` = 1) AS infoTotal
        ) temp
                                                                                                            (SELECT COUNT(t1.id) FROM mcs_game t1
                                                                                                                                          LEFT JOIN mcs_merchant t2 ON t1.merchant_id = t2.id
                                                                                                                                          LEFT JOIN sys_user t3 ON t2.user_id = t3.user_id
                                                                                                             WHERE t1.is_del = 0 AND t1.`status` = 2 AND t1.`type` = 2 AND t1.expire_at &gt; NOW() AND t2.is_del = 0 AND t3.`status` = 1) AS infoTotal
                                                                                                    ) temp
    </select>
    <select id="pageH5McsMerchant"
            resultType="com.panzhihua.common.model.vos.community.microCommercialStreet.McsMerchantVO">
        SELECT * FROM (
            SELECT t1.id, t1.`name`, t1.phone, t1.account, t1.`level`, t1.expire_at, t1.first_lit_at, t1.publish_limit,
            t1.introduction, t1.logo,
            ROUND(6378.138 * 2 * ASIN(SQRT(POW(SIN((t1.lat * PI() / 180 - #{pageMcsMerchantDTO.lat} * PI() / 180) / 2),2) +
            COS(t1.lat * PI() / 180) * COS(#{pageMcsMerchantDTO.lat} * PI() / 180) * POW(SIN((t1.lon * PI() / 180 -
            #{pageMcsMerchantDTO.lon} * PI() / 180) / 2),2))), 2) AS distance
            FROM mcs_merchant t1
            LEFT JOIN sys_user t2 ON t1.user_id = t2.user_id
            <if test="pageMcsMerchantDTO.type != null">
        SELECT t1.id, t1.`name`, t1.phone, t1.account, t1.`level`, t1.expire_at, t1.first_lit_at, t1.publish_limit,
        t1.introduction, t1.logo,
        ROUND(6378.138 * 2 * ASIN(SQRT(POW(SIN((t1.lat * PI() / 180 - #{pageMcsMerchantDTO.lat} * PI() / 180) / 2),2) +
        COS(t1.lat * PI() / 180) * COS(#{pageMcsMerchantDTO.lat} * PI() / 180) * POW(SIN((t1.lon * PI() / 180 -
        #{pageMcsMerchantDTO.lon} * PI() / 180) / 2),2))), 2) AS distance
        FROM mcs_merchant t1
        LEFT JOIN sys_user t2 ON t1.user_id = t2.user_id
        <if test="pageMcsMerchantDTO.type != null">
            LEFT JOIN (SELECT * FROM mcs_game
            WHERE `status` = 2 AND `type` = #{pageMcsMerchantDTO.type} AND expire_at &gt; NOW() GROUP BY merchant_id) t3 ON t1.id = t3.merchant_id
            </if>
            WHERE t1.is_del = 0 AND t1.expire_at &gt; NOW() AND t2.`status` = 1
            <if test="pageMcsMerchantDTO.type != null">
                AND t3.id IS NOT NULL
            </if>
            <if test="pageMcsMerchantDTO.keyword != null and pageMcsMerchantDTO.keyword != &quot;&quot;">
                AND t1.`name` LIKE CONCAT(#{pageMcsMerchantDTO.keyword}, '%')
            </if>
        </if>
        WHERE t1.is_del = 0 AND t1.expire_at &gt; NOW() AND t2.`status` = 1
        <if test="pageMcsMerchantDTO.type != null">
            AND t3.id IS NOT NULL
        </if>
        <if test="pageMcsMerchantDTO.keyword != null and pageMcsMerchantDTO.keyword != &quot;&quot;">
            AND t1.`name` LIKE CONCAT(#{pageMcsMerchantDTO.keyword}, '%')
        </if>
        ) temp WHERE 1=1
        <if test="pageMcsMerchantDTO.distance != null">
            <if test="pageMcsMerchantDTO.isMore != null and pageMcsMerchantDTO.isMore ==1">

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

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

    <resultMap type="com.panzhihua.service_dangjian.model.dos.ComPbServiceTeamDO" id="ComPbServiceTeamMap">
        <result property="id" column="id" jdbcType="INTEGER"/>
        <result property="name" column="name" jdbcType="VARCHAR"/>
        <result property="job" column="job" jdbcType="VARCHAR"/>
        <result property="jobTwo" column="job_two" jdbcType="VARCHAR"/>
        <result property="url" column="url" jdbcType="VARCHAR"/>
        <result property="createAt" column="create_at" jdbcType="TIMESTAMP"/>
        <result property="communityId" column="community_id" jdbcType="INTEGER"/>
        <result property="jobResponsibilities" column="job_responsibilities" jdbcType="VARCHAR"/>
        <result property="phone" column="phone" jdbcType="VARCHAR"/>
        <result property="isReg" column="is_reg" jdbcType="INTEGER"/>
        <result property="cardNo" column="card_no" jdbcType="VARCHAR"/>
    </resultMap>

    <select id="PageComPbServiceTeamDTO"
            resultType="com.panzhihua.common.model.vos.partybuilding.ComPbServiceTeamVO">
        SELECT t1.*, t2.`name` AS communityName
        FROM com_pb_service_team t1
        LEFT JOIN com_act t2 ON t1.community_id = t2.community_id
        WHERE 1=1
        <if test="pageComPbServiceTeamDTO.streetId != null">
            AND t2.street_id = #{pageComPbServiceTeamDTO.streetId}
        </if>
        <if test="pageComPbServiceTeamDTO.communityId != null">
            AND t1.community_id = ${pageComPbServiceTeamDTO.communityId}
        </if>
        <if test ="pageComPbServiceTeamDTO.name != null and pageComPbServiceTeamDTO.name.trim() != &quot;&quot;">
            AND t1.`name` LIKE concat(#{pageComPbServiceTeamDTO.name}, '%' )
        </if>
        <if test="pageComPbServiceTeamDTO.keyword != null and pageComPbServiceTeamDTO.keyword.trim() != &quot;&quot;">
            AND(t1.`name` LIKE concat(#{pageComPbServiceTeamDTO.keyword}, '%' )
            OR t1.phone LIKE concat(#{pageComPbServiceTeamDTO.keyword}, '%' ))
        </if>
        <if test="pageComPbServiceTeamDTO.job != null and pageComPbServiceTeamDTO.job.trim() != &quot;&quot;">
            AND t1.job LIKE concat( #{pageComPbServiceTeamDTO.job}, '%')
        </if>
    </select>

</mapper>


 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/config/WebSocketClient.java

@@ -71,6 +71,39 @@
    }

    @Async
    void dealNewData(String message) {
        comPropertyAlarmDao = SpringUtil.getBean(ComPropertyAlarmDao.class);
        JSONObject deviceMess = JSONObject.parseObject(message);
        boolean checkFlag =
                ("trace_call".equals(deviceMess.getString("cmd")) && (StringUtils.isNotEmpty(deviceMess.getString("userid"))));
        if (checkFlag) {
            log.info("已经接收到报警记录，记录信息:{}",deviceMess.toJSONString());
            boolean panzhihuaDevice = deviceMess.getString("userid").startsWith("7") || deviceMess.getString("userid").startsWith("8");
            if(panzhihuaDevice) {
                log.info("报警记录是攀枝花设备7-8开头的设备");
                logger.info("收到设备报警信息：{}", message);
                for (int i = 1; i < 10; i++) {
                    if (org.apache.commons.lang.StringUtils.isNotEmpty(deviceMess.getString("num" + i))) {
                        ComPropertyAlarm comPropertyAlarm = new ComPropertyAlarm();
                        comPropertyAlarm.setSerialNo(deviceMess.getString("userid"));
                        comPropertyAlarm.setReceiveNo(deviceMess.getString("num" + i));
                        comPropertyAlarm.setStatus(0);
                        // 10位的秒级别的时间戳
                        Date createDate = new Date(deviceMess.getLong("ts" + i) * 1000);
                        //对应的就是时间戳对应的Date
                        comPropertyAlarm.setCreateTime(createDate);
                        comPropertyAlarm.setType(1);
                        comPropertyAlarmDao.insert(comPropertyAlarm);
                    } else {
                        break;
                    }
                }
            }
        }
    }

    @Deprecated
    @Async
    void dealData(String message) {
        comPropertyAlarmDao = SpringUtil.getBean(ComPropertyAlarmDao.class);
        DeviceDto deviceInfo = JSONObject.parseObject(message, DeviceDto.class);

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/SysAppConfigApi.java

@@ -98,4 +98,15 @@

        return R.fail();
    }

    @GetMapping("/selectByAreaCode")
    public R<SysAppConfigVO> selectByAreaCode(@RequestParam("areaCode") String areaCode) {
        SysAppConfig sysAppConfig = this.sysAppConfigService.getOne(new QueryWrapper<SysAppConfig>().lambda().eq(SysAppConfig::getAreaCode, areaCode));
        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/dao/UserDao.java

@@ -30,6 +30,10 @@
import com.panzhihua.common.model.vos.community.screen.event.EventGridMemberVO;
import com.panzhihua.common.model.vos.grid.GridMemberVO;
import com.panzhihua.common.model.vos.partybuilding.ComPbServiceTeamWishVO;
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.model.vos.user.SysUserVO;
import com.panzhihua.common.model.vos.user.UpdateUserArchivesVO;
import com.panzhihua.service_user.model.dos.SysUserDO;
import com.panzhihua.service_user.model.dtos.DataKanbanDTO;

@@ -242,6 +246,34 @@
    int countFmsMember(@Param("phone") String phone, @Param("communityId") Long userCommunityId);

    /**
     * 查询街道信息
     * @param streetId
     * @return
     */
    ComStreetVO selectStreetById(@Param("streetId") Long streetId);

    /**
     * 查询是否是社会组织成员
     * @param userId
     * @return
     */
    int countSocialOrgMember(@Param("userId") Long userId);

    /**
     * 查询是否社会组织联系人
     * @param phone
     * @return
     */
    int countOrgNum(@Param("phone") String phone);

    /**
     * 查询是否人大代表
     * @param phone
     * @param userCommunityId
     * @return
     */
    int selectCountDpc(@Param("phone") String phone, @Param("userCommunityId") Long userCommunityId);
    /**
     * 查看是否网格员
     * @param phone
     * @param userCommunityId

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml

@@ -432,7 +432,7 @@
    </update>

    <select id="selectCommunity" resultType="com.panzhihua.common.model.vos.community.ComActVO">
       select * from com_act where community_id = #{communityId}
       select name,community_id,lng,lat,area_code,contacts_phone from com_act where community_id = #{communityId}
    </select>

    <delete id="delLcMember">
@@ -540,6 +540,27 @@
        WHERE phone = #{phone} AND community_id = #{communityId}
    </select>

    <select id="selectStreetById" resultType="com.panzhihua.common.model.vos.community.ComStreetVO">
        SELECT street_id, area_code FROM com_street WHERE street_id = #{streetId}
    </select>

    <select id="countSocialOrgMember" resultType="integer">
        SELECT COUNT(id) FROM com_act_social_member
        WHERE user_id = #{userId}
    </select>

    <select id="countOrgNum" resultType="integer">
        SELECT COUNT(id)
        FROM com_act_social_org
        WHERE contact_phone = #{phone} AND is_society = 1
    </select>

    <select id="selectCountDpc" resultType="integer">
        SELECT COUNT(id)
        FROM com_act_dpc
        WHERE phone = #{phone} AND community_id = #{userCommunityId} AND is_del = 0
    </select>

    <select id="countEasyPhotoMember" resultType="Integer">
        SELECT COUNT(id) FROM com_act_easy_photo_member
        WHERE phone = #{phone} AND community_id = #{communityId}

 springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/ConvenientApi.java

@@ -16,6 +16,7 @@
import javax.validation.Valid;

import com.panzhihua.common.model.vos.UploadFilesVO;
import com.panzhihua.common.utlis.MimeTypeUtils;
import org.apache.commons.io.FilenameUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
@@ -187,6 +188,7 @@
        String extension = FilenameUtils.getExtension(file.getOriginalFilename());
        String name = UUID.randomUUID().toString().replaceAll("-", "") + "." + extension;
        try {
            assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
            SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
            sftp.login();
            InputStream is = file.getInputStream();

 springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/KaphtchaApi.java

New file
@@ -0,0 +1,80 @@
package com.panzhihua.shop_backstage.api;

import com.google.code.kaptcha.impl.DefaultKaptcha;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.utlis.StringUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import javax.imageio.ImageIO;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream;
import java.time.Duration;

/**
 * @author zzj
 */
@Api(tags = {"验证码接口"})
@RestController
@RequestMapping("/kaphtcha/")
public class KaphtchaApi extends BaseController {
    @Resource
    private DefaultKaptcha defaultKaptcha;
    @Resource
    private StringRedisTemplate stringRedisTemplate;

    @ApiOperation("生成验证码")
    @GetMapping("/verification")
    public void defaultKaptcha(@RequestParam("uuid")String uuid,HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse)
            throws Exception {
        byte[] captchaChallengeAsJpeg = null;
        ByteArrayOutputStream jpegOutputStream = new ByteArrayOutputStream();
        try {
            // 生产验证码字符串并保存到session中，分布式环境存redis中
            String createText = defaultKaptcha.createText();
            stringRedisTemplate.opsForValue().set("verifyCode_"+uuid,createText, Duration.ofMinutes(5));
            // 使用生产的验证码字符串返回一个BufferedImage对象并转为byte写入到byte数组中
            BufferedImage challenge = defaultKaptcha.createImage(createText);
            ImageIO.write(challenge, "jpg", jpegOutputStream);

        } catch (IllegalArgumentException e) {
            httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND);
            return;
        }

        // 定义response输出类型为image/jpeg类型，使用response输出流输出图片的byte数组
        captchaChallengeAsJpeg = jpegOutputStream.toByteArray();
        httpServletResponse.setHeader("Cache-Control", "no-store");
        httpServletResponse.setHeader("Pragma", "no-cache");
        httpServletResponse.setDateHeader("Expires", 0);
        httpServletResponse.setContentType("image/jpeg");
        ServletOutputStream responseOutputStream = httpServletResponse.getOutputStream();
        responseOutputStream.write(captchaChallengeAsJpeg);
        responseOutputStream.flush();
        responseOutputStream.close();
    }
    @ApiOperation("验证码核对")
    @GetMapping("/checkVerifyCode")
    public R checkVerifyCode(@RequestParam("verifyCode")String verifyCode,@RequestParam("uuid")String uuid){
        String text=stringRedisTemplate.opsForValue().get("verifyCode_"+uuid);
        if(StringUtils.isNotEmpty(text)){
            if(verifyCode.equals(text)){
                stringRedisTemplate.delete("verifyCode_"+uuid);
                return R.ok();
            }
            return R.fail("验证码错误");
        }
        return R.fail("验证码失效");
    }

}

 springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/config/AuthConfig.java

New file
@@ -0,0 +1,25 @@
package com.panzhihua.shop_backstage.config;

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

/**
 * 读取项目相关配置
 * 
 * @author huanghongfa
 */
@Data
@Component
@ConfigurationProperties(prefix = "auth")
public class AuthConfig {
    /** 上传路径 */
    public static String profile;
    /** 获取地址开关 */
    public static boolean addressEnabled;
    /** 项目名称 */
    public String name;
    /** 版本 */
    public String version;

}

 springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/config/KaptchaConfig.java

New file
@@ -0,0 +1,45 @@
package com.panzhihua.shop_backstage.config;

import com.google.code.kaptcha.Constants;
import com.google.code.kaptcha.impl.DefaultKaptcha;
import com.google.code.kaptcha.util.Config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

import java.util.Properties;

/**
 * @author zzj
 */
@Configuration
public class KaptchaConfig {
    /**
     * 验证码配置
     * @return
     */
    @Bean
    public DefaultKaptcha getDefaultKaptcha(){
        DefaultKaptcha defaultKaptcha=new DefaultKaptcha();
        Properties properties=new Properties();
        //是否有边框
        properties.setProperty(Constants.KAPTCHA_BORDER,"yes");
        //验证码文本颜色
        properties.setProperty(Constants.KAPTCHA_TEXTPRODUCER_FONT_COLOR,"red");
        //验证码图片宽度
        properties.setProperty(Constants.KAPTCHA_IMAGE_WIDTH,"180");
        //验证码图片高度
        properties.setProperty(Constants.KAPTCHA_IMAGE_HEIGHT,"80");
        //文本字符大小
        properties.setProperty(Constants.KAPTCHA_TEXTPRODUCER_FONT_SIZE,"39");
        //验证码session的值
        properties.setProperty(Constants.KAPTCHA_SESSION_CONFIG_KEY,"kaptchaCode");
        //验证码文本长度
        properties.setProperty(Constants.KAPTCHA_TEXTPRODUCER_CHAR_LENGTH,"4");
        //字体
        properties.setProperty(Constants.KAPTCHA_TEXTPRODUCER_FONT_NAMES, "宋体,楷体,微软雅黑");

        Config config=new Config(properties);
        defaultKaptcha.setConfig(config);
        return defaultKaptcha;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java

@@ -305,6 +305,15 @@
                noLoginUrl.add("/api/applets/fms/event/detail");
                noLoginUrl.add("/api/applets/fms/service/page");
                noLoginUrl.add("/api/applets/fms/service/detail");
                noLoginUrl.add("/api/applets/comActSocialOrgHatchAudit/process");
                noLoginUrl.add("/api/applets/comActSocialProject/queryAll");
                noLoginUrl.add("/api/applets/comActSocialProjectPublicity/queryAll");
                noLoginUrl.add("/api/applets/comActSocialOrg/queryAll");
                noLoginUrl.add("/api/applets/comactsocialworker");
                noLoginUrl.add("/api/applets/enterprise/detail");
                noLoginUrl.add("/api/applets/enterprise/page");
                noLoginUrl.add("/api/applets/dpc/detail");
                noLoginUrl.add("/api/applets/dpc/page");
                if (noLoginUrl.contains(requestURI)) {
                    List<SimpleGrantedAuthority> authorities = new ArrayList<>();
                    authorities.add(new SimpleGrantedAuthority(SecurityConstants.ROLE_APPLETS));