Merge branch 'zigonggao_dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuish...

fengjin

2022-11-16 8d493a008ce655963f0363b116d5b55e02eff3d6

Merge branch 'zigonggao_dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into zigonggao_dev

 flower_city/src/main/java/com/dg/core/controller/OrganizationController.java

@@ -162,11 +162,37 @@
    }




    /**
     * 通过父级id查询对应机构下的全部部门id
     * @param departmentId
     * @return
     */
    @ApiOperation(value = "通过父级id查询对应机构下的全部部门")
    @GetMapping("/getdepartment/id")
    public TableDataInfo getOrganizationIds(@RequestParam(value = "department",required = false) String departmentId)
    {
        if(StringUtils.isEmpty(departmentId))
        {
            return getDataTable("departmentId 不能为空");
        }

        List<String> ids=new ArrayList<>();
        List<String> getId=iOrganizationChartService.getIds(departmentId);
        ids.addAll(getId);
        return getDataTable(ids);
    }





    /**
     * 通过父级id查询对应机构下的全部部门
     * @param departmentId
     * @return
     */
    @ApiOperation(value = "通过父级id查询对应机构下的全部部门",response = OrganizationChartEntity.class)
    @GetMapping("/getdepartment")
    public TableDataInfo getOrganizations(@RequestParam(value = "department",required = false) String departmentId)

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

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

import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
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;

@RestController
@RequestMapping("/proceedings")
@Api(tags = "议事委员会")
public class ComActProceedings {
    @Resource
    private CommunityService communityService;

    @GetMapping("/list")
    @ApiOperation("议事委员会列表")
    public R list(@RequestParam("page")Integer page,@RequestParam("size")Integer size){
        return communityService.proceedingsList(page,size ,null );
    }
}

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

@@ -64,8 +64,8 @@

    @ApiOperation("查看自己的投诉建议或问题留言记录")
    @GetMapping("myFeedBack")
    public R myFeedBack(@ApiParam("类型:1问题留言2投诉建议") @RequestParam(value = "type",required = false)Integer type){
        return userService.myFeedBack(this.getLoginUserInfo().getUserId(),type);
    public R myFeedBack(@ApiParam("类型:1问题留言2投诉建议") @RequestParam(value = "type",required = false)Integer type,@RequestParam(value = "propertyId",required = false)Long propertyId){
        return userService.myFeedBack(this.getLoginUserInfo().getUserId(),type,propertyId);
    }

    @ApiOperation("通知公告列表")

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

@@ -11,6 +11,7 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
@@ -18,6 +19,8 @@
import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.HashMap;

import static java.util.Objects.nonNull;

/**
 * ClassName   ComEventController
@@ -83,8 +86,13 @@
    @ApiOperation(value = "三说会堂事件表分页列表数据", notes = "三说会堂事件表分页列表数据")
    @PostMapping("/page")
    public R page(@RequestBody ComEventPageRequestVO comEventPageRequestVO) {
        ComEventVO comEventVO = CopyUtil.copyProperties(comEventPageRequestVO, ComEventVO.class);
        log.info("================appId="+comEventPageRequestVO);
        ComEventVO comEventVO = new ComEventVO();
        BeanUtils.copyProperties(comEventPageRequestVO,comEventVO);
        comEventPageRequestVO.setCreateBy(getUserId());
        if (nonNull(comEventPageRequestVO.getAppId())){
            comEventVO.setAppId(comEventPageRequestVO.getAppId());
        }
        return comEventService.page(comEventVO, comEventVO.getPageNo(), comEventVO.getPageSize());
    }


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

@@ -535,13 +535,14 @@
    @ApiOperation("新增投诉建议或问题留言")
    @PostMapping("addFeedBack")
    public R addFeedBack(@RequestBody SysUserFeedbackDTO sysUserFeedbackDTO){
        sysUserFeedbackDTO.setCommunityId(null);
        return userService.addFeedback(sysUserFeedbackDTO);
    }

    @ApiOperation("查看自己的投诉建议或问题留言记录")
    @GetMapping("myFeedBack")
    public R myFeedBack(@ApiParam("类型:1问题留言2投诉建议") @RequestParam(value = "type",required = false)Integer type){
        return userService.myFeedBack(this.getLoginUserInfo().getUserId(),type);
    public R myFeedBack(@ApiParam("类型:1问题留言2投诉建议") @RequestParam(value = "type",required = false)Integer type,@RequestParam("propertyId")Long propertyId){
        return userService.myFeedBack(this.getLoginUserInfo().getUserId(),type,propertyId);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserAuthenticationProvider.java

@@ -109,10 +109,6 @@
                if (r1.getCode()== Constants.SUCCESS){
                    loginUserInfoVO.setType(13);
                }
                R r2 = userService.propertyCheck(loginUserInfoVO.getPhone());
                if (r2.getCode() == Constants.SUCCESS){
                    loginUserInfoVO.setPropertyId((Long)r2.getData());
                }
            }
            return new UsernamePasswordAuthenticationToken(loginUserInfoVO, password, grantedAuthorityList);
        }

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

@@ -115,6 +115,8 @@

    @ApiModelProperty("服务范围")
    private Integer serviceRange;
    @ApiModelProperty("微信手机号")
    private String mobilePhone;

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

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

@@ -75,4 +75,8 @@
    private Integer userType;
    @ApiModelProperty(value = "社会组织id", hidden = true)
    private Long orgId;
    @ApiModelProperty("物业id")
    private Long propertyId;
    @ApiModelProperty("是否为物业查看报事报修")
    private Integer propertyCheck;
}

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

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

    private String areaCode;

    @ApiModelProperty("1投诉建议2问题留言")
    private Integer type;
    private Long propertyId;
}

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

@@ -65,4 +65,5 @@

    @ApiModelProperty("电话")
    private String phone;
    private Long propertyId;
}

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

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

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

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


@Data
public class ComActProceedingsVO implements Serializable {
    /**
     * 主键id
@@ -52,6 +54,8 @@
    /**
     * 创建时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty("创建时间")
    private Date createTime;

    /**
@@ -71,6 +75,7 @@

    @ApiModelProperty("工作时间")
    private String workTime;
    private String logo;

    private static final long serialVersionUID = 1L;
}

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

@@ -106,6 +106,12 @@
    @ApiModelProperty("该商家存有商品，最多返回两条")
    private List<ConvenientProductVO> productVOList;

    @ApiModelProperty("服务范围")
    private Integer serviceRange;

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

    public void setPeriod(String period) {
        this.period = MerchantBusinessPeriod.valueOf(period);
    }

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventPageRequestVO.java

@@ -49,7 +49,16 @@
    private Long createBy;
    private Long pageNo;
    private Long pageSize;
    @ApiModelProperty("搜索关键字")
    private String keyword;
    @ApiModelProperty(value = "查看类型1用户查看自己的调解事件申请2专家查看自己受理的调解事件")
    private Integer userType;
    @ApiModelProperty("appId")
    private String appId;
    @ApiModelProperty("开始时间")
    private String startTime;
    @ApiModelProperty("结束时间")
    private String endTime;
    private Integer level;
    private Long searchId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventVO.java

@@ -154,6 +154,53 @@
    @ApiModelProperty(value = "查看类型1用户查看自己的调解事件申请2专家查看自己受理的调解事件,3后台查看")
    private Integer userType;
    private Integer usertype;
    private String appId;
    @ApiModelProperty("开始时间")
    private String startTime;
    @ApiModelProperty("结束时间")
    private String endTime;
    private Integer level;
    private Long searchId;

    public String getStartTime() {
        return startTime;
    }

    public void setStartTime(String startTime) {
        this.startTime = startTime;
    }

    public String getEndTime() {
        return endTime;
    }

    public void setEndTime(String endTime) {
        this.endTime = endTime;
    }

    public Integer getLevel() {
        return level;
    }

    public void setLevel(Integer level) {
        this.level = level;
    }

    public Long getSearchId() {
        return searchId;
    }

    public void setSearchId(Long searchId) {
        this.searchId = searchId;
    }

    public String getAppId() {
        return appId;
    }

    public void setAppId(String appId) {
        this.appId = appId;
    }

    public static long getSerialVersionUID() {
        return serialVersionUID;

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

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

    @ApiModelProperty("回复内容")
    private String reply;

    private Long propertyId;
    private Integer type;
}

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

@@ -182,4 +182,10 @@
     */
    @GetMapping("/status/calculate")
    R calculate();

    /**
     * 事件范围筛选列表
     * */
    @GetMapping("/rangeList")
    R eventRangeList();
}

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

