From 6b30e5552861c305de3a80fd1f968bc440c1ef13 Mon Sep 17 00:00:00 2001 From: tangwei Date: Tue, 23 Jun 2026 10:10:24 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=B1=BC=E7=B1=BB=E8=B0=83=E6=9F=A5?= =?UTF-8?q?=E8=A3=85=E7=BD=AE=E6=95=B0=E6=8D=AE=E5=BA=93=E8=A1=A8=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fpr/service/impl/FprMonitorServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/fpr/service/impl/FprMonitorServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/fpr/service/impl/FprMonitorServiceImpl.java index 8bef55ff..09b35d14 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/fpr/service/impl/FprMonitorServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/fpr/service/impl/FprMonitorServiceImpl.java @@ -336,7 +336,7 @@ public class FprMonitorServiceImpl implements FprMonitorService { "NVL(alongBase.ORDER_INDEX, 999999) AS rvcdStepSort, " + "NVL(engSort.SORT, 999999) AS rstcdStepSort, " + "NVL(siteSort.SORT, NVL(src.ORDER_INDEX, 999999)) AS siteStepSort " + - "FROM SD_FPRD_B_H src " + + "FROM SD_AIMONITOR_B_H src " + "LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = src.RSTCD AND NVL(eng.IS_DELETED, 0) = 0 " + "LEFT JOIN SD_HYDROBASE hb ON hb.BASEID = src.BASE_ID AND NVL(hb.IS_DELETED, 0) = 0 " + "LEFT JOIN SD_HBRV_DIC hbrv ON hbrv.HBRVCD = src.HBRVCD " + @@ -372,13 +372,13 @@ public class FprMonitorServiceImpl implements FprMonitorService { private String buildFprdRunDataInfoSql(FprdRunDataAo ao) { StringBuilder sql = new StringBuilder("SELECT ") .append("NVL((SELECT COUNT(1) ") - .append(" FROM SD_FPRD_B_H baseCnt ") + .append(" FROM SD_AIMONITOR_B_H baseCnt ") .append(" WHERE NVL(baseCnt.IS_DELETED, 0) = 0 ") .append(" AND baseCnt.STTP = 'FPRD' ") .append(" AND baseCnt.BASE_ID = #{map.baseId}), 0) AS fprdCount, ") .append("NVL((SELECT COUNT(DISTINCT fish.NAME) ") .append(" FROM SD_FPRD_R run ") - .append(" INNER JOIN SD_FPRD_B_H base ON base.STCD = run.STCD ") + .append(" INNER JOIN SD_AIMONITOR_B_H base ON base.STCD = run.STCD ") .append(" AND NVL(base.IS_DELETED, 0) = 0 ") .append(" AND base.STTP = 'FPRD' ") .append(" INNER JOIN SD_FPRDFISH_R fish ON fish.FPRDR_ID = run.ID ") @@ -392,7 +392,7 @@ public class FprMonitorServiceImpl implements FprMonitorService { sql.append("), 0) AS ftpCount, ") .append("NVL((SELECT COUNT(1) ") .append(" FROM SD_FPRD_R run ") - .append(" INNER JOIN SD_FPRD_B_H base ON base.STCD = run.STCD ") + .append(" INNER JOIN SD_AIMONITOR_B_H base ON base.STCD = run.STCD ") .append(" AND NVL(base.IS_DELETED, 0) = 0 ") .append(" AND base.STTP = 'FPRD' ") .append(" INNER JOIN SD_FPRDFISH_R fish ON fish.FPRDR_ID = run.ID ") @@ -415,7 +415,7 @@ public class FprMonitorServiceImpl implements FprMonitorService { .append("TO_NUMBER(TO_CHAR(run.TM, 'MM')) AS month, ") .append("TO_NUMBER(TO_CHAR(run.TM, 'YYYY')) AS year ") .append("FROM SD_FPRD_R run ") - .append("INNER JOIN SD_FPRD_B_H base ON base.STCD = run.STCD ") + .append("INNER JOIN SD_AIMONITOR_B_H base ON base.STCD = run.STCD ") .append(" AND NVL(base.IS_DELETED, 0) = 0 ") .append(" AND base.STTP = 'FPRD' ") .append("INNER JOIN SD_FPRDFISH_R fish ON fish.FPRDR_ID = run.ID ") @@ -442,7 +442,7 @@ public class FprMonitorServiceImpl implements FprMonitorService { "fish.FSZ AS fsz, " + "fish.WEIGHT AS weight " + "FROM SD_FPRD_R run " + - "INNER JOIN SD_FPRD_B_H base ON run.STCD = base.STCD " + + "INNER JOIN SD_AIMONITOR_B_H base ON run.STCD = base.STCD " + " AND base.STTP = 'FPRD' " + " AND NVL(base.IS_DELETED, 0) = 0 " + "INNER JOIN SD_FPRDFISH_R fish ON run.ID = fish.FPRDR_ID " +