From 4703dfef3ac757486bc4c5971165ac31891bd0b5 Mon Sep 17 00:00:00 2001 From: tangwei Date: Tue, 30 Jun 2026 09:37:21 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wte/service/impl/WeFishServiceImpl.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/wte/service/impl/WeFishServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/wte/service/impl/WeFishServiceImpl.java index f316b217..26263693 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/wte/service/impl/WeFishServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/wte/service/impl/WeFishServiceImpl.java @@ -3002,7 +3002,7 @@ public class WeFishServiceImpl implements WeFishService { "fish.AVG_FSZ AS avgFsz, " + "fish.FID AS fid, " + "fish.FILE_ID AS fileId, " + - "dict.FISH_ID AS id, " + + "dict.ID AS id, " + "dict.NAME AS name, " + "dict.ALIAS AS alias, " + "dict.GENUS AS genus, " + @@ -3022,14 +3022,14 @@ public class WeFishServiceImpl implements WeFishService { "INNER JOIN SD_WEFISH_R fish ON fish.WER_ID = we.ID " + " AND NVL(fish.IS_DELETED, 0) = 0 " + "INNER JOIN SD_WE_B_H section ON section.STCD = we.STCD " + - " AND NVL(section.USFL, 0) = 1 " + +// " AND NVL(section.USFL, 0) = 1 " + "LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = section.RSTCD " + " AND NVL(eng.IS_DELETED, 0) = 0 " + - "LEFT JOIN V_SD_FISHDICTORY_B dict ON dict.FISH_ID = fish.FTP " + - " AND (dict.RVCD = 'ZY' OR dict.RVCD = eng.HBRVCD) " + + "LEFT JOIN SD_FISHDICTORY_B dict ON dict.ID = fish.FTP " + +// " AND (dict.RVCD = 'ZY' OR dict.RVCD = eng.HBRVCD) " + "WHERE NVL(we.IS_DELETED, 0) = 0 " + // 旧库按 TASK_STATUS=Approved/null 过滤，新库改用 STATUS=1(完成) 承接审批通过口径 - "AND NVL(we.STATUS, 1) = 1 "; + "AND dict.IS_DELETED =0 "; } private String buildWeFishQgcFilterCondition(DataSourceRequest.FilterDescriptor filter, @@ -4084,7 +4084,7 @@ public class WeFishServiceImpl implements WeFishService { StringBuilder sql = new StringBuilder(); Map paramMap = new HashMap<>(); sql.append("SELECT COUNT(1) AS cnt FROM SD_WE_B_H weB ") - .append("WHERE NVL(weB.IS_DELETED, 0) = 0 ") + .append("WHERE 1=1 ") .append("AND EXISTS (SELECT 1 FROM SD_WE_R we ") .append("WHERE we.STCD = weB.STCD AND NVL(we.IS_DELETED, 0) = 0 AND NVL(we.STATUS, 1) = 1) "); appendWeEnvmBaseIdCondition(sql, paramMap, "weB.BASE_ID", baseId); @@ -4122,7 +4122,7 @@ public class WeFishServiceImpl implements WeFishService { .append("FROM SD_WE_R we ") .append("INNER JOIN SD_WEFISH_R fish ON we.ID = fish.WER_ID AND NVL(fish.IS_DELETED, 0) = 0 ") .append("INNER JOIN SD_FISHDICTORY_B dict ON dict.ID = fish.FTP AND NVL(dict.IS_DELETED, 0) = 0 ") - .append("INNER JOIN SD_WE_B_H weB ON weB.STCD = we.STCD AND NVL(weB.IS_DELETED, 0) = 0 ") + .append("INNER JOIN SD_WE_B_H weB ON weB.STCD = we.STCD ") .append("WHERE NVL(we.IS_DELETED, 0) = 0 ") .append("AND NVL(we.STATUS, 1) = 1 ") .append("AND NVL(dict.RARE, 0) = 1 ") @@ -4163,7 +4163,7 @@ public class WeFishServiceImpl implements WeFishService { sql.append("SELECT COUNT(DISTINCT fish.FTP) AS cnt ") .append("FROM SD_WE_R we ") .append("INNER JOIN SD_WEFISH_R fish ON we.ID = fish.WER_ID AND NVL(fish.IS_DELETED, 0) = 0 ") - .append("INNER JOIN SD_WE_B_H weB ON weB.STCD = we.STCD AND NVL(weB.IS_DELETED, 0) = 0 ") + .append("INNER JOIN SD_WE_B_H weB ON weB.STCD = we.STCD ") .append("WHERE NVL(we.IS_DELETED, 0) = 0 ") .append("AND NVL(we.STATUS, 1) = 1 "); appendWeEnvmBaseIdCondition(sql, paramMap, "weB.BASE_ID", baseId);