@@ -10571,7 +10571,7 @@

    @GetMapping("/sanshuo/expert/backstageList2")
    R expertBackStageList(@RequestParam(value = "level",required = false)Integer level,@RequestParam(value = "page",required = false)Integer page,
                          @RequestParam(value = "size",required = false)Integer size);
                          @RequestParam(value = "size",required = false)Integer size,@RequestParam(value = "keyWord",required = false)String  keyWord);

    /**
     * 查询社区id集合

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

@@ -1324,7 +1324,7 @@
    R updateFeedBack(@RequestBody SysUserFeedbackVO sysUserFeedbackVO);

    @GetMapping("/myFeedBack")
    R myFeedBack(@RequestParam("userId") Long userId,@RequestParam(value = "type",required = false)Integer type);
    R myFeedBack(@RequestParam("userId") Long userId,@RequestParam(value = "type",required = false)Integer type,@RequestParam("propertyId")Long propertyId);

    /**
     * 获取所有社区等

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

@@ -3,9 +3,11 @@

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.ComActAnnouncementVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
@@ -32,6 +34,8 @@
     */
    @Resource
    private CommunityService communityService;
    @Resource
    private UserService userService;

    /**
     * 分页查询所有数据
@@ -43,6 +47,20 @@
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        commonPage.setCommunityId(this.getCommunityId());
        return this.communityService.comActAnnouncementSelectAll(commonPage);
    }

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "分页查询所有数据(物业公告)",response = ComActAnnouncementVO.class)
    @PostMapping("queryAllProperty")
    public R selectAllProperty(@RequestBody CommonPage commonPage) {
        //commonPage.setCommunityId(this.getCommunityId());
        commonPage.setPropertyId(userService.detailUser(this.getLoginUserInfo().getUserId()).getData().getPropertyId());
        return this.communityService.comActAnnouncementSelectAll(commonPage);
    }

@@ -74,6 +92,22 @@
    }

    /**
     * 新增数据
     *
     * @param comActAnnouncementVO 实体对象
     * @return 新增结果
     */
    @ApiOperation("新增物业公告")
    @PostMapping("/addPropertyAnnouncement")
    public R insertProperty(@RequestBody ComActAnnouncementVO comActAnnouncementVO) {
        comActAnnouncementVO.setCreateTime(new Date());
        //comActAnnouncementVO.setCommunityId(this.getCommunityId());
        comActAnnouncementVO.setUserId(this.getUserId());
        comActAnnouncementVO.setPropertyId(userService.detailUser(this.getLoginUserInfo().getUserId()).getData().getPropertyId());
        return this.communityService.comActAnnouncementInsert(comActAnnouncementVO);
    }

    /**
     * 修改数据
     *
     * @param comActAnnouncementVO 实体对象

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

@@ -3,6 +3,7 @@
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.user.PageFeedBackDTO;
import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.user.SysUserFeedbackVO;
import com.panzhihua.common.service.user.UserService;
@@ -13,6 +14,8 @@
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

import static java.util.Objects.nonNull;

@RestController
@RequestMapping("/feedBack")
@@ -25,6 +28,23 @@
    @PostMapping("pagefeedback")
    public R pageFeedback(@RequestBody @Validated(PageGroup.class) PageFeedBackDTO pageFeedBackDTO) {
        pageFeedBackDTO.setAreaCode(this.getAreaCode());
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        LoginUserInfoVO user = userService.detailUser(loginUserInfo.getUserId()).getData();
        if(nonNull(user.getPropertyId())){
            pageFeedBackDTO.setPropertyId(user.getPropertyId());
        }
        return userService.pageFeedback(pageFeedBackDTO);
    }

    @ApiOperation(value = "分页查询用户意见反馈", response = SysUserFeedbackVO.class)
    @PostMapping("pagefeedbackProperty")
    public R pageFeedbackProperty(@RequestBody @Validated(PageGroup.class) PageFeedBackDTO pageFeedBackDTO) {
        //pageFeedBackDTO.setAreaCode(this.getAreaCode());
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        LoginUserInfoVO user = userService.detailUser(loginUserInfo.getUserId()).getData();
        if(nonNull(user.getPropertyId())){
            pageFeedBackDTO.setPropertyId(user.getPropertyId());
        }
        return userService.pageFeedback(pageFeedBackDTO);
    }


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

@@ -3,9 +3,11 @@
import cn.hutool.core.date.DateUtil;
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.property.ComPropertyRepairVO;
import com.panzhihua.common.service.property.PropertyService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.StringUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -14,6 +16,8 @@

import javax.annotation.Resource;

import static java.util.Objects.nonNull;

@Slf4j
@RestController
@RequestMapping("propertyRepair")
@@ -21,6 +25,8 @@
public class ComPropertyRepairApi extends BaseController {
    @Resource
    private PropertyService propertyService;
    @Resource
    private UserService userService;

    /**
     * 分页查询所有数据
@@ -29,10 +35,28 @@
    @ApiOperation(value = "后台列表接口",response = ComPropertyRepairVO.class)
    @PostMapping("/queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        commonPage.setParamId(this.getCommunityId());
        if(this.getAreaId()!=null&&this.getAreaId()!=0L){
            commonPage.setAreaId(this.getAreaId());
        }
        if (nonNull(commonPage.getPropertyCheck()) && commonPage.getPropertyCheck().equals(1)){
            //物业公司查看
            LoginUserInfoVO user = userService.detailUser(loginUserInfo.getUserId()).getData();
            if (nonNull(user.getPropertyId())){
                commonPage.setPropertyId(user.getPropertyId());
            }
        }
        return this.propertyService.comPropertyRepairSelectAll(commonPage);
    }

    /**
     * 分页查询所有物业公司报事报修
     * @return 所有数据
     */
    @ApiOperation(value = "后台列表接口",response = ComPropertyRepairVO.class)
    @PostMapping("/queryAllProperty")
    public R selectAllProperty(@RequestBody CommonPage commonPage) {
        return this.propertyService.comPropertyRepairSelectAll(commonPage);
    }


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

