CeDo
2021-06-07 fbeca6637b66bae2e97a2eeba67bf911fb9002af
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
@@ -647,9 +647,9 @@
    @Override
    public R republishEvent(CommonEventRepublishDTO commonEventRepublishDTO) {
        EventDO eventDO = this.getBaseMapper().selectById(commonEventRepublishDTO.getId());
        boolean canRepublishByUser = eventDO.getEventStatus()==4;
        boolean canRepublishByUser = eventDO.getEventStatus()==4||eventDO.getEventStatus()==1;
        if(!canRepublishByUser){
            return R.fail("当前不是撤销状态");
            return R.fail("当前不是撤销/草稿状态");
        }
        eventDO.setEventStatus(2);//2 发布
@@ -1304,6 +1304,24 @@
            return R.fail("事件当前不是上报状态");
        }
        List<EventTransferRecordDO> list = eventTransferRecordService.getBaseMapper().selectList(new LambdaQueryWrapper<EventTransferRecordDO>()
                .eq(EventTransferRecordDO::getEventId, eventDO.getId())
                .orderByDesc(EventTransferRecordDO::getCreateAt)
        );
        Long reportToInDB = -1L;
        for (int i = 0; i < list.size(); i++) {
            EventTransferRecordDO eventTransferRecordDO = list.get(i);
            if(eventTransferRecordDO.getProcessType()!=null && eventTransferRecordDO.getProcessType()==2){
                reportToInDB = eventTransferRecordDO.getToId();
            }
        }
        if(commonEventDealDTO.getCommunityId()==null){
            return R.fail("当前用户社区获取失败");
        }
        if(reportToInDB.longValue() != commonEventDealDTO.getCommunityId().longValue()){
            return R.fail("用户上报的社区不是当前社区");
        }
        if(commonEventDealDTO.getNeedVerify()){
            eventDO.setEventProcessStatus(3);//待验证状态
            eventDO.setProcessType(1);//交给网格员处理-验证