From 4a2ba4863da23d354ca55ca72893400d934b3c64 Mon Sep 17 00:00:00 2001
From: tangwei <tangwei0654@163.com>
Date: Fri, 17 Jul 2026 10:26:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/yfd/platform/common/GroupHelper.java  | 5 ++++-
 .../qgc_base/service/impl/SdEngInfoBHServiceImpl.java       | 2 +-
 .../qgc_env/overview/entity/vo/OverviewVmsstbprptVo.java    | 5 +++++
 .../qgc_env/overview/service/impl/OverviewServiceImpl.java  | 5 +++++
 .../com/yfd/platform/qgc_lygk/along/domain/MsAlongDetB.java | 6 +++++-
 .../qgc_lygk/along/service/impl/MsAlongDetBServiceImpl.java | 4 ++--
 6 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/java/com/yfd/platform/common/GroupHelper.java b/backend/src/main/java/com/yfd/platform/common/GroupHelper.java
index aaf612b5..6b707ee9 100644
--- a/backend/src/main/java/com/yfd/platform/common/GroupHelper.java
+++ b/backend/src/main/java/com/yfd/platform/common/GroupHelper.java
@@ -92,7 +92,10 @@ public class GroupHelper {
 
         for(Map<String, Object> item : data) {
             Object groupKey = this.getKey(item, groupInfo);
-            Object groupIndexKey = groupKey != null ? groupKey : null;
+            if (groupKey == null) {
+                continue;
+            }
+            Object groupIndexKey = groupKey;
             Object tempCount = item.get("count_" + groupInfo.getSelector());
             if (tempCount == null) {
                 tempCount = item.get("COUNT_" + groupInfo.getSelector().toUpperCase());
diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java
index 7e34245e..1418a713 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java
@@ -170,7 +170,7 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
         wrapper.eq(StringUtils.hasText(baseId), SdEngInfoBH::getBaseId, baseId)
                 .eq(StringUtils.hasText(hbrvcd), SdEngInfoBH::getHbrvcd, hbrvcd)
                 .eq(StrUtil.isNotBlank(reachcd), SdEngInfoBH::getReachcd, reachcd)
-                .eq(StrUtil.isNotBlank(rvcd), SdEngInfoBH::getRvcd, rvcd)
+                .eq(StrUtil.isNotBlank(rvcd), SdEngInfoBH::getReachcd, rvcd)
                 .in(rvcds != null && !rvcds.isEmpty(), SdEngInfoBH::getReachcd, rvcds)
                 .in(hbrvcds != null && !hbrvcds.isEmpty(), SdEngInfoBH::getHbrvcd, hbrvcds)
                 .like(StringUtils.hasText(ennm), SdEngInfoBH::getEnnm, ennm)
diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/overview/entity/vo/OverviewVmsstbprptVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/overview/entity/vo/OverviewVmsstbprptVo.java
index 401a950b..62120e64 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_env/overview/entity/vo/OverviewVmsstbprptVo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/overview/entity/vo/OverviewVmsstbprptVo.java
@@ -44,6 +44,11 @@ public class OverviewVmsstbprptVo implements Serializable {
     private String introduce;
     private String logo;
     private String inffile;
+    private String boundary;
+    private String location;
+    private BigDecimal height;
+    private String url;
+    private String accuracy;
     private BigDecimal inv;
     private Integer invinmn;
     private Date stdsdt;
diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/overview/service/impl/OverviewServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/overview/service/impl/OverviewServiceImpl.java
index 37bc6524..a84ca5a7 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_env/overview/service/impl/OverviewServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/overview/service/impl/OverviewServiceImpl.java
@@ -1459,6 +1459,11 @@ public class OverviewServiceImpl implements OverviewService {
         columnMap.put("introduce", "t.INTRODUCE AS \"introduce\"");
         columnMap.put("logo", "t.LOGO AS \"logo\"");
         columnMap.put("inffile", "t.INFFILE AS \"inffile\"");
+        columnMap.put("url", "t.URL AS \"url\"");
+        columnMap.put("boundary", "t.BOUNDARY AS \"boundary\"");
+        columnMap.put("height", "t.HEIGHT AS \"height\"");
+        columnMap.put("location", "t.LOCATION AS \"location\"");
+        columnMap.put("accuracy", "t.ACCURACY AS \"accuracy\"");
         columnMap.put("inv", "t.INV AS \"inv\"");
         columnMap.put("invinmn", "t.INVINMN AS \"invinmn\"");
         columnMap.put("stdsdt", "t.STDSDT AS \"stdsdt\"");
diff --git a/backend/src/main/java/com/yfd/platform/qgc_lygk/along/domain/MsAlongDetB.java b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/domain/MsAlongDetB.java
index c18d2659..2f3ba4b8 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_lygk/along/domain/MsAlongDetB.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/domain/MsAlongDetB.java
@@ -41,7 +41,11 @@ public class MsAlongDetB implements Serializable {
 
     /** 排序序号 */
     @TableField("SORT")
-    private String sort;
+    private Integer sort;
+
+//    /** 排序序号 */
+//    @TableField("SORT")
+//    private String sort;
 
     /** 沿程配置表ID */
     @TableField("ALONG_ID")
diff --git a/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/impl/MsAlongDetBServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/impl/MsAlongDetBServiceImpl.java
index a704d9a3..df2e846b 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/impl/MsAlongDetBServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/impl/MsAlongDetBServiceImpl.java
@@ -81,7 +81,7 @@ public class MsAlongDetBServiceImpl extends ServiceImpl<MsAlongDetBMapper, MsAlo
                     List<PowerDto> powerDtos = msAlongDetBMapper.getWbsbList(stcd);
                     if (CollUtil.isNotEmpty(powerDtos)) {
                         // 取第一个结果（通常一个 STCD 只对应一条记录）
-                        String stnm = powerDtos.get(0).getStnm();
+                        String stnm = powerDtos.getFirst().getStnm();
                         record.setStnm(stnm);
                     }
                 }
@@ -154,7 +154,7 @@ public class MsAlongDetBServiceImpl extends ServiceImpl<MsAlongDetBMapper, MsAlo
         entity.setRecordUser(SecurityUtils.getUserId());            // 创建人
         //entity.setRecordUser(SecurityUtils.getCurrentUsername());            // 创建人
         if (node.getSort() != null){
-        entity.setSort(String.valueOf(node.getSort()));            // 若传了排序
+        entity.setSort(node.getSort());            // 若传了排序
         }
         if (StrUtil.isBlank(entity.getId())) {
             entity.setId(null);