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

yanghui

2022-11-17 56e2dc02ca5f4cf38308f8a1389322639f89e99e

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

 flower_city/src/main/java/com/dg/core/api/AutomessagePolicyDocumentsAppletsController.java

@@ -52,7 +52,6 @@
     */
    @ApiOperation(value = " 根据id获取法律法规政策文件数据 ",response = AutomessagePolicyDocuments.class)
    @GetMapping("/selectAutomessagePolicyDocumentById")
    @Authorization
    public ResultData selectAutomessagePolicyDocumentById(@RequestParam(value = "id") Integer id){
        AutomessagePolicyDocuments automessagePolicyDocuments = iAutomessagePolicyDocumentsService.selectAutomessagePolicyDocumentById(id);
        if (automessagePolicyDocuments!=null){

 flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java

@@ -352,4 +352,16 @@
    }


    /**
     * 删除评论
     * @return
     */
    @ApiOperation(value = "删除评论",response = GuideRepairOrder.class)
    @GetMapping("/deleteComment")
    @Authorization
    public  ResultData deleteComment(@RequestParam(value = "id",required = false) Integer id,@CurrentUser  SysUser sysUser){
        return  iGuideRepairOrderService.deleteComment(id,sysUser);
    }


}

 flower_city/src/main/java/com/dg/core/api/TransactionEventAppletsController.java

@@ -5,39 +5,46 @@
import com.dg.core.annotation.Authorization;
import com.dg.core.annotation.CurrentUser;
import com.dg.core.controller.BaseController;
import com.dg.core.db.gen.entity.AutomessageSmartConsulting;
import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.db.gen.entity.TransactionEvent;
import com.dg.core.db.manual.pojo.QueryResults;
import com.dg.core.db.manual.pojo.RecommendResult;
import com.dg.core.db.manual.pojo.Search;
import com.dg.core.service.IAutomessageSmartConsultingService;
import com.dg.core.service.ITransactionEventService;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import java.time.LocalDateTime;
import java.util.List;

@Api(tags = {"导办事项管理(及办事指南)小程序接口"})
@RestController
@RequestMapping("/applets/transaction")
public class TransactionEventAppletsController extends BaseController
{
public class TransactionEventAppletsController extends BaseController {

    @Autowired(required = true)
    ITransactionEventService iTransactionEventService;

    @Autowired(required = true)
    IAutomessageSmartConsultingService iAutomessageSmartConsultingService;

    /**
     * 查询导办事务详情
     *
     * @param Id
     * @return
     */
    @ApiOperation("查询导办事务详情")
    @GetMapping("/getData")
    public ResultData selectConfigData(@RequestParam("Id") String Id,@CurrentUser SysUser sysUser)
    {
    public ResultData selectConfigData(@RequestParam("Id") String Id, @CurrentUser SysUser sysUser) {
        Assert.notNull(Id, "Id 不能为空");
        return ResultData.success(iTransactionEventService.selectConfigData(Id,sysUser));
    }
@@ -45,37 +52,46 @@

    /**
     * 导办事物列表(不分页)
     *
     * @param
     * @return
     */
    @ApiOperation(value = "导办事物列表(不分页)",response = TransactionEvent.class)
    @GetMapping("/selectList")
    public TableDataInfo selectList(@RequestParam(value = "keyWord",required = false) String keyWord)
    {
    public TableDataInfo selectList(@RequestParam(value = "keyWord", required = false) String keyWord) {
        return getDataTable(iTransactionEventService.selectList(keyWord));
    }





    /**
     * 导办事务搜索(无分页用于小程序)
     *
     * @param keyWord
     * @return
     */
    @ApiOperation(value = "导办事务搜索(无分页用于小程序)",response = QueryResults.class)
    @ApiImplicitParams({
            @ApiImplicitParam(name = "isSmartConsulting", value = "是否是智能咨询（1.是 2.否）", required = true, dataType = "String", paramType = "query")
    })
    @GetMapping("/queryKeyWord")
    public QueryResults queryKeyWord(@RequestParam(value = "keyWord",required = false) String keyWord)
    {
    public QueryResults queryKeyWord(@RequestParam(value = "keyWord", required = false) String keyWord, @RequestParam(value = "isSmartConsulting", required = false) String isSmartConsulting, @CurrentUser SysUser sysUser) {
        QueryResults queryResults = iTransactionEventService.queryMatterNameList(keyWord);
        if (isSmartConsulting != null && isSmartConsulting.equals("1")) {
            AutomessageSmartConsulting automessageSmartConsulting = new AutomessageSmartConsulting();
            if (sysUser != null) {
                automessageSmartConsulting.setCreateUserId(sysUser.getUserId());
            }
            automessageSmartConsulting.setType(1);
            automessageSmartConsulting.setCreateTime(LocalDateTime.now());
            iAutomessageSmartConsultingService.add(automessageSmartConsulting);
        }
        return queryResults;
    }



    /**
     *  根据分类查询导办事务
     *
     * @param classifyId
     * @return
     */
@@ -88,6 +104,7 @@

    /**
     *  查询导办事务求和
     *
     * @return
     */
    @ApiOperation(value = "查询导办事务求和",response = TransactionEvent.class)
@@ -98,6 +115,7 @@

    /**
     * 智能咨询
     *
     * @return
     */
    @ApiOperation(value = "智能咨询",response = RecommendResult.class)

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

@@ -37,7 +37,6 @@
            @ApiImplicitParam(name = "type", value = "类型（1.法律法规2.政策文件）", required = true, dataType = "String", paramType = "query")
    })
    @GetMapping("/selectConfigList")
    @Authorization
    public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
                                          @RequestParam(value = "pageSize",required = false) Integer pageSize,
                                          @RequestParam(value = "name",required = false) String name,
@@ -129,7 +128,6 @@
     */
    @ApiOperation(value = " 根据id获取法律法规政策文件数据 ",response = AutomessagePolicyDocuments.class)
    @GetMapping("/selectAutomessagePolicyDocumentById")
    @Authorization
    public ResultData selectAutomessagePolicyDocumentById(@RequestParam(value = "id") Integer id){
        AutomessagePolicyDocuments automessagePolicyDocuments = iAutomessagePolicyDocumentsService.selectAutomessagePolicyDocumentById(id);
        if (automessagePolicyDocuments!=null){

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

@@ -48,11 +48,12 @@
        Page<ElseAccessoryEntity> pageParam = new Page<>(pageNum,pageSize);
        List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
        List<ElseAccessoryEntity> list;
        if (sysUser.getUserType().equals("2")){
         list = iElseAccessoryService.selectConfigList(pageParam,pageSize,name,ids,sysUser.getUserId());}
        else {
        if (sysUser.getUserType().equals("1")||sysUser.getIsDivisionHead().equals("1")){
            list = iElseAccessoryService.selectConfigList(pageParam,pageSize,name,ids,null);
        }
        else {
            list = iElseAccessoryService.selectConfigList(pageParam,pageSize,name,ids,sysUser.getUserId());
        }
        int num=iElseAccessoryService.countNum(name,ids);
        return getDataTable(list,num);
    }

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

@@ -56,9 +56,9 @@
        Assert.notNull(pageSize, "pageSize can not be empty");
        Page<SysUser> pageParam = new Page<>(pageNum,pageSize);
        List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"2",keyword,ids);
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"2",keyword,ids,null);

        int num=IUserService.selectNum("2",keyword,ids);
        int num=IUserService.selectNum("2",keyword,ids,null);
        return getDataTable(list,num);
    }

@@ -122,7 +122,7 @@
                user.setRoleIds("2");
            }
            user.setUserType("2");
            user.setIsDivisionHead("1");
            user.setIsDivisionHead(config.getIsDivisionHead());
            user.setStatus(config.getStatus());
            user.setUpdateTime(LocalDateTime.now());
            //提示用户名或密码错误
@@ -140,7 +140,7 @@
        config.setCreateTime(LocalDateTime.now());
        config.setUpdateTime(LocalDateTime.now());
        config.setUserId(Snowflake.getId()+"");
        config.setIsDivisionHead("1");
        config.setIsDivisionHead(config.getIsDivisionHead());
        return toAjax(IUserService.insertConfig(config));
    }


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

@@ -469,4 +469,16 @@
    }


    /**
     * 删除评论
     * @return
     */
    @ApiOperation(value = "删除评论",response = GuideRepairOrder.class)
    @GetMapping("/deleteComment")
    @Authorization
    public  ResultData deleteComment(@RequestParam(value = "id",required = false) Integer id,@CurrentUser  SysUser sysUser){
        return  iGuideRepairOrderService.deleteComment(id,sysUser);
    }


}

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

