fix: 优化逻辑

This commit is contained in:
tangwei 2026-07-03 09:54:39 +08:00
parent 115da13fcf
commit fb54991df1
2 changed files with 8 additions and 7 deletions

View File

@ -124,6 +124,7 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
} }
@Override @Override
@Cacheable(cacheNames = "engInfoCache", key = "'eng:dropdown:' + #sdEngInfoBHRequest.baseId + ':' + #sdEngInfoBHRequest.hbrvcd + ':' + #sdEngInfoBHRequest.rvcd + ':' + #sdEngInfoBHRequest.reachcd + ':' + #sdEngInfoBHRequest.ennm")
public List<SdEngInfoBH> selectForDropdown(SdEngInfoBHRequest sdEngInfoBHRequest) { public List<SdEngInfoBH> selectForDropdown(SdEngInfoBHRequest sdEngInfoBHRequest) {
String baseId = sdEngInfoBHRequest.getBaseId(); String baseId = sdEngInfoBHRequest.getBaseId();
String hbrvcd = sdEngInfoBHRequest.getHbrvcd(); String hbrvcd = sdEngInfoBHRequest.getHbrvcd();

View File

@ -108,13 +108,13 @@ public class ZqMonitorServiceImpl implements ZqMonitorService {
.append(buildMsstbprptDetailSelectSql(dataSourceRequest == null ? null : dataSourceRequest.getSelect())) .append(buildMsstbprptDetailSelectSql(dataSourceRequest == null ? null : dataSourceRequest.getSelect()))
.append(" FROM SD_RIVER_B_H t ") .append(" FROM SD_RIVER_B_H t ")
.append("LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = t.RSTCD AND NVL(eng.IS_DELETED, 0) = 0 ") .append("LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = t.RSTCD AND NVL(eng.IS_DELETED, 0) = 0 ")
.append("LEFT JOIN SD_HYDROBASE hb ON hb.BASEID = eng.BASE_ID AND NVL(hb.IS_DELETED, 0) = 0 ") // .append("LEFT JOIN SD_HYDROBASE hb ON hb.BASEID = eng.BASE_ID AND NVL(hb.IS_DELETED, 0) = 0 ")
.append("LEFT JOIN SD_HBRV_DIC hbrv ON hbrv.HBRVCD = eng.HBRVCD ") // .append("LEFT JOIN SD_HBRV_DIC hbrv ON hbrv.HBRVCD = eng.HBRVCD ")
.append(" AND hbrv.BASEID = eng.BASE_ID ") // .append(" AND hbrv.BASEID = eng.BASE_ID ")
.append(" AND hbrv.IS_DELETED = 0 ") // .append(" AND hbrv.IS_DELETED = 0 ")
.append(" AND hbrv.ENABLED = 1 ") // .append(" AND hbrv.ENABLED = 1 ")
.append("LEFT JOIN SD_RVCD_DIC rv ON rv.RVCD = eng.RVCD ") // .append("LEFT JOIN SD_RVCD_DIC rv ON rv.RVCD = eng.RVCD ")
.append("LEFT JOIN SD_ADDVCD_DIC addv ON addv.ADDVCD = eng.ADDVCD ") // .append("LEFT JOIN SD_ADDVCD_DIC addv ON addv.ADDVCD = eng.ADDVCD ")
.append("WHERE t.IS_DELETED = 0 "); .append("WHERE t.IS_DELETED = 0 ");
if (onlyZq) { if (onlyZq) {
sql.append("AND t.STTP = 'ZQ' "); sql.append("AND t.STTP = 'ZQ' ");