|
@@ -3010,6 +3010,11 @@ public class RepairRecordController implements RepairRecordControllerAPI {
|
|
|
IPage<MaintenanceWorkerVo> page = new Page();
|
|
IPage<MaintenanceWorkerVo> page = new Page();
|
|
|
BeanUtils.copyProperties(repairReceivingListPage, page);
|
|
BeanUtils.copyProperties(repairReceivingListPage, page);
|
|
|
|
|
|
|
|
|
|
+ List<RepairReceiving> records = repairReceivingListPage.getRecords();
|
|
|
|
|
+ if (ObjectUtils.isEmpty(records) && records.size() <= 0) {
|
|
|
|
|
+ return CommonResult.ok(page);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
LambdaQueryWrapper<RepairReceiving> wrapperReceiving2 = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<RepairReceiving> wrapperReceiving2 = new LambdaQueryWrapper<>();
|
|
|
wrapperReceiving2.between(ObjectUtils.isNotEmpty(startTime), RepairReceiving::getReceivingTime, startTime, endTime);
|
|
wrapperReceiving2.between(ObjectUtils.isNotEmpty(startTime), RepairReceiving::getReceivingTime, startTime, endTime);
|
|
|
wrapperReceiving2.isNotNull(RepairReceiving::getFinishTime);
|
|
wrapperReceiving2.isNotNull(RepairReceiving::getFinishTime);
|