refactor: 将许可证状态处理改为使用StringBuilder

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/ComprehensiveStatisticalAnalysisServiceImpl.java

@@ -460,7 +460,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
                     }
                     dto.put("equipType", equipTypes.substring(0, equipTypes.length() - 1));
                 }
-                String licensesStauts = "";
+                StringBuilder licensesStatus = new StringBuilder();
                 if (dto.containsKey("licenses")) {
                     // 以下人员类型有资质要求
                     // 人员类型(newPost)：检验人员：66151、检测人员：66152、作业人员：6552、检查人员：6763
@@ -474,7 +474,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
                             for (Object object : licenses) {
                                 JSONObject json = JSONObject.parseObject(JSONObject.toJSONString(object));
                                 if (!json.containsKey("expiryDate")) {
-                                    licensesStauts = "无有效期";
+                                    licensesStatus.append("/无有效期");
                                     continue;
                                 }
                                 String expiryDate = json.getString("expiryDate");
@@ -494,22 +494,28 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
                             long zc = permissionStatusList.stream().filter(e -> e.equals("正常")).count();
                             long no = permissionStatusList.stream().filter(e -> e.equals("无有效期")).count();
                             if (cq > 0) {
-                                licensesStauts = "资质超期";
-                            } else if (lq > 0) {
-                                licensesStauts = "资质临期";
-                            } else if (zc > 0) {
-                                licensesStauts = "资质正常";
-                            } else if (no > 0) {
-                                licensesStauts = "无有效期";
+                                licensesStatus.append("/资质超期");
+                            }
+                            if (lq > 0) {
+                                licensesStatus.append("/资质临期");
+                            }
+                            if (zc > 0) {
+                                licensesStatus.append("/资质正常");
+                            }
+                            if (no > 0) {
+                                licensesStatus.append("/无有效期");
                             }
                         } else {
-                            licensesStauts = "无资质";
+                            licensesStatus.append("无资质");
                         }
                     } else {
-                        licensesStauts = "无资质要求";
+                        licensesStatus.append("无资质要求");
                     }
                 }
-                dto.put("licensesStauts", licensesStauts);
+                String licensesStatusStr = licensesStatus.toString();
+                licensesStatusStr = licensesStatusStr.startsWith("/") ? licensesStatusStr.substring(1) : licensesStatusStr;
+                licensesStatusStr = licensesStatusStr.endsWith("/") ? licensesStatusStr.substring(0, licensesStatusStr.length() - 1) : licensesStatusStr;
+                dto.put("licensesStatus", licensesStatusStr);
                 list.add(dto);
             }
             totle = Objects.requireNonNull(response.getInternalResponse().hits().getTotalHits()).value;
@@ -671,7 +677,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
             for (SearchHit hit : response.getHits().getHits()) {
                 JSONObject jsonObject = (JSONObject) JSONObject.toJSON(hit);
                 JSONObject dto = jsonObject.getJSONObject("sourceAsMap");
-                String permissionStatus = null;
+                StringBuilder permissionStatus = new StringBuilder();
                 if (dto.containsKey("licenses")) {
                     JSONArray licenses = dto.getJSONArray("licenses");
                     if (!ObjectUtils.isEmpty(licenses)) {
@@ -697,13 +703,16 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
                         long zc = permissionStatusList.stream().filter(e -> e.equals("正常")).count();
                         long no = permissionStatusList.stream().filter(e -> e.equals("无有效期")).count();
                         if (cq > 0) {
-                            permissionStatus = "许可超期";
-                        } else if (lq > 0) {
-                            permissionStatus = "许可临期";
-                        } else if (zc > 0) {
-                            permissionStatus = "许可正常";
-                        } else if (no > 0) {
-                            permissionStatus = "无有效期";
+                            permissionStatus.append("/许可超期");
+                        }
+                        if (lq > 0) {
+                            permissionStatus.append("/许可临期");
+                        }
+                        if (zc > 0) {
+                            permissionStatus.append("/许可正常");
+                        }
+                        if (no > 0) {
+                            permissionStatus.append("/无有效期");
                         }
                     }
                 } else if (!dto.containsKey("licenses") && (dto.get("unitType").toString().contains("检测单位") ||
@@ -712,9 +721,12 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
                         dto.get("unitType").toString().contains("充装单位") ||
                         dto.get("unitType").toString().contains("设计单位") ||
                         dto.get("unitType").toString().contains("安装改造维修单位"))) {
-                    permissionStatus = "无有效期";
+                    permissionStatus.append("/无有效期");
                 }
-                dto.put("permissionStatus", permissionStatus);
+                String permissionStatusStr = permissionStatus.toString();
+                permissionStatusStr = permissionStatusStr.startsWith("/") ? permissionStatusStr.substring(1) : permissionStatusStr;
+                permissionStatusStr = permissionStatusStr.endsWith("/") ? permissionStatusStr.substring(0, permissionStatusStr.length() - 1) : permissionStatusStr;
+                dto.put("permissionStatus", permissionStatusStr);
                 list.add(dto);
             }
             totle = Objects.requireNonNull(response.getInternalResponse().hits().getTotalHits()).value;