|
@@ -80,8 +80,11 @@ public class AnalyzeService {
|
|
|
ExtraService extraService;
|
|
|
|
|
|
@Autowired
|
|
|
+
|
|
|
ShortTokenDao shortTokenDao;
|
|
|
|
|
|
+ ExamDao examDao;
|
|
|
+
|
|
|
@Value("${server.host}")
|
|
|
private String serverHost;
|
|
|
@Value("${report.port}")
|
|
@@ -825,8 +828,11 @@ public class AnalyzeService {
|
|
|
// cache.put("word","Hello Guava Cache");
|
|
|
// System.out.println(cache.getIfPresent("word"));
|
|
|
|
|
|
-
|
|
|
+ Exam exam = examDao.findById(caseId);
|
|
|
Task task=taskDao.findById(taskId);
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
long startTime=0;
|
|
|
long endTime=0;
|
|
|
String taskName="";
|
|
@@ -834,9 +840,11 @@ public class AnalyzeService {
|
|
|
if(task!=null) {
|
|
|
startTime = task.getStart_time();
|
|
|
endTime = task.getEnd_time();
|
|
|
- taskName = task.getName();
|
|
|
writeMins = task.getTotal_mins();
|
|
|
}
|
|
|
+ if(exam!=null){
|
|
|
+ taskName = exam.getName();
|
|
|
+ }
|
|
|
String caseTakeId=caseId+"-"+taskId;
|
|
|
List<Bug>bugs=bdao.findByCaseid(caseTakeId);
|
|
|
int bugNum=bugs.size();
|
|
@@ -970,6 +978,9 @@ public class AnalyzeService {
|
|
|
StringBuffer managerCheckUrl = new StringBuffer("http://");
|
|
|
managerCheckUrl.append(serverHost).append(":").append(serverPort).append("/report/managerCheck/")
|
|
|
.append(taskId).append("/").append(caseId);
|
|
|
+ if(reports.size()!=0)
|
|
|
+ managerCheckUrl.append("?identity=0&report_id=").append(reports.get(0).getId())
|
|
|
+ .append("&worker_id=").append(reports.get(0).getWorker_id());
|
|
|
analyseVO.setManagerCheck(managerCheckUrl.toString());
|
|
|
return analyseVO;
|
|
|
}
|