查询添加分页

ruoyi-admin/src/main/java/com/ruoyi/web/controller/wx/OrderBillsPlansController.java

@@ -39,8 +39,10 @@ public class OrderBillsPlansController {
         }
 
         String orderNo = orderBillsPlansVo.getOrderNo();
+        Integer head = orderBillsPlansVo.getHead();
+        Integer tail = orderBillsPlansVo.getTail();
 
-        return AjaxResult.success(orderBillsPlansService.getOrderBillsPlansList(dataStart, dataEnd, orderNo));
+        return AjaxResult.success(orderBillsPlansService.getOrderBillsPlansList(dataStart, dataEnd, orderNo, head, tail));
     }
 
     /**

ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/OrderBillsPlansVo.java

@@ -32,4 +32,10 @@ public class OrderBillsPlansVo extends OrderBillsPlans {
      * 照片
      */
     private List<ImgVo> fileList1;
+
+    /**
+     * 分页
+     */
+    private Integer head;
+    private Integer tail;
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/IOrderBillsPlansService.java

@@ -3,7 +3,6 @@ package com.ruoyi.system.service;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.system.domain.*;
 import com.ruoyi.system.domain.vo.ItemsVo;
-import com.ruoyi.system.domain.vo.LoadFeeItemsVo;
 import com.ruoyi.system.domain.vo.OrderBillsPlansVo;
 
 import javax.servlet.http.HttpServletRequest;
@@ -16,9 +15,11 @@ public interface IOrderBillsPlansService {
      *
      * @param dataStart 日期起
      * @param dataEnd   日期止
+     * @param pageNum
+     * @param pageSize
      * @return
      */
-    List<WfTaskList> getOrderBillsPlansList(String dataStart, String dataEnd, String orderNo);
+    List<WfTaskList> getOrderBillsPlansList(String dataStart, String dataEnd, String orderNo, Integer head, Integer tail);
 
     /**
      * 根据orderNo查询

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OrderBillsPlansServiceImpl.java

@@ -5,15 +5,12 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.SnowFlakeUtil;
 import com.ruoyi.system.domain.*;
 import com.ruoyi.system.domain.vo.ImgVo;
 import com.ruoyi.system.domain.vo.ItemsVo;
-import com.ruoyi.system.domain.vo.LoadFeeItemsVo;
 import com.ruoyi.system.domain.vo.OrderBillsPlansVo;
 import com.ruoyi.system.mapper.EmplsMapper;
 import com.ruoyi.system.mapper.OrderBillsPlansMapper;
-import com.ruoyi.system.mapper.SysConfigMapper;
 import com.ruoyi.system.service.IOrderBillsPlansService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,10 +49,12 @@ public class OrderBillsPlansServiceImpl implements IOrderBillsPlansService {
      *
      * @param dataStart 日期起
      * @param dataEnd   日期止
+     * @param pageNum
+     * @param pageSize
      * @return
      */
     @Override
-    public List<WfTaskList> getOrderBillsPlansList(String dataStart, String dataEnd, String orderNo) {
+    public List<WfTaskList> getOrderBillsPlansList(String dataStart, String dataEnd, String orderNo, Integer head, Integer tail) {
 
         // 根据登录名去匹配EMPLS 里面的EMPL  找到 EMPLID
         String userName = SecurityUtils.getLoginUser().getUsername();
@@ -80,8 +79,15 @@ public class OrderBillsPlansServiceImpl implements IOrderBillsPlansService {
         map.put("dataEnd", dataEnd);
         map.put("orderNo", orderNo);
         map.put("actId", actId.toString());
+        map.put("head", head);
+        map.put("tail", tail);
+        List<WfTaskList> orderBillsPlansList = new ArrayList<>();
+        try {
 
-        List<WfTaskList> orderBillsPlansList = orderBillsPlansMapper.getOrderBillsPlansLsit(map);
+            orderBillsPlansList = orderBillsPlansMapper.getOrderBillsPlansLsit(map);
+        } catch (Exception a) {
+            System.out.println("aa");
+        }
         for (WfTaskList wfTaskList : orderBillsPlansList) {
             Long status317 = wfTaskList.getStatus317();
             Long status376 = wfTaskList.getStatus376();

ruoyi-system/src/main/resources/mapper/system/OrderBillsPlansMapper.xml

@@ -77,8 +77,7 @@
 
 
     <select id="getOrderBillsPlansLsit" parameterType="Map" resultType="com.ruoyi.system.domain.WfTaskList">
-        Select
-        Distinct p.SysID sysId
+        Select Distinct p.SysID sysId
         , p.EntityID entityId
         , p.LineNo lineNo
         , p.OrderNo orderNo
@@ -108,12 +107,12 @@
         ,e.Empl transact
         , b.BillDate billDate
         , p.rightqty
-
         , b.billStatus
         ,t.Status status317
         , tt.Status status376
         from wf_TaskList t
-        Left join wf_TaskList tt on (tt.SysID=t.SysID and tt.ActID=#{actId, jdbcType=VARCHAR} and tt.EntityID=t.EntityID)
+        Left join wf_TaskList tt on (tt.SysID=t.SysID and tt.ActID=#{actId, jdbcType=VARCHAR} and
+        tt.EntityID=t.EntityID)
         Left join LoadBills b on (b.SysID=t.SysID and b.EntityID=t.EntityID)
         Left join OrderBillsPlans p on (p.SysID=b.SysID and p.EntityID=b.SrcEntityID and p.LineNo=b.SrcLineNo)
         Left join Empls e on (e.SysID=b.SysID and e.EmplID=b.TransactID)
@@ -139,7 +138,8 @@
             </if>
         </where>
 
-        ORDER BY b.BillDate desc
+        ORDER BY b.BillDate DESC ROWS #{head} TO #{tail}
+
     </select>
 
     <select id="getOrderBillsPlansByid" resultType="com.ruoyi.system.domain.OrderBillsPlans">