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-15 13:57:00 +08:00
parent 4a3b70cab4
commit 8977c4a2ca
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/com/yfd/platform/qgc_env/fb/service/impl/FbStationServiceImpl.java
View File

@ -4599,7 +4599,7 @@ public class FbStationServiceImpl implements FbStationService {
String rstcd = QgcQueryWrapperUtil.getFilterFieldValue(devRequest, "rstcd");
String sttp = QgcQueryWrapperUtil.getFilterFieldValue(devRequest, "sttp");
if(StrUtil.isBlank(sttp)){
sttp= QgcQueryWrapperUtil.getFilterFieldValue(devRequest, "sttpCode");
sttp= Objects.requireNonNull(QgcQueryWrapperUtil.getFilterFieldValue(devRequest, "sttpCode")).toLowerCase();
}
String bldsttCcode = QgcQueryWrapperUtil.getFilterFieldValue(devRequest, "bldsttCcode");
@ -4633,7 +4633,7 @@ public class FbStationServiceImpl implements FbStationService {
.append("NVL(along.ORDER_INDEX, 999999) AS rvcdStepSort, ")
.append("NVL(rstSort.SORT, 999999) AS rstcdStepSort, ")
.append("NVL(hb.ORDER_INDEX, 999999) AS baseStepSort, ")
.append("'" + sttp.toLowerCase() + "' AS anchoPointState, ")
.append("'" + sttp + "' AS anchoPointState, ")
.append("CASE WHEN b.lcjStatus IS NOT NULL THEN 1 ELSE 2 END AS lcjStatus ")
.append("FROM SD_FBRD_B_H a ")
.append("LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = a.RSTCD AND NVL(eng.IS_DELETED, 0) = 0 ")

2
backend/src/main/java/com/yfd/platform/qgc_env/wt/service/impl/SdWtMonitorServiceImpl.java
View File

@ -2904,7 +2904,7 @@ public class SdWtMonitorServiceImpl implements SdWtMonitorService {
.append("LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = t.RSTCD AND NVL(eng.IS_DELETED, 0) = 0 ")
.append("LEFT JOIN SD_STTP_B sttp ON sttp.STTP_CODE = t.STTP AND NVL(sttp.IS_DELETED, 0) = 0 ")
.append("WHERE NVL(t.IS_DELETED, 0) = 0 ")
.append("AND NVL(t.USFL, 1) = 1 ")
// .append("AND NVL(t.USFL, 1) = 1 ")
.append("AND t.LGTD IS NOT NULL ")
.append("AND t.LTTD IS NOT NULL ");