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-06-15 14:48:33 +08:00
parent fa7b9b8e69
commit 67dc13039d
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
backend/src/main/java/com/yfd/platform/qgc_env/fp/service/impl/FpRunServiceImpl.java
View File

@ -264,14 +264,14 @@ public class FpRunServiceImpl implements FpRunService {
stationParamMap stationParamMap
); );
String rstcd = stationContext == null ? null : Convert.toStr(stationContext.get("rstcd"), null); String rstcd = stationContext == null ? null : Convert.toStr(stationContext.get("rstcd"), null);
String hbrvcd = stationContext == null ? null : Convert.toStr(stationContext.get("hbrvcd"), null); // String hbrvcd = stationContext == null ? null : Convert.toStr(stationContext.get("hbrvcd"), null);
String rvcd = stationContext == null ? null : Convert.toStr(stationContext.get("rvcd"), null);
String wtrvStcd = null; String wtrvStcd = null;
String wqStcd = null; String wqStcd = null;
if (StrUtil.isNotBlank(rstcd) && StrUtil.isNotBlank(hbrvcd)) { if (StrUtil.isNotBlank(rstcd) && StrUtil.isNotBlank(rvcd)) {
Map<String, Object> alongParamMap = new HashMap<>(); Map<String, Object> alongParamMap = new HashMap<>();
alongParamMap.put("rstcd", rstcd); alongParamMap.put("rstcd", rstcd);
alongParamMap.put("hbrvcd", hbrvcd); alongParamMap.put("rvcd", rvcd);
List<Map<String, Object>> alongRows = microservicDynamicSQLMapper.pageAllList( List<Map<String, Object>> alongRows = microservicDynamicSQLMapper.pageAllList(
null, null,
buildQgcFpRunAnalysisAlongSql(), buildQgcFpRunAnalysisAlongSql(),
@ -294,14 +294,13 @@ public class FpRunServiceImpl implements FpRunService {
paramMap.put("startTime", StrUtil.trim(tmArr[0])); paramMap.put("startTime", StrUtil.trim(tmArr[0]));
paramMap.put("endTime", StrUtil.trim(tmArr[1])); paramMap.put("endTime", StrUtil.trim(tmArr[1]));
paramMap.put("rstcd", rstcd); paramMap.put("rstcd", rstcd);
paramMap.put("hbrvcd", hbrvcd); paramMap.put("hbrvcd", rvcd);
paramMap.put("wtrvStcd", wtrvStcd); paramMap.put("wtrvStcd", wtrvStcd);
paramMap.put("wqStcd", wqStcd); paramMap.put("wqStcd", wqStcd);
String sql = buildQgcFpRunAnalysisDataSql(dataSourceRequest == null ? null : dataSourceRequest.getSort());
Page<?> page = loadOptions == null ? null : QgcQueryWrapperUtil.buildPage(loadOptions); Page<?> page = loadOptions == null ? null : QgcQueryWrapperUtil.buildPage(loadOptions);
List<FpRunAnalysisVo> rows = microservicDynamicSQLMapper.pageAllListWithResultType( List<FpRunAnalysisVo> rows = microservicDynamicSQLMapper.pageAllListWithResultType(
page, page,sql,
buildQgcFpRunAnalysisDataSql(dataSourceRequest == null ? null : dataSourceRequest.getSort()),
paramMap, paramMap,
FpRunAnalysisVo.class FpRunAnalysisVo.class
); );
@ -2059,7 +2058,7 @@ public class FpRunServiceImpl implements FpRunService {
} }
private String buildQgcFpRunAnalysisStationSql() { private String buildQgcFpRunAnalysisStationSql() {
return "SELECT fp.RSTCD AS rstcd, eng.HBRVCD AS hbrvcd " + return "SELECT fp.RSTCD AS \"rstcd\",eng.RVCD AS \"rvcd\", eng.HBRVCD AS \"hbrvcd\" " +
"FROM SD_FPSS_B_H fp " + "FROM SD_FPSS_B_H fp " +
"LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = fp.RSTCD AND NVL(eng.IS_DELETED, 0) = 0 " + "LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = fp.RSTCD AND NVL(eng.IS_DELETED, 0) = 0 " +
"WHERE fp.STCD = #{map.stcd} " + "WHERE fp.STCD = #{map.stcd} " +
@ -2071,7 +2070,7 @@ public class FpRunServiceImpl implements FpRunService {
"FROM MS_ALONG_B t1 " + "FROM MS_ALONG_B t1 " +
"INNER JOIN MS_ALONGDET_B t2 ON t1.ID = t2.ALONG_ID " + "INNER JOIN MS_ALONGDET_B t2 ON t1.ID = t2.ALONG_ID " +
"WHERE t1.CODE = 'common' " + "WHERE t1.CODE = 'common' " +
" AND t1.RVCD = #{map.hbrvcd} " + " AND t1.RVCD = #{map.rvcd} " +
" AND t2.RSTCD = #{map.rstcd} " + " AND t2.RSTCD = #{map.rstcd} " +
" AND t2.STTP IN ('WTRV', 'WQ') " + " AND t2.STTP IN ('WTRV', 'WQ') " +
" AND NVL(t1.IS_DELETED, 0) = 0 " + " AND NVL(t1.IS_DELETED, 0) = 0 " +