fix: 优化逻辑水质逻辑

backend/src/main/java/com/yfd/platform/env/wq/controller/EnvWqDataController.java

@@ -42,7 +42,7 @@ public class EnvWqDataController {
     }
 
 
-    @GetMapping("/stTbYs/GetStTbYsBVoKendoListCust")
+    @GetMapping("/stbprp/GetStbprpYsByStcd")
     @Operation(summary = "水质监测信息查询")
     public ResponseResult getStTbYsBVoKendoListCust(
             @RequestParam String stcd,
@@ -52,6 +52,12 @@ public class EnvWqDataController {
         return ResponseResult.successData(envWqDataService.getStTbYsBVoKendoListCust(stcd, tbCode, startTime, endTime));
     }
 
+    @PostMapping("/stTbYs/GetStTbYsBVoKendoListCust")
+    @Operation(summary = "水质监测信息查询")
+    public ResponseResult getStTbYsBVoKendoListCust(@RequestBody DataSourceRequest dataSourceRequest) {
+        return ResponseResult.successData(envWqDataService.getStTbYsBVoKendoListCust(dataSourceRequest));
+    }
+
     @PostMapping("/data/noAuth/GetKendoListCust")
     @Operation(summary = "水质统计分析(完成)")
     public ResponseResult getNoAuthKendoListCust(@RequestBody DataSourceRequest dataSourceRequest) {

backend/src/main/java/com/yfd/platform/env/wq/service/EnvWqDataService.java

@@ -25,4 +25,6 @@ public interface EnvWqDataService {
     DataSourceResult getWbsbList(DataSourceRequest dataSourceRequest);
 
     DataSourceResult getStTbYsBVoKendoListCust(String stcd, String tbCode, String startTime, String endTime);
+
+    DataSourceResult getStTbYsBVoKendoListCust(DataSourceRequest dataSourceRequest);
 }

backend/src/main/java/com/yfd/platform/env/wq/service/impl/EnvWqDataServiceImpl.java

@@ -215,6 +215,8 @@ public class EnvWqDataServiceImpl implements EnvWqDataService {
         return result;
     }
 
+
+
     @Override
     public DataSourceResult getAlongWqKendoListCust(DataSourceRequest dataSourceRequest) {
         DataSourceLoadOptionsBase loadOptions = dataSourceRequest == null ? null : dataSourceRequest.toDevRequest();
@@ -2136,6 +2138,48 @@ public class EnvWqDataServiceImpl implements EnvWqDataService {
         return queryStbprpYsByStcd(stcd, tbCode);
     }
 
+
+    @Override
+    public DataSourceResult getStTbYsBVoKendoListCust(DataSourceRequest dataSourceRequest) {
+        StringBuilder sql = new StringBuilder();
+        sql.append("SELECT ")
+                .append("y.ID AS id, ")
+                .append("y.TB_ID AS tbId, ")
+                .append("t.TB_NAME AS tbName, ")
+                .append("t.TB_CODE AS tbCode, ")
+                .append("y.DESCRIPTION AS description, ")
+                .append("y.YS AS ys, ")
+                .append("y.YS_SHOW_NAME AS ysShowName, ")
+                .append("y.SHOW_CONTROL AS showControl, ")
+                .append("TO_CHAR(y.ENABLE) AS enable, ")
+                .append("y.ORDER_INDEX AS orderIndex ")
+                .append("FROM ST_TB_YS_B y ")
+                .append("INNER JOIN ST_TB_B t ON t.ID = y.TB_ID AND NVL(t.IS_DELETED, 0) = 0 ")
+                .append("WHERE NVL(y.IS_DELETED, 0) = 0 ");
+
+        Map<String, Object> paramMap = new HashMap<>();
+        String filterSql = buildStTbYsFilterCondition(
+                dataSourceRequest == null ? null : dataSourceRequest.getFilter(),
+                paramMap,
+                new int[]{0}
+        );
+        if (StrUtil.isNotBlank(filterSql)) {
+            sql.append(" AND ").append(filterSql).append(" ");
+        }
+        sql.append(buildStTbYsOrderBySql(dataSourceRequest == null ? null : dataSourceRequest.getSort()));
+
+        DataSourceLoadOptionsBase loadOptions = dataSourceRequest == null ? null : dataSourceRequest.toDevRequest();
+        PageInfo pageInfo = loadOptions == null ? null : QgcQueryWrapperUtil.getPageInfo(loadOptions);
+        Page<?> page = pageInfo != null && pageInfo.getHasPageInfo() ? pageInfo.getPage() : null;
+        List<StTbYsVo> list = microservicDynamicSQLMapper.pageAllListWithResultType(page, sql.toString(), paramMap, StTbYsVo.class);
+
+        DataSourceResult<StTbYsVo> result = new DataSourceResult<>();
+        result.setData(list);
+        result.setTotal(page != null ? page.getTotal() : list.size());
+        result.setAggregates(new HashMap<>());
+        return result;
+    }
+
     private String buildStTbYsFilterCondition(DataSourceRequest.FilterDescriptor root,
                                               Map<String, Object> paramMap,
                                               int[] paramIndex) {