From ca5d5f3bfab5ce083d9d27313dc3b12e3c15024a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@gmail.com>
Date: 星期五, 23 一月 2026 14:59:47 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaServiceImpl.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaServiceImpl.java
index 9498743..8afdba0 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaServiceImpl.java
@@ -27,6 +27,8 @@
private TravelService travelService;
@Autowired
private StaReserveService staReserveService;
+ @Autowired
+ private TaskService taskService;
@Override
public Sta selectByStaNo(String staNo) {
@@ -56,15 +58,18 @@
@Override
public Task checkoutTask(Long staId) {
- List<StaReserve> list = staReserveService.list(new LambdaQueryWrapper<StaReserve>()
+ StaReserve reserve = staReserveService.getOne(new LambdaQueryWrapper<StaReserve>()
.eq(StaReserve::getStaId, staId)
.eq(StaReserve::getState, StaReserveStateType.CONFIRMED.toString())
-// .eq(StaReserve::getType, StaReserveType.IN.toString())
+ .eq(StaReserve::getType, StaReserveType.IN.toString())
.eq(StaReserve::getStatus, StatusType.ENABLE.val)
- .orderByDesc(StaReserve::getCreateTime)
-// .last("limit 1")
+ .orderByDesc(StaReserve::getConfirmedAt)
+ .last("limit 1")
);
- return null;
+ if (null == reserve) {
+ return null;
+ }
+ return taskService.getById(reserve.getTaskId());
}
@Override
--
Gitblit v1.9.1