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-23 10:10:24 +08:00
parent 75adb3836b
commit 6b30e55528
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
backend/src/main/java/com/yfd/platform/qgc_env/fpr/service/impl/FprMonitorServiceImpl.java
View File

@ -336,7 +336,7 @@ public class FprMonitorServiceImpl implements FprMonitorService {
"NVL(alongBase.ORDER_INDEX, 999999) AS rvcdStepSort, " + "NVL(alongBase.ORDER_INDEX, 999999) AS rvcdStepSort, " +
"NVL(engSort.SORT, 999999) AS rstcdStepSort, " + "NVL(engSort.SORT, 999999) AS rstcdStepSort, " +
"NVL(siteSort.SORT, NVL(src.ORDER_INDEX, 999999)) AS siteStepSort " + "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_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_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 " + "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) { private String buildFprdRunDataInfoSql(FprdRunDataAo ao) {
StringBuilder sql = new StringBuilder("SELECT ") StringBuilder sql = new StringBuilder("SELECT ")
.append("NVL((SELECT COUNT(1) ") .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(" WHERE NVL(baseCnt.IS_DELETED, 0) = 0 ")
.append(" AND baseCnt.STTP = 'FPRD' ") .append(" AND baseCnt.STTP = 'FPRD' ")
.append(" AND baseCnt.BASE_ID = #{map.baseId}), 0) AS fprdCount, ") .append(" AND baseCnt.BASE_ID = #{map.baseId}), 0) AS fprdCount, ")
.append("NVL((SELECT COUNT(DISTINCT fish.NAME) ") .append("NVL((SELECT COUNT(DISTINCT fish.NAME) ")
.append(" FROM SD_FPRD_R run ") .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 NVL(base.IS_DELETED, 0) = 0 ")
.append(" AND base.STTP = 'FPRD' ") .append(" AND base.STTP = 'FPRD' ")
.append(" INNER JOIN SD_FPRDFISH_R fish ON fish.FPRDR_ID = run.ID ") .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, ") sql.append("), 0) AS ftpCount, ")
.append("NVL((SELECT COUNT(1) ") .append("NVL((SELECT COUNT(1) ")
.append(" FROM SD_FPRD_R run ") .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 NVL(base.IS_DELETED, 0) = 0 ")
.append(" AND base.STTP = 'FPRD' ") .append(" AND base.STTP = 'FPRD' ")
.append(" INNER JOIN SD_FPRDFISH_R fish ON fish.FPRDR_ID = run.ID ") .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, 'MM')) AS month, ")
.append("TO_NUMBER(TO_CHAR(run.TM, 'YYYY')) AS year ") .append("TO_NUMBER(TO_CHAR(run.TM, 'YYYY')) AS year ")
.append("FROM SD_FPRD_R run ") .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 NVL(base.IS_DELETED, 0) = 0 ")
.append(" AND base.STTP = 'FPRD' ") .append(" AND base.STTP = 'FPRD' ")
.append("INNER JOIN SD_FPRDFISH_R fish ON fish.FPRDR_ID = run.ID ") .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.FSZ AS fsz, " +
"fish.WEIGHT AS weight " + "fish.WEIGHT AS weight " +
"FROM SD_FPRD_R run " + "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 base.STTP = 'FPRD' " +
" AND NVL(base.IS_DELETED, 0) = 0 " + " AND NVL(base.IS_DELETED, 0) = 0 " +
"INNER JOIN SD_FPRDFISH_R fish ON run.ID = fish.FPRDR_ID " + "INNER JOIN SD_FPRDFISH_R fish ON run.ID = fish.FPRDR_ID " +