CeDo
2021-06-04 c2733906630059f0ecbc4f518bcb5427f5ef6b12
bugfixed
1个文件已修改
60 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java 60 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
@@ -1393,30 +1393,44 @@
     * @param eventDO 事件
     */
    private Integer  getEventDealStatus(EventDO eventDO){
        Integer event_status = eventDO.getEventStatus();
        Integer event_process_status = eventDO.getEventProcessStatus();
        Integer process_type = eventDO.getProcessType();
        Integer community_process = eventDO.getCommunityProcess();
        if(eventDO.getEventCategory()!=null) {
            if (eventDO.getEventCategory() == 1) {
                Integer event_status = eventDO.getEventStatus();
                Integer event_process_status = eventDO.getEventProcessStatus();
                Integer process_type = eventDO.getProcessType();
                Integer community_process = eventDO.getCommunityProcess();
        Integer eventDealStatus = -1;
        //1 待处理、2 待验证、3 已上报、4 已解决、5 草稿箱、6已撤销、7已失效
        if(eventDO.getInvalid()!=null && eventDO.getInvalid()==false){
            eventDealStatus = 7;//7已失效
        }else if(event_status!=null && event_status ==2 && event_process_status!=null && event_process_status == 1
                && process_type!=null  && process_type == 1) {
            eventDealStatus = 1;//"待处理"
        }else if( event_process_status!=null &&  event_process_status == 3) {
            eventDealStatus = 2;//"待验证"
        }else if(event_status!=null && event_status == 2 && community_process!=null
                && community_process == 1 && process_type!=null && process_type == 2) {
            eventDealStatus=3;//"已上报"
        }else if( event_process_status!=null && event_process_status == 2 ) {
            eventDealStatus=4;//"已解决"
        }else if(  event_status!=null && event_status == 1 ) {
            eventDealStatus = 5;//"草稿箱"
        }else if( event_status!=null && event_status == 4 ) {
            eventDealStatus=6;//"已撤销"
                Integer eventDealStatus = -1;
                //1 待处理、2 待验证、3 已上报、4 已解决、5 草稿箱、6已撤销、7已失效
                if (eventDO.getInvalid() != null && eventDO.getInvalid() == false) {
                    eventDealStatus = 7;//7已失效
                } else if (event_status != null && event_status == 2 && event_process_status != null && event_process_status == 1
                        && process_type != null && process_type == 1) {
                    eventDealStatus = 1;//"待处理"
                } else if (event_process_status != null && event_process_status == 3) {
                    eventDealStatus = 2;//"待验证"
                } else if (event_status != null && event_status == 2 && community_process != null
                        && community_process == 1 && process_type != null && process_type == 2) {
                    eventDealStatus = 3;//"已上报"
                } else if (event_process_status != null && event_process_status == 2) {
                    eventDealStatus = 4;//"已解决"
                } else if (event_status != null && event_status == 1) {
                    eventDealStatus = 5;//"草稿箱"
                } else if (event_status != null && event_status == 4) {
                    eventDealStatus = 6;//"已撤销"
                }
                return eventDealStatus;
            } else if (eventDO.getEventCategory() == 2) {
                Integer event_status = eventDO.getEventStatus();
                if (event_status != null && event_status == 1) {
                    return 5; //"草稿箱"
                } else if (event_status != null && event_status == 2) {
                    return 8;//已发布
                } else if (event_status != null && event_status == 4) {
                    return 6;//"已撤销"
                }
            }
        }
        return eventDealStatus;
        return -1;
    }
}