#feat .

yanghui

2022-11-29 3da01b2a6cf247f90aed86fc37d8cb0ab51a4b4c

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

@@ -967,7 +967,7 @@
    }

    @Override
    public R calculate(LoginUserInfoVO loginUserInfoVO) {
    public R calculate(LoginUserInfoVO loginUserInfoVO,Integer level,Long id) {
        ComEvent comEvent=new ComEvent();
        Boolean isExpertCheck=false;
        Long expertId=null;
@@ -1024,6 +1024,11 @@
        LoginUserInfoVO user = r.getData();
        if (nonNull(user.getAppId())){
            comEvent.setAppId(user.getAppId());
        }
        if (nonNull(level) && nonNull(id)){
            comEvent.setLevel(level);
            comEvent.setSearchId(id);
            comEvent.setUserType(null);
        }
        List<ComEventCalculateVO> calculateList = baseMapper.calculate(comEvent);
        ComEventCalculateVO comEventCalculateVO =new ComEventCalculateVO();
@@ -1119,13 +1124,13 @@
            Integer centerCount=comEventMapper.expertSolveCountCenter();
            for (EventRateVO eventRateVO : eventRateVOS) {
                if (nonNull(eventRateVO)){
                    eventRateVO.setName(typeToName(eventRateVO.getCurrentProcessType()));
                    if (eventRateVO.getCurrentProcessType().equals(2)){
                        eventRateVO.setCount(eventRateVO.getCount()+expertCount);
                    }
                    if (eventRateVO.getCurrentProcessType().equals(1)){
                        eventRateVO.setCount(eventRateVO.getCount()+centerCount);
                    }
                    eventRateVO.setName(typeToName(eventRateVO.getType()));
//                    if (eventRateVO.getCurrentProcessType().equals(2)){
//                        eventRateVO.setCount(eventRateVO.getCount()+expertCount);
//                    }
//                    if (eventRateVO.getCurrentProcessType().equals(1)){
//                        eventRateVO.setCount(eventRateVO.getCount()+centerCount);
//                    }
                    if (nonNull(eventCount) && !eventCount.equals(0)){
                        //计算占比
                        eventRateVO.setRate(NumberUtil.div(eventRateVO.getCount(),eventCount,2));