From fd17f7e68a3a409ecbc4c468bc85a07439c3a477 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期二, 25 四月 2023 14:27:59 +0800
Subject: [PATCH] 修改三说会堂排序和返回情况

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 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..946a463 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
@@ -26,6 +26,7 @@
 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;
@@ -370,6 +371,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,12 +385,27 @@
                         //计算成功率
                         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);
+            }
+        }
+        comSanshuoExpertTwoVo.setComSanshuoExperts(comSanshuoExpertsOne);
+        comSanshuoExpertTwoVo.setComSanshuoExpertsTwo(comSanshuoExpertsTwo);
+        return R.ok(comSanshuoExpertTwoVo);
     }
 
     @Override

--
Gitblit v1.7.1