新增优化

mitao

2024-09-04 ecca9ab70a9a87bcb60977c92fbf81053b8fc1bb

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/MasterWorkerController.java

@@ -26,6 +26,7 @@

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -83,15 +84,16 @@
        if (null != state) {
            wrapper.eq(MasterWorker::getIsEnable, Constants.ONE);
        }
        for (int i = 0; i < cityList.size(); i++) {
            // 最后一跳城市不匹配or条件
            String s = cityList.get(i);
            if (cityList.size() - 1 == i) {
                wrapper.like(MasterWorker::getCityCode, s);
            } else {
                wrapper.like(MasterWorker::getCityCode, s).or();
            }
        }
        wrapper.in(!cityList.isEmpty(),MasterWorker::getCityCode,cityList);
//        for (int i = 0; i < cityList.size(); i++) {
//            // 最后一跳城市不匹配or条件
//            String s = cityList.get(i);
//            if (cityList.size() - 1 == i) {
//                wrapper.like(MasterWorker::getCityCode, s);
//            } else {
//                wrapper.like(MasterWorker::getCityCode, s).or();
//            }
//        }
        return R.ok(wrapper.eq(MasterWorker::getIsDelete, Constants.ZERO)
                .orderByDesc(MasterWorker::getCreateTime).page(Page.of(pageNum, pageSize)));
    }
@@ -196,8 +198,12 @@
        if (!star.isEmpty()) {
            // 总评分 / 评价数量
            double sum = star.stream().mapToDouble(Double::doubleValue).sum();
            workerDetail.setStarRating(new BigDecimal(sum / star.size()));
            BigDecimal average = new BigDecimal(sum / star.size()).setScale(1, RoundingMode.HALF_UP);
            workerDetail.setStarRating(average);
        } else {
            workerDetail.setStarRating(new BigDecimal("0.0"));
        }

        return R.ok(workerDetail);
    }