From 30f0f81a55eef5851a62cf5a9ed7547a5a558389 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 25 六月 2025 17:46:06 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/EvaluateMapper.xml | 45 +++++++++++++++
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/EvaluateMapper.java | 4
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/EvaluateController.java | 1
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/EvaluateServiceImpl.java | 8 ++
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml | 72 ++++++++++++------------
5 files changed, 91 insertions(+), 39 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/EvaluateController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/EvaluateController.java
index cc746d5..4d13bf0 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/EvaluateController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/EvaluateController.java
@@ -58,6 +58,7 @@
@ApiImplicitParam(value = "每页条数", name = "pageSize", dataType = "Integer", required = true)
})
public R<Page<EvaluatePageVO>> queryPageList(@RequestBody EvaluatePageRequest request) {
+ request.setPageNum((request.getPageNum()-1)*request.getPageSize());
return R.ok(evaluateService.queryPageList(request, Page.of(request.getPageNum(), request.getPageSize())));
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/EvaluateMapper.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/EvaluateMapper.java
index 14c67c0..41c0f90 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/EvaluateMapper.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/EvaluateMapper.java
@@ -27,10 +27,10 @@
* 订单评价分页列表
*
* @param request 查询参数
- * @param page 分页
* @return 分页
*/
- Page<EvaluatePageVO> queryPageList(@Param("data") EvaluatePageRequest request, Page<EvaluatePageVO> page);
+ List<EvaluatePageVO> queryPageList(@Param("data") EvaluatePageRequest request);
+ List<EvaluatePageVO> queryPageListNoLimit(@Param("data") EvaluatePageRequest request);
/**
* 用户所关联评价记录分页列表
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/EvaluateServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/EvaluateServiceImpl.java
index 3e4b1a1..b943ec9 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/EvaluateServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/EvaluateServiceImpl.java
@@ -25,7 +25,13 @@
@Override
public Page<EvaluatePageVO> queryPageList(EvaluatePageRequest request, Page<EvaluatePageVO> page) {
- return baseMapper.queryPageList(request, page);
+ Page<EvaluatePageVO> evaluatePageVOPage1 = new Page<>();
+
+ List<EvaluatePageVO> evaluatePageVOPage = baseMapper.queryPageList(request);
+ int count = baseMapper.queryPageListNoLimit(request).size();
+ evaluatePageVOPage1.setRecords(evaluatePageVOPage);
+ evaluatePageVOPage1.setTotal( count);
+ return evaluatePageVOPage1;
}
@Override
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/EvaluateMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/EvaluateMapper.xml
index 9144ec6..eed7113 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/EvaluateMapper.xml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/EvaluateMapper.xml
@@ -85,6 +85,7 @@
</if>
</where>
order by e.createTime desc
+ limit #{data.pageNum},#{data.pageSize}
</select>
<resultMap id="pageMap" type="com.ruoyi.order.vo.EvaluatePageVO">
@@ -189,4 +190,48 @@
</where>
order by o.createTime desc
</select>
+ <select id="queryPageListNoLimit" resultType="com.ruoyi.order.vo.EvaluatePageVO">
+
+
+ select
+ e.id
+
+ from t_evaluate e
+ left join t_order o on e.order_id = o.id
+ <where>
+ e.is_delete = 0
+ and o.is_delete = 0
+ <if test="data.userIdList != null and data.userIdList.size() != 0">
+ and o.user_id in
+ <foreach collection="data.userIdList" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </if>
+ <if test="data.orderNumber != null and data.orderNumber != ''">
+ and o.order_number like concat('%', #{data.orderNumber}, '%')
+ </if>
+ <if test="data.workerName != null and data.workerName != ''">
+ and o.server_name like concat('%', #{data.workerName}, '%')
+ </if>
+ <if test="data.cityList != null and data.cityList.size() != 0">
+ and o.city_code in
+ <foreach collection="data.cityList" item="city" open="(" separator="," close=")">
+ #{city}
+ </foreach>
+ </if>
+ <if test="data.userIdList != null and data.userIdList.size() != 0">
+ and e.user_id in
+ <foreach collection="data.userIdList" item="userId" open="(" separator="," close=")">
+ #{userId}
+ </foreach>
+ </if>
+
+ <if test="data.siteIds != null and data.siteIds.size() != 0">
+ and o.site_id in
+ <foreach collection="data.siteIds" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </if>
+ </where>
+ </select>
</mapper>
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
index 47b1d20..c3505f0 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
@@ -232,51 +232,51 @@
<select id="queryPage" resultMap="BaseResultMap">
select
- o.id,
- o.city,
- o.order_number,
+ o.id ,
+ o.city ,
+ o.order_number ,
o.site_id,
- o.site_name,
- o.serve_id,
- o.serve_name,
- o.serve_price,
- o.user_id,
+ o.site_name ,
+ o.serve_id ,
+ o.serve_name ,
+ o.serve_price ,
+ o.user_id ,
o.reservation_name,
- o.reservation_phone,
- o.reservation_address,
- o.time,
+ o.reservation_phone ,
+ o.reservation_address ,
+ o.time ,
o.server_id,
o.server_name,
o.server_phone,
- o.reservation_remark,
- o.order_money,
+ o.reservation_remark ,
+ o.order_money ,
o.state,
o.createBy,
o.updateBy,
o.createTime,
o.updateTime,
- o.is_delete,
- o.accept_time,
+ o.is_delete ,
+ o.accept_time ,
o.type,
o.longitude,
o.latitude,
- o.arrive_time,
- o.complete_time
- o.is_withdrawal,
+ o.arrive_time ,
+ o.complete_time ,
+ o.is_withdrawal ,
o.subsidy,
o.address,
- o.top_sort,
- o.cancel_reason,
- o.out_batch_no,
- o.remark,
- o.package_info,
- o.msg_count,
- o.province_code,
- o.provice_code,
- o.area_code,
- o.print_count,
- o.fake,
- o.city_code,
+ o.top_sort ,
+ o.cancel_reason ,
+
+ o.remark ,
+ o.package_info ,
+ o.msg_count ,
+ o.province_code ,
+ o.provice_code ,
+ o.area_code ,
+ o.print_count ,
+ o.fake ,
+ o.city_code ,
o.is_reinvest,
o.is_evaluate
@@ -397,13 +397,13 @@
o.longitude,
o.latitude,
o.arrive_time,
- o.complete_time
+ o.complete_time,
o.is_withdrawal,
o.subsidy,
o.address,
o.top_sort,
o.cancel_reason,
- o.out_batch_no,
+
o.remark,
o.package_info,
o.msg_count,
@@ -715,13 +715,13 @@
o.longitude,
o.latitude,
o.arrive_time,
- o.complete_time
+ o.complete_time,
o.is_withdrawal,
o.subsidy,
o.address,
o.top_sort,
o.cancel_reason,
- o.out_batch_no,
+
o.remark,
o.package_info,
o.msg_count,
@@ -828,13 +828,13 @@
o.longitude,
o.latitude,
o.arrive_time,
- o.complete_time
+ o.complete_time,
o.is_withdrawal,
o.subsidy,
o.address,
o.top_sort,
o.cancel_reason,
- o.out_batch_no,
+
o.remark,
o.package_info,
o.msg_count,
--
Gitblit v1.7.1