Merge branch 'haucheng_panzhihua' into local_20221024

yanghui

2022-11-01 03dfa1de5279c75a4206f59226d871823bdbe72e

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

@@ -41,6 +41,7 @@
import org.springframework.web.bind.annotation.RequestParam;

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.*;

import static java.util.Objects.isNull;
@@ -373,7 +374,8 @@
                    comEvent.setSolve(0);
                    comEvent.setDistribution(0);
                    //comEvent.setChangeExpert(0);
                    comEvent.setArchive(0);
                    //comEvent.setArchive(0);
                    comEvent.setConciliation(0);
                }
                else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventSucceed().equals(2)){
                    //调解完成，可以归档,查看
@@ -617,14 +619,14 @@
            comEvent.setCurrentOrgId(community.getCommunityId().toString());
            comEvent.setCurrentProcessType(5);
        }
        if (!StringUtils.isEmpty(comEvent.getCenterId())) {
        if (!StringUtils.isEmpty(comEvent.getCenterId()))   {
            //创建时处理级别都是专家
            ComSanshuoIndustryCenter center = comSanShuoIndustryCenterService.getById(comEvent.getCenterId());
            comEvent.setCurrentOrgName(center.getName());
            comEvent.setCurrentOrgId(center.getId().toString());
            comEvent.setCurrentProcessType(5);
        }
        if (nonNull(comEvent.getCenterId())){
        if (StringUtils.isNotEmpty(comEvent.getCenterId())){
            comEvent.setRequestUserCommunity(null);
        }
        comEvent.setUserEventStatus(2);
@@ -656,13 +658,14 @@
    public void sendMessage(Long expertId,ComEvent comEvent){
        //获取专家的openId
        ComSanshuoExpert expert = comSanShuoExpertService.getById(expertId);
        SysUser sysUser = sysUserDao.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getPhone, expert.getPhone()).eq(SysUser::getType, 1));
        SysUser sysUser = sysUserDao.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getPhone, expert.getPhone()).eq(SysUser::getType, 1).eq(SysUser::getAppId,"wx0cef797390444b75" ));
        SanShuoMessageVO vo=new SanShuoMessageVO();
        if (nonNull(sysUser)){
            if (isNull(sysUser.getOpenid())){
                log.info("专家未登陆APP，无法推送");
                return;
            }
        if (isNull(sysUser)){
            return;
        }
        if (isNull(sysUser.getOpenid())){
           log.info("专家未登陆APP，无法推送");
           return;
        }
        vo.setTouser(sysUser.getOpenid());
        vo.setThing1(commediateTypeService.getById(comEvent.getEventCategory()).getName());
@@ -851,7 +854,7 @@
                || comEvent.getEventProcessStatus() == SanShuoEventStatusEnum.VALID.getCode().intValue()) {
            comEvent.setId(id);
            comEvent.setUserEventStatus(4);
            comEvent.setEventProcessStatus(8);
            comEvent.setEventProcessStatus(9);
            comEvent.setRevokeDes("用户手动取消");
            comEvent.setRevokeDate(new Date());
            int flag = baseMapper.updateById(comEvent);
@@ -906,9 +909,15 @@
        if (isNull(comEvent.getRequestUserCommunity())){
            return comSanShuoIndustryCenterService.getById(comEvent.getCenterId()).getPhone();
        }else {
            return comActDAO.selectById(comEvent.getRequestUserCommunity()).getContactsPhone();
            String contactsPhone = comActDAO.selectById(comEvent.getRequestUserCommunity()).getContactsPhone();
            if (isNull(contactsPhone)){
                return null;
            }
            return contactsPhone;
        }
    }



    @Override
    @Transactional(rollbackFor = Exception.class)
@@ -1051,7 +1060,12 @@
        if (nonNull(vo.getSuccess()) && !vo.getSuccess().equals(0)){
            if (nonNull(vo.getAccepted()) && !vo.getAccepted().equals(0)){
                //计算成功率
                vo.setSuccessRate(NumberUtil.div(vo.getSuccess(),vo.getAccepted(),2));
                try {
                    vo.setSuccessRate(NumberUtil.div(vo.getSuccess(),vo.getAccepted(),2));
                }catch (NullPointerException e){
                    vo.setSuccessRate(new BigDecimal(0));
                }

            }
        }
        vo.setExpert(comSanshuoExpertDao.selectExpertCount(indexDataDTO));
@@ -1137,11 +1151,11 @@
            case 1:
                return "行业分中心受理";
            case 3:
                return "街道调解站受理";
                return "镇/街道受理案件";
            case 2:
                return "社区调解站受理";
                return "村/社区受理案件";
            case 4:
                return "区三说会堂受理";
                return "区三说会堂中心受理";
        }
        return null;
    }
@@ -1149,13 +1163,13 @@
    public String typeToNameExpert(Integer type){
        switch (type){
            case 1:
                return "区三说会堂专家";
                return "区三说会堂中心专家";
            case 2:
                return "行业分中心专家";
            case 3:
                return "街道调解站专家";
                return "镇/街道调解专家";
            case 4:
                return "社区调解站专家";
                return "村/社区调解专家";
        }
        return null;
    }