From 4d45de01e35f8b271e5ba25439b574a8b67bc5eb Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期五, 26 十二月 2025 14:00:55 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java
index ada2d61..603bea5 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java
@@ -65,12 +65,12 @@
}
@Override
- public Segment getPreviousStepOfFinish(Long travelId, Integer serial, String memo) {
+ public Segment getPreviousStepOfFinish(Long travelId, Integer serial) {
return this.getOne(new LambdaQueryWrapper<Segment>()
.eq(Segment::getTravelId, travelId)
.eq(Segment::getSerial, serial - 1)
-// .eq(Segment::getState, SegmentStateType.FINISH.toString())
- .eq(Segment::getMemo, memo)
+ .eq(Segment::getState, SegmentStateType.FINISH.toString())
+ .orderByDesc(Segment::getId)
);
}
@@ -131,7 +131,7 @@
for (Segment seg : segmentList) {
Task task = taskService.getById(segment.getTaskId());
if (task != null &&
- (!task.getTaskTypeEl().equals(TaskStsType.COMPLETE.toString()) || !task.getTaskTypeEl().equals(TaskStsType.CANCEL.toString()))) {
+ (!task.getTaskSts().equals(TaskStsType.COMPLETE.val()) && !task.getTaskSts().equals(TaskStsType.CANCEL.val()))) {
throw new CoolException("the task is not finish");
}
seg.setState(SegmentStateType.FINISH.toString());
--
Gitblit v1.9.1