fengjin
2023-04-25 fd17f7e68a3a409ecbc4c468bc85a07439c3a477
修改三说会堂排序和返回情况
1个文件已修改
1个文件已添加
36 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSanshuoExpertTwoDO.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSanshuoExpertTwoDO.java
New file
@@ -0,0 +1,16 @@
package com.panzhihua.service_community.model.dos;
import com.panzhihua.service_community.entity.ComSanshuoExpert;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import java.util.List;
@ApiModel("专家返回数据")
@Data
public class ComSanshuoExpertTwoDO {
    private List<ComSanshuoExpert> comSanshuoExperts;
    private List<ComSanshuoExpert> comSanshuoExpertsTwo;
}
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