From a2f28fb1c32aeefbe549f48c4ed07929ef851b1b Mon Sep 17 00:00:00 2001 From: 18516761980 <tqsxp@163.com> Date: 星期六, 04 三月 2023 09:39:16 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 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 1b995a3..999ba33 100644 --- a/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java @@ -7,7 +7,11 @@ import com.core.exception.CoolException; import com.zy.asrs.entity.StaDesc; import com.zy.asrs.mapper.StaDescMapper; +import com.zy.asrs.service.LocMastService; import com.zy.asrs.service.StaDescService; +import com.zy.asrs.utils.Utils; +import com.zy.common.service.CommonService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -15,9 +19,26 @@ @Service("staDescService") public class StaDescServiceImpl extends ServiceImpl<StaDescMapper, StaDesc> implements StaDescService { + @Autowired + private LocMastService locMastService; + @Override public List<Integer> queryOutStaNosByLocNo(String locNo, Integer typeNo) { - return this.baseMapper.queryOutStaNosByLocNo(locNo, typeNo); + int crnNo = 0; + int row = Utils.getRow(locNo); + if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) { + crnNo = 1; + } + if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)) { + crnNo = 3; + } + if (row == 1) { + crnNo = 1; + } + if (row == 31 || row == 32) { + crnNo = 3; + } + return this.baseMapper.queryOutStaNosByCrnNo(crnNo, typeNo); } @Override -- Gitblit v1.9.1