From d6aabd981bf80cd57c09819f42b1c4e79f1904f9 Mon Sep 17 00:00:00 2001 From: manailin <261030956@qq.com> Date: 星期三, 21 九月 2022 10:13:50 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/sanshuohuitang_dev' into sanshuohuitang_dev --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java index 36d7e9f..c8b5813 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java @@ -1,7 +1,9 @@ package com.panzhihua.service_community.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.NumberUtil; import cn.hutool.crypto.digest.MD5; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.common.model.dtos.community.sanshuo.ComSanshuoExpertDTO; @@ -14,6 +16,8 @@ import com.panzhihua.common.utlis.Snowflake; import com.panzhihua.common.utlis.StringUtils; import com.panzhihua.service_community.dao.*; +import com.panzhihua.service_community.entity.ComEvent; +import com.panzhihua.service_community.entity.ComSanshuoEvent; import com.panzhihua.service_community.entity.ComSanshuoExpert; import com.panzhihua.service_community.model.dos.ComActDO; import com.panzhihua.service_community.model.dos.ComStreetDO; @@ -24,6 +28,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -43,6 +48,8 @@ private ComStreetDAO comStreetDAO; @Resource private ComActDAO comActDAO; + @Resource + private ComEventMapper comEventMapper; /** @@ -219,4 +226,33 @@ } + /** + * 小程序获取专家列表 + * */ + @Override + public R selectExpertList() { + List<ComSanshuoExpert> comSanshuoExperts = comSanshuoExpertDao.selectList(new QueryWrapper<ComSanshuoExpert>().lambda().eq(ComSanshuoExpert::getStatus, 1).eq(ComSanshuoExpert::getDelFlag, 1)); + //设置成功率 + for (ComSanshuoExpert comSanshuoExpert : comSanshuoExperts) { + //查询成功率 + Integer count = comEventMapper.selectCount(new QueryWrapper<ComEvent>().lambda().eq(ComEvent::getSpecialistId, comSanshuoExpert.getId()).eq(ComEvent::getEventProcessStatus, 6)); + Integer successCount = comEventMapper.selectCount(new QueryWrapper<ComEvent>().lambda().eq(ComEvent::getSpecialistId, comSanshuoExpert.getId()).eq(ComEvent::getEventProcessStatus, 6).eq(ComEvent::getEventResult, 2)); + comSanshuoExpert.setCount(count); + if (nonNull(count) && !count.equals(0)){ + comSanshuoExpert.setCount(count); + if (nonNull(successCount) && !count.equals(successCount)){ + //计算成功率 + comSanshuoExpert.setRate(NumberUtil.div(successCount, count,2)); + }else { + comSanshuoExpert.setRate(new BigDecimal(0)); + } + }else { + comSanshuoExpert.setCount(0); + } + + } + return R.ok(comSanshuoExperts); + } + + } -- Gitblit v1.7.1