From bd956ec24c5995e6a2a585d6a4987c6b7de372c1 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 05 五月 2026 12:44:20 +0800
Subject: [PATCH] Merge branch 'rcs_master' into rcs_master_all_zkd
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 ea56edf..c184621 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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.exception.CoolException;
+import com.zy.acs.manager.common.constant.Constants;
import com.zy.acs.manager.manager.entity.Segment;
import com.zy.acs.manager.manager.entity.Task;
import com.zy.acs.manager.manager.enums.ActionStsType;
@@ -59,10 +60,17 @@
@Override
public Segment getNextStepOfInit(Long travelId, Integer serial) {
+// return this.getOne(new LambdaQueryWrapper<Segment>()
+// .eq(Segment::getTravelId, travelId)
+// .eq(Segment::getSerial, serial + 1)
+// .eq(Segment::getState, SegmentStateType.INIT.toString())
+// );
+ // 涓嶆槸鍥哄畾鏌ヨ涓�涓紝鑰屾槸鏌ヨ涓�涓墖娈碉紝鍥犱负瀛樺湪浜轰负瀹岀粨浠诲姟瀵艰嚧鏌ヤ笉鍒颁笅涓�涓�+1鐨勭墖娈�
return this.getOne(new LambdaQueryWrapper<Segment>()
.eq(Segment::getTravelId, travelId)
- .eq(Segment::getSerial, serial + 1)
.eq(Segment::getState, SegmentStateType.INIT.toString())
+ .orderByDesc(Segment::getSerial)
+ .last(Constants.LIMIT_ONE)
);
}
@@ -73,7 +81,7 @@
.eq(Segment::getSerial, serial - 1)
.eq(Segment::getState, SegmentStateType.FINISH.toString())
.orderByDesc(Segment::getId)
- .last("limit 1")
+ .last(Constants.LIMIT_ONE)
);
}
--
Gitblit v1.9.1