From b7686f7f5fa3ab54c6bb0c34ca7f55a5aa58ec3c Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 04 七月 2023 17:22:43 +0800
Subject: [PATCH] 修改街道新增报错
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 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 b8f32e9..60ad722 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
@@ -2,8 +2,6 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.NumberUtil;
-import cn.hutool.crypto.SecureUtil;
-import cn.hutool.crypto.digest.MD5;
import cn.hutool.extra.pinyin.PinyinUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -18,19 +16,14 @@
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.Snowflake;
-import com.panzhihua.common.utlis.StringUtils;
-import com.panzhihua.service_community.api.ComSanShuoExpertApi;
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.entity.ComSanshuoIndustryCenter;
import com.panzhihua.service_community.model.dos.ComActDO;
+import com.panzhihua.service_community.model.dos.ComSanshuoExpertTwoDO;
import com.panzhihua.service_community.model.dos.ComStreetDO;
-import com.panzhihua.service_community.service.ComActService;
import com.panzhihua.service_community.service.ComSanShuoExpertService;
-import com.panzhihua.service_community.service.ComStreetService;
-import com.panzhihua.service_community.util.MyAESUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -370,6 +363,8 @@
wrapper.eq("id",id );
}
}
+ wrapper.orderByDesc("(select count(*) FROM com_sanshuo_event_info where specialist_id=com_sanshuo_expert.id and event_process_status=6 and event_result=2)/(select count(*) FROM com_sanshuo_event_info where specialist_id=com_sanshuo_expert.id and event_process_status=6 ) ");
+ wrapper.orderByDesc("(select count(*) FROM com_sanshuo_event_info where specialist_id=com_sanshuo_expert.id and event_process_status=6 )");
List<ComSanshuoExpert> comSanshuoExperts = comSanshuoExpertDao.selectList(wrapper);
for (ComSanshuoExpert comSanshuoExpert : comSanshuoExperts) {
//获取成功率
@@ -382,13 +377,33 @@
//计算成功率
comSanshuoExpert.setRate(NumberUtil.div(successCount, count,2));
}
+ else {
+ comSanshuoExpert.setRate(new BigDecimal(0));
+ }
}else {
comSanshuoExpert.setRate(new BigDecimal(0));
}
}
- return R.ok(comSanshuoExperts);
- }
+ ComSanshuoExpertTwoDO comSanshuoExpertTwoVo=new ComSanshuoExpertTwoDO();
+ List<ComSanshuoExpert> comSanshuoExpertsOne=new ArrayList<>();
+ List<ComSanshuoExpert> comSanshuoExpertsTwo=new ArrayList<>();
+ for (ComSanshuoExpert comSanshuoExpert : comSanshuoExperts){
+ if (comSanshuoExpert.getId()%2==1){
+ comSanshuoExpertsOne.add(comSanshuoExpert);
+ }else {
+ comSanshuoExpertsTwo.add(comSanshuoExpert);
+ }
+ }
+ if (level==0){
+ comSanshuoExpertTwoVo.setComSanshuoExperts(comSanshuoExpertsOne);
+ comSanshuoExpertTwoVo.setComSanshuoExpertsTwo(comSanshuoExpertsTwo);
+ return R.ok(comSanshuoExpertTwoVo);
+ }
+ else {
+ return R.ok(comSanshuoExperts);
+ }
+ }
@Override
public void insertExpert(ComSanshuoExpert expert) {
--
Gitblit v1.7.1