@@ -3,7 +3,9 @@
import javax.annotation.Resource;
import javax.validation.Valid;

import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.property.ComPropertyWorkerVO;
import com.panzhihua.common.service.user.UserService;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
@@ -27,6 +29,7 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;

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

/**
@@ -45,6 +48,12 @@
     */
    @Resource
    private CommunityService communityService;

    /**
     * 用户对象
     * */
    @Resource
    private UserService userService;


    @ApiOperation(value = "添加物业工作人员")
@@ -69,8 +78,13 @@
    @ApiOperation(value = "分页查询物业工作人员", response = ComPropertyWorkerVO.class)
    @PostMapping("/page")
    public R pagePropertyWorker(@RequestBody @Valid PagePropertyWorkerDTO pagePropertyWorkerDTO) {
        if(nonNull(getLoginUserInfo().getPropertyId())){
            pagePropertyWorkerDTO.setRefId(getLoginUserInfo().getPropertyId());
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        if (nonNull(loginUserInfo.getPhone()) && isNull(pagePropertyWorkerDTO.getRefId())){
            //设置物业id
            LoginUserInfoVO user = userService.detailUser(loginUserInfo.getUserId()).getData();
            if (nonNull(user.getPropertyId())){
                pagePropertyWorkerDTO.setRefId(user.getPropertyId());
            }
        }
        return communityService.pagePropertyWorker(pagePropertyWorkerDTO);
    }

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

@@ -175,7 +175,8 @@
    @GetMapping("/expert/backstageList")
    public R expertBackStageList(@RequestParam(value = "level",required = false)Integer level,
                                 @RequestParam(value = "page",required = false)Integer page,
                                 @RequestParam(value = "size",required = false)Integer size){
        return communityService.expertBackStageList(level,page,size);
                                 @RequestParam(value = "size",required = false)Integer size,
                                 @RequestParam(value = "keyWord",required = false)String  keyWord){
        return communityService.expertBackStageList(level,page,size,keyWord);
    }
}

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

@@ -246,4 +246,11 @@
    }


    @ApiOperation("时间筛选范围列表")
    @GetMapping("/rangeList")
    public R rangeList(){
        return comEventService.eventRangeList();
    }


}

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

@@ -623,6 +623,18 @@
        return partyBuildingService.addServiceTeam(comPbServiceTeamDTO);
    }

    @ApiOperation(value = "新增物业服务团队人员")
    @PostMapping("serviceteamProperty")
    public R addServiceTeamProperty(@RequestBody @Validated(AddGroup.class) ComPbServiceTeamDTO comPbServiceTeamDTO) {
        //comPbServiceTeamDTO.setCommunityId(this.getCommunityId());
        comPbServiceTeamDTO.setAppid(this.getAppId());
        //获取物业id
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        R<LoginUserInfoVO> r = userService.detailUser(loginUserInfo.getUserId());
        comPbServiceTeamDTO.setPropertyId(r.getData().getPropertyId());
        return partyBuildingService.addServiceTeam(comPbServiceTeamDTO);
    }

    @ApiOperation(value = "编辑服务团队人员")
    @PutMapping("serviceteam")
    public R putServiceTeam(@RequestBody ComPbServiceTeamDTO comPbServiceTeamDTO) {
@@ -654,11 +666,21 @@
        } else {
            pageComPbServiceTeamDTO.setCommunityId(this.getCommunityId());
        }
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        if (nonNull(loginUserInfo.getPropertyId())){
            pageComPbServiceTeamDTO.setPropertyId(loginUserInfo.getPropertyId());
        return partyBuildingService.pageServiceTeam(pageComPbServiceTeamDTO);
        }
        log.info("==============物业公司id"+loginUserInfo.getPropertyId());

    @ApiOperation(value = "分页查询物业党员先锋", response = ComPbServiceTeamVO.class)
    @PostMapping("pageserviceteamProperty")
    public R pageServiceTeamProperty(@RequestBody PageComPbServiceTeamDTO pageComPbServiceTeamDTO) {
//        if(nonNull(this.getLoginUserInfo().getStreetId())) {
//            pageComPbServiceTeamDTO.setStreetId(this.getLoginUserInfo().getStreetId());
//        } else {
//            pageComPbServiceTeamDTO.setCommunityId(this.getCommunityId());
//        }
        //获取物业id
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        R<LoginUserInfoVO> r = userService.detailUser(loginUserInfo.getUserId());
        pageComPbServiceTeamDTO.setPropertyId(r.getData().getPropertyId());
        return partyBuildingService.pageServiceTeam(pageComPbServiceTeamDTO);
    }


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

@@ -10,15 +10,18 @@
import com.panzhihua.common.model.vos.sanshuo.ComEventConciliationVO;
import com.panzhihua.common.model.vos.sanshuo.ComEventVO;
import com.panzhihua.common.model.vos.sanshuo.ComSanRequestVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.CopyUtil;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.entity.ComEvent;
import com.panzhihua.service_community.service.ComSanShuoExpertService;
import com.panzhihua.service_community.service.IComEventService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
@@ -29,6 +32,7 @@
import java.util.List;

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

