From 11a1ecba92a012beb85894f32e0cd54f3fe17381 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 15 七月 2025 13:34:09 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/mapper/StaDescMapper.java | 2 +-
src/main/resources/mapper/asrs/StaDescMapper.xml | 6 ++++--
src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java | 11 ++++++++++-
src/main/java/com/zy/asrs/entity/StaDesc.java | 7 +++++++
4 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/StaDesc.java b/src/main/java/com/zy/asrs/entity/StaDesc.java
index 6145e8c..29e990d 100644
--- a/src/main/java/com/zy/asrs/entity/StaDesc.java
+++ b/src/main/java/com/zy/asrs/entity/StaDesc.java
@@ -109,6 +109,13 @@
@TableField("appe_time")
private Date appeTime;
+ /**
+ * 浼樺厛绾�
+ */
+ @ApiModelProperty(value= "浼樺厛绾�")
+ @TableField("pri")
+ private Integer pri;
+
public StaDesc() {}
public StaDesc(String typeDesc,String stnDesc,Integer crnStn,String memo,Long modiUser,Date modiTime,Long appeUser,Date appeTime) {
diff --git a/src/main/java/com/zy/asrs/mapper/StaDescMapper.java b/src/main/java/com/zy/asrs/mapper/StaDescMapper.java
index c26c603..9d5dadb 100644
--- a/src/main/java/com/zy/asrs/mapper/StaDescMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/StaDescMapper.java
@@ -12,7 +12,7 @@
@Repository
public interface StaDescMapper extends BaseMapper<StaDesc> {
- List<Integer> queryOutStaNosByLocNo(@Param("locNo") String locNo, @Param("typeNo") Integer typeNo);
+ List<StaDesc> queryOutStaNosByLocNo(@Param("locNo") String locNo, @Param("typeNo") Integer typeNo);
StaDesc queryCrnStn(Integer crnNo);
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..2e4d7bf 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,7 +18,15 @@
@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
diff --git a/src/main/resources/mapper/asrs/StaDescMapper.xml b/src/main/resources/mapper/asrs/StaDescMapper.xml
index 6bbea2d..89de8db 100644
--- a/src/main/resources/mapper/asrs/StaDescMapper.xml
+++ b/src/main/resources/mapper/asrs/StaDescMapper.xml
@@ -16,12 +16,13 @@
<result column="modi_time" property="modiTime" />
<result column="appe_user" property="appeUser" />
<result column="appe_time" property="appeTime" />
+ <result column="pri" property="pri" />
</resultMap>
- <select id="queryOutStaNosByLocNo" resultType="java.lang.Integer">
+ <select id="queryOutStaNosByLocNo" resultMap="BaseResultMap">
select
- distinct asd.stn_no
+ distinct asd.stn_no,asd.pri
from asr_sta_desc asd
left join asr_loc_mast alm on asd.crn_no = alm.crn_no
where 1=1
@@ -29,6 +30,7 @@
<if test="typeNo != null and typeNo !=''">
and asd.type_no = #{typeNo}
</if>
+ order by pri desc
</select>
<select id="queryCrnStn" resultMap="BaseResultMap">
--
Gitblit v1.9.1