From 36f92d746ce56f1cc8477e6a50bf3fdce9ac5e31 Mon Sep 17 00:00:00 2001
From: xyiege <xc@xyiege.com>
Date: Sat, 16 Jul 2022 20:20:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/chjyj/szwh/controller/api/OrderController.java  |  5 +++--
 .../cn/chjyj/szwh/service/impl/OrderServiceImpl.java   |  2 +-
 src/main/resources/mapper/szwh/OrderMapper.xml         | 10 +++++-----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/java/cn/chjyj/szwh/controller/api/OrderController.java b/src/main/java/cn/chjyj/szwh/controller/api/OrderController.java
index e52f9bd..5c85a83 100644
--- a/src/main/java/cn/chjyj/szwh/controller/api/OrderController.java
+++ b/src/main/java/cn/chjyj/szwh/controller/api/OrderController.java
@@ -65,10 +65,11 @@ public class OrderController extends BaseController {
         int ipage = Integer.valueOf(page);
         int ips = Integer.valueOf(pagesize);
         int startrs = ipage > 0 ? (ipage - 1) * ips : 0;
-        List<Order> olist =orderService.getOrderList(qmap, startrs, ips);
+        //List<Order> olist =orderService.getOrderList(qmap, startrs, ips);
+        Map outmap = orderService.getOrderList(qmap,startrs,ips);
         //赋值
         jsonObject.put("code","200");
-        jsonObject.put("data",olist);
+        jsonObject.put("data",outmap);
         jsonObject.put("msg","success");
         jsonObject.put("page",page);
         jsonObject.put("limit",pagesize);
diff --git a/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java
index 6016d8b..99cd213 100644
--- a/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java
+++ b/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java
@@ -47,7 +47,7 @@ public class OrderServiceImpl implements OrderService {
         retmap.put("start",starrs+1);
         retmap.put("cur_page",page);
         retmap.put("end",page*limit);
-        retmap.put("start",starrs);
+        retmap.put("id",starrs);
         retmap.put("per_page",limit);
         retmap.put("data",orderList);
         return retmap;
diff --git a/src/main/resources/mapper/szwh/OrderMapper.xml b/src/main/resources/mapper/szwh/OrderMapper.xml
index b9a9c48..29b6f09 100644
--- a/src/main/resources/mapper/szwh/OrderMapper.xml
+++ b/src/main/resources/mapper/szwh/OrderMapper.xml
@@ -57,15 +57,15 @@
         <where>
             <!-- 查询条件封装在map中，以k-v形式进行查询-->
             <foreach collection="map" item="v" index="k" separator="and">
-                <if test="v != null and v != ''">
+                <if test="v != null and v != '' and k!='id'">
                     ${k} = #{v}
                 </if>
+                <if test="k=='id'">
+                    ${k}>#{v}
+                </if>
             </foreach>
-            <if test="map.startrs!=null">
-                and id>#{map.startrs}
-            </if>
         </where>
-        and id>#{startRs} limit #{pageSize}
+        limit #{pageSize}
     </select>
 
     <!-- 根据不同状态代码统计 -->