/**
 * ClassName   ComEventController
@@ -45,6 +49,10 @@

    @Resource
    private IComEventService comEventService;
    @Resource
    private UserService userService;
    @Resource
    private ComSanShuoExpertService comSanShuoExpertService;


    /**
@@ -66,7 +74,9 @@
        comEvent.setRequestUserId(loginUser.getUserId());
        comEvent.setRequestUserName(loginUser.getName());
        comEvent.setRequestUserTel(loginUser.getPhone());
        if (isNull(comEventVO.getAppId())){
        comEvent.setAppId(loginUser.getAppId());
        }
        return comEventService.insertComEvent(comEvent);
    }

@@ -156,7 +166,13 @@
    @PostMapping("/page")
    public R page(@RequestBody ComEventVO comEventVO, Long pageNo, Long pageSize) {
        Page pagination = new Page(pageNo, pageSize);
        ComEvent comEvent = CopyUtil.copyProperties(comEventVO, ComEvent.class);
        ComEvent comEvent=new ComEvent();
        BeanUtils.copyProperties(comEventVO, comEvent);
        LoginUserInfoVO loginUserInfo = getLoginUserInfo();
        if (isNull(comEventVO.getAppId())){
            String appId = userService.detailUser(loginUserInfo.getUserId()).getData().getAppId();
            comEvent.setAppId(appId);
        }
        return comEventService.pageByComEvent(comEvent, pagination,this.getLoginUserInfo());
    }

@@ -355,4 +371,12 @@
        return comEventService.listCommunityScreen();
    }

    /**
     * 获取事件范围筛选列表
     * */
    @GetMapping("/rangeList")
    public R rangeList(){
        return comSanShuoExpertService.rangeList();
    }

}

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

@@ -51,7 +51,7 @@
    @PostMapping
    public R add(@RequestBody ComSanshuoExpertDTO comSanshuoExpertDTO){
        comSanshuoExpertDTO.setCreateBy(this.getLoginUserInfo().getName());
        comSanshuoExpertDTO.setAppId(getLoginUserInfo().getAppId());
        comSanshuoExpertDTO.setAppId(userService.detailUser(getLoginUserInfo().getUserId()).getData().getAppId());
        return comSanShuoExpertService.addOrUpdateExpert(comSanshuoExpertDTO);
    }

@@ -86,6 +86,7 @@
                      @RequestParam(value = "size",required = false)Integer size,
                      @RequestParam(value = "level",required = false)Integer level){
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        loginUserInfo.setAppId(userService.detailUser(getLoginUserInfo().getUserId()).getData().getAppId());
        return comSanShuoExpertService.expertPage(keyWord,page,size,loginUserInfo,level);
    }

@@ -180,8 +181,11 @@
    @GetMapping("/backstageList2")
    public R  backstageList(@RequestParam(value = "level",required = false)Integer level,
                            @RequestParam(value = "page",required = false)Integer page,
                            @RequestParam(value = "size",required = false)Integer size){
        return comSanShuoExpertService.backstageList(level,getLoginUserInfo(),page,size);
                            @RequestParam(value = "size",required = false)Integer size,
                            @RequestParam(value = "keyWord",required = false)String  keyWord){
        LoginUserInfoVO loginUserInfo = getLoginUserInfo();
        loginUserInfo.setAppId(userService.detailUser(getLoginUserInfo().getUserId()).getData().getAppId());
        return comSanShuoExpertService.backstageList(level,loginUserInfo,page,size,keyWord);
    }



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

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

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.community.ComActProceedingsVO;
import com.panzhihua.service_community.entity.ComActProceedings;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -28,7 +29,7 @@
     * @param keyWord 搜索关键字
     * @return 处理结果
     * */
    List<ComActProceedings> pageProceedings(Page page, @Param("keyWord") String keyWord);
    List<ComActProceedingsVO> pageProceedings(Page page, @Param("keyWord") String keyWord);


}

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

@@ -70,7 +70,7 @@

    Integer selectExpertVoList();

    IPage<ComSanshuoExpertVO> expertList(Page page, @Param("level") Integer level, @Param("id") Long  id,@Param("appId")String appId);
    IPage<ComSanshuoExpertVO> expertList(Page page, @Param("level") Integer level, @Param("id") Long  id,@Param("appId")String appId,@Param("keyWord")String keyWord);
}



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

@@ -3,6 +3,8 @@
import java.io.Serializable;
import java.util.Date;

import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -11,10 +13,12 @@
 * @author zts
 */
@Data
@TableName("com_act_proceedings")
public class ComActProceedings implements Serializable {
    /**
     * 主键id
     */
    @TableId
    private Long id;

    /**

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

@@ -215,5 +215,15 @@
    @TableField(exist = false)
    private Integer changeExpert;
    private String appId;
    @TableField(exist = false)
    @ApiModelProperty("开始时间")
    private String startTime;
    @TableField(exist = false)
    @ApiModelProperty("结束时间")
    private String endTime;
    @TableField(exist = false)
    private Integer level;
    @TableField(exist = false)
    private Long searchId;

}

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

@@ -126,4 +126,9 @@
     * 服务范围
     */
    private Integer serviceRange;

    /**
     * 手机号
     */
    private String mobilePhone;
}

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

@@ -54,5 +54,10 @@
    /**
     * 新增专家后台列表
     * */
    R backstageList(Integer level,LoginUserInfoVO loginUserInfoVO,Integer page,Integer size);
    R backstageList(Integer level,LoginUserInfoVO loginUserInfoVO,Integer page,Integer size,String keyWord);

    /**
     * 事件范围筛选列表
     * */
    R rangeList();
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java

@@ -580,7 +580,7 @@
    @Override
    public R checkCommit(Long userId) {
        if(userId!=null){
            List<ComActAcidRecord> comActAcidRecords= this.baseMapper.selectList(new QueryWrapper<ComActAcidRecord>().lambda().eq(ComActAcidRecord::getIsDel,0).eq(ComActAcidRecord::getUserId,userId).ge(ComActAcidRecord::getCreateTime, DateUtils.getCurrentDate(DateUtils.yyyyMMdd_format)).isNull(ComActAcidRecord::getAcidTest));
            List<ComActAcidRecord> comActAcidRecords= this.baseMapper.selectList(new QueryWrapper<ComActAcidRecord>().lambda().eq(ComActAcidRecord::getIsDel,0).eq(ComActAcidRecord::getUserId,userId).ge(ComActAcidRecord::getCreateTime, DateUtils.getCurrentDate(DateUtils.yyyyMMdd_format)).isNull(ComActAcidRecord::getColorImage));
            return R.ok(comActAcidRecords);
        }
       return R.ok();

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java

@@ -117,7 +117,7 @@
            }
            comActDynDAO.updateById(comActDynDO);
        }
        return R.ok();
        return R.ok(comActDynDO);
    }

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActProceedingsServiceImpl.java

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

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

import static java.util.Objects.isNull;

@@ -31,7 +32,8 @@
     * */
    @Override
    public R pageProceedings(Integer page, Integer size, String keyWord) {
        return R.ok(CopyUtil.beanCopyList(comActProceedingsDao.pageProceedings(new Page(page,size),keyWord), ComActProceedingsVO.class));
        List<ComActProceedingsVO> comActProceedingsVOS = comActProceedingsDao.pageProceedings(new Page(page, size), keyWord);
        return R.ok(comActProceedingsVOS);
    }

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java

