diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/controller/TicketProcessController.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/controller/TicketProcessController.java index c435161..2a18960 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/controller/TicketProcessController.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/controller/TicketProcessController.java @@ -41,18 +41,19 @@ public class TicketProcessController { @ApiOperation("启动流程") @PostMapping("/startUp") public R start(@RequestBody WorkTicketVo workTicketVo) { - ticketProcessService.startUp(workTicketVo); - return R.success("申请开票成功"); + Long ticketId = ticketProcessService.startUp(workTicketVo); + return R.data(ticketId); } /** * 工作票待处理 + * * @param response */ @PostMapping("/findPending") @ApiOperation(value = "工作票待处理") - public Boolean findPending(@RequestBody ProcessWorkFlowResponse response){ + public Boolean findPending(@RequestBody ProcessWorkFlowResponse response) { try { ticketProcessService.findPending(response); return true; @@ -62,8 +63,6 @@ public class TicketProcessController { } - - /** * 预览 */ diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/TicketProcessService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/TicketProcessService.java index ac72f7c..906c85d 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/TicketProcessService.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/TicketProcessService.java @@ -17,7 +17,7 @@ public interface TicketProcessService { /** * 启动开票流程 */ - void startUp(WorkTicketVo workTicketVo); + Long startUp(WorkTicketVo workTicketVo); /** diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java index c68b92f..2b71d51 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java @@ -159,7 +159,7 @@ public class TicketProcessServiceImpl implements TicketProcessService { @SneakyThrows @Override @Transactional - public void startUp(WorkTicketVo workTicketVo) { + public Long startUp(WorkTicketVo workTicketVo) { log.info("执行 com.hnac.hzims.ticket.twoTicket.service.impl【startUp】 。。。方法"); if (workTicketVo.getWorkTicket().getSignage() == null) { throw new ServiceException("票据抬头未配置,请您到站点管理配置"); @@ -214,6 +214,7 @@ public class TicketProcessServiceImpl implements TicketProcessService { //8. 处理任务 this.returnTicket(workTicketVo); + return workTicketVo.getWorkTicket().getId(); } /**