Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-07-14 15149032252ac30c5a7df721259fae5538e467af

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

@@ -1021,6 +1021,7 @@
        }
        EventDO eventDO = new EventDO();
        BeanUtils.copyProperties(publicityEventAddDTO, eventDO);
        eventDO.setHappenTime(publicityEventAddDTO.getPropagandaTime());
        eventDO.setGridMemberId(publicityEventAddDTO.getUserId());
        eventDO.setEventCategory(2l);//宣传事件
        eventDO.setEventStatus(2);//事件状态 2发布
@@ -2281,6 +2282,9 @@
        List<EventWorkVO> list = new ArrayList<>();
        for(EventWorkVO eventWorkVO: listHalfYearByDyn()){
            EventWorkVO result = this.eventMapper.countByTime(eventWorkVO.getStart(),eventWorkVO.getEnd(),communityId);
            result.setEventTotal(result.getEventTotal() + result.getSspTotal());
            result.setEventAdd(result.getEventAdd() + result.getSspAdd());
            result.setEventSolve(result.getEventSolve() + result.getSspSolve());
            result.setMonth(eventWorkVO.getMonth());
            list.add(result);
        }