@@ -97,7 +97,7 @@
        Boolean isExpertCheck=false;
        Long expertId=null;
        Boolean isStretAccount = isStreetAccount(loginUserInfoVO);
        comEvent.setAppId(loginUserInfoVO.getAppId());
//        comEvent.setAppId(loginUserInfoVO.getAppId());
        if (nonNull(comEvent.getUserType())){
            if (comEvent.getUserType().equals(1)){
                //个人账号权限
@@ -258,6 +258,7 @@
                    comEvent.setArchive(0);
                    comEvent.setConciliation(0);
                    comEvent.setChangeExpert(0);
                    comEvent.setDistribution(0);
                } else if(comEvent.getEventProcessStatus().equals(2)){
                    //待分配和待验证状态，可以受理，分配专家
                    //关闭调解和归档
@@ -657,6 +658,9 @@
    }

    public void sendMessage(Long expertId,ComEvent comEvent){
        if (nonNull(comEvent.getRequestUserCommunity()) && comEvent.getRequestUserCommunity().equals(10172)){
            return;
        }
        //获取专家的openId
        ComSanshuoExpert expert = comSanShuoExpertService.getById(expertId);
        SysUser sysUser = sysUserDao.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getPhone, expert.getPhone()).eq(SysUser::getType, 1).eq(SysUser::getAppId,"wx0cef797390444b75" ));
@@ -1005,7 +1009,12 @@
            }
        }
        log.info("当前userType===="+comEvent.getUserType());
        comEvent.setAppId(loginUserInfoVO.getAppId());
        //comEvent.setAppId(loginUserInfoVO.getAppId());
        R<LoginUserInfoVO> r = userService.detailUser(loginUserInfoVO.getUserId());
        LoginUserInfoVO user = r.getData();
        if (nonNull(user.getAppId())){
            comEvent.setAppId(user.getAppId());
        }
        List<ComEventCalculateVO> calculateList = baseMapper.calculate(comEvent);
        ComEventCalculateVO comEventCalculateVO =new ComEventCalculateVO();
        comEventCalculateVO.setStatus("0");

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java

@@ -138,8 +138,10 @@
                expert.setStreetId(Long.parseLong(expert.getUnitId()));
                expert.setUnit(comStreetDAO.selectById(expert.getUnitId()).getName()+"调解站");
            }else if(expert.getLevel()==4){
                if (nonNull(expert.getUnitId())){
                expert.setCommunityId(Long.parseLong(expert.getUnitId()));
                expert.setUnit(comActDAO.selectById(expert.getUnitId()).getName()+"调解站");
                }
            }
            return R.ok(comSanshuoExpertDao.updateById(expert));
        }
@@ -427,24 +429,54 @@
    }

    @Override
    public R backstageList(Integer level,LoginUserInfoVO loginUserInfoVO,Integer page,Integer size) {
    public R backstageList(Integer level,LoginUserInfoVO loginUserInfoVO,Integer page,Integer size,String keyWord) {
        if (nonNull(level)){
            if (level.equals(1)){
                //三说会堂权限，查看所有
                return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,null ,loginUserInfoVO.getAppId()));
                return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,null ,loginUserInfoVO.getAppId(),keyWord));
            }else if (level.equals(2)){
                //行业分中心
                ComSanshuoIndustryCenter center = comSanshuoIndustryCenterDao.selectOne(new QueryWrapper<ComSanshuoIndustryCenter>().lambda().eq(ComSanshuoIndustryCenter::getAccount, loginUserInfoVO.getAccount()));
                return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,center.getId(),loginUserInfoVO.getAppId()));
                return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,center.getId(),loginUserInfoVO.getAppId(),keyWord));
            }else if (level.equals(3)){
                //街道
                return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,loginUserInfoVO.getStreetId(),loginUserInfoVO.getAppId()));
                return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,loginUserInfoVO.getStreetId(),loginUserInfoVO.getAppId(),keyWord));
            }else if(level.equals(4)){
                return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,loginUserInfoVO.getCommunityId(),loginUserInfoVO.getAppId()));
                return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,loginUserInfoVO.getCommunityId(),loginUserInfoVO.getAppId(),keyWord));
            }
        }else {
            return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,loginUserInfoVO.getCommunityId(),loginUserInfoVO.getAppId(),keyWord));
        }
        return null;
    }

    @Override
    public R rangeList() {
        List<ExpertRangeVO> list=new ArrayList<>();
        for (int i = 1; i < 5; i++) {
            ExpertRangeVO vo=new ExpertRangeVO();
            vo.setLevel(i);
            if (i==2){
                //设置行业分中心为childList
                vo.setId(2L);
                vo.setChildList(comSanshuoIndustryCenterDao.indstryList());
                vo.setName("行业分中心");
            }else if (i==3){
                vo.setId(3L);
                vo.setChildList(comSanshuoIndustryCenterDao.streetList());
                vo.setName("街道调解站");
            }else if (i==4){
                vo.setId(4L);
                vo.setChildList(comSanshuoIndustryCenterDao.communityList());
                vo.setName("社区调解站");
            }else if(i==1){
                vo.setId(1L);
                vo.setName("三说会堂");
            }
            list.add(vo);
        }
        return R.ok(list);
    }


}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActAnnouncementMapper.xml

