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/service/impl/DeviceScrapServiceImpl.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/DeviceScrapServiceImpl.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/DeviceScrapServiceImpl.java
index 2dd8044..c72ff40 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/DeviceScrapServiceImpl.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/DeviceScrapServiceImpl.java
@@ -1,7 +1,11 @@
 package com.by4cloud.platformx.device.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.by4cloud.platformx.common.core.util.R;
+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.entity.DeviceScrap;
@@ -25,12 +29,17 @@
 	@Override
 	public R approved(Long id) {
 		DeviceScrap scrap = baseMapper.selectById(id);
-		scrap.setStatus(2);
+		scrap.setStatus(CommonStatusContant.DEVICE_SCRAP_STATUS_COMPLETE);
 		baseMapper.updateById(scrap);
 		DeviceInventory inventory = inventoryMapper.selectById(scrap.getInventoryId());
-		inventory.setInventoryStatus(4);
+		inventory.setInventoryStatus(CommonStatusContant.DEVICE_INVENTORY_SCRAPING);
 		inventoryMapper.updateById(inventory);
 		return R.ok();
 	}
 
+	@Override
+	public IPage pageNew(Page page, DeviceRepairQueryDTO queryDTO) {
+		return baseMapper.pageNew(page,queryDTO);
+	}
+
 }
\ No newline at end of file

--
Gitblit v1.9.1