소스 검색

pms 瑞恒看板 生产动态明细 过滤多余的分号

zhangcl 4 일 전
부모
커밋
b416b7cdec

+ 12 - 2
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/stat/IotStaticController.java

@@ -2798,8 +2798,18 @@ public class IotStaticController {
                     List<String> sortedWells = new ArrayList<>(wellMap.keySet());
                     Collections.sort(sortedWells);
                     for (String well : sortedWells) {
-                        String dynamicsStr = String.join(";", wellMap.get(well));
-                        sb.append(well).append(",").append(dynamicsStr).append(";\n");
+                        List<String> dynamics = wellMap.get(well);
+                        // 过滤掉空字符串(包括null和仅空白字符)
+                        List<String> nonEmptyDynamics = dynamics.stream()
+                                .filter(s -> s != null && !s.trim().isEmpty())
+                                .collect(Collectors.toList());
+                        if (nonEmptyDynamics.isEmpty()) {
+                            // 无有效动态时,只显示井名和一个分号
+                            sb.append(well).append(",;\n");
+                        } else {
+                            String dynamicsStr = String.join(";", nonEmptyDynamics);
+                            sb.append(well).append(",").append(dynamicsStr).append(";\n");
+                        }
                     }
                 }
                 rate.setProductionSummary(sb.toString());