@@ -24,6 +24,9 @@
            <if test="commonPage.keyword!=null and commonPage.keyword !=''">
                and t.content like concat('%',#{commonPage.keyword},'%')
            </if>
            <if test="commonPage.propertyId!=null and commonPage.propertyId !=''">
                and t.property_id=#{commonPage.propertyId}
            </if>
        </where>
        order by t.create_time desc
    </select>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActProceedingsDao.xml

@@ -30,10 +30,10 @@
  </delete>
  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.panzhihua.service_community.entity.ComActProceedings" useGeneratedKeys="true">
    insert into com_act_proceedings (id,`name`, unit_name, unit_id,
      introduce, del_flag, `status`, 
      introduce, del_flag, `status`, work_time,
      create_time)
    values (#{id},#{name,jdbcType=VARCHAR}, #{unitName,jdbcType=VARCHAR}, #{unitId,jdbcType=BIGINT},
      #{introduce,jdbcType=VARCHAR}, #{delFlag,jdbcType=BIT}, #{status,jdbcType=BIT}, 
      #{introduce,jdbcType=VARCHAR}, #{delFlag,jdbcType=BIT}, #{status,jdbcType=BIT}, #{workTime},
      #{createTime,jdbcType=TIMESTAMP})
  </insert>
  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.panzhihua.service_community.entity.ComActProceedings" useGeneratedKeys="true">
@@ -159,7 +159,7 @@
      update_by = #{updateBy,jdbcType=TIMESTAMP}
    where id = #{id,jdbcType=BIGINT}
  </update>
  <select id="pageProceedings" resultType="com.panzhihua.service_community.entity.ComActProceedings">
  <select id="pageProceedings" resultType="com.panzhihua.common.model.vos.community.ComActProceedingsVO">
    select * from com_act_proceedings where del_flag=0
    <if test="keyWord != null and keyWord != ''">
      AND name like concat("%",#{keyWord},"%")

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEventMapper.xml

@@ -59,7 +59,10 @@
            event_process_status !=9
            AND app_id=#{comEvent.appId}
            <if test="comEvent.keyword != null and comEvent.keyword!=''" >
                AND    ( order_sn = #{comEvent.keyword} or request_user_tel =#{comEvent.keyword} or current_org_name=#{comEvent.keyword})
                AND    ( order_sn like concat ('%',#{comEvent.keyword},'%')  or request_user_tel like concat ('%',#{comEvent.keyword},'%') or current_org_name like concat ('%',#{comEvent.keyword},'%'))
            </if>
            <if test="comEvent.startTime != null and comEvent.startTime != ''">
                AND create_at between DATA_FORMAT(#{comEvent.startTime},'%Y-%m-%d 00:00:00') and DATA_FORMAT(#{comEvent.endTime},'%Y-%m-%d 00:00:00')
            </if>
            <if test="comEvent.createBy != null and comEvent.createBy!=''" >
                AND create_by = #{comEvent.createBy}
@@ -97,6 +100,22 @@
                    #{id}
                </foreach>
            </if>
            <if test="comEvent.level != null and comEvent.level != ''">
                <if test="comEvent.searchId != null and comEvent.searchId != ''">
                    <if test="comEvent.level == 1">
                        AND type=4
                    </if>
                    <if test="comEvent.level == 2">
                        AND type=1 AND center_id=#{comEvent.searchId}
                    </if>
                    <if test="comEvent.level == 3">
                        AND type=3 AND request_user_community in (select community_id from com_act where street_id=#{comEvent.searchId})
                    </if>
                    <if test="comEvent.level == 4">
                        AND type=2 AND request_user_community=#{comEvent.searchId}
                    </if>
                </if>
            </if>
        </where>
        order by create_at desc
    </select>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSanshuoExpertDao.xml

@@ -159,6 +159,9 @@
        unit_id,unit from com_sanshuo_expert
        where del_flag=1
        AND app_id=#{appId}
        <if test="keyWord != null and keyWord != ''">
            AND name like concat('%',#{keyWord},'%') or phone like concat('%',#{keyWord},'%')
        </if>
        <if test="level != null">
            <if test="level == 2">
                AND level = 2

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ConvenientMerchantMapper.xml

@@ -30,12 +30,13 @@
                <id column="updated_by" property="updatedBy" />
                <id column="area_code" property="areaCode" />
                <id column="service_range" property="serviceRange" />
                <id column="mobile_phone" property="mobilePhone" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id,`name`,community_id,community_name,logo,contacts,id_card,phone,address,lat,lon,begin_at,end_at,period,introduction,
        business_status,user_id,consultation_volume,is_del,created_at,created_by,updated_at,updated_by,area_code,service_range
        business_status,user_id,consultation_volume,is_del,created_at,created_by,updated_at,updated_by,area_code,service_range,mobile_phone
    </sql>
    <select id="pageMerchant" resultType="com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO">
        SELECT ccm.*, su.account, su.status AS accountStatus, GROUP_CONCAT(ccss.service_name) AS serviceScope

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

@@ -42,4 +42,6 @@
        + " where community_id = ${communityId}" + "<if test='param != null and param != &quot;&quot;'>"
        + " and name LIKE concat( #{param}, '%' ) \n" + " </if> " + "</script>")
    List<ComPbServiceTeamVO> getTotlePerson(@Param("param") String param, @Param("communityId") Long communityId);

    IPage<ComPbServiceTeamVO> pageServiceTeamProperty(Page page, @Param("pageComPbServiceTeamDTO")PageComPbServiceTeamDTO pageComPbServiceTeamDTO);
}

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

@@ -118,6 +118,9 @@
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<ComPbServiceTeamVO> iPage = comPbServiceTeamDAO.PageComPbServiceTeamDTO(page, pageComPbServiceTeamDTO);
        if (nonNull(pageComPbServiceTeamDTO.getPropertyId())){
        iPage = comPbServiceTeamDAO.pageServiceTeamProperty(page, pageComPbServiceTeamDTO);
        }
        return R.ok(iPage);
    }


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

@@ -39,6 +39,16 @@
            AND t1.job LIKE concat( #{pageComPbServiceTeamDTO.job}, '%')
        </if>
    </select>
    <select id="pageServiceTeamProperty"
            resultType="com.panzhihua.common.model.vos.partybuilding.ComPbServiceTeamVO">
        select * from com_pb_service_team where property_id=#{pageComPbServiceTeamDTO.propertyId}
        <if test="pageComPbServiceTeamDTO.name != null and pageComPbServiceTeamDTO.name != ''">
            AND name like concat('%',#{pageComPbServiceTeamDTO.name},'%')
        </if>
        <if test="pageComPbServiceTeamDTO.job != null and pageComPbServiceTeamDTO.job != ''">
            AND name like concat('%',#{pageComPbServiceTeamDTO.job},'%')
        </if>
    </select>

</mapper>


 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/api/ComPropertyRepairApi.java

@@ -8,10 +8,13 @@
import com.panzhihua.common.utlis.RSAUtils;
import com.panzhihua.service_property.entity.ComPropertyRepair;
import com.panzhihua.service_property.service.ComPropertyRepairService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

import static java.util.Objects.nonNull;

/**
 * (ComPropertyRepair)表控制层
@@ -21,6 +24,7 @@
 */
@RestController
@RequestMapping("comPropertyRepair")
@Slf4j
public class ComPropertyRepairApi {
    /**
     * 服务对象

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/dao/ComPropertyRepairDao.java

@@ -21,5 +21,6 @@
@Mapper
public interface ComPropertyRepairDao extends BaseMapper<ComPropertyRepair> {
    IPage<ComPropertyRepairVO> pageList(Page page, @Param("commonPage") CommonPage commonPage);
    IPage<ComPropertyRepairVO> pageList2(Page page, @Param("commonPage") CommonPage commonPage);
    ComPropertyRepairVO selectDetail(Long id);
}

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/entity/ComPropertyRepair.java

@@ -135,4 +135,7 @@
    @ApiModelProperty(value = "物业id")
    private Long propertyId;

    @ApiModelProperty(value = "小区名称")
    private String areaName;

}

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/ComPropertyRepairService.java

@@ -36,4 +36,9 @@
     * 详情查询脱敏
     */
    R selectDetailDesensitize(Long id);

    /**
     * 查询物业报事报修列表
     * */
    R pageListProperty(CommonPage commonPage);
}

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/impl/ComPropertyRepairServiceImpl.java

@@ -9,13 +9,16 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.property.ComPropertyRepairVO;
import com.panzhihua.common.utlis.RSAUtils;
import com.panzhihua.service_property.dao.ComPropertyRepairDao;
import com.panzhihua.service_property.entity.ComPropertyRepair;
import com.panzhihua.service_property.dao.ComPropertyRepairDao;
import com.panzhihua.service_property.service.ComPropertyRepairService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

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

import static java.util.Objects.nonNull;

/**
 * (ComPropertyRepair)表服务实现类
@@ -31,8 +34,13 @@

    @Override
    public R pageList(CommonPage commonPage) {
        if (nonNull(commonPage.getPropertyCheck()) && nonNull(commonPage.getPropertyId())){
            IPage<ComPropertyRepairVO> list = comPropertyRepairDao.pageList2(new Page(commonPage.getPage(), commonPage.getSize()), commonPage);
            return R.ok(list);
        }else{
        IPage<ComPropertyRepairVO> list = comPropertyRepairDao.pageList(new Page(commonPage.getPage(), commonPage.getSize()), commonPage);
        return R.ok(list);
        }
    }

    @Override
@@ -51,13 +59,6 @@
        }
        return R.ok(list);
    }

    @Override
    public R selectDetail(Long id) {
        ComPropertyRepairVO vo = comPropertyRepairDao.selectDetail(id);
        return R.ok(vo);
    }

    @Override
    public R selectDetailDesensitize(Long id) {
        ComPropertyRepairVO vo = comPropertyRepairDao.selectDetail(id);
@@ -66,4 +67,18 @@
        vo.setFeedback(DesensitizedUtil.chineseName(vo.getFeedback()));
        return R.ok(vo);
    }

    @Override
    public R pageListProperty(CommonPage commonPage) {
        IPage<ComPropertyRepairVO> list = comPropertyRepairDao.pageList(new Page(commonPage.getPage(), commonPage.getSize()), commonPage);
        return R.ok(list);
    }

    @Override
    public R selectDetail(Long id) {
        ComPropertyRepairVO vo = comPropertyRepairDao.selectDetail(id);
        return R.ok(vo);
    }


}

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/mapper/ComPropertyRepairMapper.xml

@@ -57,6 +57,9 @@
            <if test="commonPage.userId !=null">
                and t.create_by =#{commonPage.userId}
            </if>
            <if test="commonPage.propertyId != null and commonPage.propertyId != ''">
                AND t.property_id=#{commonPage.propertyId}
            </if>
        </where>
    order by t.create_time desc
    </select>
@@ -64,5 +67,43 @@
    <select id="selectDetail" resultType="com.panzhihua.common.model.vos.property.ComPropertyRepairVO">
        select t.*,t1.name as feedback from com_property_repair t left join sys_user t1 on t.feedback_by = t1.user_id where t.id=#{id}
    </select>

    <select id="pageList2" resultType="com.panzhihua.common.model.vos.property.ComPropertyRepairVO">
    select t.*,t1.name as feedback from com_property_repair t left join sys_user t1 on t.feedback_by = t1.user_id left join com_property t2 on t.property_id = t2.area_id left join com_mng_village t3 on t.property_id=t3.village_id
    <where>
        1=1
        <if test="commonPage.status !=null">
            and t.repair_status =#{commonPage.status}
        </if>
        <if test="commonPage.username !=null and commonPage.username.trim() !=''">
            and t.repair_name  like concat(#{commonPage.username},'%')
        </if>
        <if test="commonPage.phone !=null and commonPage.phone.trim() !=''">
            and t.repair_phone like concat(#{commonPage.phone},'%')
        </if>
        <if test="commonPage.address !=null and commonPage.address.trim() !=''">
            and t.repair_position like  concat(#{commonPage.address},'%')
        </if>
        <if test="commonPage.beginTime !=null">
            and t.create_time >=#{commonPage.beginTime}
        </if>
        <if test="commonPage.endTime !=null">
            and #{commonPage.endTime} >=t.create_time
        </if>
        <if test="commonPage.systemName !=null and commonPage.systemName.trim() !=''">
            and t1.name like concat(#{commonPage.systemName},'%')
        </if>
        <if test="commonPage.paramId !=null and commonPage.paramId !=0">
            and t2.community_id = ${commonPage.paramId}
        </if>
        <if test="commonPage.areaId !=null and commonPage.areaId !=0">
            and t2.area_id =#{commonPage.areaId}
        </if>
        <if test="commonPage.userId !=null">
            and t.create_by =#{commonPage.userId}
        </if>
        <if test="commonPage.propertyId != null and commonPage.propertyId != ''">
            AND t.property_id=#{commonPage.propertyId}
        </if>
    </where>
    </select>
</mapper>

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

@@ -1513,8 +1513,8 @@
    }

    @GetMapping("/myFeedBack")
    public R myFeedBack(@RequestParam("userId")Long id,@RequestParam(value = "type",required = false)Integer type){
        return userService.myFeedBack(id,type);
    public R myFeedBack(@RequestParam("userId")Long id,@RequestParam(value = "type",required = false)Integer type,@RequestParam("propertyId")Long propertyId){
        return userService.myFeedBack(id,type,propertyId);
    }

    @GetMapping("/propertyCheck")

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserFeedbackDAO.java

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


    SysUserFeedbackVO detailFeedback(Long id);

    int reply(@Param("dto") SysUserFeedbackDO sysUserFeedbackDO1);
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java

@@ -440,4 +440,7 @@
     * 是否为物业公司后台账号
     * */
    Long isPropertyAccount(String phone);


    String getCommunityAppId(Long communityId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserFeedbackDO.java

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

import com.baomidou.mybatisplus.annotation.*;

import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;

/**
@@ -38,6 +39,7 @@
     * create_at
     */
    @TableField(fill = FieldFill.INSERT)
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date createAt;

    /**
@@ -69,4 +71,10 @@
     * 问题留言或投诉建议
     * */
    private Integer type;

    /**
     * 关联物业id
     * */
    private Long propertyId;
    private String reply;
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java

@@ -968,7 +968,7 @@
    /**
     * 查看我的问题留言或者问题留言记录
     * */
    R myFeedBack(Long id,Integer type);
    R myFeedBack(Long id,Integer type,Long propertyId);

    /**
     * 是否为物业公司登录

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -1335,6 +1335,7 @@
    @Override
    public R addUserBackstageProperty(AdministratorsUserVO administratorsUserVO) {
        SysUserDO sysUserDO = new SysUserDO();
        String appId=userDao.getCommunityAppId(administratorsUserVO.getCommunityId());
        Long roleId = administratorsUserVO.getRoleId();
        if (roleId.intValue() == 777777777) {
            SysRoleDO sysRoleDO = new SysRoleDO();
@@ -1376,10 +1377,6 @@
            }
        }
        log.info("======================type"+administratorsUserVO.getType());
        if (administratorsUserVO.getType().equals(20)){
            roleId=1559112102373756548L;
            administratorsUserVO.setType(3);
        }
        log.info("=======================roleId"+roleId);
        SysRoleDO roleDO = roleDAO.selectById(roleId);
        if (ObjectUtils.isEmpty(roleDO)) {
@@ -1388,6 +1385,7 @@
        String encode = new BCryptPasswordEncoder().encode(administratorsUserVO.getPassword());
        administratorsUserVO.setPassword(encode);
        BeanUtils.copyProperties(administratorsUserVO, sysUserDO);
        sysUserDO.setAppId(appId);
        int insert = 0;
        try {
            insert = userDao.insert(sysUserDO);
@@ -1410,6 +1408,9 @@
            SysUserRoleDO sysUserRoleDO = new SysUserRoleDO();
            sysUserRoleDO.setUserId(userId);
            sysUserRoleDO.setRoleId(roleDO.getRoleId());
            if (sysUserDO.getCommunityId().equals(10172)){
                sysUserRoleDO.setRoleId(1559112102373756548L);
            }
            int insert1 = sysUserRoleDAO.insert(sysUserRoleDO);
            if (insert1 > 0) {
                return R.ok(userId);
@@ -2871,7 +2872,8 @@
    @Transactional(rollbackFor = Exception.class)
    public R addConvenientMerchantUser(ConvenientMerchantDTO convenientMerchantDTO) {
        SysUserDO sysUserDO;
        sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getAccount, convenientMerchantDTO.getAccount()));
        sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getAccount, convenientMerchantDTO.getAccount())
                .eq(SysUserDO::getPhone,convenientMerchantDTO.getMobilePhone()).eq(SysUserDO::getAppId,"wx118de8a734d269f0"));
        if (nonNull(sysUserDO)) {
            return R.fail("账户已经存在");
        }
@@ -2880,10 +2882,10 @@
        String encode = new BCryptPasswordEncoder().encode(convenientMerchantDTO.getPassword());
        BeanUtils.copyProperties(convenientMerchantDTO, sysUserDO);
        sysUserDO.setAccount(convenientMerchantDTO.getAccount());
        sysUserDO.setType(10);
        sysUserDO.setType(5);
        sysUserDO.setAreaId(null);
        sysUserDO.setStatus(1);
        sysUserDO.setPhone(null);
        sysUserDO.setPhone(convenientMerchantDTO.getMobilePhone());
        sysUserDO.setName(convenientMerchantDTO.getContacts());
        sysUserDO.setPassword(encode);
        try {
@@ -3977,14 +3979,17 @@

    @Override
    public R feedBackReply(SysUserFeedbackVO sysUserFeedbackVO) {
        SysUserFeedbackDO sysUserFeedbackDO=new SysUserFeedbackDO();
        BeanUtils.copyProperties(sysUserFeedbackVO, sysUserFeedbackDO);
        return R.ok(sysUserFeedbackDAO.updateById(sysUserFeedbackDO));
        if (isNull(sysUserFeedbackVO.getReply())){
            return R.fail("回复内容不能为空");
        }
        SysUserFeedbackDO sysUserFeedbackDO1 = sysUserFeedbackDAO.selectById(sysUserFeedbackVO.getId());
        sysUserFeedbackDO1.setReply(sysUserFeedbackVO.getReply());
        return R.ok(sysUserFeedbackDAO.reply(sysUserFeedbackDO1));
    }

    @Override
    public R myFeedBack(Long id,Integer type) {
        List<SysUserFeedbackDO> sysUserFeedbackDOS = sysUserFeedbackDAO.selectList(new QueryWrapper<SysUserFeedbackDO>().lambda().eq(SysUserFeedbackDO::getType, type).eq(SysUserFeedbackDO::getUserId, id));
    public R myFeedBack(Long id,Integer type,Long propertyId) {
        List<SysUserFeedbackDO> sysUserFeedbackDOS = sysUserFeedbackDAO.selectList(new QueryWrapper<SysUserFeedbackDO>().lambda().eq(SysUserFeedbackDO::getType, type).eq(SysUserFeedbackDO::getUserId, id).eq(SysUserFeedbackDO::getPropertyId,propertyId ));
        return R.ok(sysUserFeedbackDOS);
    }


 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/SysUserFeedbackDAO.xml

@@ -16,23 +16,22 @@
    <sql id="columns">
        `id`,`content`,`photo_path`,`create_at`,`update_at`,`user_id`,`area_id`,`community_id`,`status`
    </sql>
    <update id="reply">
        update sys_user_feedback set reply=#{dto.reply} where id=#{dto.id}
    </update>


    <select id="detailFeedback" resultType="com.panzhihua.common.model.vos.user.SysUserFeedbackVO">
        select
        u.name,
        u.nick_name,
        f.id,
        f.content,
        f.photo_path,
        f.*,
        u.phone,
        f.create_at,
        c.name communityName
        from sys_user_feedback f
        join sys_user u on f.user_id=u.user_id
        join com_act c on u.community_id=c.community_id
        where f.id=#{id}

    </select>

    <select id="pageFeedback" resultType="com.panzhihua.common.model.vos.user.SysUserFeedbackVO">
@@ -44,7 +43,8 @@
        f.create_at,
        f.content,
        f.photo_path,
        c.name communityName
        c.name communityName,
        f.reply
        from sys_user_feedback f
        left join sys_user u on f.user_id=u.user_id
        left join com_act c on u.community_id=c.community_id
@@ -61,6 +61,12 @@
            <if test='pageFeedBackDTO.areaCode != null and pageFeedBackDTO.areaCode.trim() != &quot;&quot;'>
                and c.area_code = #{pageFeedBackDTO.areaCode}
            </if>
            <if test="pageFeedBackDTO.propertyId != null and pageFeedBackDTO.propertyId != ''">
                and f.property_id = #{pageFeedBackDTO.propertyId}
            </if>
            <if test="pageFeedBackDTO.type != null and pageFeedBackDTO.type != ''">
                and f.type = #{pageFeedBackDTO.type}
            </if>
        </where>
        order by f.create_at desc


 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml

@@ -841,4 +841,7 @@
    <select id="isPropertyAccount" resultType="java.lang.Long">
        select id from com_property where phone=#{phone}
    </select>
    <select id="getCommunityAppId" resultType="java.lang.String">
        select app_id from com_act where community_id=#{communityId}
    </select>
</mapper>