|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
//查询属于分配自己的数据 |
|
|
//查询属于分配自己的数据 |
|
|
List<WorkOrder> workOrders = myWorkList(user, query); |
|
|
List<WorkOrder> workOrders = myWorkList(user, query); |
|
|
records.addAll(workOrders); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (CollectionUtils.isEmpty(records) && CollectionUtils.isNotEmpty(workOrders)){ |
|
|
|
|
|
records = workOrders; |
|
|
|
|
|
} |
|
|
list = this.getWorkOrderList(records,user); |
|
|
list = this.getWorkOrderList(records,user); |
|
|
//按照时间+分配人排序 |
|
|
//按照时间+分配人排序 |
|
|
List<WorkOrderInfoVo> newList = |
|
|
List<WorkOrderInfoVo> newList = |
|
|
list.stream().sorted(Comparator.comparing(WorkOrderInfoVo::getCreateTime).thenComparing(WorkOrderInfoVo::getAssignUserName).reversed()).collect(Collectors.toList()); |
|
|
list.stream().sorted(Comparator.comparing(WorkOrderInfoVo::getCreateTime).thenComparing(WorkOrderInfoVo::getAssignUserName).reversed()).collect(Collectors.toList()); |
|
|
pageData.setRecords(newList); |
|
|
pageData.setRecords(newList); |
|
|
long c = System.currentTimeMillis() - b; |
|
|
|
|
|
System.out.printf("花费时间b:" + c); |
|
|
|
|
|
return JsonResult.success(pageData); |
|
|
return JsonResult.success(pageData); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
//查询属于分配自己的数据 |
|
|
//查询属于分配自己的数据 |
|
|
List<WorkOrder> workOrders = myWorkList(user, query); |
|
|
List<WorkOrder> workOrders = myWorkList(user, query); |
|
|
records.addAll(workOrders); |
|
|
|
|
|
|
|
|
if (CollectionUtils.isEmpty(records) && CollectionUtils.isNotEmpty(workOrders)){ |
|
|
|
|
|
records = workOrders; |
|
|
|
|
|
} |
|
|
list = this.getWorkOrderList(records,user); |
|
|
list = this.getWorkOrderList(records,user); |
|
|
//按照时间+分配人排序 |
|
|
//按照时间+分配人排序 |
|
|
List<WorkOrderInfoVo> newList = |
|
|
List<WorkOrderInfoVo> newList = |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
//查询属于分配自己的数据 |
|
|
//查询属于分配自己的数据 |
|
|
List<WorkOrder> workOrders = myWorkList(user, query); |
|
|
List<WorkOrder> workOrders = myWorkList(user, query); |
|
|
records.addAll(workOrders); |
|
|
|
|
|
|
|
|
if (CollectionUtils.isEmpty(records) && CollectionUtils.isNotEmpty(workOrders)){ |
|
|
|
|
|
records = workOrders; |
|
|
|
|
|
} |
|
|
list = this.getWorkOrderList(records,user); |
|
|
list = this.getWorkOrderList(records,user); |
|
|
//按照时间+分配人排序 |
|
|
//按照时间+分配人排序 |
|
|
List<WorkOrderInfoVo> newList = |
|
|
List<WorkOrderInfoVo> newList = |