Trang chủ Khám phá Trợ giúp
Đăng nhập
crowd-test-service
/
moooc_review
2
0
Fork 0
Các tập tin Các vấn đề 0 Yêu cầu khéo về 0 Wiki
Browse Source

报告流程优化

insomniaLee 6 năm trước cách đây
mục cha
733f9be2cd
commit
8932aba408
3 tập tin đã thay đổi với 34 bổ sung và 2 xóa
View chưa được định nghĩa Hiển thị tình trạng sai khác
  1. 7 0
      src/main/java/com/mooctest/controller/TaskController.java
  2. 23 1
      src/main/resources/templates/final_report_list.html
  3. 4 1
      src/main/resources/templates/task_detail.html

+ 7 - 0
src/main/java/com/mooctest/controller/TaskController.java
Xem Tập Tin 

@@ -4,6 +4,7 @@ import com.mooctest.data.BugDTO;
 
 import com.mooctest.data.TaskDTO;

 import com.mooctest.data.TaskDTO;

 import com.mooctest.model.MasterReport;

 import com.mooctest.model.MasterReport;

 import com.mooctest.service.BugReportService;

 import com.mooctest.service.BugReportService;

+import com.mooctest.service.HistoryService;

 import com.mooctest.service.MasterReportService;

 import com.mooctest.service.MasterReportService;

 import com.mooctest.service.TaskService;

 import com.mooctest.service.TaskService;

 import com.mooctest.util.ReportUtil;

 import com.mooctest.util.ReportUtil;

@@ -30,6 +31,9 @@ public class TaskController {
 
     BugReportService bugReportService;

     BugReportService bugReportService;

 

 

     @Autowired

     @Autowired

+    HistoryService historyService;

+

+    @Autowired

     MasterReportService masterReportService;

     MasterReportService masterReportService;

     @GetMapping("/home")

     @GetMapping("/home")

     public String home(Model model) {

     public String home(Model model) {

@@ -51,6 +55,7 @@ public class TaskController {
 
 

 

         boolean aggregated = masterReportService.isAggregated(examId, caseId);

         boolean aggregated = masterReportService.isAggregated(examId, caseId);

         List<BugDTO> allReports = bugReportService.getAllBugs(examId, caseId);

         List<BugDTO> allReports = bugReportService.getAllBugs(examId, caseId);

+        Map<String,String> single2rootMap = historyService.getSingle2Root(caseId, examId);

         if (aggregated) {

         if (aggregated) {

             List<String> bugIds = allReports.stream().map(BugDTO::getId).collect(Collectors.toList());

             List<String> bugIds = allReports.stream().map(BugDTO::getId).collect(Collectors.toList());

             List<MasterReport> mrs = masterReportService.getByBugIds(bugIds);

             List<MasterReport> mrs = masterReportService.getByBugIds(bugIds);

@@ -60,6 +65,8 @@ public class TaskController {
 
                 bug.setStatus(mr.getStatus());

                 bug.setStatus(mr.getStatus());

                 bug.setReviewerId(mr.getReviewerId());

                 bug.setReviewerId(mr.getReviewerId());

                 bug.setMasterId(mr.getMasterId());

                 bug.setMasterId(mr.getMasterId());

+                String te = single2rootMap.get(bug.getId());

+                bug.setTreeId(te==null?"null":te);

             });

             });

         }

         }

         TaskDTO task = taskService.getByExamIdAndCaseId(examId, caseId);

         TaskDTO task = taskService.getByExamIdAndCaseId(examId, caseId);

+ 23 - 1
src/main/resources/templates/final_report_list.html
Xem Tập Tin 

@@ -14,10 +14,32 @@
 
 </head>

 </head>

 <body>

 <body>

 <th:block layout:fragment="sidebar">

 <th:block layout:fragment="sidebar">

+    <li>

+        <a th:href="'/task_detail?examId=' + ${examId} + '&amp;caseId=' + ${caseId}">

+            <i class="glyphicon glyphicon-book"></i>

+            <span>

+                任务详情

+            </span>

+        </a>

+    </li>

+    <li>

+        <a th:href="'/final_reports?examId=' + ${examId} + '&amp;caseId=' + ${caseId}">

+            <i class="fa fa-calendar-check-o"></i>

+            <span>预交付报告</span>

+        </a>

+    </li>

+    <li>

+        <a th:href="'/review_report?examId=' + ${examId} + '&amp;caseId=' + ${caseId}">

+            <i class="glyphicon glyphicon-edit"></i>

+            <span>

+                报告审核

+            </span>

+        </a>

+    </li>

     <li class="treeview">

     <li class="treeview">

         <a href="#">

         <a href="#">

             <i class="fa fa-list"></i>

             <i class="fa fa-list"></i>

-            <span>审核报告</span>

+            <span>Reports</span>

             <span class="pull-right-container">

             <span class="pull-right-container">

 			<i class="fa fa-angle-left pull-right"></i>

 			<i class="fa fa-angle-left pull-right"></i>

 		</span>

 		</span>

+ 4 - 1
src/main/resources/templates/task_detail.html
Xem Tập Tin 

@@ -216,7 +216,10 @@
 
 <!--                        是否已经聚合-->

 <!--                        是否已经聚合-->

                         <a th:if="${aggregated}" th:text="|ML-AG-${report.masterId.substring(10)}|" th:href="'/report?masterId='+${report.masterId}+'&amp;examId='+${examId}+'&amp;caseId='+${caseId}"></a>

                         <a th:if="${aggregated}" th:text="|ML-AG-${report.masterId.substring(10)}|" th:href="'/report?masterId='+${report.masterId}+'&amp;examId='+${examId}+'&amp;caseId='+${caseId}"></a>

                     </td>

                     </td>

-                    <td>暂无</td>

+                    <td>

+                        <span th:if="(${report.getTreeId()==null}) or ${report.getTreeId().length()==4}">暂无</span>

+                        <a th:if="${report.getTreeId()!=null} and  ${report.getTreeId().length()!=4}" th:text="|ML-TR-${report.treeId.substring(10)}|" th:href="'/history/report?treeId='+${report.treeId}+'&amp;examId='+${examId}+'&amp;caseId='+${caseId}"></a>

+                    </td>

                 </tr>

                 </tr>

             </th:block>

             </th:block>

             </tbody>

             </tbody>