Merge branch 'test_future_wangge' into test

CeDo

2021-06-03 302d51ec3c223fd32c746d6bc163a840225b6f46

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

@@ -49,6 +49,8 @@
    private EventTransferRecordService eventTransferRecordService;
    @Resource
    private CommunityService communityService;
    @Resource
    private EventGridDataMapper eventGridDataMapper;


    /**
@@ -162,6 +164,10 @@
                eventDealStatus=6;//"已撤销"
            }
            eventDetailsVO.setEventDealStatus(eventDealStatus);

            EventGridDataDO eventGridDataDO = eventGridDataMapper.selectById(eventDO.getGridId());
            eventDetailsVO.setGridName(eventGridDataDO.getGridName());

            //查询事件关联附件
            List<EventResourceDO> eventResourceDOList =
                    eventResourceService.getBaseMapper().selectList(new LambdaQueryWrapper<EventResourceDO>()