修改一些小bug

src/main/java/com/mooctest/controller/HistoryController.java

@@ -105,7 +105,7 @@ public class HistoryController {
 //		System.out.println("/getPath path = " + result);
 //		System.out.println("result.toString() = " + result.toString());
 
-		model.addAttribute("master2BugIdsMap", tree2BugIdsMap); //
+		model.addAttribute("tree2BugIdsMap", tree2BugIdsMap); //
 		model.addAttribute("bugMap", bugsMap); //
 		model.addAttribute("examId", examId);
 		model.addAttribute("caseId", caseId);

src/main/java/com/mooctest/controller/ReportController.java

@@ -50,6 +50,9 @@ public class ReportController {
     @Autowired
     TaskService taskService;
 
+    @Autowired
+    HistoryService historyService;
+
     @GetMapping(value = "/index")
     public String hello(HttpServletRequest request, @RequestParam(value = "name", required = false, defaultValue = "springboot-thymeleaf") String name) {
         request.setAttribute("name", name);
@@ -258,7 +261,8 @@ public class ReportController {
         boolean aggregated = masterReportService.isAggregated(examId, caseId);
         List<BugDTO> allReports = bugReportService.getAllBugs(examId, caseId);
         TaskDTO task = taskService.getByExamIdAndCaseId(examId, caseId);
-
+        List<String> treeRootids = historyService.getTreeRoots(caseId+"-"+examId);
+        Map<String,List<String>> tree2BugIdsMap = historyService.getTree2BugIdsMap(treeRootids);
         if (aggregated) { // 如果报告已经是聚合过的。
             List<String> bugIds = allReports.stream().map(BugDTO::getId).collect(Collectors.toList());
             List<MasterReport> mrs = masterReportService.getByBugIds(bugIds);
@@ -285,6 +289,7 @@ public class ReportController {
             model.addAttribute("bugMap", bugsMap);// 聚合才有de
             model.addAttribute("aggNum", masterReportService.getAggNum(examId, caseId)); // 聚合才有的
         }
+        model.addAttribute("tree2BugIdsMap",tree2BugIdsMap);
         model.addAttribute("aggregated", aggregated);
         model.addAttribute("allReports", allReports);
         model.addAttribute("severity2String", ReportUtil.severity2String);

src/main/resources/templates/agg_report_new.html

@@ -210,11 +210,9 @@
                                                            style="color: #07b309; margin-right: 5px;" >
                                                     </span>
 
-                                                    <!-- description -->
+                                                    <!-- de scription -->
 
                                                     <th:block th:each="sent, iterStat : ${report.taggedSentences}">
-
-
                                                         <span th:if="${sent.isDiff()}" th:text="${sent.sentence}"
                                                               style="color: red; font-weight: bold;"></span>
                                                         <span th:unless="${sent.isDiff()}"

src/main/resources/templates/test.html

@@ -63,7 +63,7 @@
                 <a href="#masterReport" data-toggle="tab">聚类报告</a>
             </li>
             <li>
-                <a href="#allReport" data-toggle="tab">树状报告</a>
+                <a href="#treeReport" data-toggle="tab">树状报告</a>
             </li>
         </ul>
 
@@ -214,8 +214,71 @@
         </div>
 
         <div class="tab-pane fade" id="treeReport">
-            <p>iOS 是一个由苹果公司开发和发布的手机操作系统。最初是于 2007 年首次发布 iPhone、iPod Touch 和 Apple
-                TV。iOS 派生自 OS X，它们共享 Darwin 基础。OS X 操作系统是用在苹果电脑上，iOS 是苹果的移动版本。</p>
+            <section class="content container-fluid">
+                <div class="box">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">树状视图 <span class="badge badge-info" th:text="${aggNum}"></span></h3>
+                        <div class="box-tools pull-right">
+                            <a class="btn btn-sm btn-primary" th:href="'/task_detail?examId='+${examId}+'&amp;caseId='+${caseId}">
+                                <i class="fa fa-list-alt" style="margin-right: 5px;"></i>
+                                默认视图
+                            </a>
+                        </div>
+                    </div><!-- /.box-header -->
+
+                    <div class="box-body agg-report-list">
+
+                        <th:block th:each="masterBug : ${tree2BugIdsMap}">
+                            <div class="col-md-4">
+                                <div class="box box-solid box-default">
+
+                                    <div class="box-header" id="agg-title-{{aggReport.dup_tag}}">
+                                        <div style="overflow: auto;">
+                                            <a th:href="@{'/report?masterId=' + ${masterBug.key} + '&amp;examId=' + ${examId} + '&amp;caseId=' + ${caseId}}"
+                                               class="pull-left agg-title" th:text="|${masterBug.key}|"></a>
+                                            <a th:href="'#dup-list-'+${masterBug.key}"
+                                               class="glyphicon glyphicon-menu-hamburger pull-right agg-title"
+                                               data-toggle="collapse"></a>
+                                            <span class="pull-right" style="margin-right: 5px;">
+
+                                        <label class="badge badge-success" th:if="${bugMap.get(masterBug.key).status == 1}">已审核</label>
+                                                <!--<label class="badge badge-warning" th:if="${bugMap.get(masterBug.key).status == 0}">未审核</label>-->
+                                        <label class="badge badge-little-green" th:if="${bugMap.get(masterBug.key).status == 0}">审核中</label>
+                                    </span>
+                                            <br/>
+                                        </div>
+                                        <div style="margin-top: 5px;">
+                                            <span class="agg-title">拥有报告数<span class="badge badge-default agg-badge" th:text="${masterBug.value.size()}">10</span></span>
+
+                                        </div>
+                                    </div>
+                                    <div class="sup-title" style="padding: 15px 15px; min-height: 181px;overflow: scroll; max-height: 181px;"
+                                    >
+                                        <span th:text="${bugMap.get(masterBug.key).description}"></span><br/>
+                                        <img class="my-img-thumbnail pointer to-add" th:src="${imgUrl}"
+                                             th:each="imgUrl,iterStat : ${bugMap.get(masterBug.key).getImgUrls()}"
+                                             th:onclick="'javascript:showimage(\''+${imgUrl}+'\');'"/>
+                                    </div>
+                                    <ul class="list-group collapse" th:id="'dup-list-' + ${masterBug.key}"
+                                        style="max-height: 161px; min-height: 161px; overflow: scroll;" >
+                                        <li class="list-group-item list-group-item-inner" th:each="bugId : ${masterBug.value}" >
+                                            <div th:id="'report-title-' + ${bugId}">
+                                        <span  th:text="${bugId}">{{ report.print_id
+                                            }}</span>
+                                            </div>
+                                            <div style="margin-top: 5px" th:text="${bugMap.get(bugId).description}">
+                                                {{ report.description }}
+                                            </div>
+                                        </li>
+                                    </ul>
+                                </div>
+                            </div>
+                        </th:block>
+
+
+                    </div><!-- /.box-body -->
+                </div>
+            </section>
         </div>
 
     </div>

src/main/resources/templates/tree_report_list.html

@@ -84,14 +84,14 @@
 
             <div class="box-body agg-report-list">
 
-                <th:block th:each="masterBug : ${master2BugIdsMap}">
+                <th:block th:each="masterBug : ${tree2BugIdsMap}">
                     <div class="col-md-4">
                         <div class="box box-solid box-default">
 
                             <div class="box-header" id="agg-title-{{aggReport.dup_tag}}">
                                 <div style="overflow: auto;">
                                     <a th:href="@{'/report?masterId=' + ${masterBug.key} + '&amp;examId=' + ${examId} + '&amp;caseId=' + ${caseId}}"
-                                       class="pull-left agg-title" th:text="|ML-AG-${masterBug.key.substring(10)}|"></a>
+                                       class="pull-left agg-title" th:text="|${masterBug.key}|"></a>
                                     <a th:href="'#dup-list-'+${masterBug.key}"
                                        class="glyphicon glyphicon-menu-hamburger pull-right agg-title"
                                        data-toggle="collapse"></a>