Merge remote-tracking branch 'origin/test_future_wangge' into test_future_w...

huanghongfa

2021-06-05 95d336192af530dae4a70d78fcd300048976395d

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

# Conflicts:
#	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
#	springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java
#	springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridDataService.java
#	springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridDataServiceImpl.java

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventAddDTO.java

@@ -53,7 +53,7 @@
    private Long gridId;


    @Length(max=255)
    @Length(max=500)
    @ApiModelProperty(value = "事件描述", hidden = false, example = "", required = true)
    @NotNull(message = "事件描述不能为空")
    private String eventDes;

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventEditDTO.java

@@ -57,7 +57,7 @@
    @NotNull(message = "发生区域-网格ID不能为空")
    private Long gridId;

    @Length(max=255)
    @Length(max=500)
    @ApiModelProperty(value = "事件描述", hidden = false, example = "", required = true)
    @NotNull(message = "事件描述不能为空")
    private String eventDes;

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventRevokeDTO.java

@@ -26,7 +26,14 @@

    @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
    private Long userId;

    @ApiModelProperty(value = "(当前操作)用户姓名", hidden = true, example = "李四")
    private String userName;

    @ApiModelProperty(value = "操作人所属社区", hidden = true, example = "学院社区")
    private String communityName;

    @ApiModelProperty(value = "操作人所属社区", hidden = true, example = "学院社区")
    private Long communityId;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventVisitingTasksAddDTO.java

@@ -77,7 +77,7 @@
    @ApiModelProperty(value = "事件类型", hidden = false, example = "1")
    private Integer eventType;

    @Length(max=255)
    @Length(max=500)
    @ApiModelProperty(value = "事件描述", hidden = false, example = "")
    private String eventDes;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventVisitingTasksEditDTO.java

@@ -80,7 +80,7 @@
    @ApiModelProperty(value = "事件类型", hidden = false, example = "1")
    private Integer eventType;

    @Length(max=255)
    @Length(max=500)
    @ApiModelProperty(value = "事件描述", hidden = false, example = "")
    private String eventDes;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventDTO.java

@@ -116,7 +116,7 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date propagandaTimeEnd;

    @Length(max=255)
    @Length(max=500)
    @ApiModelProperty(value = "事件描述", hidden = false, example = "")
    private String eventDes;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventVisitingTasksDTO.java

@@ -115,7 +115,7 @@
    private Integer eventType;


    @Length(max=255)
    @Length(max=500)
    @ApiModelProperty(value = "事件描述", hidden = false, example = "")
    private String eventDes;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PagePublicityEventDTO.java

@@ -109,7 +109,7 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date propagandaTimeEnd;

    @Length(max=255)
    @Length(max=500)
    @ApiModelProperty(value = "事件描述", hidden = false, example = "")
    private String eventDes;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PublicityEventAddDTO.java

@@ -54,7 +54,7 @@
    @NotNull(message = "宣传主题不能为空")
    private String eventTitle;

    @Length(max=255)
    @Length(max=500)
    @ApiModelProperty(value = "宣传内容", hidden = false, example = "", required = true)
    @NotNull(message = "宣传内容不能为空")
    private String eventDes;

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PublicityEventEditDTO.java

@@ -56,7 +56,7 @@
    @NotNull(message = "宣传主题不能为空")
    private String eventTitle;

    @Length(max=255)
    @Length(max=500)
    @ApiModelProperty(value = "宣传内容", hidden = false, example = "", required = true)
    @NotNull(message = "宣传内容不能为空")
    private String eventDes;

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventAddDTO.java

@@ -44,7 +44,7 @@
    @NotNull(message = "发生区域-网格ID不能为空")
    private Long gridId;

    @Length(max=255)
    @Length(max=500)
    @ApiModelProperty(value = "事件描述", hidden = false, example = "", required = true)
    @NotNull(message = "事件描述不能为空")
    private String eventDes;

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventEditDTO.java

@@ -46,7 +46,7 @@
    @NotNull(message = "发生区域-网格ID不能为空")
    private Long gridId;

    @Length(max=255)
    @Length(max=500)
    @ApiModelProperty(value = "事件描述", hidden = false, example = "", required = true)
    @NotNull(message = "事件描述不能为空")
    private String eventDes;

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

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

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

