bug修改

无关风月

18 小时以前 1442f149019ee0590389abd7a88a79c4d9b59034

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/EvaluateController.java

@@ -7,6 +7,7 @@
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.order.entity.Evaluate;
import com.ruoyi.order.entity.Order;
import com.ruoyi.order.request.EvaluatePageRequest;
import com.ruoyi.order.request.OrderEvaluateSubmitRequest;
import com.ruoyi.order.service.EvaluateService;
import com.ruoyi.order.service.OrderService;
@@ -44,12 +45,11 @@
    /**
     * 订单评价分页列表
     *
     * @param pageNum  页码
     * @param pageSize 每页显示条数
     * @param request 筛选参数
     */
    @RequiresPermissions("order_evaluate")
    @ApiOperation(value = "订单评价分页查询列表", tags = {"后台"})
    @GetMapping(value = "/page")
    @PostMapping(value = "/page")
    @ApiImplicitParams({
            @ApiImplicitParam(value = "评价用户", name = "userNo", dataType = "String"),
            @ApiImplicitParam(value = "订单编号", name = "orderNumber", dataType = "String"),
@@ -57,12 +57,8 @@
            @ApiImplicitParam(value = "页码", name = "pageNum", dataType = "Integer", required = true),
            @ApiImplicitParam(value = "每页条数", name = "pageSize", dataType = "Integer", required = true)
    })
    public R<Page<EvaluatePageVO>> queryPageList(@RequestParam(value = "userNo", required = false) String userNo,
                                                 @RequestParam(value = "orderNumber", required = false) String orderNumber,
                                                 @RequestParam(value = "workerName", required = false) String workerName,
                                                 @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
                                                 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
        return R.ok(evaluateService.queryPageList(userNo, orderNumber, workerName, Page.of(pageNum, pageSize)));
    public R<Page<EvaluatePageVO>> queryPageList(@RequestBody EvaluatePageRequest request) {
        return R.ok(evaluateService.queryPageList(request, Page.of(request.getPageNum(), request.getPageSize())));
    }

    /**
@@ -113,9 +109,21 @@
    public R<Page<EvaluatePageVO>> evaluateList(@RequestParam(value = "userId", required = false) Integer userId,
                                                @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
                                                @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
        return R.ok(evaluateService.evaluateList(userId, Page.of(pageNum, pageSize)));
        Page<EvaluatePageVO> evaluatePageVOPage = evaluateService.evaluateList(userId, Page.of(pageNum, pageSize));
        return R.ok(evaluatePageVOPage);
    }

    @GetMapping(value = "/evaluateList1")
    public R<Page<EvaluatePageVO>> evaluateList1(@RequestParam(value = "cityList", required = false) List<String> cityList,
                                                @RequestParam(value = "userId", required = false) Integer userId,
                                                @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
                                                @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                 @RequestParam("siteIds")List<String> siteIds) {
        Page<EvaluatePageVO> evaluatePageVOPage = evaluateService.evaluateList1(cityList,userId, Page.of(pageNum, pageSize),siteIds);
        return R.ok(evaluatePageVOPage);
    }


    /**
     * 根据师傅id获取评价列表
     *