From 67f416634f95c81e618123b826e18a57ae08220d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 22 四月 2025 17:55:30 +0800
Subject: [PATCH] 11.6
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/MasterWorkerController.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/MasterWorkerController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/MasterWorkerController.java
index 580d976..fbd0dba 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/MasterWorkerController.java
+++ b/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);
}
--
Gitblit v1.7.1