|
|
@ -119,19 +119,16 @@ public class TaskController extends BladeController { |
|
|
|
/** |
|
|
|
/** |
|
|
|
* PC端分页显示任务列表 |
|
|
|
* PC端分页显示任务列表 |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
@PostMapping("/list") |
|
|
|
@GetMapping("/list") |
|
|
|
@ApiOperation(value = "分页显示任务列表", notes = "传入task") |
|
|
|
@ApiOperation(value = "分页显示任务列表", notes = "传入task") |
|
|
|
@OperationAnnotation(moduleName = "巡检管理",title = "我的巡检任务",operatorType = OperatorType.MOBILE,businessType = |
|
|
|
@OperationAnnotation(moduleName = "巡检管理",title = "我的巡检任务",operatorType = OperatorType.MOBILE,businessType = |
|
|
|
BusinessType.GENCODE, |
|
|
|
BusinessType.GENCODE, |
|
|
|
action = "分页显示任务列表") |
|
|
|
action = "分页显示任务列表") |
|
|
|
public R<BladePage<TaskVo>> list(@RequestBody TaskListQuery task) { |
|
|
|
public R<BladePage<TaskVo>> list(TaskListQuery task, Query query) { |
|
|
|
//CacheUtil.put("test#2","inspect","test","12");
|
|
|
|
//CacheUtil.put("test#2","inspect","test","12");
|
|
|
|
// LambdaQueryWrapper<TaskEntity> queryWrapper = Condition.getQueryWrapper(new TaskEntity(),task);
|
|
|
|
// LambdaQueryWrapper<TaskEntity> queryWrapper = Condition.getQueryWrapper(new TaskEntity(),task);
|
|
|
|
// queryWrapper.orderByDesc(TaskEntity::getUpdateTime);
|
|
|
|
// queryWrapper.orderByDesc(TaskEntity::getUpdateTime);
|
|
|
|
// IPage<TaskEntity> pages = taskService.page(Condition.getPage(query), queryWrapper);
|
|
|
|
// IPage<TaskEntity> pages = taskService.page(Condition.getPage(query), queryWrapper);
|
|
|
|
Query query = new Query(); |
|
|
|
|
|
|
|
query.setSize(task.getSize()); |
|
|
|
|
|
|
|
query.setCurrent(task.getCurrent()); |
|
|
|
|
|
|
|
IPage<TaskVo> pages = Condition.getPage(query); |
|
|
|
IPage<TaskVo> pages = Condition.getPage(query); |
|
|
|
if(!AuthUtil.isAdministrator()){ |
|
|
|
if(!AuthUtil.isAdministrator()){ |
|
|
|
task.setCurUserId(AuthUtil.getUserId()); |
|
|
|
task.setCurUserId(AuthUtil.getUserId()); |
|
|
|