Merge commit 'd8576ab8f01799eda149147551fbf4f7df7e9dbb'

smsb-modules/smsb-digital-promotion/src/main/java/com/inspur/digital/service/impl/SmsbAppointmentInfoServiceImpl.java

@@ -512,6 +512,36 @@ public class SmsbAppointmentInfoServiceImpl implements ISmsbAppointmentInfoServi
                     });
                 }
             result.add(builder.toString());
+
+            // 2-4 分析建议
+            JSONObject suggestion = reportContent.getJSONObject("suggestion");
+            // 2-4-1 劣势列表
+            JSONArray disadvantage = suggestion.getJSONArray("disadvantage");
+            if (null != disadvantage && disadvantage.size() > 0){
+                StringBuilder disadvantageResult = new StringBuilder();
+                for (int i = 0; i < disadvantage.size(); i++) {
+                    disadvantageResult.append("劣势列表:\n");
+                    disadvantageResult.append(disadvantage.get(i)).append("\n");
+                }
+                result.add(disadvantageResult.toString());
+            }
+            // 2-4-2 优势列表
+            JSONArray advantage = suggestion.getJSONArray("advantage");
+            if (null != advantage && advantage.size() > 0) {
+                StringBuilder advantageResult = new StringBuilder();
+                for (int i = 0; i < advantage.size(); i++) {
+                    advantageResult.append("优势列表:\n");
+                    advantageResult.append(advantage.get(i)).append("\n");
+                }
+                result.add(advantageResult.toString());
+            }
+            // 2-4-3 相关建议列表
+            JSONObject content = suggestion.getJSONObject("content");
+            result.add("相关建议:" + content.toString()
+                .replaceAll("\\{", "").replaceAll("}", "")
+                .replaceAll("\\[", "").replaceAll("]", "").trim());
+            // 2-5 满分
+            result.add("满分:" + reportContent.get("fullScore"));
             return result;
         } catch (Exception e) {
             log.error("获取评估报告内容失败", e);