@@ -48,6 +48,9 @@
    @Autowired
    private ISysUserRecordService iSysUserRecordService;

    @Autowired(required = true)
    IAutomessageSmartConsultingService iAutomessageSmartConsultingService;


    @ApiOperation("首页统计不同状态工单数")
    @GetMapping("/getWorkOrder")
@@ -658,6 +661,17 @@
    /***************************************************    部门数据统计 end   **********************************************************/


    /**
     * 统计访问量
     * @return
     */
    @ApiOperation("统计访问量")
    @GetMapping("/countSmartConsulting")
    public ResultData countSmartConsulting(){
       return  ResultData.success(iAutomessageSmartConsultingService.countSmartConsulting()) ;
    }






 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)

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

@@ -46,10 +46,11 @@
        Page<ReplyTemplateEntity> pageParam = new Page<>(pageNum,pageSize);
        List<String> ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
        List<ReplyTemplateEntity> list;
        if (sysUser.getUserType().equals("2")){
              list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids,sysUser.getUserId());}
        else {
        if (sysUser.getUserType().equals("1")||sysUser.getIsDivisionHead().equals("1")){
            list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids,null);
        }
        else {
            list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids,sysUser.getUserId());
        }
        int num=iReplyTemplateService.countNum(Name,ids);
        return getDataTable(list,num);
@@ -156,7 +157,7 @@
    @ApiOperation("复制模板")
    @PostMapping("/copy")
    @Authorization
    public ResultData copy(@RequestParam(value = "Id",required = false) String Id)
    public ResultData copy(@RequestParam(value = "Id",required = false) String Id,@CurrentUser SysUser sysUser)
    {
        if(StringUtils.isEmpty(Id))
        {
@@ -169,6 +170,7 @@
        {
            return ResultData.error("模板不存在！");
        }
        entity.setCreateUserId(sysUser.getUserId());
        entity.setName(entity.getName()+"(副本)");
        entity.setId(null);
        return toAjax(iReplyTemplateService.insertConfig(entity));

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

@@ -5,6 +5,7 @@
import com.dg.core.annotation.Authorization;
import com.dg.core.annotation.CurrentUser;
import com.dg.core.db.gen.AjaxResult;
import com.dg.core.db.gen.entity.AutomessageSmartConsulting;
import com.dg.core.db.gen.entity.Slideshow;
import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.db.gen.entity.TransactionEvent;
@@ -14,6 +15,7 @@
import com.dg.core.file.FtpConstants;
import com.dg.core.file.MimeTypeUtils;
import com.dg.core.file.SFTPUtil;
import com.dg.core.service.IAutomessageSmartConsultingService;
import com.dg.core.service.IOrganizationChartService;
import com.dg.core.service.ITransactionEventService;
import com.dg.core.util.TableDataInfo;
@@ -27,6 +29,7 @@
import org.springframework.web.multipart.MultipartFile;

import java.io.InputStream;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
@@ -45,6 +48,9 @@

    @Autowired(required = true)
    IOrganizationChartService iOrganizationChartService;

    @Autowired(required = true)
    IAutomessageSmartConsultingService iAutomessageSmartConsultingService;

    /**
     * 查询导办事务详情
@@ -72,15 +78,42 @@
                                          @RequestParam(value = "pageSize",required = false) Integer pageSize,
                                          @RequestParam(value = "keyword",required = false) String keyword,
                                          @RequestParam(value = "classifyGrade",required = false) String classifyGrade,
                                          @RequestParam(value = "departmentId",required = false) String departmentId,
                                          @CurrentUser SysUser sysUser)
    {
        Assert.notNull(pageNum, "pageNum 不能为空");
        Assert.notNull(pageSize, "pageSize 不能为空");
        Page<TransactionEvent> pageParam = new Page<>(pageNum,pageSize);
//        List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
        List<TransactionEvent> list = iTransactionEventService.selectConfigList(pageParam,pageSize,keyword,
        List<TransactionEvent> list;
        int num;
        if (departmentId!=null&&departmentId.length()>0){
            List<String> ids=iOrganizationChartService.getDepartmentId(departmentId);
            list = iTransactionEventService.selectConfigList(pageParam,pageSize,keyword,
                    classifyGrade,ids);
              num=iTransactionEventService.countNum(keyword,classifyGrade,ids);

        }else {
               list = iTransactionEventService.selectConfigList(pageParam,pageSize,keyword,
                classifyGrade,null);
        int num=iTransactionEventService.countNum(keyword,classifyGrade,null);
              num=iTransactionEventService.countNum(keyword,classifyGrade,null);
        }
        return getDataTable(list,num);
    }

    /**
     * 导办事物列表
     * @param
     * @return
     */
    @ApiOperation("根据部门id获取导办事物列表")
    @PostMapping("/department/getList")
    @Authorization
    public TableDataInfo<TransactionEvent> selectConfigList(@RequestBody List<String> DepartmentId,
                                          @CurrentUser SysUser sysUser)
    {
//        List<String> ids=iOrganizationChartService.getIds(DepartmentId);
        List<TransactionEvent> list = iTransactionEventService.selectConfigList(null,null,DepartmentId);
        int num=iTransactionEventService.countNum(null,null,DepartmentId);
        return getDataTable(list,num);
    }

@@ -248,7 +281,14 @@
     */
    @ApiOperation(value = "智能咨询",response = RecommendResult.class)
    @GetMapping("/smartConsulting")
    public RecommendResult smartConsulting(@RequestParam("keyWord") String keyWord){
    public RecommendResult smartConsulting(@RequestParam("keyWord") String keyWord,@CurrentUser SysUser sysUser){
        AutomessageSmartConsulting automessageSmartConsulting = new AutomessageSmartConsulting();
        if (sysUser!=null){
            automessageSmartConsulting.setCreateUserId(sysUser.getUserId());
        }
        automessageSmartConsulting.setType(2);
        automessageSmartConsulting.setCreateTime(LocalDateTime.now());
        iAutomessageSmartConsultingService.add(automessageSmartConsulting);
        return  iTransactionEventService.smartConsulting(keyWord);
    }


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

@@ -195,9 +195,9 @@
        Assert.notNull(pageNum, "pageNum can not be empty");
        Assert.notNull(pageSize, "pageSize can not be empty");
        Page<SysUser> pageParam = new Page<>(pageNum,pageSize);
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"3",keyword,null);
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"3",keyword,null,"1");

        int num=IUserService.selectNum("3",keyword,null);
        int num=IUserService.selectNum("3",keyword,null,"1");
        return getDataTable(list,num);
    }

