zhengsl/WholeProcessPlatform
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: 优化梯级排序

Browse Source
This commit is contained in:
tangwei 2026-07-17 15:26:45 +08:00
parent ecd6803a0e
commit 9b93565fc5
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java
View File

@ -3519,10 +3519,10 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
sql.append("SELECT ") sql.append("SELECT ")
.append("r.ID AS id, ") .append("r.ID AS id, ")
.append("r.RVCD AS rvcd, ") .append("eng.BASE_ID AS rvcd, ")
.append("rv.RVNM AS rvcdName, ") .append("eng.BASE_NAME AS rvcdName, ")
.append("r.STCD AS stcd, ") .append("r.STCD AS stcd, ")
.append("r.ENNM AS ennm, ") .append("eng.ENNM AS ennm, ")
.append("r.SRCDIS AS srcdis, ") .append("r.SRCDIS AS srcdis, ")
.append("r.DMHG AS dmhg, ") .append("r.DMHG AS dmhg, ")
.append("r.NORMZ AS normz, ") .append("r.NORMZ AS normz, ")
@ -3561,13 +3561,13 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
Map<String, Object> paramMap = new HashMap<>(); Map<String, Object> paramMap = new HashMap<>();
StringBuilder sql = new StringBuilder(); StringBuilder sql = new StringBuilder();
sql.append("SELECT DISTINCT ") sql.append("SELECT DISTINCT ")
.append("dic.HBRVCD AS wbsCode, ") .append("dic.BASEID AS wbsCode, ")
.append("dic.HBRVNM AS wbsName, ") .append("dic.BASENAME AS wbsName, ")
.append("dic.BASEID AS objId, ") .append("dic.BASEID AS objId, ")
.append("NVL(dic.BASEID, 'ZZZZZZZZ') AS baseOrder, ") .append("NVL(dic.BASEID, 'ZZZZZZZZ') AS baseOrder, ")
.append("NVL(dic.ORDER_INDEX, 999999) AS orderIndex ") .append("NVL(dic.ORDER_INDEX, 999999) AS orderIndex ")
.append("FROM SD_HBRV_DIC dic ") .append("FROM SD_HYDROBASE dic ")
.append("INNER JOIN SD_RSVRCSCD_B r ON r.RVCD = dic.HBRVCD AND NVL(r.IS_DELETED, 0) = 0 ") .append("INNER JOIN SD_RSVRCSCD_B r ON r.BASE_ID = dic.BASEID AND NVL(r.IS_DELETED, 0) = 0 ")
.append("WHERE NVL(dic.IS_DELETED, 0) = 0 ") .append("WHERE NVL(dic.IS_DELETED, 0) = 0 ")
.append("AND NVL(dic.ENABLED, 1) = 1 "); .append("AND NVL(dic.ENABLED, 1) = 1 ");
@ -3712,7 +3712,8 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
} }
return switch (field) { return switch (field) {
case "id" -> "r.ID"; case "id" -> "r.ID";
case "rvcd" -> "r.RVCD"; case "rvcd" -> "eng.BASE_ID";
case "baseId" -> "eng.BASE_ID";
case "rvcdName" -> "rv.RVNM"; case "rvcdName" -> "rv.RVNM";
case "stcd" -> "r.STCD"; case "stcd" -> "r.STCD";
case "ennm" -> "r.ENNM"; case "ennm" -> "r.ENNM";