From fc8c86e7a365d5c6bdc37c2b05b9f83115ac2bc3 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 23 四月 2025 17:30:52 +0800
Subject: [PATCH] 巡检任务 设备维修新增是否生成工单
---
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceRepairController.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceRepairController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceRepairController.java
index f570bff..297f4c1 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceRepairController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceRepairController.java
@@ -1,14 +1,13 @@
package com.by4cloud.platformx.device.controller;
-import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.log.annotation.SysLog;
+import com.by4cloud.platformx.device.constant.CommonStatusContant;
+import com.by4cloud.platformx.device.dto.DeviceRepairQueryDTO;
import com.by4cloud.platformx.device.entity.DeviceInventory;
import com.by4cloud.platformx.device.entity.DeviceRepair;
import com.by4cloud.platformx.device.service.DeviceRepairService;
@@ -43,17 +42,14 @@
/**
* 鍒嗛〉鏌ヨ
* @param page 鍒嗛〉瀵硅薄
- * @param deviceRepair 璁惧缁翠慨
+ * @param queryDTO 璁惧缁翠慨
* @return
*/
@Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
@GetMapping("/page" )
@PreAuthorize("@pms.hasPermission('device_deviceRepair_view')" )
- public R getDeviceRepairPage(@ParameterObject Page page, @ParameterObject DeviceRepair deviceRepair) {
- LambdaQueryWrapper<DeviceRepair> wrapper = Wrappers.lambdaQuery();
- wrapper.eq(StrUtil.isNotBlank(deviceRepair.getSerialNo()),DeviceRepair::getSerialNo,deviceRepair.getSerialNo());
- wrapper.orderByDesc(DeviceRepair::getCreateTime);
- return R.ok(deviceRepairService.page(page, wrapper));
+ public R getDeviceRepairPage(@ParameterObject Page page, DeviceRepairQueryDTO queryDTO) {
+ return R.ok(deviceRepairService.pageNew(page, queryDTO));
}
@@ -79,7 +75,8 @@
@PostMapping
@PreAuthorize("@pms.hasPermission('device_deviceRepair_add')" )
public R save(@RequestBody DeviceRepair deviceRepair) {
- deviceRepair.setStatus(1);
+ deviceRepair.setStatus(CommonStatusContant.DEVICE_REPAIR_STATUS_PANDING_APPROVAL);
+ deviceRepair.setWoFlag(CommonStatusContant.DEVICE_REPAIR_FLAG_N);
return R.ok(deviceRepairService.save(deviceRepair));
}
@@ -142,4 +139,13 @@
public R complete(@PathVariable("id")Long id) {
return deviceRepairService.complete(id);
}
+
+ /**
+ * 璁惧缁翠慨瀹屾垚
+ * @return
+ */
+ @GetMapping("/genWorkOrder/{id}" )
+ public R genWorkOrder(@PathVariable("id")Long id) {
+ return deviceRepairService.genWorkOrder(id);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1