@@ -396,7 +396,7 @@
     *
     * @return 结果
     */
    @ApiOperation("获取登录人员信息")
    @ApiOperation(value = "获取登录人员信息,userType=1 为超级管理员  isDivisionHead=1 为部门领导",response = SysUser.class)
    @PostMapping("/getLoginInformation")
    @Authorization
    public ResultData getLoginInformation(@CurrentUser SysUser sysUse)

 flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessagePolicyDocuments.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -73,6 +74,7 @@
     * 创建时间
     */
    @ApiModelProperty("创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime createTime;

    /**
@@ -85,6 +87,7 @@
     * 修改时间
     */
    @ApiModelProperty("修改时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime updateTime;



 flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageSmartConsulting.java

New file
@@ -0,0 +1,57 @@
package com.dg.core.db.gen.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.time.LocalDateTime;

/**
 * <p>
 * 
 * </p>
 *
 * @author fengjin
 * @since 2022-11-16
 */
@TableName("automessage_smart_consulting")
@Data
@ApiModel("智能咨询访问类")
public class AutomessageSmartConsulting implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 主键id
     */
    @ApiModelProperty("主键id")
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    /**
     * 创建时间
     */
    @ApiModelProperty("创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime createTime;

    /**
     * 咨询类型：1.小程序访问 2.门户网访问
     */
    @ApiModelProperty("咨询类型：1.小程序访问 2.门户网访问")
    private Integer type;

    /**
     * 咨询人id 可以为 空
     */
    @ApiModelProperty("咨询人id 可以为 空")
    private String createUserId;



}

 flower_city/src/main/java/com/dg/core/db/gen/entity/GuideEvolveEntity.java

@@ -54,9 +54,9 @@
    private String fromUserId;

    /**
     * state", value = "状态（1待分配  2 待办结 3 已办结 4 待评价 5 已取消 6未解决  7已解决  8 系统自动分配 9 回复 10转派 11手动分配12默认好评13评价）
     * state", value = "状态（1待分配  2 待办结 3 已办结 4 待评价 5 已取消 6未解决  7已解决  8 系统自动分配 9 回复 10转派 11手动分配12默认好评13评价14.删除评论）
     */
    @ApiModelProperty(name = "state", value = "状态（1待分配  2 待办结 3 已办结 4 待评价 5 已取消 6未解决  7已解决  8 系统自动分配 9 回复 10转派 11手动分配 12默认好评 13用户评价）")
    @ApiModelProperty(name = "state", value = "状态（1待分配  2 待办结 3 已办结 4 待评价 5 已取消 6未解决  7已解决  8 系统自动分配 9 回复 10转派 11手动分配 12默认好评 13用户评价14.删除评论）")
    private String state;



 flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrder.java

@@ -194,6 +194,12 @@
    @ApiModelProperty("是否推送过（1 是 2 否）")
    private Integer isPush;

    /**
     * 是否隐藏评论（1 是 2 否）
     */
    @ApiModelProperty("是否隐藏评论（1 是 2 否）")
    private Integer isHideComments;

    @TableField(exist = false)
    @ApiModelProperty(name = "sumClassifyName", value = "完整分类名称")
    private String sumClassifyName;

 flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java

@@ -264,6 +264,10 @@
    private String mattersIds;


    @ApiModelProperty("部门ids")
    private String departmentIds;


    @TableField(exist = false)
    @ApiModelProperty("办理事项名称")
    private String mattersNames;

 flower_city/src/main/java/com/dg/core/db/gen/entity/TransactionEvent.java

@@ -272,5 +272,13 @@

    @ApiModelProperty(name = "classifyIds", value = "前端使用")
    private String classifyIds;


    @ApiModelProperty(name = "departmentIds", value = "所属部门列")
    private String departmentIds;

    @TableField(exist = false)
    @ApiModelProperty(name = "departmentNames", value = "所属部门列名称集合")
    private String departmentNames;

}

 flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessageSmartConsultingMapper.java

New file
@@ -0,0 +1,16 @@
package com.dg.core.db.gen.mapper;

import com.dg.core.db.gen.entity.AutomessageSmartConsulting;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author fengjin
 * @since 2022-11-16
 */
public interface AutomessageSmartConsultingMapper extends BaseMapper<AutomessageSmartConsulting> {

}

 flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java

@@ -29,7 +29,8 @@
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,
                                          @Param("userType") String userType,
                                          @Param("userName") String userName,
                                          @Param("ids") List<String> ids);
                                          @Param("ids") List<String> ids,
                                          @Param("isDivisionHead") String  isDivisionHead);



@@ -70,7 +71,8 @@
     */
    public int selectNum(@Param("userType") String userType,
                         @Param("userName") String userName,
                         @Param("ids") List<String> ids);
                         @Param("ids") List<String> ids,
                         @Param("isDivisionHead") String  isDivisionHead);

    /**
     * 根据部门id及分类id获取导办用户

 flower_city/src/main/java/com/dg/core/db/gen/mapper/TransactionEventMapper.java

@@ -30,6 +30,7 @@




    /**
     * 导办事物列表 (部分也)
     * @param

 flower_city/src/main/java/com/dg/core/db/manual/mapper/util/MapperGenerator.java

@@ -34,7 +34,7 @@
                })
                .strategyConfig(builder -> {
//                    builder.addInclude("");
                    builder.addInclude("automessage_policy_documents") // 设置需要生成的表名
                    builder.addInclude("automessage_smart_consulting") // 设置需要生成的表名
                            .addTablePrefix("t_", "c_"); // 设置过滤表前缀
                })
                .templateConfig(builder -> {

 flower_city/src/main/java/com/dg/core/service/IAutomessageSmartConsultingService.java

New file
@@ -0,0 +1,18 @@
package com.dg.core.service;

import com.dg.core.db.gen.entity.AutomessageSmartConsulting;

public interface IAutomessageSmartConsultingService {

    /**
     * 新增智能咨询访问记录
     * @return
     */
    int add(AutomessageSmartConsulting automessageSmartConsulting);

    /**
     * 统计访问量
     * @return
     */
    Long countSmartConsulting();
}

 flower_city/src/main/java/com/dg/core/service/IGuideRepairOrderService.java

@@ -133,4 +133,11 @@
     */
    int updateEvaluate();


    /**
     * 删除评论
     * @return
     */
    ResultData deleteComment(Integer id, SysUser sysUser);

}

 flower_city/src/main/java/com/dg/core/service/IOrganizationChartService.java

@@ -70,4 +70,11 @@
     */
    public List<OrganizationChartEntity> selectParentList(String parentId,String grade);

    /**
     * 获取该部门所有上级部门及其所有下级部门
     * @param id
     * @return
     */
    List<String> getDepartmentId(String id);

}

 flower_city/src/main/java/com/dg/core/service/ISysUserService.java

@@ -15,7 +15,7 @@
     * @return 参数配置信息
     */
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType,
                                          String userName,List<String> ids);
                                          String userName,List<String> ids,String isDivisionHead);


    SysUser selectData(String userId,String phonenumber,String loginName);
