From 45333415b7634fc20b03b7e8ae3b7eee91101bda Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 07 十二月 2023 10:48:31 +0800
Subject: [PATCH] 增加筛选条件
---
src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 999ba33..d39cf02 100644
--- a/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
@@ -38,15 +38,15 @@
if (row == 31 || row == 32) {
crnNo = 3;
}
- return this.baseMapper.queryOutStaNosByCrnNo(crnNo, typeNo);
+ return this.baseMapper.queryOutStation();
+ //return this.baseMapper.queryOutStaNosByCrnNo(crnNo, typeNo);
}
@Override
public 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);
+ .eq("stn_no", stnNo);
StaDesc staDesc = this.selectOne(wrapper);
if (staDesc == null) {
throw new CoolException("鍑哄簱璺緞涓嶅瓨鍦�");
@@ -58,13 +58,13 @@
public StaDesc queryCrnStnAuto(Integer typeNo, Integer crnNo, Integer stnNo) {
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
.eq("type_no", typeNo)
- .eq("stn_no", stnNo)
- .eq("crn_no", crnNo);
+ .eq("stn_no", stnNo);
+ //.eq("crn_no", crnNo);
StaDesc staDesc = this.selectOne(wrapper);
if (staDesc == null) {
wrapper = new EntityWrapper<StaDesc>()
- .eq("type_no", typeNo)
- .eq("crn_no", crnNo);
+ .eq("type_no", typeNo);
+ //.eq("crn_no", crnNo);
List<StaDesc> staDescs = this.selectList(wrapper);
if (Cools.isEmpty(staDescs)) {
throw new CoolException("鍑哄簱璺緞涓嶅瓨鍦�");
--
Gitblit v1.9.1