修改两票统计分页查询

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/IStandardTicketInfoService.java

@@ -130,9 +130,11 @@ public interface IStandardTicketInfoService extends BaseService<StandardTicketIn
 
 
 	/**
-	 * 查看操作票
-	 * @param ticketCountQueryVo
-	 * @return
-	 */
-	List<StandardTicketInfoEntity> listByOperationTicketWithKeyword(TicketCountQueryVo ticketCountQueryVo);
+     * 查看操作票
+     *
+     * @param entityPage
+     * @param ticketCountQueryVo
+     * @return
+     */
+	IPage<StandardTicketInfoEntity> listByOperationTicketWithKeyword(Page<StandardTicketInfoEntity> entityPage, TicketCountQueryVo ticketCountQueryVo);
 }

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java

@@ -707,11 +707,12 @@ public class StandardTicketInfoServiceImpl extends BaseServiceImpl<StandardTicke
     /**
      * 查看操作票
      *
+     * @param entityPage
      * @param ticketCountQueryVo
      * @return
      */
     @Override
-    public List<StandardTicketInfoEntity> listByOperationTicketWithKeyword(TicketCountQueryVo ticketCountQueryVo) {
+    public IPage<StandardTicketInfoEntity> listByOperationTicketWithKeyword(Page<StandardTicketInfoEntity> entityPage, TicketCountQueryVo ticketCountQueryVo) {
         String flowTaskName = ticketCountQueryVo.getFlowTaskName();
         String dateTime = ticketCountQueryVo.getDateTime();
         String type = ticketCountQueryVo.getType();
@@ -741,6 +742,6 @@ public class StandardTicketInfoServiceImpl extends BaseServiceImpl<StandardTicke
         if (StringUtils.isNotBlank(dateTime)) {
             queryWrapper.apply("date_format(create_time,'%Y-%m') = {0}", dateTime);
         }
-        return baseMapper.selectList(queryWrapper);
+        return baseMapper.selectPages(entityPage,queryWrapper);
     }
 }

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/controller/TicketCountController.java

@@ -1,6 +1,8 @@
 package com.hnac.hzims.ticket.twoTicket.controller;
 
 import cn.hutool.http.server.HttpServerResponse;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hnac.hzims.ticket.standardTicket.entity.StandardTicketInfoEntity;
 import com.hnac.hzims.ticket.standardTicket.service.IStandardTicketInfoService;
 import com.hnac.hzims.ticket.standardTicket.service.OperationTicketService;
@@ -79,10 +81,14 @@ public class TicketCountController {
     /**
      * 查看工作票
      */
-    @GetMapping("/listByTicketWithKeyword")
-    public R listByTicketWithKeyword(TicketCountQueryVo ticketCountQueryVo) {
-        List<WorkTicketInfoEntity> workTicketInfoEntities =
-                workTicketService.listByTicketWithKeyword(ticketCountQueryVo);
+    @GetMapping("/listByTicketWithKeyword/{page}/{size}")
+    public R listByTicketWithKeyword(
+            @PathVariable Long page,
+            @PathVariable Long size,
+            TicketCountQueryVo ticketCountQueryVo) {
+        Page<WorkTicketInfoEntity> entityPage = new Page<>(page,size);
+        IPage<WorkTicketInfoEntity> workTicketInfoEntities =
+                workTicketService.listByTicketWithKeyword(entityPage,ticketCountQueryVo);
         return R.data(workTicketInfoEntities);
     }
 
@@ -90,10 +96,14 @@ public class TicketCountController {
     /**
      * 查看操作票
      */
-    @GetMapping("/listByOperationTicketWithKeyword")
-    public R listByOperationTicketWithKeyword(TicketCountQueryVo ticketCountQueryVo) {
-        List<StandardTicketInfoEntity> ticketInfoEntities =
-                standardTicketInfoService.listByOperationTicketWithKeyword(ticketCountQueryVo);
+    @GetMapping("/listByOperationTicketWithKeyword/{page}/{size}")
+    public R listByOperationTicketWithKeyword(
+            @PathVariable Long page,
+            @PathVariable Long size,
+            TicketCountQueryVo ticketCountQueryVo) {
+        Page<StandardTicketInfoEntity> entityPage = new Page<>(page,size);
+        IPage<StandardTicketInfoEntity> ticketInfoEntities =
+                standardTicketInfoService.listByOperationTicketWithKeyword(entityPage,ticketCountQueryVo);
         return R.data(ticketInfoEntities);
     }
 

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketInfoService.java

@@ -2,7 +2,6 @@ package com.hnac.hzims.ticket.workTicket.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.hnac.hzims.ticket.areamonthly.vo.AreaMonthlyVo;
 import com.hnac.hzims.ticket.areamonthly.vo.StandardTicketWithAreaVo;
 import com.hnac.hzims.ticket.areamonthly.vo.StandardWorkVo;
 import com.hnac.hzims.ticket.twoTicket.vo.TicketCountQueryVo;
@@ -173,8 +172,10 @@ public interface IWorkTicketInfoService extends BaseService<WorkTicketInfoEntity
 
 	/**
 	 * 查看工作票
+	 *
+	 * @param entityPage
 	 * @param ticketCountQueryVo
 	 * @return
 	 */
-	List<WorkTicketInfoEntity> listByTicketWithKeyword(TicketCountQueryVo ticketCountQueryVo);
+	IPage<WorkTicketInfoEntity> listByTicketWithKeyword(Page<WorkTicketInfoEntity> entityPage, TicketCountQueryVo ticketCountQueryVo);
 }

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java

@@ -26,7 +26,6 @@ import com.hnac.hzims.ticket.areamonthly.vo.StandardTicketWithAreaVo;
 import com.hnac.hzims.ticket.areamonthly.vo.StandardWorkVo;
 import com.hnac.hzims.ticket.aspect.AroundFlow;
 import com.hnac.hzims.ticket.constants.TicketConstants;
-import com.hnac.hzims.ticket.standardTicket.entity.StandardTicketInfoEntity;
 import com.hnac.hzims.ticket.twoTicket.entity.TicketInfoDanger;
 import com.hnac.hzims.ticket.twoTicket.entity.WorkTicketFinish;
 import com.hnac.hzims.ticket.twoTicket.service.TicketInfoDangerService;
@@ -1135,11 +1134,12 @@ public class WorkTicketInfoServiceImpl extends BaseServiceImpl<WorkTicketInfoMap
     /**
      * 查看工作票
      *
+     * @param entityPage
      * @param ticketCountQueryVo
      * @return
      */
     @Override
-    public List<WorkTicketInfoEntity> listByTicketWithKeyword(TicketCountQueryVo ticketCountQueryVo) {
+    public IPage<WorkTicketInfoEntity> listByTicketWithKeyword(Page<WorkTicketInfoEntity> entityPage, TicketCountQueryVo ticketCountQueryVo) {
         //延期
         String input = ticketCountQueryVo.getInput();
         //开票 结束 作废
@@ -1180,6 +1180,6 @@ public class WorkTicketInfoServiceImpl extends BaseServiceImpl<WorkTicketInfoMap
                     evaluateEntities.stream().map(TicketInfoEvaluateEntity::getTicketId).collect(Collectors.toList());
             queryWrapper.lambda().in(BaseEntity::getId, idList);
         }
-        return baseMapper.selectList(queryWrapper);
+        return baseMapper.selectPages(entityPage,queryWrapper);
     }
 }