From 221823457aed674a422c42e4d7a1dcf1963fe5ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B5=E9=A3=9E=E5=AE=87?= <2684146481@qq.com> Date: Tue, 25 Jul 2023 08:41:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=A4=E7=A5=A8=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/IStandardTicketInfoService.java | 12 +++++----- .../impl/StandardTicketInfoServiceImpl.java | 5 +++-- .../controller/TicketCountController.java | 26 +++++++++++++++------- .../workTicket/service/IWorkTicketInfoService.java | 5 +++-- .../service/impl/WorkTicketInfoServiceImpl.java | 6 ++--- 5 files changed, 34 insertions(+), 20 deletions(-) diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/IStandardTicketInfoService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/IStandardTicketInfoService.java index 99267e8..43a9333 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/IStandardTicketInfoService.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/IStandardTicketInfoService.java @@ -130,9 +130,11 @@ public interface IStandardTicketInfoService extends BaseService listByOperationTicketWithKeyword(TicketCountQueryVo ticketCountQueryVo); + * 查看操作票 + * + * @param entityPage + * @param ticketCountQueryVo + * @return + */ + IPage listByOperationTicketWithKeyword(Page entityPage, TicketCountQueryVo ticketCountQueryVo); } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java index 1262a20..80ca0cf 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java @@ -707,11 +707,12 @@ public class StandardTicketInfoServiceImpl extends BaseServiceImpl listByOperationTicketWithKeyword(TicketCountQueryVo ticketCountQueryVo) { + public IPage listByOperationTicketWithKeyword(Page entityPage, TicketCountQueryVo ticketCountQueryVo) { String flowTaskName = ticketCountQueryVo.getFlowTaskName(); String dateTime = ticketCountQueryVo.getDateTime(); String type = ticketCountQueryVo.getType(); @@ -741,6 +742,6 @@ public class StandardTicketInfoServiceImpl extends BaseServiceImpl workTicketInfoEntities = - workTicketService.listByTicketWithKeyword(ticketCountQueryVo); + @GetMapping("/listByTicketWithKeyword/{page}/{size}") + public R listByTicketWithKeyword( + @PathVariable Long page, + @PathVariable Long size, + TicketCountQueryVo ticketCountQueryVo) { + Page entityPage = new Page<>(page,size); + IPage workTicketInfoEntities = + workTicketService.listByTicketWithKeyword(entityPage,ticketCountQueryVo); return R.data(workTicketInfoEntities); } @@ -90,10 +96,14 @@ public class TicketCountController { /** * 查看操作票 */ - @GetMapping("/listByOperationTicketWithKeyword") - public R listByOperationTicketWithKeyword(TicketCountQueryVo ticketCountQueryVo) { - List ticketInfoEntities = - standardTicketInfoService.listByOperationTicketWithKeyword(ticketCountQueryVo); + @GetMapping("/listByOperationTicketWithKeyword/{page}/{size}") + public R listByOperationTicketWithKeyword( + @PathVariable Long page, + @PathVariable Long size, + TicketCountQueryVo ticketCountQueryVo) { + Page entityPage = new Page<>(page,size); + IPage ticketInfoEntities = + standardTicketInfoService.listByOperationTicketWithKeyword(entityPage,ticketCountQueryVo); return R.data(ticketInfoEntities); } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketInfoService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketInfoService.java index a95c59f..7e5f6cb 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketInfoService.java +++ b/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 listByTicketWithKeyword(TicketCountQueryVo ticketCountQueryVo); + IPage listByTicketWithKeyword(Page entityPage, TicketCountQueryVo ticketCountQueryVo); } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java index 559dd69..76d970d 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java +++ b/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 listByTicketWithKeyword(TicketCountQueryVo ticketCountQueryVo) { + public IPage listByTicketWithKeyword(Page entityPage, TicketCountQueryVo ticketCountQueryVo) { //延期 String input = ticketCountQueryVo.getInput(); //开票 结束 作废 @@ -1180,6 +1180,6 @@ public class WorkTicketInfoServiceImpl extends BaseServiceImpl