From d9d8b1eb440d455252e9859b2294b8a55366baba Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 02 四月 2025 10:48:29 +0800
Subject: [PATCH] 招标 中标 台账 验收 新增名称字段对应表单列表调整

---
 platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceController.java |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceController.java
index 80e083d..1ffdbd0 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceController.java
@@ -29,6 +29,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
@@ -67,7 +68,8 @@
 		Page<Device> page1 = deviceService.page(page, wrapper);
 		for (Device device1 : page1.getRecords()) {
 			QueryWrapper<DeviceInventory> wrapper1 = new QueryWrapper<>();
-			wrapper1.lambda().eq(DeviceInventory::getDeviceId,device1.getId());
+			wrapper1.lambda().eq(DeviceInventory::getDeviceId,device1.getId())
+					.eq(DeviceInventory::getInventoryStatus,1);
 			long count = inventoryService.count(wrapper1);
 			device1.setNum(Integer.parseInt(count+""));
 		}
@@ -157,6 +159,7 @@
 			return R.ok(deviceService.save(device));
 		}
 		device.setNumber(maxSizeService.nextNo(MaxSizeContant.DEVICE_NUM));
+		device.setReleaseDate(new Date());
 		return R.ok(deviceService.save(device));
     }
 
@@ -183,7 +186,12 @@
     @PutMapping
     @PreAuthorize("@pms.hasPermission('platformx_device_edit')" )
     public R updateById(@RequestBody Device device) {
-        return R.ok(deviceService.updateById(device));
+		Device byId = deviceService.getById(device.getId());
+		if(StringUtils.isNotBlank(byId.getNumber())){
+			byId.setNumber(maxSizeService.nextNo(MaxSizeContant.DEVICE_NUM));
+			byId.setReleaseDate(new Date());
+		}
+		return R.ok(deviceService.updateById(device));
     }
 
     /**
@@ -212,4 +220,13 @@
     public List<Device> export(Device device,Long[] ids) {
         return deviceService.list(Wrappers.lambdaQuery(device).in(ArrayUtil.isNotEmpty(ids), Device::getId, ids));
     }
+
+	/**
+	 * 鎵�鏈夎澶囦笅鎷�
+	 * @return
+	 */
+	@GetMapping("/getDropdowmList" )
+	public R getDeviceList() {
+		return R.ok(deviceService.list());
+	}
 }

--
Gitblit v1.9.1