Forráskód Böngészése

添加树状报告查看已经创建的报告

insomniaLee 6 éve
szülő
commit
66d022f54e

+ 5 - 2
src/main/java/com/mooctest/controller/HistoryController.java

@@ -43,6 +43,9 @@ public class HistoryController {
 	@Autowired
     BugReportService bugReportService;
 
+	@Autowired
+	FinalReportService finalReportService;
+
 
 	//获取指定节点的历史信息
 //	@RequestMapping(value = "/getHistory")
@@ -136,9 +139,9 @@ public class HistoryController {
 				.map(BugDTO::getSeverity)
 				.map((severityNum) -> ReportUtil.severity2String.get(severityNum))
 				.collect(Collectors.groupingBy(Function.identity(), Collectors.counting()));
-		List<FinalReportDTO> finalReports = new ArrayList<>();// 暂时还没有finalreport的数据
-
+//		List<FinalReportDTO> finalReports = new ArrayList<>();// 暂时还没有finalreport的数据
 
+		List<FinalReportDTO> finalReports = finalReportService.getBySourceId(treeId);
         model.addAttribute("categoryCounts", categoryCounts);
         model.addAttribute("severityCounts", severityCounts);
         model.addAttribute("pageCounts",pageCounts);

+ 3 - 3
src/main/resources/templates/tree_report_new.html

@@ -426,7 +426,7 @@
 
     var word_list = /*[[${wordList}]]*/;  //源代码如此
     var urlParams = new URLSearchParams(window.location.search);
-    var masterId = urlParams.get('masterId');
+    var treeId = urlParams.get('treeId');
     var examId = urlParams.get('examId');
     var caseId = urlParams.get('caseId');
     var finalReportId = urlParams.get('finalReportId');
@@ -461,7 +461,7 @@
             'severity': $("#severity").val(),
             'recurrent': $("#recurrent").val(),
             'category': $("#category").val(),
-            'sourceId': masterId,
+            'sourceId': treeId,
             'reviewerId': 1,
             'examId': examId,
             'caseId': caseId,
@@ -508,7 +508,7 @@
     function loadPartReports() {
         console.log("局部刷新")
         /*<![CDATA[*/
-        $('#new-created-reports-panel').load("/created_reports?masterId="+ masterId +"&caseId="+ caseId +"&examId="+ examId );
+        $('#new-created-reports-panel').load("/created_reports?masterId="+ treeId +"&caseId="+ caseId +"&examId="+ examId );
         //$('#new-report-create-block').load("/created_reports_form");
         finalReportId = null