修改

YijiaRestful/pom.xml

@@ -85,6 +85,12 @@
             <artifactId>mybatis-spring-boot-starter</artifactId>
             <version>2.1.4</version>
         </dependency>
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+            <version>1.2.10</version>
+        </dependency>
+
         <!-- Mysql驱动包 -->
         <dependency>
             <groupId>mysql</groupId>

YijiaRestful/src/main/java/com/platform/yijia/controller/PosMachineController.java

@@ -1,4 +1,5 @@
 package com.platform.yijia.controller;
+import com.github.pagehelper.PageHelper;
 import com.google.gson.Gson;
 import com.platform.yijia.param.request.LoginBody;
 import com.platform.yijia.pojo.PayOrder;
@@ -12,6 +13,7 @@ import com.platform.yijia.service.PosMachineService;
 import com.platform.yijia.utils.CodeMsg;
 import com.platform.yijia.utils.ResultData;
 import org.apache.ibatis.annotations.Param;
+import org.omg.CORBA.ObjectHelper;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
@@ -142,14 +144,24 @@ public class PosMachineController {
         Gson gson =new Gson();
         //返回结果集
         ResultData resultData = null;
-        PayOrder payOrder = new PayOrder();
-        payOrder.setStationId(request.getStationId());
-        payOrder.setBeginTime(request.getBeginTime());
-        payOrder.setEndTime(request.getEndTime());
-        payOrder.setPayType(request.getPayType());
-        payOrder.setStatus("1");
-        List<PayOrder> payOrders = payOrderService.selectPayOrderList(payOrder);
-        resultData = ResultData.success(payOrders);
+        if(request.getStationId() !=null){
+            PayOrder payOrder = new PayOrder();
+            payOrder.setStationId(request.getStationId());
+            payOrder.setBeginTime(request.getBeginTime());
+            payOrder.setEndTime(request.getEndTime());
+            payOrder.setPayType(request.getPayType());
+            payOrder.setStatus("1");
+            //分页
+            if(request.getPageNum() !=null && request.getPageSize() !=null){
+                PageHelper.startPage(request.getPageNum(), request.getPageSize());
+            }
+            List<PayOrder> payOrderList = payOrderService.selectPayOrderList(payOrder);
+            Map<String, Object> resultMap = new HashMap<>();
+            resultMap.put("listSum", payOrderList);
+            resultData = ResultData.success(resultMap);
+        }else {
+            resultData = ResultData.error(CodeMsg.PARAMS_NUll);
+        }
         return  gson.toJson(resultData);
     }
 

YijiaRestful/src/main/java/com/platform/yijia/pojo/PayOrder.java

@@ -58,6 +58,9 @@ public class PayOrder {
     private String classStructureDate;
     private String classStructureMan;
 
+    //分页参数
+    private Integer pageNum;
+    private Integer pageSize;
 
     private String beginTimeQOQ;    //环比开始时间
     private String endTimeQOQ;      //环比结束时间

YijiaRestful/src/main/resources/application.yml

@@ -9,6 +9,9 @@ server:
         # tomcat的URI编码
         uri-encoding: UTF-8
 
+pagehelper:
+    helper-dialect=mysql:
+
 # Spring配置
 spring:
     datasource:

YijiaRestful/src/main/resources/mapper/PayOrderMapper.xml

@@ -295,23 +295,23 @@
   <!--查询班结时间内订单-->
   <select id="selectPayOrderList" parameterType="com.platform.yijia.pojo.PayOrder" resultMap="BaseResultMap">
     SELECT
-        <include refid="Base_Column_List_DateFormat"/>
+        <include refid="Base_Column_List"/>
     FROM
         pay_order
     <where>
       <if test="stationId !=null">
         station_id= #{stationId}
       </if>
-      <if test="payType !=null">
+      <if test="payType !=null and payType !=''">
         AND pay_type= #{payType}
       </if>
       <if test="status !=null">
         AND status= #{status}
       </if>
-      <if test="beginTime !=null">
+      <if test="beginTime !=null and beginTime !=''">
         AND pay_date &gt;= #{beginTime}
       </if>
-      <if test="endTime !=null">
+      <if test="endTime !=null and endTime !=''">
         AND pay_date &lt; #{endTime}
       </if>
     </where>