修改路北社区 活动发布 报名时间问题

lidongdong

2023-12-13 6aeed3a91b3bca658fc8dbb0f8642712e484d77d

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java

@@ -150,10 +150,14 @@
            if (ids!=null && ids.size()>0 ){
                list = comEventMapper.pageByComEventExpert(ids, comEvent, pagination);
            }
            else
            {
                list = comEventMapper.pageByComEventExpert(null, comEvent, pagination);
            }
        }else{
            list = baseMapper.pageByComEvent(comEvent, pagination);
        }
        if (list.getRecords().size() < 1) {
        if (list==null || list.getRecords().size() < 1) {
            return R.ok(Collections.emptyList());
        }
        list.getRecords().forEach(comEvent1 -> {
@@ -510,55 +514,8 @@
        }else if (isAdmin){
            //区三说会堂账号，最高权限全部开放
            // 是否上报到三说会堂
            if (comEvent.getCurrentProcessType().equals(4) || comEvent.getReportHall().equals(1)){
                //已上报到三说会堂,可以操作
                if (comEvent.getEventProcessStatus().equals(1)){
                    //待受理和待验证状态，可以受理，分配专家
                    //关闭调解和归档
                    comEvent.setArchive(0);
                    comEvent.setSolve(0);
                    comEvent.setConciliation(0);
                    comEvent.setChangeExpert(0);
                }
                else if(comEvent.getEventProcessStatus().equals(2)){
                    //待分配和待验证状态，可以受理，分配专家
                    //关闭调解和归档
                    comEvent.setArchive(0);
                    comEvent.setConciliation(0);
                    comEvent.setChangeExpert(0);
                    if (comEvent.getSpecialistName().equals("待分配")){
                        comEvent.setSolve(0);
                    }
                }else if (comEvent.getEventProcessStatus().equals(3)){
                    //新分配给专家并且专家还未受理
                    comEvent.setDistribution(0);
                    comEvent.setArchive(0);
                    //comEvent.setConciliation(0);
                    comEvent.setChangeExpert(0);
                    comEvent.setSolve(0);
                }
                else if (comEvent.getEventProcessStatus().equals(5)){
                    //调解中，可以查看，调解，更换专家,删除
                    comEvent.setDistribution(0);
                    comEvent.setSolve(0);
                    comEvent.setArchive(0);
                } else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventResult().equals(1) && !comEvent.getIsEnd().equals(1)){
                    //失败后转交三说会堂
                    comEvent.setSolve(0);
                    comEvent.setDistribution(0);
                    //comEvent.setConciliation(0);
                    comEvent.setEventProcessStatus(2);
                    comEvent.setArchive(0);
                    //comEvent.setChangeExpert(0);
                }
                else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventSucceed().equals(2)){
                    //调解完成，可以归档,查看
                    comEvent.setConciliation(0);
                    comEvent.setSolve(0);
                    comEvent.setDistribution(0);
                    comEvent.setChangeExpert(0);
                }
            }else{
            if(comEvent.getCurrentProcessType()==null)
            {
                //未上报到三说会堂,仅查看
                comEvent.setArchive(0);
                comEvent.setSolve(0);
@@ -566,6 +523,66 @@
                comEvent.setChangeExpert(0);
                comEvent.setConciliation(0);
            }
            else
            {
                if (comEvent.getCurrentProcessType().equals(4) || comEvent.getReportHall().equals(1)){
                    //已上报到三说会堂,可以操作
                    if (comEvent.getEventProcessStatus().equals(1)){
                        //待受理和待验证状态，可以受理，分配专家
                        //关闭调解和归档
                        comEvent.setArchive(0);
                        comEvent.setSolve(0);
                        comEvent.setConciliation(0);
                        comEvent.setChangeExpert(0);
                    }
                    else if(comEvent.getEventProcessStatus().equals(2)){
                        //待分配和待验证状态，可以受理，分配专家
                        //关闭调解和归档
                        comEvent.setArchive(0);
                        comEvent.setConciliation(0);
                        comEvent.setChangeExpert(0);
                        if (comEvent.getSpecialistName().equals("待分配")){
                            comEvent.setSolve(0);
                        }
                    }else if (comEvent.getEventProcessStatus().equals(3)){
                        //新分配给专家并且专家还未受理
                        comEvent.setDistribution(0);
                        comEvent.setArchive(0);
                        //comEvent.setConciliation(0);
                        comEvent.setChangeExpert(0);
                        comEvent.setSolve(0);
                    }
                    else if (comEvent.getEventProcessStatus().equals(5)){
                        //调解中，可以查看，调解，更换专家,删除
                        comEvent.setDistribution(0);
                        comEvent.setSolve(0);
                        comEvent.setArchive(0);
                    } else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventResult().equals(1) && !comEvent.getIsEnd().equals(1)){
                        //失败后转交三说会堂
                        comEvent.setSolve(0);
                        comEvent.setDistribution(0);
                        //comEvent.setConciliation(0);
                        comEvent.setEventProcessStatus(2);
                        comEvent.setArchive(0);
                        //comEvent.setChangeExpert(0);
                    }
                    else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventSucceed().equals(2)){
                        //调解完成，可以归档,查看
                        comEvent.setConciliation(0);
                        comEvent.setSolve(0);
                        comEvent.setDistribution(0);
                        comEvent.setChangeExpert(0);
                    }
                }else{
                    //未上报到三说会堂,仅查看
                    comEvent.setArchive(0);
                    comEvent.setSolve(0);
                    comEvent.setDistribution(0);
                    comEvent.setChangeExpert(0);
                    comEvent.setConciliation(0);
                }
            }

        }
    }

