Merge branch 'test_future_wangge' into test

CeDo

2021-06-07 8d33e4df2aa8d5fce2ab4ebfd7309899538c2645

Merge branch 'test_future_wangge' into test

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

@@ -24,7 +24,6 @@

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "事件ID", hidden = false, example = "1",required = true)
    @NotNull(message = "事件ID不能为空")
    private Long eventId;

    @Length(max=255)

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

@@ -2001,7 +2001,7 @@
                if (comActVO == null) {
                    return R.fail("社区不存在");
                }
                EventDO eventDOInDB = this.getBaseMapper().selectById(commonEventDirectReportDTO.getEventId());
                EventDO eventDOInDB = this.getBaseMapper().selectById(eventDO.getId());
                eventDOInDB.setCommunityProcess(1);    //社区处理
                eventDOInDB.setProcessType(2);    //当前处理对象： 社区处理
                eventDOInDB.setCommunityProcess(1);
@@ -2014,7 +2014,7 @@
                }
                addTransferRecord(eventDO.getId(), commonEventDirectReportDTO.getToId(), comActVO.getName(), 2, commonEventDirectReportDTO.getProcessResult(),
                        commonEventDirectReportDTO.getUserId(), commonEventDirectReportDTO.getUserName(), 2);
                return R.ok();
                return R.ok(eventDO.getId());
            }
        }