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/DeviceScrapController.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceScrapController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceScrapController.java
index 7ac2bfd..a3d2f0e 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceScrapController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceScrapController.java
@@ -2,12 +2,12 @@
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.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.entity.DeviceRepair;
+import com.by4cloud.platformx.device.constant.CommonStatusContant;
+import com.by4cloud.platformx.device.dto.DeviceRepairQueryDTO;
import com.by4cloud.platformx.device.entity.DeviceScrap;
import com.by4cloud.platformx.device.service.DeviceScrapService;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -21,7 +21,6 @@
import org.springframework.web.bind.annotation.*;
import java.util.List;
-import java.util.Objects;
/**
* 璁惧鎶ュ簾
@@ -41,16 +40,14 @@
/**
* 鍒嗛〉鏌ヨ
* @param page 鍒嗛〉瀵硅薄
- * @param deviceScrap 璁惧鎶ュ簾
+ * @param queryDTO 璁惧鎶ュ簾
* @return
*/
@Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
@GetMapping("/page" )
@PreAuthorize("@pms.hasPermission('device_deviceScrap_view')" )
- public R getDeviceScrapPage(@ParameterObject Page page, @ParameterObject DeviceScrap deviceScrap) {
- LambdaQueryWrapper<DeviceScrap> wrapper = Wrappers.lambdaQuery();
- wrapper.orderByDesc(DeviceScrap::getCreateTime);
- return R.ok(deviceScrapService.page(page, wrapper));
+ public R getDeviceScrapPage(@ParameterObject Page page, @ParameterObject DeviceRepairQueryDTO queryDTO) {
+ return R.ok(deviceScrapService.pageNew(page, queryDTO));
}
@@ -76,7 +73,7 @@
@PostMapping
@PreAuthorize("@pms.hasPermission('device_deviceScrap_add')" )
public R save(@RequestBody DeviceScrap deviceScrap) {
- deviceScrap.setStatus(1);
+ deviceScrap.setStatus(CommonStatusContant.DEVICE_SCRAP_STATUS_PANDING_APPROVAL);
return R.ok(deviceScrapService.save(deviceScrap));
}
--
Gitblit v1.9.1