From 9781420b252caedfbefdadf4661428702b1a6540 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 20 四月 2024 15:08:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gdykwcs' into gdykwcs
---
src/main/java/com/zy/asrs/entity/BasRgvMap.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasRgvMap.java b/src/main/java/com/zy/asrs/entity/BasRgvMap.java
index 190dec9..300d642 100644
--- a/src/main/java/com/zy/asrs/entity/BasRgvMap.java
+++ b/src/main/java/com/zy/asrs/entity/BasRgvMap.java
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.SpringUtils;
+import com.zy.asrs.service.BasRgvMapService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -77,8 +79,10 @@
this.lockEndRoute = lockEndRoute;
}
- public Integer getRgvNoOther(){
- return 3-this.rgvNo;
+ public Integer getRgvNoOther(Integer rgvNo){
+ BasRgvMapService basRgvMapService = SpringUtils.getBean(BasRgvMapService.class);
+ BasRgvMap basRgvMap = basRgvMapService.selectByOtherRgvNo(rgvNo);
+ return basRgvMap.getRgvNo();
}
--
Gitblit v1.9.1