Merge branch 'test_future_wangge' into test

CeDo

2021-06-04 7e2b1cce36643fe48aec347e8ec1bbf3d25c3d4e

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

@@ -1400,7 +1400,7 @@

        Integer eventDealStatus = -1;
        //1 待处理、2 待验证、3 已上报、4 已解决、5 草稿箱、6已撤销、7已失效
        if(eventDO.getInvalid()==false){
        if(eventDO.getInvalid()!=null && eventDO.getInvalid()==false){
            eventDealStatus = 7;//7已失效
        }else if(event_status ==2 && event_process_status == 1 && process_type == 1) {
            eventDealStatus = 1;//"待处理"