|
|
|
@ -67,7 +67,7 @@ public class MaintenanceTaskQueryServiceImpl implements IMaintenanceTaskQuerySer
|
|
|
|
|
LambdaQueryWrapper<OperMaintenanceTaskEntity> wq = Wrappers.<OperMaintenanceTaskEntity>lambdaQuery() |
|
|
|
|
.like(OperMaintenanceTaskEntity::getDisposeTime, month) |
|
|
|
|
.like(Func.isNotEmpty(deptId),OperMaintenanceTaskEntity::getCreateDept,deptId) |
|
|
|
|
.orderByAsc(OperMaintenanceTaskEntity::getDisposeTime); |
|
|
|
|
.orderByDesc(OperMaintenanceTaskEntity::getDisposeTime); |
|
|
|
|
IPage page = maintenanceTaskService.page(Condition.getPage(query), wq); |
|
|
|
|
page.setRecords(this.fillTaskQuery(page.getRecords())); |
|
|
|
|
return page; |
|
|
|
@ -78,7 +78,7 @@ public class MaintenanceTaskQueryServiceImpl implements IMaintenanceTaskQuerySer
|
|
|
|
|
LambdaQueryWrapper<OperMaintenanceTaskEntity> wq = Wrappers.<OperMaintenanceTaskEntity>lambdaQuery() |
|
|
|
|
.like(OperMaintenanceTaskEntity::getDisposeTime, month) |
|
|
|
|
.like(Func.isNotEmpty(deptId),OperMaintenanceTaskEntity::getCreateDept,deptId) |
|
|
|
|
.orderByAsc(OperMaintenanceTaskEntity::getDisposeTime); |
|
|
|
|
.orderByDesc(OperMaintenanceTaskEntity::getDisposeTime); |
|
|
|
|
List<OperMaintenanceTaskEntity> taskList = maintenanceTaskService.list(wq); |
|
|
|
|
if(CollectionUtil.isEmpty(taskList)) { |
|
|
|
|
return Lists.newArrayList(); |
|
|
|
|