fix: 优化逻辑

This commit is contained in:
tangwei 2026-07-01 10:12:55 +08:00
parent ff45b9a5f3
commit c3f0fba517

View File

@ -3327,6 +3327,7 @@ public class EngEqDataServiceImpl implements EngEqDataService {
"'ENG' AS sttpCode, " +
"'电站' AS sttpName, " +
"eng.STCD AS stcd, " +
"pbh.TTPWR AS ttpwr, " +
"eng.ENNM AS stnm, " +
"eng.ENNM AS ennm, " +
"eng.BASE_ID AS baseId, " +
@ -3346,6 +3347,7 @@ public class EngEqDataServiceImpl implements EngEqDataService {
"NVL(eng.ORDER_INDEX, 999999) AS rstcdStepSort, " +
"NVL(eng.ORDER_INDEX, 999999) AS siteStepSort " +
"FROM SD_ENGINFO_B_H eng " +
"INNER JOIN SD_PWR_B_H pbh ON pbh.STCD= eng.STCD " +
"LEFT JOIN SD_HYDROBASE hb ON hb.BASEID = eng.BASE_ID AND NVL(hb.IS_DELETED, 0) = 0 " +
"LEFT JOIN SD_HBRV_DIC hbrv ON hbrv.HBRVCD = eng.HBRVCD AND hbrv.BASEID = eng.BASE_ID " +
" AND NVL(hbrv.IS_DELETED, 0) = 0 AND NVL(hbrv.ENABLED, 1) = 1 " +
@ -5440,6 +5442,7 @@ public class EngEqDataServiceImpl implements EngEqDataService {
case "sttpCode" -> "t.sttpCode";
case "sttpName" -> "t.sttpName";
case "stcd" -> "t.stcd";
case "ttpwr" -> "t.ttpwr";
case "stnm" -> "t.stnm";
case "ennm" -> "t.ennm";
case "baseId" -> "t.baseId";