@@ -49,7 +49,7 @@
     *
     * @return 结果
     */
    public int selectNum(String userType,String userName,List<String> ids);
    public int selectNum(String userType,String userName,List<String> ids,String  isDivisionHead);

    /**
     * 发送验证码(如果没有该用户则新建用户)

 flower_city/src/main/java/com/dg/core/service/impl/AreaCodeServiceImpl.java

@@ -13,6 +13,7 @@

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;

@@ -27,12 +28,18 @@

    @Override
    public List<AreaCode2022> getAreaCodeByTransactionId(Integer transactionId){
//        HashMap<Object, Object> objectObjectHashMap = new HashMap<>();
        List<String> areaCodes = new ArrayList<>();
        TransactionEvent transactionEvent = transactionEventMapper.selectOne(new QueryWrapper<TransactionEvent>().lambda().
                eq(TransactionEvent::getId, transactionId));
        List<String> departmentIds = new ArrayList<>();
        if (transactionEvent.getDepartmentIds() != null) {
            departmentIds = new ArrayList<>(Arrays.asList(transactionEvent.getDepartmentIds().split(",")));
        }

        departmentIds.add(transactionEvent.getDepartmentId());
        for (String departmentId : departmentIds) {
        OrganizationChartEntity organizationChartEntity = organizationChartMapper.selectOne(new QueryWrapper<OrganizationChartEntity>().lambda()
                .eq(OrganizationChartEntity::getId, transactionEvent.getDepartmentId()));
        List<String> areaCodes=new ArrayList<>();
                    .eq(OrganizationChartEntity::getId, departmentId));
        if (organizationChartEntity!=null){
           if (organizationChartEntity.getCity()!=null)
             areaCodes.add(organizationChartEntity.getCity());
@@ -40,11 +47,9 @@
             areaCodes.add(organizationChartEntity.getDistrict());
           if (organizationChartEntity.getVillage()!=null)
             areaCodes.add(organizationChartEntity.getVillage());
           getAreaCodeIds(areaCodes,organizationChartEntity);
        }
        if (areaCodes.size()==0)
            return null;
        else

        }
           return baseMapper.selectByIdSet(areaCodes);
    }


 flower_city/src/main/java/com/dg/core/service/impl/AutomessagePolicyDocumentsServiceImpl.java

@@ -18,17 +18,18 @@
    @Override
    public List<AutomessagePolicyDocuments> selectConfigList(IPage<AutomessagePolicyDocuments> page, Integer state, String name, String type, SysUser sysUser,Integer departmentId) {
        List<AutomessagePolicyDocuments> automessagePolicyDocumentsList = baseMapper.selectConfigList(page, state, name, type, departmentId);
        if (sysUser!=null){
        for (AutomessagePolicyDocuments automessagePolicyDocuments:automessagePolicyDocumentsList) {
            if(sysUser.getUserType().equals("1")){//超级管理员
                automessagePolicyDocuments.setIsDelete(1);
            }else if (sysUser.getUserType().equals("3") && sysUser.getIsDivisionHead().equals("1")){//部门领导
                if (sysUser.getDepartmentId().equals(automessagePolicyDocuments.getDepartmentId())){//如果是一个部门则可以删除
            }else if ( sysUser.getIsDivisionHead().equals("1")){//部门领导
                if (sysUser.getDepartmentId().equals(automessagePolicyDocuments.getDepartmentId().toString())){//如果是一个部门则可以删除
                    automessagePolicyDocuments.setIsDelete(1);
                }else {
                    automessagePolicyDocuments.setIsDelete(2);
                }
            }
            else if (sysUser.getUserType().equals("2")){
            else if (sysUser.getUserType().equals("2")){//导办人员
                if(sysUser.getUserId().equals(automessagePolicyDocuments.getCreateUserId())){//如果它创建的则可以删除
                    automessagePolicyDocuments.setIsDelete(1);
                }else {
@@ -36,6 +37,7 @@
                }
            }
        }
        }
        return automessagePolicyDocumentsList;
    }


 flower_city/src/main/java/com/dg/core/service/impl/GuideEvolveImpl.java

@@ -26,7 +26,7 @@
    @Override
    public List<GuideEvolveEntity> selectConfigList(String guideId,SysUser sysUser) {
        List<GuideEvolveEntity> guideEvolveEntities;
        if (sysUser.getUserType().equals("4")){
        if ((sysUser.getUserType().equals("3")&&sysUser.getIsDivisionHead().equals("2"))||(sysUser.getUserType().equals("4"))){
            guideEvolveEntities=baseMapper.selectHideList(guideId);
        }else {
            guideEvolveEntities = baseMapper.selectConfigList(guideId);

 flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java

@@ -106,8 +106,7 @@
                        for (String departmentId : departmentIdsParent) {
                            OrganizationChartEntity organizationChart = organizationChartMapper.selectOne(new QueryWrapper<OrganizationChartEntity>().lambda().eq(OrganizationChartEntity::getId, departmentId));
                            OrganizationChartEntity organizationChartParent = organizationChartMapper.selectOne(new QueryWrapper<OrganizationChartEntity>().lambda().eq(OrganizationChartEntity::getId, organizationChart.getParentId()));
                            if (organizationChartParent!=null)
                            {
                            if (organizationChartParent != null) {
                                departmentIds.add(organizationChartParent.getId().toString());
                            }
                        }
@@ -437,5 +436,33 @@
        return 0;
    }

    @Override
    public ResultData deleteComment(Integer id, SysUser sysUser) {
        if (sysUser.getUserType().equals("1") || sysUser.getIsDivisionHead().equals("1")) {
            GuideRepairOrder guideRepairOrder = baseMapper.selectOne(new QueryWrapper<GuideRepairOrder>().lambda().eq(GuideRepairOrder::getId, id));
            if (guideRepairOrder!=null&&guideRepairOrder.getState().equals("3")) {
                guideRepairOrder.setIsHideComments(1);
                baseMapper.updateById(guideRepairOrder);
                //新增删除评论进展
                GuideEvolveEntity entity = new GuideEvolveEntity();
                entity.setCreateTime(LocalDateTime.now());
                entity.setUpdateTime(LocalDateTime.now());
                entity.setState("14");
                entity.setFromUserId(sysUser.getUserId() + "");
                entity.setGuideId(guideRepairOrder.getId().toString());
                guideEvolveMapper.insertConfig(entity);
                baseMapper.updateById(guideRepairOrder);
                return ResultData.success("删除评论成功");
            } else {
                ResultData.error("已办结的单据才能进行删除评论操作");
            }
        } else {
            ResultData.error("只能部门领导和超级管理员才能删除评论");
        }
        return  ResultData.error();
    }




}

 flower_city/src/main/java/com/dg/core/service/impl/IAutomessageSmartConsultingServiceImpl.java

New file
@@ -0,0 +1,23 @@
package com.dg.core.service.impl;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dg.core.db.gen.entity.AutomessageSmartConsulting;
import com.dg.core.db.gen.mapper.AutomessageSmartConsultingMapper;
import com.dg.core.service.IAutomessageSmartConsultingService;
import org.springframework.stereotype.Service;

@Service
public class IAutomessageSmartConsultingServiceImpl extends ServiceImpl<AutomessageSmartConsultingMapper, AutomessageSmartConsulting> implements IAutomessageSmartConsultingService {

   @Override
   public int add(AutomessageSmartConsulting automessageSmartConsulting){
       return   baseMapper.insert(automessageSmartConsulting);
   }

    @Override
   public  Long countSmartConsulting(){
     return baseMapper.selectCount(new QueryWrapper<AutomessageSmartConsulting>().lambda());
   }
}

 flower_city/src/main/java/com/dg/core/service/impl/OrganizationChartImpl.java

@@ -128,6 +128,43 @@
        return ids;
    }

    @Override
    public List<String> getDepartmentId(String id){
        String parentId = parentId(id);
        List<String> departmentIds=new ArrayList<>();
        departmentIds.add(parentId);
        List<OrganizationChartEntity> organizationChartEntities = baseMapper.selectList(new QueryWrapper<OrganizationChartEntity>().lambda().eq(OrganizationChartEntity::getParentId, parentId));
        for (OrganizationChartEntity organizationChart :organizationChartEntities){
            departmentIds.add(organizationChart.getId().toString());
            departmentIds=getDepartmentIds(organizationChart.getId().toString(),departmentIds);
        }
        return  departmentIds;
    }


    public  String parentId(String id){
        String parentId=id;
        OrganizationChartEntity organizationChart = baseMapper.selectOne(new QueryWrapper<OrganizationChartEntity>().lambda().eq(OrganizationChartEntity::getId, id));
        if (organizationChart.getParentId().length()>0){
            parentId=parentId(organizationChart.getParentId());
        }
        return parentId;
    }

    public  List<String>  getDepartmentIds(String id,List<String> departmentIds){
        List<OrganizationChartEntity> organizationChartEntities = baseMapper.selectList(new QueryWrapper<OrganizationChartEntity>().lambda().eq(OrganizationChartEntity::getParentId, id));
        if (organizationChartEntities.size()==0){
            return  departmentIds;
        }
        else {
            for (OrganizationChartEntity organizationChart :organizationChartEntities){
                departmentIds.add(organizationChart.getId().toString());
                departmentIds=getDepartmentIds(organizationChart.getId().toString(),departmentIds);
            }
        }
        return departmentIds;
    }



    //递归取id

 flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java

@@ -55,7 +55,8 @@

    @Override
    public ResultData smsSend(SysUser user){
       return smsUtil.sendSms(user.getPhonenumber());
        return smsUtil.sendSmsNew(user.getPhonenumber());

    }

    @Override
@@ -68,7 +69,7 @@
            List<HuaChengSysUser> list=iHuaChengSysUserService.selectData("","",phonenumber);
            HuaChengSysUser huaChengSysUser=null;

            if(list!=null || list.size()>0 )
            if( list.size()>0  )
            {
                huaChengSysUser=list.get(0);
            }
@@ -254,8 +255,8 @@
    }

    @Override
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType,String userName,List<String> ids) {
        return baseMapper.selectConfigList(page, state,userType,userName,ids);
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType,String userName,List<String> ids,String isDivisionHead) {
        return baseMapper.selectConfigList(page, state,userType,userName,ids,isDivisionHead);
    }

    @Override
@@ -298,8 +299,8 @@
    }

    @Override
    public int selectNum(String userType,String userName,List<String> ids) {
        return baseMapper.selectNum(userType,userName,ids);
    public int selectNum(String userType,String userName,List<String> ids,String  isDivisionHead) {
        return baseMapper.selectNum(userType,userName,ids,isDivisionHead);
    }



 flower_city/src/main/java/com/dg/core/util/SmsUtil.java

@@ -1,5 +1,6 @@
package com.dg.core.util;

import com.alibaba.fastjson.JSONObject;
import com.aliyuncs.CommonRequest;
import com.aliyuncs.CommonResponse;
import com.aliyuncs.DefaultAcsClient;
@@ -11,6 +12,9 @@
import com.dg.core.ResultData;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.squareup.okhttp.OkHttpClient;
import com.squareup.okhttp.Request;
import com.squareup.okhttp.Response;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -18,7 +22,9 @@
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import java.util.Random;
import java.util.concurrent.TimeUnit;

@@ -37,6 +43,12 @@
    // 注入redisTemplate
    @Resource
    RedisTemplate<String, Object> redisTemplate;

    private  String LoginName="DSCJKCSZH";

    private  String Pwd="dx@2020";

    private  String FeeType="2";

    /**
     * 发送短信登录验证码
@@ -88,6 +100,38 @@
        return ResultData.error("短信发送失败");
    }

    public ResultData sendSmsNew(String tel) {
        String url =
                "https://dxsdk.028lk.com:8082/Api/SendSms?"+"LoginName="+LoginName+"&Pwd="+Pwd+"&FeeType="+FeeType+"&Mobile="+tel+"&Content=";
        Random rd = new Random();
       // int code = rd.nextInt(900000) + 100000;测试账号模板验证码数值固定等有正式账号才能进行随机数
        int code=181326;
        String content="验证码："+code+"，您正在进行注册操作，验证码5分钟内有效，请勿向他人泄露。";
        url=url+content;
        OkHttpClient client = new OkHttpClient();
        Response response;
        //解密数据
        String rsa = null;
        Request request = new Request.Builder()
                .url(url)
                .get()
                .addHeader("Content-Type", "application/x-www-form-urlencoded")
                .build();
        try {
            response = client.newCall(request).execute();
            redisTemplate.opsForValue().set(tel, code + "", 5, TimeUnit.MINUTES);
//            rsa = response.body().string().split("|")[0];
              rsa   = response.message();
              if (!rsa.equals("OK")){
                  return ResultData.success("短信发送失败");
              }
        } catch (IOException e) {
            e.printStackTrace();
            return ResultData.success("短信发送失败");
        }
        return ResultData.success("短信发送成功");
    }

    /**
     * 发送工单超时短信
     *

 flower_city/src/main/resources/application-sms.properties

@@ -7,19 +7,19 @@
#??????????,???????????????????????????????????

#??????
aliyun.TemplateCodeOvertime=SMS_254460011
#aliyun.TemplateCodeOvertime=SMS_254460011
#??????
#aliyun.TemplateCodeOvertime=SMS_254460012
aliyun.TemplateCodeOvertime=SMS_254460012

#??????
aliyun.TemplateCodeComplete=SMS_254875101
#aliyun.TemplateCodeComplete=SMS_254875101
#??????
#aliyun.TemplateCodeComplete=SMS_254875102
aliyun.TemplateCodeComplete=SMS_254875102

#??????
aliyun.TemplateCodeSubmit=SMS_254880764
#aliyun.TemplateCodeSubmit=SMS_254880764
#??????
#aliyun.TemplateCodeSubmit=SMS_254880763
aliyun.TemplateCodeSubmit=SMS_254880763




 flower_city/src/main/resources/mapper/AutomessagePolicyDocumentsMapper.xml

@@ -48,6 +48,7 @@
                 and department_id  in  (SELECT id from automessage_organization_chart where id=#{departmentId} or parent_id = #{departmentId})
            </if>
        </where>
        order by create_time desc
    </select>

    <select id="selectCountList" resultType="integer">

 flower_city/src/main/resources/mapper/AutomessageSmartConsultingMapper.xml

New file
@@ -0,0 +1,5 @@
<?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.dg.core.db.gen.mapper.AutomessageSmartConsultingMapper">

</mapper>

 flower_city/src/main/resources/mapper/GuideEvolveMapper.xml

@@ -65,10 +65,10 @@
            id,
            departmental_id,
            IFNULL(
                    (select  concat(substring(user_name,1,1),'老师') from automessage_sys_user where a.to_user_id=user_id and user_type in (1,2) or is_division_head=1),
                    (select  concat(substring(user_name,1,1),'老师') from automessage_sys_user where a.to_user_id=user_id and (user_type in (1,2) or is_division_head=1)),
                    (select user_name from automessage_sys_user where a.to_user_id=user_id))toUserName,
            IFNULL(
                    (select  concat(substring(user_name,1,1),'老师') from automessage_sys_user where a.from_user_id=user_id and user_type in (1,2) or is_division_head=1),
                    (select  concat(substring(user_name,1,1),'老师') from automessage_sys_user where a.from_user_id=user_id and (user_type in (1,2) or is_division_head=1)),
                    (select user_name from automessage_sys_user where a.from_user_id=user_id))fromUserName,
            to_user_id,
            from_user_id,

 flower_city/src/main/resources/mapper/SysUserMapper.xml

@@ -38,6 +38,7 @@
        <result property="transactionNum"      column="transaction_num"      />
        <result property="isDivisionHead"      column="is_division_head"      />
        <result property="mattersIds"      column="matters_ids"      />
        <result property="departmentIds"      column="department_ids"      />
    </resultMap>

    <sql id="selectSysUserVo">
@@ -68,6 +69,7 @@
            stair_id,
            second_level_id,
            matters_ids,
            department_ids,
            (SELECT GROUP_CONCAT(matter_name) FROM automessage_transaction_event WHERE id in (SELECT
              substring_index(substring_index(matters_ids,',', b.help_topic_id + 1), ',', -1) result
          FROM
@@ -119,6 +121,9 @@
                    #{param}
                </foreach>
            </if>
            <if test="isDivisionHead != null and isDivisionHead != ''">
                AND is_division_head=#{isDivisionHead}
            </if>
            <if test="userName != null and userName != ''">
                AND (user_name like concat('%', #{userName}, '%') or
                (department_id in (SELECT id FROM automessage_organization_chart
@@ -151,6 +156,9 @@
                <foreach collection="ids" item="param"  open="(" close=")" separator=",">
                    #{param}
                </foreach>
            </if>
            <if test="isDivisionHead != null and isDivisionHead != ''">
                and is_division_head=#{isDivisionHead}
            </if>
            <if test="userName != null and userName != ''">
                AND (user_name like concat('%', #{userName}, '%') or
@@ -239,13 +247,14 @@
        <if test="departmentName != null and departmentName != '' ">,department_name</if>
        <if test="departmentArea != null and departmentArea != '' ">,department_area</if>
        <if test="leisureState != null and leisureState != '' ">,leisure_state</if>
        <if test="masterIds != null and masterIds != '' ">,master_ids</if>
        <if test="masterNames != null and masterNames != '' ">,master_names</if>
        <if test="masterIds != null">,master_ids</if>
        <if test="masterNames != null">,master_names</if>
        <if test="transactionIds != null and transactionIds != '' ">,transaction_ids</if>
        <if test="transactionNames != null and transactionNames != '' ">,transaction_names</if>
        <if test="openid != null and openid != '' ">,openid</if>
        <if test="isDivisionHead != null and isDivisionHead != '' ">,is_division_head</if>
        <if test="mattersIds != null and mattersIds != '' ">,matters_ids</if>
        <if test="mattersIds != null  ">,matters_ids</if>
        <if test="departmentIds != null  ">,department_ids</if>
        )values(
        sysdate()
        <if test="userId != null and userId != '' ">,#{userId}</if>
@@ -275,12 +284,13 @@
        <if test="departmentArea != null and departmentArea != '' ">,#{departmentArea}</if>
        <if test="leisureState != null and leisureState != '' ">,#{leisureState}</if>
        <if test="masterIds != null   ">,#{masterIds}</if>
        <if test="masterNames != null  ' ">,#{masterNames}</if>
        <if test="masterNames != null">,#{masterNames}</if>
        <if test="transactionIds != null and transactionIds != '' ">,#{transactionIds}</if>
        <if test="transactionNames != null and transactionNames != '' ">,#{transactionNames}</if>
        <if test="openid != null and openid != '' ">,#{openid}</if>
        <if test="isDivisionHead != null and isDivisionHead != '' ">,#{isDivisionHead}</if>
        <if test="mattersIds != null  ">,#{mattersIds}</if>
        <if test="departmentIds != null  ">,#{departmentIds}</if>
        )
    </insert>

@@ -320,6 +330,7 @@
            <if test="openid != null and openid != '' ">,openid=#{openid}</if>
            <if test="isDivisionHead != null and isDivisionHead != '' ">,is_division_head=#{isDivisionHead}</if>
            <if test="mattersIds != null   ">,matters_ids=#{mattersIds}</if>
            <if test="departmentIds != null  ">,department_ids=#{departmentIds}</if>
            ,update_time=sysdate()
        </set>
        where user_id= #{userId}

 flower_city/src/main/resources/mapper/TransactionEventMapper.xml

@@ -48,6 +48,7 @@
        <id     property="transactionAreaUrl"      column="transaction_area_url"      />
        <id     property="transactionAreaName"      column="transaction_area_name"      />
        <id     property="classifyIds"      column="classify_ids"      />
        <id     property="departmentIds"      column="department_ids"      />

    </resultMap>

@@ -102,6 +103,13 @@
            transaction_area_url,
            transaction_area_name,
            classify_ids,
            department_ids,
            (SELECT GROUP_CONCAT(organization_name) FROM automessage_organization_chart WHERE id in (SELECT
                 substring_index(substring_index(department_ids,',', b.help_topic_id + 1), ',', -1) result
             FROM
                 mysql.help_topic b
             where
                     b.help_topic_id &lt; (LENGTH(department_ids) - LENGTH(REPLACE(department_ids, ',', '')) + 1))) as departmentNames,
            (IF((select classify_grade from automessage_classify_administration where automessage_classify_administration.id=automessage_transaction_event.classify_id)='2',
                (select classify_name from automessage_classify_administration where automessage_classify_administration.id=(select parent_id from
                automessage_classify_administration where automessage_classify_administration.id=automessage_transaction_event.classify_id)),
@@ -138,6 +146,13 @@
            associate_names,
            transaction_num,
            browse_num,
            department_ids,
            (SELECT GROUP_CONCAT(organization_name) FROM automessage_organization_chart WHERE id in (SELECT
              substring_index(substring_index(department_ids,',', b.help_topic_id + 1), ',', -1) result
          FROM
              mysql.help_topic b
          where
                  b.help_topic_id &lt; (LENGTH(department_ids) - LENGTH(REPLACE(department_ids, ',', '')) + 1))) as departmentNames,
            create_time,
            update_time
        FROM
@@ -239,6 +254,7 @@
        <if test="transactionAreaUrl != null ">transaction_area_url,</if>
        <if test="transactionAreaName != null ">transaction_area_name,</if>
        <if test="classifyIds != null ">classify_ids,</if>
        <if test="departmentIds != null ">department_ids,</if>
        update_time,
        create_time
        )values(
@@ -281,6 +297,7 @@
        <if test="transactionAreaUrl != null ">#{transactionAreaUrl},</if>
        <if test="transactionAreaName != null ">#{transactionAreaName},</if>
        <if test="classifyIds != null ">#{classifyIds},</if>
        <if test="departmentIds != null ">#{departmentIds},</if>
        sysdate(),
        sysdate()
        )
@@ -328,6 +345,7 @@
            <if test="transactionAreaUrl != null ">transaction_area_url=#{transactionAreaUrl},</if>
            <if test="transactionAreaName != null ">transaction_area_name=#{transactionAreaName},</if>
            <if test="classifyIds != null ">classify_ids=#{classifyIds},</if>
            <if test="departmentIds != null ">department_ids=#{departmentIds},</if>
            update_time=sysdate()
        </set>
        where  id= #{id}
@@ -440,8 +458,8 @@
                                                      where id=(select parent_id from  automessage_classify_administration  where id=automessage_transaction_event.classify_id)),
                                                     '>',(select classify_name from  automessage_classify_administration  where id=automessage_transaction_event.classify_id)) content,
                         browse_num views,2 type from automessage_transaction_event UNION
                 SELECT id ,name title,'政策文件' content,null        views,5 type FROM     automessage_policy_documents where type=2      UNION
                 SELECT id ,name title,'法律法规' content,null        views,6 type FROM     automessage_policy_documents where type=1
                 SELECT id ,name title,concat((select organization_name from automessage_organization_chart where id=automessage_policy_documents.department_id ),'>','政策文件') content,null        views,5 type FROM     automessage_policy_documents where type=2      UNION
                 SELECT id ,name title,concat((select organization_name from automessage_organization_chart where id=automessage_policy_documents.department_id ),'>','法律法规') content,null        views,6 type FROM     automessage_policy_documents where type=1
             ) k
        where  k.title like concat('%',#{keyWord}, '%') or k.content  like concat('%', #{keyWord}, '%')
    </select>

 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);
        }
@@ -148,10 +144,6 @@
                R r1 = communityService.isExpert(loginUserInfoVO.getPhone());
                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/sanshuo/IndexDateDTO.java

@@ -14,4 +14,5 @@
    private Long id;
    @ApiModelProperty(hidden = true)
    private Integer level;
    private String appId;
}

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

@@ -93,4 +93,8 @@

    @ApiModelProperty("logo")
    private String logo;

    private String appId;

    private Long createUserId;
}

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

@@ -40,4 +40,6 @@
    private List<ComEventRequestImageVO> images;
    @ApiModelProperty("处理人")
    private String solver;


}

 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

@@ -10590,7 +10590,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/ComPropertyApi.java

@@ -50,6 +50,7 @@
    @PostMapping
    public R insert(@RequestBody ComPropertyVO comPropertyVO) {
        comPropertyVO.setCommunityId(this.getCommunityId());
        comPropertyVO.setCreateUserId(this.getUserId());
        return this.communityService.comPropertyInsert(comPropertyVO);
    }


 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/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/ComSanShuoApi.java

@@ -165,8 +165,9 @@
    @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/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/ComSanShuoEventController.java

@@ -14,6 +14,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;
@@ -88,7 +89,8 @@
    @ApiOperation(value = "三说会堂事件表分页列表数据", notes = "三说会堂事件表分页列表数据")
    @PostMapping("/page")
    public R<List<ComEventVO>> page(@RequestBody ComEventPageRequestVO comEventPageRequestVO) {
        ComEventVO comEventVO = CopyUtil.copyProperties(comEventPageRequestVO, ComEventVO.class);
        ComEventVO comEventVO = new ComEventVO();
        BeanUtils.copyProperties(comEventPageRequestVO, comEventVO);
        return comEventService.page(comEventVO, comEventVO.getPageNo(), comEventVO.getPageSize());
    }


 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,15 @@
    @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);
        log.info("==================参数vo"+comEventVO);
        log.info("==================参数comEvent"+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 +373,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);
    }

@@ -126,7 +127,7 @@
     * */
    @GetMapping("/expertShow")
    public R expertShow(){
        return comSanShuoExpertService.expertShow();
        return comSanShuoExpertService.expertShow(this.getLoginUserInfo().getAppId());
    }


