diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java index c2a4aba0..5f599d11 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java @@ -1256,7 +1256,7 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl item = new LinkedHashMap<>(); if (countValue == null) { countValue = row.get("count_stcd"); } @@ -3321,7 +3322,7 @@ public class EnvWqDataServiceImpl implements EnvWqDataService { count = Long.parseLong(String.valueOf(countValue)); } - Map item = new LinkedHashMap<>(); + item.put("key", key); item.put("keyName", null); item.put("keyExt", new HashMap<>()); @@ -3330,7 +3331,7 @@ public class EnvWqDataServiceImpl implements EnvWqDataService { detail.put(upperField, key); detail.put(countField, count); item.put("items", List.of(detail)); - item.put("count", 0); + item.put("count", count); item.put("summary", new Object[0]); Map aggregates = new LinkedHashMap<>(); diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/impl/SdWtMonitorServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/impl/SdWtMonitorServiceImpl.java index 868bb3db..e29a737f 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/impl/SdWtMonitorServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/impl/SdWtMonitorServiceImpl.java @@ -791,8 +791,20 @@ public class SdWtMonitorServiceImpl implements SdWtMonitorService { sql.append("AND wt.STTP = #{map.sttpCode} "); } if (queryDwDirectly && StrUtil.isNotBlank(sttpCode)) { - paramMap.put("sttpCode", sttpCode); - sql.append("AND dw.STTP = #{map.sttpCode} "); + List sttpCodes = StrUtil.split(sttpCode, ","); + if(sttpCodes.size() > 1){ + // 正确拼接,每个值加单引号并用逗号连接 + String joined = sttpCodes.stream() + .map(s -> "'" + s.replace("'", "''") + "'") // 转义单引号 + .collect(Collectors.joining(",")); + sql.append("AND dw.STTP NOT IN (").append(joined).append(") "); + } + if(sttpCodes.size() == 1){ + paramMap.put("sttpCode", sttpCode); + sql.append("AND dw.STTP = #{map.sttpCode} "); + } +// paramMap.put("sttpCode", sttpCode); +// sql.append("AND dw.STTP = #{map.sttpCode} "); } if (queryDwDirectly && StrUtil.isNotBlank(bldsttCcode)) { diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/wte/entity/vo/WeVmsstbprptVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/wte/entity/vo/WeVmsstbprptVo.java index e65e99cf..ac598f1f 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/wte/entity/vo/WeVmsstbprptVo.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/wte/entity/vo/WeVmsstbprptVo.java @@ -36,6 +36,15 @@ public class WeVmsstbprptVo { @Schema(description = "河流编码") private String rvcd; + @Schema(description = "站址/位置") + private String stlc; + + @Schema(description = "地形裁剪范围") + private String box; + + @Schema(description = "基地编码") + private String baseName; + @Schema(description = "排序") private Integer orderIndex; 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 45316df3..26bc2a95 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 @@ -2753,7 +2753,16 @@ public class WeFishServiceImpl implements WeFishService { "b.NAME AS name, " + "b.NAME_EN AS nameEn, " + "b.PROTECTLVL AS protectlvl, " + - "b.PROTECTLVL AS protectlvlName, " + + "CASE b.PROTECTLVL\n" + + " WHEN '1' THEN '国家一级'\n" + + " WHEN '2' THEN '国家二级'\n" + + " WHEN '3' THEN '国家三级'\n" + + " WHEN '4' THEN '省重点'\n" + + " WHEN '5' THEN '市一级'\n" + + " WHEN '6' THEN '市二级'\n" + + " WHEN '7' THEN '无'\n" + + " ELSE b.PROTECTLVL\n" + + "END AS protectlvlName, " + "b.LOGO AS logo, " + "b.INTRODUCE AS introduce " + "FROM MS_SPECANIMALS_B a " + @@ -3286,11 +3295,14 @@ public class WeFishServiceImpl implements WeFishService { return "SELECT " + "ai.STCD AS id, " + "ai.STTP AS sttpCode, " + + "ai.STLC AS stlc, " + "ai.STCD AS stcd, " + "ai.STNM AS stnm, " + + "ai.BOX AS box, " + "ai.RSTCD AS rstcd, " + "eng.ENNM AS ennm, " + "ai.BASE_ID AS baseId, " + + "hb.BASENAME AS baseName, " + "ai.HBRVCD AS hbrvcd, " + "ai.RVCD AS rvcd, " + "ai.ORDER_INDEX AS orderIndex, " + @@ -3298,6 +3310,7 @@ public class WeFishServiceImpl implements WeFishService { "ai.LTTD AS lttd " + "FROM SD_AIMONITOR_B_H ai " + "LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = ai.RSTCD AND NVL(eng.IS_DELETED, 0) = 0 " + + "LEFT JOIN SD_HYDROBASE hb ON hb.BASEID = ai.BASE_ID AND NVL(hb.IS_DELETED, 0) = 0 " + "WHERE NVL(ai.IS_DELETED, 0) = 0"; } @@ -3350,6 +3363,9 @@ public class WeFishServiceImpl implements WeFishService { selected.add("t.sttpCode AS sttpCode"); selected.add("t.stnm AS stnm"); selected.add("t.stcd AS stcd"); + selected.add("t.stlc AS stlc"); + selected.add("t.box AS box"); + selected.add("t.baseName AS baseName"); } else { for (String field : selectFields) { String column = columns.get(field);