|
@@ -645,7 +645,7 @@ public class TaskController {
|
|
|
return msg;
|
|
|
}
|
|
|
//查询直接子任务
|
|
|
- QueryWrapper<Task> subQuery = new QueryWrapper<Task>().eq("parent_tid", id);
|
|
|
+ QueryWrapper<Task> subQuery = new QueryWrapper<Task>().eq("parent_tid", id).orderByAsc("end_date");
|
|
|
t.setSubTaskList(taskService.list(subQuery));
|
|
|
|
|
|
//查询最新的一条任务进展
|
|
@@ -707,13 +707,13 @@ public class TaskController {
|
|
|
String userId = request.getHeader("Token");
|
|
|
|
|
|
//查询直接子任务
|
|
|
- QueryWrapper<Task> subQuery = new QueryWrapper<Task>().eq("parent_tid", id);
|
|
|
+ QueryWrapper<Task> subQuery = new QueryWrapper<Task>().eq("parent_tid", id).orderByAsc("end_date");
|
|
|
msg.data = taskService.list(subQuery);
|
|
|
return msg;
|
|
|
}
|
|
|
|
|
|
@RequestMapping("/getRecentTask")
|
|
|
- public HttpRespMsg getRecentTask(Integer projectId, Integer groupId, Integer stage,
|
|
|
+ public HttpRespMsg getRecentTask(Integer projectId,
|
|
|
@RequestParam(required = false, defaultValue = "0") Integer isSubstitude) {
|
|
|
HttpRespMsg msg = new HttpRespMsg();
|
|
|
String userId = request.getHeader("Token");
|