import java.util.Date;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("网格数据")
public class EventGridDataAreaVO {

    @ApiModelProperty(value = "主键ID")
    private Long id;

    @ApiModelProperty(value = "类型，1、区县网格2街道网格3社区网格")
    private Long type;

    @ApiModelProperty(value = "区/县ID")
    private Long zoneId;

    @ApiModelProperty(value = "区/县名称")
    private String zoneName;

    @ApiModelProperty(value = "网格所属街道")
    private Long gridStreetId;

    @ApiModelProperty(value = "网格所属街道名称")
    private String gridStreetName;

    @ApiModelProperty(value = "网格所属社区ID")
    private Long gridCommunityId;

    @ApiModelProperty(value = "网格所属社区名称")
    private String gridCommunityName;

    @ApiModelProperty(value = "网格名称")
    private String gridName;

    @ApiModelProperty(value = "所属图层")
    private Integer mapLevel;

    @ApiModelProperty(value = "面积")
    private String area;

    @ApiModelProperty(value = "线条颜色")
    private String lineColor;

    @ApiModelProperty(value = "线条宽度")
    private String lineBroadband;

    @ApiModelProperty(value = "填充颜色")
    private String fillColor;

    @ApiModelProperty(value = "备注")
    private String remarks;

    @ApiModelProperty(value = "围栏数据")
    private String data;

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

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

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

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


}

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

@@ -49,6 +49,15 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date processDate;

    @ApiModelProperty(value = "处理人或社区")
    private Long processBy;

    @ApiModelProperty(value = "处理人名或社区名")
    private String processByName;

    @ApiModelProperty(value = "业务处理类型")
    private String processType;

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

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

@@ -783,6 +783,22 @@
    R easyPublicityByAdmin(@RequestBody ComActEasyPhotoEditAdminDTO photoHandleDTO);

    /**
     * 查询网格下所有网格员
     * @param gridId
     * @return
     */
    @PostMapping("/eventgriddata/grid/member")
    R getGridMemberListsByGrid(@RequestParam("gridId") Long gridId);

    /**
     * 查询网格下所有网格员
     * @param communityId
     * @return
     */
    @PostMapping("/eventgriddata/communitygrid")
    R getGridDataListByCommunity(@RequestParam("gridId") Long communityId);

    /**
     * 后台管理-统计模块
     * @param communityId   社区id
     * @return  统计信息

 springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventManageApi.java

@@ -7,6 +7,7 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.grid.EventDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridMemberAdminVO;
import com.panzhihua.common.model.vos.grid.EventVO;
import com.panzhihua.common.service.grid.GridService;
import com.panzhihua.common.utlis.ClazzUtils;
@@ -75,6 +76,8 @@
        LoginUserInfoVO loginUserInfoVO = getLoginUserInfo();
        eventRevokeDTO.setUserId(loginUserInfoVO.getUserId());
        eventRevokeDTO.setUserName(loginUserInfoVO.getName());
        eventRevokeDTO.setCommunityName(loginUserInfoVO.getCommunityName());
        eventRevokeDTO.setCommunityId(loginUserInfoVO.getCommunityId());
        return gridService.markEventInvalid(eventRevokeDTO);
    }
    /**
@@ -165,4 +168,27 @@
        return gridService.dealEvent(commonEventDealDTO);
    }


    @ApiOperation(value = "查询当前社区所有网格员", response = EventGridMemberAdminVO.class)
    @GetMapping("/member/list")
    public R getGridMemberLists(){
        Long communityId = this.getCommunityId();
        if(communityId == null){
            return R.fail("请先登录");
        }
        return gridService.getGridMemberLists(communityId);
    }

    @ApiOperation(value = "查询网格下所有网格员", response = EventGridMemberAdminVO.class)
    @GetMapping("/member/{gridId}")
    public R getGridMemberInLists(@PathVariable("gridId") Long gridId){
        return gridService.getGridMemberListsByGrid(gridId);
    }

    @ApiOperation(value = "查询社区所有网格", response = EventGridMemberAdminVO.class)
    @GetMapping("/grid/list/{communityId}")
    public R getGridLists(@PathVariable("communityId") Long communityId){
        return gridService.getGridDataListByCommunity(communityId);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/PublicityEventApi.java

@@ -6,6 +6,7 @@
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridMemberAdminVO;
import com.panzhihua.common.model.vos.grid.EventVO;
import com.panzhihua.common.service.grid.GridService;
import com.panzhihua.common.utlis.ClazzUtils;
@@ -139,6 +140,30 @@
        LoginUserInfoVO loginUserInfoVO = getLoginUserInfo();
        eventRevokeDTO.setUserId(loginUserInfoVO.getUserId());
        eventRevokeDTO.setUserName(loginUserInfoVO.getName());
        eventRevokeDTO.setCommunityName(loginUserInfoVO.getCommunityName());
        eventRevokeDTO.setCommunityId(loginUserInfoVO.getCommunityId());
        return gridService.markEventInvalid(eventRevokeDTO);
    }

    @ApiOperation(value = "查询当前社区所有网格员", response = EventGridMemberAdminVO.class)
    @GetMapping("/member/list")
    public R getGridMemberLists(){
        Long communityId = this.getCommunityId();
        if(communityId == null){
            return R.fail("请先登录");
        }
        return gridService.getGridMemberLists(communityId);
    }

    @ApiOperation(value = "查询网格下所有网格员", response = EventGridMemberAdminVO.class)
    @GetMapping("/member/{gridId}")
    public R getGridMemberInLists(@PathVariable("gridId") Long gridId){
        return gridService.getGridMemberListsByGrid(gridId);
    }

    @ApiOperation(value = "查询社区所有网格", response = EventGridMemberAdminVO.class)
    @GetMapping("/grid/list/{communityId}")
    public R getGridLists(@PathVariable("communityId") Long communityId){
        return gridService.getGridDataListByCommunity(communityId);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java

@@ -139,6 +139,29 @@
        return eventGridDataService.editGridDataByAdmin(eventGridDataDTO);
    }


    /**
     * 查询网格下所有网格员
     * @param gridId
     * @return
     */
    @PostMapping("/grid/member")
    R getGridMemberListsByGrid(@RequestParam("gridId") Long gridId){
        return eventGridDataService.getGridMemberListsByGrid(gridId);
    }

    /**
     * 查询网格下所有网格员
     * @param communityId
     * @return
     */
    @PostMapping("/communitygrid")
    R getGridDataListByCommunity(@RequestParam("gridId") Long communityId){
        return eventGridDataService.getGridDataListByCommunity(communityId);
    }



    @PostMapping("/data/delete")
    public R deleteGridDataByAdmin(@RequestBody List<Long> Ids){
        return eventGridDataService.deleteGridDataByAdmin(Ids);

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridDataMapper.java

@@ -61,4 +61,7 @@

    void removeGridRelationByGridId(@Param("gridId") Long gridId);

    List<EventGridMemberAdminVO> getGridMemberListsByGrid(@Param("gridId") Long gridId);

    List<EventGridDataAreaVO> getGridDataListByCommunity(@Param("communityId") Long communityId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventTransferRecordDO.java

@@ -66,6 +66,18 @@
     */
    private Date processDate;
    /**
     * 处理人或社区   列: process_by
     */
    private Long processBy;
    /**
     * 处理人名或社区名   列: process_by_name
     */
    private String processByName;
    /**
     * 业务处理类型   列: process_type
     */
    private Integer processType;
    /**
     * 创建时间   列: create_at
     */
    @TableField(fill = FieldFill.INSERT)

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridDataService.java

@@ -98,5 +98,19 @@
     */
    R editGridDataByAdmin(EventGridDataEditAdminDTO eventGridDataDTO);

    /**
     * 查询网格下所有网格员
     * @param gridId
     * @return
     */
    R getGridMemberListsByGrid(Long gridId);

    /**
     * 查询网格下所有网格员
     * @param communityId
     * @return
     */
    R getGridDataListByCommunity(Long communityId);

    R deleteGridDataByAdmin(List<Long> Ids);
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridDataServiceImpl.java

@@ -248,6 +248,18 @@
    }

    @Override
    public R getGridMemberListsByGrid(Long gridId) {
        List<EventGridMemberAdminVO> eventGridMemberAdminVOList = this.getBaseMapper().getGridMemberListsByGrid(gridId);
        return R.ok(eventGridMemberAdminVOList);
    }

    @Override
    public R getGridDataListByCommunity(Long communityId) {
        List<EventGridDataAreaVO>  eventGridDataAreaVOList = this.getBaseMapper().getGridDataListByCommunity(communityId);
        return R.ok(eventGridDataAreaVOList);
    }

    @Override
    public R deleteGridDataByAdmin(List<Long> Ids){
        Integer count = eventMapper.getEventCountByGridIds(Ids);
        if(count > 0){

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java

@@ -389,8 +389,8 @@
        }else{
            //编辑原来的
            EventDO eventDO = eventMapper.selectById(commonEventEditDTO.getId());
            if(eventDO.getEventStatus()!=null && eventDO.getEventStatus()!=1){
                return R.fail("保存草稿失败，事件不是草稿状态");
            if(eventDO.getEventStatus()!=null && eventDO.getEventStatus()!=1 && eventDO.getEventDealStatus()!=6){
                return R.fail("保存草稿失败，事件不是草稿/已撤销状态");
            }
            BeanUtils.copyProperties(commonEventEditDTO, eventDO);
            eventDO.setGridMemberId(commonEventEditDTO.getUserId());
@@ -487,7 +487,7 @@
        if(updated!=1){
            throw new ServiceException("更新突发事件状态更新失败");
        }
        addTransferRecord(eventDO.getId(), commonEventReportDTO.getToId(), comActVO.getName(), 2, commonEventReportDTO.getProcessResult());
        addTransferRecord(eventDO.getId(), commonEventReportDTO.getToId(), comActVO.getName(), 2, commonEventReportDTO.getProcessResult(),2);
        return R.ok();

    }
@@ -501,11 +501,10 @@
        }
        boolean canRevoke = eventDO.getEventStatus()==2; //发布状态
        if(!canRevoke){
            return R.fail("当前事件不允许撤销");
            return R.fail("当前事件不允许·");
        }
        if(eventDO.getEventCategory()!=null && eventDO.getEventCategory().intValue()==2){//宣传教育事件
            //不做验证
        }else if(eventDO.getEventProcessStatus()==2 ||eventDO.getEventProcessStatus()==3) {   //已解决 或者 待验证 不允许撤销
        Integer eventProcessStatus = eventDO.getEventProcessStatus()!=null?eventDO.getEventProcessStatus():-1;
         if(eventProcessStatus==2 ||eventProcessStatus==3) {   //已解决 或者 待验证 不允许撤销
            return R.fail("当前事件不允许撤销");
        }
        eventDO.setEventStatus(4);
@@ -514,7 +513,8 @@
        eventDO.setCommunityProcess(0);//非 社区处理
        int updated = this.getBaseMapper().updateById(eventDO);
        if(updated == 1){
            addTransferRecord(eventDO.getId(), eventRevokeDTO.getUserId(), eventRevokeDTO.getUserName(), 1,"撤销成功");
            addTransferRecord(eventDO.getId(), eventRevokeDTO.getUserId(), eventRevokeDTO.getUserName(),
                    1,"撤销成功", eventRevokeDTO.getUserId(), eventRevokeDTO.getUserName(), 7);
            return R.ok();
        }
        return R.fail();
@@ -551,8 +551,14 @@
        if(updated!=1){
            return R.fail("更新事件状态失败");
        }
        Integer processType = -1;
        if(eventDO.getInvalid()!=null){
            processType = 5;
        }else{
            processType = 1;
        }
        EventTransferRecordDO transferRecordDO =
                addTransferRecord(eventDO.getId(), commonEventDealDTO.getUserId(), commonEventDealDTO.getUserName(),1, "网格员自处理完成");
                addTransferRecord(eventDO.getId(), commonEventDealDTO.getUserId(), commonEventDealDTO.getUserName(),1, "网格员自处理完成", processType);
        if(transferRecordDO!=null && transferRecordDO.getId()!=null){
            //添加音频
            if(StringUtils.isNotEmpty(commonEventDealDTO.getAudio())){
@@ -632,7 +638,7 @@
        if(updated!=1){
            return R.fail("更新事件状态失败");
        }
        addTransferRecord(eventDO.getId(), commonEventVerifyDTO.getUserId(), commonEventVerifyDTO.getUserName(), 1, commonEventVerifyDTO.getProcessResult());
        addTransferRecord(eventDO.getId(), commonEventVerifyDTO.getUserId(), commonEventVerifyDTO.getUserName(), 1, commonEventVerifyDTO.getProcessResult(), 6);
        return R.ok();
    }

@@ -652,7 +658,7 @@
        if(updated!=1){
            return R.fail("更新事件状态失败");
        }
        addTransferRecord(eventDO.getId(), commonEventRepublishDTO.getUserId(), commonEventRepublishDTO.getUserName(), 1, "重新发布已撤销事件");
        addTransferRecord(eventDO.getId(), commonEventRepublishDTO.getUserId(), commonEventRepublishDTO.getUserName(), 1, "重新发布已撤销事件", 8);
        return R.ok();
    }

@@ -1051,8 +1057,8 @@
        }else{
            //编辑原来的
            EventDO eventDO = eventMapper.selectById(publicityEventEditDTO.getId());
            if(eventDO.getEventStatus()!=null && eventDO.getEventStatus()!=1){
                return R.fail("保存草稿失败，事件不是草稿状态");
            if(eventDO.getEventStatus()!=null && eventDO.getEventStatus()!=1 && eventDO.getEventDealStatus()!=6){
                return R.fail("保存草稿失败，事件不是草稿/撤销状态");
            }
            BeanUtils.copyProperties(publicityEventEditDTO, eventDO);
            eventDO.setGridMemberId(publicityEventEditDTO.getUserId());
@@ -1251,13 +1257,14 @@
            return R.fail("事件所属错误");
        }
        eventDO.setInvalid(false);
        //标为无效后， 交给网格员处理
        eventDO.setUpdateBy(eventRevokeDTO.getUserId());
        eventDO.setEventStatus(4);//4、撤销
        eventDO.setProcessType(1);//网格员处理
        eventDO.setCommunityProcess(0);//非 社区处理
        int updated = this.getBaseMapper().updateById(eventDO);
        if(updated == 1){
            addTransferRecord(eventDO.getId(), eventRevokeDTO.getUserId(), eventRevokeDTO.getUserName(), 1,"撤销成功");
            addTransferRecord(eventDO.getId(), eventRevokeDTO.getUserId(), eventRevokeDTO.getUserName(), 1,"标为无效", eventRevokeDTO.getCommunityId(), eventRevokeDTO.getCommunityName(), 4);
            return R.ok();
        }
        return R.fail();
@@ -1276,7 +1283,7 @@
        eventDO.setInvalid(true);
        int updated = this.getBaseMapper().updateById(eventDO);
        if(updated == 1){
            addTransferRecord(eventDO.getId(), commonEventRepublishDTO.getUserId(), commonEventRepublishDTO.getUserName(), 1,"重新发布事件成功");
            addTransferRecord(eventDO.getId(), commonEventRepublishDTO.getUserId(), commonEventRepublishDTO.getUserName(), 1,"重新发布事件成功", 9 );
            return R.ok();
        }
        return R.fail();
@@ -1312,7 +1319,7 @@
            return R.fail("更新事件状态失败");
        }
        EventTransferRecordDO transferRecordDO =
                addTransferRecord(eventDO.getId(), commonEventDealDTO.getUserId(), commonEventDealDTO.getUserName(),1, "社区处理完成");
                addTransferRecord(eventDO.getId(), commonEventDealDTO.getUserId(), commonEventDealDTO.getUserName(),1, "社区处理完成", 3);
        if(transferRecordDO!=null && transferRecordDO.getId()!=null){
            //添加音频
            if(StringUtils.isNotEmpty(commonEventDealDTO.getAudio())){
@@ -1438,6 +1445,7 @@
        eventTransferRecordDO.setProcessDate(new Date());
        eventTransferRecordDO.setEventId(eventId);
        eventTransferRecordDO.setProcessResult("发布成功");
        eventTransferRecordDO.setProcessType(0);//初始状态
        int inserted = eventTransferRecordService.getBaseMapper().insert(eventTransferRecordDO);
        if(inserted!=1){
            throw new ServiceException("事件流转记录添加失败");
@@ -1445,6 +1453,7 @@
        this.updateEventDealStatus(eventId);
        return eventTransferRecordDO;
    }


    /**
     * 查询最后的流转记录，并添加事件流转记录
@@ -1455,7 +1464,7 @@
     * @param msg 流转消息
     * @return
     */
    private EventTransferRecordDO addTransferRecord(Long eventId, Long toId, String toName, Integer toType, String msg){
    private EventTransferRecordDO addTransferRecord(Long eventId, Long toId, String toName, Integer toType, String msg, Long processBy, String processByName, Integer processType){
        List<EventTransferRecordDO> list = eventTransferRecordService.getBaseMapper().selectList(new LambdaQueryWrapper<EventTransferRecordDO>()
                .eq(EventTransferRecordDO::getEventId, eventId)
                .orderByDesc(EventTransferRecordDO::getCreateAt)
@@ -1474,6 +1483,9 @@
        eventTransferRecordDO.setToName(toName);
        eventTransferRecordDO.setEventId(eventId);
        eventTransferRecordDO.setProcessResult(msg);
        eventTransferRecordDO.setProcessBy(processBy);
        eventTransferRecordDO.setProcessByName(processByName);
        eventTransferRecordDO.setProcessType(processType);
        int inserted = eventTransferRecordService.getBaseMapper().insert(eventTransferRecordDO);
        if(inserted==1) {
            this.updateEventDealStatus(eventId);
@@ -1483,6 +1495,20 @@
        }
    }


    /**
     * 查询最后的流转记录，并添加事件流转记录
     * @param eventId 事件ID
     * @param toId 流转到 ID
     * @param toName 流转到 名称
     * @param toType 发送类型
     * @param msg 流转消息
     * @return
     */
    private EventTransferRecordDO addTransferRecord(Long eventId, Long toId, String toName, Integer toType, String msg,Integer processType){
        return addTransferRecord(eventId, toId, toName, toType, msg, null, null, processType);
    }

    /**
     * 根据子状态 查询用户事件处理状态
     * @param eventId 事件ID

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridDataMapper.xml

@@ -213,6 +213,25 @@
    <select id="getComActByActId" resultType="com.panzhihua.common.model.vos.grid.ComGridActVO">
        select community_id,street_id,name,address,province_code,city_code,area_code from com_act where community_id = #{communityId}
    </select>
    <select id="getGridMemberListsByGrid" resultType="com.panzhihua.common.model.vos.grid.EventGridMemberAdminVO">
        SELECT
            su.user_id,
            su.nick_name
        FROM
            event_grid_member_relation AS egmr
            LEFT JOIN sys_user AS su ON su.user_id = egmr.grid_member_id
        WHERE
            egmr.grid_id = #{gridId}
    </select>
    <select id="getGridDataListByCommunity"
            resultType="com.panzhihua.common.model.vos.grid.EventGridDataAreaVO" parameterType="long">
        SELECT
            gd.id, gd.grid_name , ad.district_name AS zoneName, st.name AS gridStreetName,  act.name AS gridCommunityName
        FROM event_grid_data gd LEFT JOIN com_mng_struct_area_district ad ON gd.zone_id = ad.district_adcode
            LEFT JOIN com_street st ON gd.grid_street_id = st.street_id
            LEFT JOIN com_act act ON gd.grid_community_id = act.community_id
        WHERE gd.grid_community_id = #{communityId}
    </select>

    <delete id="removeGridRelationByGridId">
        delete from event_grid_member_relation where grid_id = #{gridId}

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

@@ -237,6 +237,12 @@
//        志愿者状态
        String phone = sysUserDO.getPhone();
        Long userCommunityId = sysUserDO.getCommunityId();
        if(userCommunityId!=null){
            ComActVO comActVO = userDao.selectCommunity(userCommunityId);
            if(comActVO!=null) {
                loginUserInfoVO.setCommunityName(comActVO.getName());
            }
        }
        if (!ObjectUtils.isEmpty(phone)) {
            ComMngVolunteerMngVO comMngVolunteerMngVO = userDao.selectVolunteerMngByPhone(phone);
            if (ObjectUtils.isEmpty(comMngVolunteerMngVO)) {