From 7896e6e42007b3d23f97b0d260dd68a18f49ba3b Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期五, 18 七月 2025 15:25:18 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java | 24 +++++++++++++++++++----- 1 files changed, 19 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 c92d7e8..47ce3d8 100644 --- a/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java @@ -10,6 +10,7 @@ import com.zy.asrs.service.StaDescService; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; @Service("staDescService") @@ -17,20 +18,28 @@ @Override public List<Integer> queryOutStaNosByLocNo(String locNo, Integer typeNo) { - return this.baseMapper.queryOutStaNosByLocNo(locNo, typeNo); + List<Integer> list = new ArrayList<>(); + List<StaDesc> staDescs = this.baseMapper.queryOutStaNosByLocNo(locNo, typeNo); + for (StaDesc staDesc : staDescs) { + if (list.contains(staDesc.getStnNo())) { + continue; + } + list.add(staDesc.getStnNo()); + } + return list; } @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 @@ -54,4 +63,9 @@ return staDesc; } + @Override + public StaDesc queryCrnStn(Integer crnNo) { + return this.baseMapper.queryCrnStn(crnNo); + } + } -- Gitblit v1.9.1