|
|
|
|
|
|
|
|
}else if ( CollectionUtils.isNotEmpty(records) && CollectionUtils.isNotEmpty(workOrders) ){ |
|
|
}else if ( CollectionUtils.isNotEmpty(records) && CollectionUtils.isNotEmpty(workOrders) ){ |
|
|
records.addAll(workOrders); |
|
|
records.addAll(workOrders); |
|
|
} |
|
|
} |
|
|
|
|
|
if (CollectionUtils.isEmpty(records)){ |
|
|
|
|
|
return JsonResult.success(pageData); |
|
|
|
|
|
} |
|
|
list = this.getWorkOrderList(records,user); |
|
|
list = this.getWorkOrderList(records,user); |
|
|
//按照时间+分配人排序 |
|
|
//按照时间+分配人排序 |
|
|
List<WorkOrderInfoVo> newList = |
|
|
List<WorkOrderInfoVo> newList = |
|
|
|
|
|
|
|
|
}else if ( CollectionUtils.isNotEmpty(records) && CollectionUtils.isNotEmpty(workOrders) ){ |
|
|
}else if ( CollectionUtils.isNotEmpty(records) && CollectionUtils.isNotEmpty(workOrders) ){ |
|
|
records.addAll(workOrders); |
|
|
records.addAll(workOrders); |
|
|
} |
|
|
} |
|
|
|
|
|
if (CollectionUtils.isEmpty(records)){ |
|
|
|
|
|
return JsonResult.success(pageData); |
|
|
|
|
|
} |
|
|
list = this.getWorkOrderList(records,user); |
|
|
list = this.getWorkOrderList(records,user); |
|
|
//按照时间+分配人排序 |
|
|
//按照时间+分配人排序 |
|
|
List<WorkOrderInfoVo> newList = |
|
|
List<WorkOrderInfoVo> newList = |
|
|
|
|
|
|
|
|
}else if ( CollectionUtils.isNotEmpty(records) && CollectionUtils.isNotEmpty(workOrders) ){ |
|
|
}else if ( CollectionUtils.isNotEmpty(records) && CollectionUtils.isNotEmpty(workOrders) ){ |
|
|
records.addAll(workOrders); |
|
|
records.addAll(workOrders); |
|
|
} |
|
|
} |
|
|
|
|
|
if (CollectionUtils.isEmpty(records)){ |
|
|
|
|
|
return JsonResult.success(pageData); |
|
|
|
|
|
} |
|
|
list = this.getWorkOrderList(records,user); |
|
|
list = this.getWorkOrderList(records,user); |
|
|
//按照时间+分配人排序 |
|
|
//按照时间+分配人排序 |
|
|
List<WorkOrderInfoVo> newList = |
|
|
List<WorkOrderInfoVo> newList = |