bugfixed

CeDo

2021-06-04 f521ac7850b578afbcf44e5580a29f2db7813483

bugfixed

 springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventManageApi.java

@@ -157,7 +157,7 @@
        if(commonEventDealDTO.getNeedVerify()==null){
            return R.fail("是否验证不能为空");
        }
        LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO();
        LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
        commonEventDealDTO.setUserId(loginUserInfoVO.getUserId());
        commonEventDealDTO.setUserName(loginUserInfoVO.getName());
        commonEventDealDTO.setOperateType(1);

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

@@ -1393,41 +1393,51 @@
     * @param eventDO 事件
     */
    private Integer  getEventDealStatus(EventDO eventDO){
        //1 待处理、2 待验证、3 已上报、4 已解决、5 草稿箱、6已撤销、7已失效、8已发布
        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 event_status = eventDO.getEventStatus()!=null?eventDO.getEventStatus():-1;
                Integer event_process_status = eventDO.getEventProcessStatus()!=null?eventDO.getEventProcessStatus():-1;
                Integer process_type = eventDO.getProcessType()!=null?eventDO.getProcessType():-1;
                Integer community_process = eventDO.getCommunityProcess()!=null?eventDO.getCommunityProcess():-1;

                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;//"已撤销"
                    eventDealStatus = 7;
                    //7已失效
                } else if (event_status == 1) {
                    eventDealStatus = 5;
                    //"草稿箱"
                } else if ( event_status == 4) {
                    eventDealStatus = 6;
                    //"已撤销"
                } else if (event_status ==2){
                    if (event_process_status == 3) {
                        eventDealStatus = 2;
                        //"待验证"
                    }else if (event_process_status == 2) {
                        eventDealStatus = 4;
                        //"已解决"
                    }else if ( community_process == 1 &&  process_type == 2) {
                        eventDealStatus = 3;
                        //"已上报"
                    }else if ( event_process_status == 1 && process_type == 1) {
                        eventDealStatus = 1;
                        //"待处理"
                    } 
                }
                return eventDealStatus;
            } else if (eventDO.getEventCategory() == 2) {
                Integer event_status = eventDO.getEventStatus();
                if (event_status != null && event_status == 1) {
                    return 5; //"草稿箱"
                    return 5;
                    //"草稿箱"
                } else if (event_status != null && event_status == 2) {
                    return 8;//已发布
                    return 8;
                    //已发布
                } else if (event_status != null && event_status == 4) {
                    return 6;//"已撤销"
                    return 6;
                    //"已撤销"
                }
            }
        }