hjl
2024-07-01 03c6572c7918beaa20365e69c9694a11f0d9948a
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/MasterWorkerController.java
@@ -51,18 +51,18 @@
    @ApiOperation(value = "师傅列表", tags = {"后台-师傅管理"})
    @GetMapping(value = "/selectServe")
    @ApiImplicitParams({
            @ApiImplicitParam(value = "师傅姓名", name = "workerName", dataType = "String"),
            @ApiImplicitParam(value = "师傅电话", name = "workerPhone", dataType = "String"),
            @ApiImplicitParam(value = "师傅姓名", name = "name", dataType = "String"),
            @ApiImplicitParam(value = "师傅电话", name = "phone", dataType = "String"),
            @ApiImplicitParam(value = "服务城市", name = "city", dataType = "String"),
            @ApiImplicitParam(value = "页码", name = "pageNum", dataType = "Integer", required = true),
            @ApiImplicitParam(value = "每页显示条数", name = "pageSize", dataType = "Integer", required = true)
    })
    public R<IPage<MasterWorker>> selectServe(String workerName, String workerPhone, String city,
    public R<IPage<MasterWorker>> selectServe(String name, String phone, String city,
                                              @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
                                              @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
        LambdaQueryChainWrapper<MasterWorker> wrapper = masterWorkerService.lambdaQuery();
        wrapper = StringUtils.isNotBlank(workerName) ? wrapper.like(MasterWorker::getRealName, workerName) : wrapper;
        wrapper = StringUtils.isNotBlank(workerPhone) ? wrapper.like(MasterWorker::getPhone, workerPhone) : wrapper;
        wrapper = StringUtils.isNotBlank(name) ? wrapper.like(MasterWorker::getRealName, name) : wrapper;
        wrapper = StringUtils.isNotBlank(phone) ? wrapper.like(MasterWorker::getPhone, phone) : wrapper;
        wrapper = StringUtils.isNotBlank(city) ? wrapper.like(MasterWorker::getCity, city) : wrapper;
        return R.ok(wrapper.eq(MasterWorker::getIsDelete, 0)
                .orderByDesc(MasterWorker::getCreateTime).page(Page.of(pageNum, pageSize)));
@@ -130,7 +130,7 @@
    }
    /**
     * 新增师傅信息
     * 师傅详细信息
     *
     * @param workerId 师傅id
     */
@@ -151,11 +151,13 @@
        List<Evaluate> evaluateList = evaluateService.lambdaQuery().eq(Evaluate::getWorkerId, workerId)
                .eq(Evaluate::getIsDelete, 0).list();
        List<BigDecimal> star = evaluateList.stream().map(Evaluate::getStarRating).collect(Collectors.toList());
        // 总评分 / 评价数量
        BigDecimal starRating = star.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
        BigDecimal result = starRating.divide(new BigDecimal(star.size()), 1, RoundingMode.HALF_UP);
        workerDetail.setStarRating(result);
        return R.fail(workerDetail);
        if (!star.isEmpty()) {
            // 总评分 / 评价数量
            BigDecimal starRating = star.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
            BigDecimal result = starRating.divide(new BigDecimal(star.size()), 1, RoundingMode.HALF_UP);
            workerDetail.setStarRating(result);
        }
        return R.ok(workerDetail);
    }
}