Commit 96853642 authored by 黎博's avatar 黎博

提测列表倒序以及提测说明详情新增jiraProjectName

parent 56b84549
...@@ -54,6 +54,7 @@ public class QualityController { ...@@ -54,6 +54,7 @@ public class QualityController {
if (!StringUtils.isEmpty(jiraProjectKey)) { if (!StringUtils.isEmpty(jiraProjectKey)) {
queryWrapper.like("jira_project_key", jiraProjectKey); queryWrapper.like("jira_project_key", jiraProjectKey);
} }
queryWrapper.orderByDesc("id");
IPage<SubmitTestInstruction> instructionIPage = new Page<>(pageNum, pageSize); IPage<SubmitTestInstruction> instructionIPage = new Page<>(pageNum, pageSize);
IPage<SubmitTestInstruction> page = instructionService.page(instructionIPage, queryWrapper); IPage<SubmitTestInstruction> page = instructionService.page(instructionIPage, queryWrapper);
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
...@@ -148,6 +149,18 @@ public class QualityController { ...@@ -148,6 +149,18 @@ public class QualityController {
if (submitTestInstruction == null) { if (submitTestInstruction == null) {
return JsonResult.buildErrorStateResult("所选项目不存在", false); return JsonResult.buildErrorStateResult("所选项目不存在", false);
} }
// 设置jiraProjectName
try {
Iterable<BasicProject> projects = jiraService.getJiraProjectList();
for (BasicProject project: projects) {
if (project.getKey().equals(submitTestInstruction.getJiraProjectKey())) {
submitTestInstruction.setJiraProjectName(project.getName());
}
}
} catch (Exception e) {
log.info("获取jira项目Map失败.");
e.printStackTrace();
}
return JsonResult.buildSuccessResult(submitTestInstruction); return JsonResult.buildSuccessResult(submitTestInstruction);
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment