fix: 优化逻辑
This commit is contained in:
parent
5634785720
commit
739f1e6f57
@ -158,6 +158,7 @@ public class WarnDataServiceImpl implements WarnDataService {
|
|||||||
.append("ai.RSTCD AS rstcd, ")
|
.append("ai.RSTCD AS rstcd, ")
|
||||||
.append("eng.ENNM AS ennm, ")
|
.append("eng.ENNM AS ennm, ")
|
||||||
.append("ai.BASE_ID AS baseId, ")
|
.append("ai.BASE_ID AS baseId, ")
|
||||||
|
.append("hb.BASENAME AS baseName, ")
|
||||||
.append("ai.HBRVCD AS hbrvcd, ")
|
.append("ai.HBRVCD AS hbrvcd, ")
|
||||||
.append("ai.RVCD AS rvcd, ")
|
.append("ai.RVCD AS rvcd, ")
|
||||||
.append("rec.TM AS tm, ")
|
.append("rec.TM AS tm, ")
|
||||||
@ -173,6 +174,7 @@ public class WarnDataServiceImpl implements WarnDataService {
|
|||||||
.append("FROM SD_AICOM_R rec ")
|
.append("FROM SD_AICOM_R rec ")
|
||||||
.append("LEFT JOIN SD_AIMONITOR_B_H ai ON ai.STCD = rec.STCD AND NVL(ai.IS_DELETED, 0) = 0 ")
|
.append("LEFT JOIN SD_AIMONITOR_B_H ai ON ai.STCD = rec.STCD AND NVL(ai.IS_DELETED, 0) = 0 ")
|
||||||
.append("LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = ai.RSTCD AND NVL(eng.IS_DELETED, 0) = 0 ")
|
.append("LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = ai.RSTCD AND NVL(eng.IS_DELETED, 0) = 0 ")
|
||||||
|
.append("LEFT JOIN SD_HYDROBASE hb ON hb.BASEID = ai.BASE_ID AND hb.IS_DELETED = 0 ")
|
||||||
.append("WHERE NVL(rec.IS_DELETED, 0) = 0 ");
|
.append("WHERE NVL(rec.IS_DELETED, 0) = 0 ");
|
||||||
|
|
||||||
String filterSql = buildAiComFilterCondition(dataSourceRequest == null ? null : dataSourceRequest.getFilter(), paramMap, new int[]{0});
|
String filterSql = buildAiComFilterCondition(dataSourceRequest == null ? null : dataSourceRequest.getFilter(), paramMap, new int[]{0});
|
||||||
@ -1902,6 +1904,7 @@ public class WarnDataServiceImpl implements WarnDataService {
|
|||||||
case "rstcd" -> alias + ".rstcd";
|
case "rstcd" -> alias + ".rstcd";
|
||||||
case "ennm", "stnmEng" -> alias + ".ennm";
|
case "ennm", "stnmEng" -> alias + ".ennm";
|
||||||
case "baseId" -> alias + ".baseId";
|
case "baseId" -> alias + ".baseId";
|
||||||
|
case "baseName" -> alias + ".baseName";
|
||||||
case "hbrvcd" -> alias + ".hbrvcd";
|
case "hbrvcd" -> alias + ".hbrvcd";
|
||||||
case "rvcd" -> alias + ".rvcd";
|
case "rvcd" -> alias + ".rvcd";
|
||||||
case "tm" -> alias + ".tm";
|
case "tm" -> alias + ".tm";
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user