| | |
| | | wrapper.like(StrUtil.isNotBlank(workOrder.getWoCode()),WorkOrder::getWoCode,workOrder.getWoCode()); |
| | | wrapper.like(StrUtil.isNotBlank(workOrder.getWoDesc()),WorkOrder::getWoDesc,workOrder.getWoDesc()); |
| | | wrapper.eq(Objects.nonNull(workOrder.getWoStatus()),WorkOrder::getWoStatus,workOrder.getWoStatus()); |
| | | wrapper.orderByDesc(WorkOrder::getCreateTime); |
| | | return R.ok(workOrderService.page(page, wrapper)); |
| | | } |
| | | |
| | |
| | | @PostMapping |
| | | @PreAuthorize("@pms.hasPermission('device_workOrder_add')" ) |
| | | public R save(@RequestBody WorkOrder workOrder) { |
| | | return R.ok(workOrderService.save(workOrder)); |
| | | return workOrderService.saveNew(workOrder); |
| | | } |
| | | |
| | | /** |
| | |
| | | @PutMapping |
| | | @PreAuthorize("@pms.hasPermission('device_workOrder_edit')" ) |
| | | public R updateById(@RequestBody WorkOrder workOrder) { |
| | | return R.ok(workOrderService.updateById(workOrder)); |
| | | return workOrderService.updateByIdNew(workOrder); |
| | | } |
| | | |
| | | /** |