@@ -145,7 +146,7 @@
    @GetMapping("/expertShowList")
    public R expertShowList(@RequestParam(value = "level",required = false)Integer level,
                            @RequestParam(value = "id",required = false)Long id){
        return comSanShuoExpertService.expertShowList(level,id);
        return comSanShuoExpertService.expertShowList(level,id,this.getLoginUserInfo().getAppId());
    }

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

@@ -111,4 +111,16 @@
    void insertEventAndExpertRecord(@Param("eventId") Long eventId, @Param("expertId") Long experId,@Param("status")Integer status);

    void updateLog(@Param("eventId") Long id, @Param("expertId") Long specialistId);

    /**
     * 社区专家受理数量
     * */
    int expertSolveCountCommunity();

    /**
     * 行业分中心专家受理数量
     * */
    int expertSolveCountCenter();


}

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

@@ -34,7 +34,7 @@
    /**
     * 专家风采列表
     * */
    List<ExpertShowVO> expertShow();
    List<ExpertShowVO> expertShow(String appId);

    /**
     * 行业分中心分组专家
@@ -50,7 +50,7 @@
    /**
     * 社区分组专家
     * */
    List<ExpertShowVO> selectExpertCommunity();
    List<ExpertShowVO> selectExpertCommunity(String appId);


    /**
@@ -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,16 @@
    @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;
    private Integer isEnd;

}

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

@@ -29,7 +29,7 @@
     * 专家风采列表
     * @return 出列记过
     * */
    R expertShow();
    R expertShow(String appId);

    /**
     * 专家级别与单位范围
@@ -44,7 +44,7 @@
    /**
     * 专家风采列表
     * */
    R expertShowList(Integer level, Long id);
    R expertShowList(Integer level, Long id,String appId);

    /**
     * Excel添加专家
@@ -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/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)){
                    //待分配和待验证状态，可以受理，分配专家
                    //关闭调解和归档
@@ -302,7 +303,7 @@
                    comEvent.setSolve(0);
                    comEvent.setArchive(0);
                    comEvent.setDistribution(0);
                } else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventResult().equals(1)){
                } else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventResult().equals(1) && !comEvent.getIsEnd().equals(1)){
                    //上报并且调解失败，此时事件的状态为6，事件结果为调解失败
                    //comEvent.setDistribution(0);
                    comEvent.setEventResult(null);
@@ -325,8 +326,11 @@
                    //关闭所有权限
                    comEvent.setDistribution(0);
                    comEvent.setSolve(0);
                    comEvent.setArchive(0);
                    //comEvent.setArchive(0);
                    comEvent.setChangeExpert(0);
                    comEvent.setConciliation(0);
                }

            }
            else{
                //已上报到街道或三说会堂，社区没有分配和受理权限权限
@@ -368,7 +372,8 @@
                    //调解中，可以查看，调解，更换专家,删除
                    comEvent.setDistribution(0);
                    comEvent.setArchive(0);
                }  else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventResult().equals(1)){
                    comEvent.setSolve(0);
                }else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventResult().equals(1) && !comEvent.getIsEnd().equals(1)){
                    //调解完成，可以归档,查看
                    comEvent.setEventResult(null);
                    comEvent.setEventProcessStatus(2);
@@ -377,12 +382,12 @@
                    //comEvent.setChangeExpert(0);
                    //comEvent.setArchive(0);
                    comEvent.setConciliation(0);
                }
                else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventSucceed().equals(2)){
                }else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventSucceed().equals(2)){
                    //调解完成，可以归档,查看
                    comEvent.setSolve(0);
                    comEvent.setDistribution(0);
                    comEvent.setChangeExpert(0);
                    comEvent.setConciliation(0);
                }
            }else if (comEvent.getCurrentProcessType().equals(5)){
                //根据事件状态决定权限
@@ -424,11 +429,12 @@
            }
            else{
                //未上上报到行业分中心，或者已上报到区三说会堂，仅查看
                comEvent.setArchive(0);
                //comEvent.setArchive(0);
                comEvent.setSolve(0);
                comEvent.setDistribution(0);
                comEvent.setChangeExpert(0);
                //comEvent.setConciliation(0);
                comEvent.setConciliation(0);

            }
        }else if (userType.equals(5)  || isStreet){
            //街道权限，操作街道下属社区的所有事件
@@ -466,7 +472,7 @@
                    comEvent.setEventResult(null);
                    comEvent.setEventProcessStatus(1);
                }
                else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventResult().equals(1)){
                else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventResult().equals(1) && !comEvent.getIsEnd().equals(1)){
                    //设置为待受理
                    comEvent.setEventResult(null);
                    comEvent.setEventProcessStatus(2);
@@ -534,7 +540,7 @@
                    comEvent.setDistribution(0);
                    comEvent.setSolve(0);
                    comEvent.setArchive(0);
                } else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventResult().equals(1)){
                } else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventResult().equals(1) && !comEvent.getIsEnd().equals(1)){
                    //失败后转交三说会堂
                    comEvent.setSolve(0);
                    comEvent.setDistribution(0);
@@ -657,6 +663,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" ));
@@ -814,6 +823,11 @@
            }else {
                //已是最高上报级别，无法上报
            }
        }

        //是否为已完成并且不上报
        if (!comEventConciliationVO.getReportSuperior() && comEventConciliationVO.getEventSucceed().equals(2)){
            comEvent.setIsEnd(1);
        }
        int flag = baseMapper.updateById(comEvent);
        comEventTransferRecord.setEventId(comEvent.getId());
@@ -1005,7 +1019,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");
@@ -1094,9 +1113,19 @@
        if (type.equals(1)){
            //受理级别占比
            List<EventRateVO> eventRateVOS = comEventMapper.eventRate();
            //获取专家受理的数量
            Integer expertCount=comEventMapper.expertSolveCountCommunity();
            //获取行业分中心受理数量
            Integer centerCount=comEventMapper.expertSolveCountCenter();
            for (EventRateVO eventRateVO : eventRateVOS) {
                if (nonNull(eventRateVO)){
                    eventRateVO.setName(typeToName(eventRateVO.getCurrentProcessType()));
                    if (eventRateVO.getCurrentProcessType().equals(2)){
                        eventRateVO.setCount(eventRateVO.getCount()+expertCount);
                    }
                    if (eventRateVO.getCurrentProcessType().equals(1)){
                        eventRateVO.setCount(eventRateVO.getCount()+centerCount);
                    }
                    if (nonNull(eventCount) && !eventCount.equals(0)){
                        //计算占比
                        eventRateVO.setRate(NumberUtil.div(eventRateVO.getCount(),eventCount,2));

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

@@ -70,6 +70,7 @@
                administratorsUserVO.setAreaId(comPropertyVO.getAreaId());
                administratorsUserVO.setName(comPropertyVO.getContactName());
                administratorsUserVO.setPhone(comPropertyVO.getPhone());
                administratorsUserVO.setAppid(userService.detailUser(comPropertyVO.getCreateUserId()).getData().getAppId());
                R r=userService.addUserBackstageProperty(administratorsUserVO);
                if(R.isOk(r)){
                    comProperty.setUserId(Long.parseLong(r.getData().toString()));

 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));
        }
@@ -215,8 +217,8 @@
     * 专家风采
     * */
    @Override
    public R expertShow() {
        List<ExpertShowVO> expertShowVOS = comSanshuoExpertDao.expertShow();
    public R expertShow(String appId) {
        List<ExpertShowVO> expertShowVOS = comSanshuoExpertDao.expertShow(appId);
        for (ExpertShowVO expertShowVO : expertShowVOS) {
            if (nonNull(expertShowVO.getLevel())){
                if (1==expertShowVO.getLevel()) {
@@ -232,7 +234,7 @@
                    expertShowVO.setChildList(expertShowVOS1);
                }else {
                    expertShowVO.setName("村/社区调解站调解专家");
                    List<ExpertShowVO> expertShowVOS1 = comSanshuoExpertDao.selectExpertCommunity();
                    List<ExpertShowVO> expertShowVOS1 = comSanshuoExpertDao.selectExpertCommunity(appId);
                    expertShowVO.setChildList(expertShowVOS1);
                }
            }
@@ -347,9 +349,10 @@
     * 专家风采列表
     * */
    @Override
    public R expertShowList(Integer level, Long id) {
    public R expertShowList(Integer level, Long id,String appId) {
        QueryWrapper<ComSanshuoExpert> wrapper=new QueryWrapper<>();
        wrapper.eq("level",level );
        wrapper.eq("app_id",appId);
        if (level.equals(2)){
            wrapper.eq("industry_center_id", id);
        }else if (level.equals(3)){
@@ -427,24 +430,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

@@ -49,7 +49,7 @@

    </resultMap>
    <sql id="columns">
        id,order_sn,request_user_id,user_event_status,request_user_event_des,event_succeed,current_event_process_result,request_user_name,request_user_tel,event_category,type,submit_date,appointment_time,request_user_community,center_id,center_tel,specialist_org,specialist_level,specialist_id,specialist_name,specialist_tel,specialist_accept_time,revoke_type,event_process_status,current_process_type,current_org_id,current_org_name,current_process_user_id,current_process_user_name,revoke_des,event_result,report_superior,result,result_date,urgent,difficult,urgent_dell,invalid,major,request_user_response,create_by,create_at,update_by,update_at,report_level,report_community,report_street,report_center,report_hall
        id,order_sn,request_user_id,user_event_status,request_user_event_des,event_succeed,current_event_process_result,request_user_name,request_user_tel,event_category,type,submit_date,appointment_time,request_user_community,center_id,center_tel,specialist_org,specialist_level,specialist_id,specialist_name,specialist_tel,specialist_accept_time,revoke_type,event_process_status,current_process_type,current_org_id,current_org_name,current_process_user_id,current_process_user_name,revoke_des,event_result,report_superior,result,result_date,urgent,difficult,urgent_dell,invalid,major,request_user_response,create_by,create_at,update_by,update_at,report_level,report_community,report_street,report_center,report_hall,is_end
    </sql>

    <select id="pageByComEvent" resultType="com.panzhihua.service_community.entity.ComEvent">
@@ -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}
@@ -96,6 +99,22 @@
                <foreach collection="comEvent.communityIds" item="id" separator="," open="(" close=")">
                    #{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
@@ -229,7 +248,8 @@
        AND user_event_status not in(3,4)
        AND app_id='wx0cef797390444b75'
        <if test="dto.type == 2">
            AND current_process_type=1
            AND current_process_type in (1,5)
            AND center_id is not  null
            <if test="dto.id != null">
                AND center_id=#{dto.id}
            </if>
@@ -242,6 +262,7 @@
        </if>
        <if test="dto.type == 4">
            AND current_process_type in(2,5)
            AND center_id is null
            <if test="dto.id != null">
                AND request_user_community=#{dto.id}
            </if>
@@ -251,11 +272,12 @@
        </if>
        ) as accept,
        (SELECT count(id) FROM com_sanshuo_event_info
        where event_process_status = 5
        where is_end &lt;> 1
        AND user_event_status not in(3,4)
        AND app_id='wx0cef797390444b75'
        <if test="dto.type == 2">
            AND current_process_type=1
            AND current_process_type in (1,5)
            AND center_id is not  null
            <if test="dto.id != null">
                AND center_id=#{dto.id}
            </if>
@@ -268,6 +290,7 @@
        </if>
        <if test="dto.type == 4">
            AND current_process_type in(2,5)
            AND center_id is null
            <if test="dto.id != null">
                AND request_user_community=#{dto.id}
            </if>
@@ -277,10 +300,12 @@
        </if>) as accepting,
        (SELECT count(id) FROM com_sanshuo_event_info
        where event_process_status = 6
        AND is_end=1
        AND user_event_status not in(3)
        AND app_id='wx0cef797390444b75'
        <if test="dto.type == 2">
            AND current_process_type=1
            AND current_process_type in (1,5)
            AND center_id is not null
            <if test="dto.id != null">
                AND center_id=#{dto.id}
            </if>
@@ -293,6 +318,7 @@
        </if>
        <if test="dto.type == 4">
            AND current_process_type in(2,5)
            AND center_id is null
            <if test="dto.id != null">
                AND request_user_community=#{dto.id}
            </if>
@@ -308,7 +334,8 @@
        AND t1.event_status=7
        AND app_id='wx0cef797390444b75'
        <if test="dto.type == 2">
            AND t.current_process_type=1
            AND t.current_process_type in (1,5)
            AND t.center_id is not  null
            <if test="dto.id != null">
                AND t.center_id=#{dto.id}
            </if>
@@ -321,6 +348,7 @@
        </if>
        <if test="dto.type == 4">
            AND t.current_process_type in(2,5)
            AND t.center_id is null
            <if test="dto.id != null">
                AND t.request_user_community=#{dto.id}
            </if>
@@ -333,7 +361,8 @@
        AND user_event_status not in(3,4)
        AND app_id='wx0cef797390444b75'
        <if test="dto.type == 2">
            AND current_process_type=1
            AND current_process_type in (1,5)
            AND center_id is not  null
            <if test="dto.id != null">
                AND center_id=#{dto.id}
            </if>
@@ -346,6 +375,7 @@
        </if>
        <if test="dto.type == 4">
            AND current_process_type in(2,5)
            AND center_id is null
            <if test="dto.id != null">
                AND request_user_community=#{dto.id}
            </if>
@@ -355,10 +385,12 @@
        </if>) as success,
        (select count(id) FROM com_sanshuo_event_info
        where event_result=1
        AND is_end=1
        AND user_event_status not in(3,4)
        AND app_id='wx0cef797390444b75'
        <if test="dto.type == 2">
            AND current_process_type=1
            AND current_process_type in (1,5)
            AND center_id is not  null
            <if test="dto.id != null">
                AND center_id=#{dto.id}
            </if>
@@ -371,6 +403,7 @@
        </if>
        <if test="dto.type == 4">
            AND current_process_type in(2,5)
            AND center_id is null
            <if test="dto.id != null">
                AND request_user_community=#{dto.id}
            </if>
@@ -383,7 +416,8 @@
        AND event_process_status not in (8)
        AND app_id='wx0cef797390444b75'
        <if test="dto.type == 2">
            AND current_process_type=1
            AND current_process_type in (1,5)
            AND center_id is not  null
            <if test="dto.id != null">
                AND center_id=#{dto.id}
            </if>
@@ -396,6 +430,7 @@
        </if>
        <if test="dto.type == 4">
            AND current_process_type in(2,5)
            AND center_id is null
            <if test="dto.id != null">
                AND request_user_community=#{dto.id}
            </if>
@@ -409,7 +444,8 @@
        AND event_process_status = 6
        AND app_id='wx0cef797390444b75'
        <if test="dto.type == 2">
            AND current_process_type=1
            AND current_process_type in (1,5)
            AND center_id is not  null
            <if test="dto.id != null">
                AND center_id=#{dto.id}
            </if>
@@ -422,6 +458,7 @@
        </if>
        <if test="dto.type == 4">
            AND current_process_type in(2,5)
            AND center_id is null
            <if test="dto.id != null">
                AND request_user_community=#{dto.id}
            </if>
@@ -437,7 +474,8 @@
        AND event_process_status not in (9)
        AND app_id='wx0cef797390444b75'
        <if test="dto.type == 2">
            AND current_process_type=1
            AND current_process_type in (1,5)
            AND center_id is not null
            <if test="dto.id != null">
                AND center_id=#{dto.id}
            </if>
@@ -450,6 +488,7 @@
        </if>
        <if test="dto.type == 4">
            AND current_process_type in(2,5)
            AND center_id is null
            <if test="dto.id != null">
                AND request_user_community=#{dto.id}
            </if>
@@ -462,9 +501,11 @@
        SELECT COUNT(id) FROM com_sanshuo_event_info
        WHERE create_at BETWEEN DATE_FORMAT(#{beginDate}, '%Y-%m-%d 00:00:00') AND DATE_FORMAT(#{endDate}, '%Y-%m-%d 23:59:59')
        AND event_process_status=6
        AND is_end=1
        AND app_id='wx0cef797390444b75'
        <if test="dto.type == 2">
            AND current_process_type=1
            AND current_process_type in (1,5)
            AND center_id is not null
            <if test="dto.id != null">
                AND center_id=#{dto.id}
            </if>
@@ -477,6 +518,7 @@
        </if>
        <if test="dto.type == 4">
            AND current_process_type in(2,5)
            AND center_id is null
            <if test="dto.id != null">
                AND request_user_community=#{dto.id}
            </if>
@@ -490,7 +532,7 @@
        where event_process_status not in(7,8,9)
        AND app_id='wx0cef797390444b75'
        group by current_process_type
        having current_process_type &lt;>5
        having current_process_type not in (5)
    </select>
    <select id="expertRate" resultType="com.panzhihua.common.model.vos.sanshuo.EventRateVO">
        select count(id) as count,level as type  from com_sanshuo_expert where app_id='wx0cef797390444b75'
@@ -510,6 +552,22 @@
    <select id="insertEventAndExpertRecord">
        insert into com_sanshuo_expert_event values(#{eventId},#{expertId},#{status})
    </select>
    <select id="expertSolveCountCommunity" resultType="java.lang.Integer">
        select count(t.id) from com_sanshuo_event_info t
        left join com_sanshuo_expert t1 on t.specialist_id=t1.id
        where t.event_process_status not in (9)
        AND t.current_process_type=5
        and t1.level=4
        AND t.app_id='wx0cef797390444b75'
    </select>
    <select id="expertSolveCountCenter" resultType="java.lang.Integer">
        select count(t.id) from com_sanshuo_event_info t
        left join com_sanshuo_expert t1 on t.specialist_id=t1.id
        where t.event_process_status not in (9)
        and t1.level=2
        AND t.current_process_type=5
        AND t.app_id='wx0cef797390444b75'
    </select>
    <update id="updateLog">
        update com_sanshuo_expert_event set status = 2
        where event_id=#{eventId} and expert_id=#{expertId} and status=0

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

@@ -37,7 +37,7 @@
        unit_id,unit from com_sanshuo_expert
    </sql>
    <select id="expertShow" resultType="com.panzhihua.common.model.vos.sanshuo.ExpertShowVO">
        select  count(id) as 'count',level from com_sanshuo_expert where status=1 and del_flag=1 group by level
        select  count(id) as 'count',level from com_sanshuo_expert where status=1 and del_flag=1 and app_id=#{appId} group by level
    </select>
    <select id="expertPage"  resultType="com.panzhihua.common.model.vos.sanshuo.ComSanshuoExpertVO">
        select id,level,community_id,
@@ -106,7 +106,7 @@
    <select id="selectExpertCommunity" resultType="com.panzhihua.common.model.vos.sanshuo.ExpertShowVO">
        select  count(t.id) as 'count',t1.name,t1.community_id as id,t.level from com_sanshuo_expert t
        left join com_act t1 on t.community_id=t1.community_id
        where t.level=4 and t.status=1 and t.del_flag=1
        where t.level=4 and t.status=1 and t.del_flag=1 and t.app_id=#{appId}
        group by t1.name
    </select>
    <select id="selectExpertList" resultType="com.panzhihua.service_community.entity.ComSanshuoExpert">
@@ -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},'%') or unit like concat('%',#{keyWord},'%')
        </if>
        <if test="level != null">
            <if test="level == 2">
                AND level = 2

 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

@@ -18,6 +18,8 @@
import javax.annotation.Resource;
import java.util.List;

import static java.util.Objects.nonNull;

/**
 * (ComPropertyRepair)表服务实现类
 *
@@ -32,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
@@ -62,6 +69,12 @@
    }

    @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

@@ -1374,7 +1374,6 @@
                menu.add(300L);
                menu.add(303L);
            }

            sysRoleDO.setRoleSort(0);
            sysRoleDO.setCreateBy(administratorsUserVO.getUserId());
            SysRoleDO sysRoleDO1 = roleDAO.selectOne(
@@ -1392,10 +1391,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)) {
@@ -1404,6 +1399,9 @@
        String encode = new BCryptPasswordEncoder().encode(administratorsUserVO.getPassword());
        administratorsUserVO.setPassword(encode);
        BeanUtils.copyProperties(administratorsUserVO, sysUserDO);
        if (nonNull(administratorsUserVO.getAppid())){
            sysUserDO.setAppId(administratorsUserVO.getAppid());
        }
        int insert = 0;
        try {
            insert = userDao.insert(sysUserDO);
@@ -3994,14 +3992,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>