From d82c353588cb3a9a080bccb65e06e44a5d9dcfb0 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 12 八月 2025 08:45:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
index 2e4d7bf..d5a8a1a 100644
--- a/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
@@ -30,20 +30,31 @@
}
@Override
- public StaDesc queryCrnStn(Integer typeNo, Integer crnNo, Integer stnNo) {
+ public List<StaDesc> queryCrnStn(Integer typeNo, Integer crnNo, Integer stnNo) {
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
.eq("type_no", typeNo)
.eq("stn_no", stnNo)
.eq("crn_no", crnNo);
- StaDesc staDesc = this.selectOne(wrapper);
- if (staDesc == null) {
+ List<StaDesc> staDescs = this.selectList(wrapper);
+ if (staDescs.isEmpty()) {
throw new CoolException("鍑哄簱璺緞涓嶅瓨鍦�");
}
- return staDesc;
+ return staDescs;
}
@Override
- public StaDesc queryCrnStnAuto(Integer typeNo, Integer crnNo, Integer stnNo) {
+ public StaDesc queryCrnStnAuto(Integer typeNo, Integer crnNo, Integer stnNo, Integer row) {
+ if (crnNo == 1 && row > 3) {
+ Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+ .eq("type_no", typeNo)
+ .eq("stn_no", stnNo)
+ .eq("crn_no", crnNo)
+ .orderBy("stn_no", false);
+ StaDesc staDesc = this.selectOne(wrapper);
+ if (staDesc != null) {
+ return staDesc;
+ }
+ }
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
.eq("type_no", typeNo)
.eq("stn_no", stnNo)
--
Gitblit v1.9.1