diff --git a/src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java b/src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java index 029958b..5b1ec18 100644 --- a/src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java +++ b/src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java @@ -116,6 +116,7 @@ public class MaintenanceController extends BladeController { @Operation(summary = "维保任务列表", description = "维保任务列表") public R taskPage(MaintenanceTask task, Query query) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(MaintenanceTask.class); + wrapper.orderByDesc(MaintenanceTask::getStartTime); wrapper.eq(MaintenanceTask::getIsDeleted, CommonConstant.FALSE_STR); if (Func.isNotEmpty(task.getPlanId())) { wrapper.eq(MaintenanceTask::getPlanId, task.getPlanId()); @@ -252,6 +253,7 @@ public class MaintenanceController extends BladeController { @Operation(summary = "维保维修列表", description = "维保维修列表") public R repairPage(MaintenanceTask task, Query query) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(MaintenanceTask.class); + wrapper.orderByDesc(MaintenanceTask::getStartTime); wrapper.eq(MaintenanceTask::getIsDeleted, CommonConstant.FALSE_STR); wrapper.gt(MaintenanceTask::getRepairStatus, MaintenanceStatusEnum.REPAIR_NO.getValue()); if (Func.isNotEmpty(task.getPlanId())) { @@ -263,7 +265,6 @@ public class MaintenanceController extends BladeController { if (Func.isNotEmpty(task.getStatusSearch())) { wrapper.in(MaintenanceTask::getRepairStatus, task.getStatusSearch().split(",")); } - IPage pages = taskService.page(Condition.getPage(query), wrapper); return R.data(pages); } diff --git a/src/main/java/org/springblade/modules/business/pojo/dto/DeviceDTO.java b/src/main/java/org/springblade/modules/business/pojo/dto/DeviceDTO.java index cf7e25f..0a656aa 100644 --- a/src/main/java/org/springblade/modules/business/pojo/dto/DeviceDTO.java +++ b/src/main/java/org/springblade/modules/business/pojo/dto/DeviceDTO.java @@ -47,5 +47,8 @@ public class DeviceDTO extends Device { //实验室id private Long limsId; + //单位 + private String unit; + } diff --git a/src/main/java/org/springblade/modules/business/pojo/entity/Device.java b/src/main/java/org/springblade/modules/business/pojo/entity/Device.java index c9b6ecc..7bbe787 100644 --- a/src/main/java/org/springblade/modules/business/pojo/entity/Device.java +++ b/src/main/java/org/springblade/modules/business/pojo/entity/Device.java @@ -111,4 +111,9 @@ public class Device extends BaseEntity { * 是否过保(0没有过保 1已过保) */ private Integer isWarran; + + /** + * 单位 + */ + private String unit; }