|
@@ -166,7 +166,7 @@ public class StagesController {
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@RequestMapping("/list")
|
|
@RequestMapping("/list")
|
|
- public HttpRespMsg list(Stages item, String order, boolean isDesc) {
|
|
|
|
|
|
+ public HttpRespMsg list(Stages item, String order, boolean isDesc,boolean hideCompleted) {
|
|
HttpRespMsg msg = new HttpRespMsg();
|
|
HttpRespMsg msg = new HttpRespMsg();
|
|
QueryWrapper<Stages> stagesQueryWrapper = new QueryWrapper<Stages>();
|
|
QueryWrapper<Stages> stagesQueryWrapper = new QueryWrapper<Stages>();
|
|
stagesQueryWrapper.eq("group_id", item.getGroupId());
|
|
stagesQueryWrapper.eq("group_id", item.getGroupId());
|
|
@@ -197,6 +197,10 @@ public class StagesController {
|
|
} else {
|
|
} else {
|
|
queryWrapper.orderByAsc(order);
|
|
queryWrapper.orderByAsc(order);
|
|
}
|
|
}
|
|
|
|
+ //是否隐藏已完成的任务
|
|
|
|
+ if(hideCompleted){
|
|
|
|
+ queryWrapper.eq("task_status",0);
|
|
|
|
+ }
|
|
List<Task> tasks = taskService.simpleList(queryWrapper,null,null);
|
|
List<Task> tasks = taskService.simpleList(queryWrapper,null,null);
|
|
//没有权限只能看到自己创建的,负责的和待分配的任务
|
|
//没有权限只能看到自己创建的,负责的和待分配的任务
|
|
List<SysRichFunction> functionList = sysFunctionMapper.getRoleFunctions(user.getRoleId(), "查看全部任务");
|
|
List<SysRichFunction> functionList = sysFunctionMapper.getRoleFunctions(user.getRoleId(), "查看全部任务");
|