@@ -586,15 +603,15 @@
        }
        //上报级别是否匹配当前账号级别
        if (sysUser.getType().equals(12) ){
            if (!comEvent.getCurrentProcessType().equals(1)){
            if (comEvent.getCurrentProcessType()!=null && !comEvent.getCurrentProcessType().equals(1)){
                perm=0;
            }
        }else if (account.equals("admin")){
            if (!comEvent.getCurrentProcessType().equals(4)){
        }else if (StringUtils.equals("admin",account)){
            if ( comEvent.getCurrentProcessType()!=null && comEvent.getCurrentProcessType()!=4){
                perm=0;
            }
        }else if (isStreetAccount(sysUser)){
            if (!comEvent.getCurrentProcessType().equals(3)){
            if (comEvent.getCurrentProcessType()!=null && comEvent.getCurrentProcessType()!=3){
                perm=0;
            }
        }
@@ -962,8 +979,6 @@
        }
    }



    @Override
    @Transactional(rollbackFor = Exception.class)
    public R acceptRequest(Long id, Long specterId) {
@@ -1016,7 +1031,12 @@
                    comEvent.setSpecialistId(expert.getId());
                    isExpertCheck=true;
                    expertId=expert.getId();
//                    level=expert.getLevel();
//                    id=expert.getCommunityId();
                    comEvent.setCommunityId(expert.getCommunityId());
            }


            }else if (loginUserInfoVO.getType().equals(12)){
                //行业分中心权限
                comEvent.setUserType(3);
@@ -1035,10 +1055,11 @@
                List<Long> cids = comActDAO.selectCommunityByStreetId(loginUserInfoVO.getStreetId());
                comEvent.setUserType(5);
                comEvent.setCommunityIds(cids);
         }
        }
        if (isExpertCheck){
            if(nonNull(comEventMapper.listEventIds(expertId))){
                List<Long> eventIds = comEventMapper.listEventIds(expertId);
            List<Long> eventIds = comEventMapper.listEventIds(expertId);
            if(eventIds!=null && eventIds.size()>0){

                //获取该专家的所有事件
                comEvent.setEventIds(eventIds);
            }