From cf55ebf52cb3fa96f1efced495c120dc0c4ecd7b Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 09 四月 2025 10:06:04 +0800
Subject: [PATCH] 优化项优化 设备分类新增问题 库存列表状态字段 中标单按钮限制
---
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceClassController.java | 6 +++---
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/PurchaseTendrOrderServiceImpl.java | 6 +++++-
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceClass.java | 2 +-
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/PurchaseWinningLetterServiceImpl.java | 2 +-
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseTendrOrderController.java | 4 ++--
5 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceClass.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceClass.java
index 8b30c3b..6be43d7 100644
--- a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceClass.java
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceClass.java
@@ -57,5 +57,5 @@
@Transient
@TableField(exist = false)
- private Integer parentId;
+ private Long parentId;
}
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceClassController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceClassController.java
index 63b3c22..f0862ac 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceClassController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceClassController.java
@@ -90,7 +90,7 @@
@GetMapping("/{id}" )
public R getById(@PathVariable("id" ) Long id) {
DeviceClass byId = deviceClassService.getById(id);
- byId.setParentId(byId.getPId().intValue());
+ byId.setParentId(byId.getPId());
return R.ok(byId);
}
@@ -107,7 +107,7 @@
return R.failed("涓婄骇鍒嗙被鏈�夋嫨锛�");
}
deviceClass.setNumber(maxSizeService.nextNo(MaxSizeContant.DEVICE_CLASS_NUM));
- deviceClass.setPId(deviceClass.getParentId().longValue());
+ deviceClass.setPId(deviceClass.getParentId());
return R.ok(deviceClassService.save(deviceClass));
}
@@ -124,7 +124,7 @@
if(deviceClass.getParentId()==null){
return R.failed("涓婄骇鍒嗙被鏈�夋嫨锛�");
}
- deviceClass.setPId(deviceClass.getParentId().longValue());
+ deviceClass.setPId(deviceClass.getParentId());
return R.ok(deviceClassService.updateById(deviceClass));
}
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseTendrOrderController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseTendrOrderController.java
index 878ddf7..7b858d5 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseTendrOrderController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseTendrOrderController.java
@@ -141,8 +141,8 @@
}
/**
- * 閫氳繃id鍒犻櫎鎷涙爣閲囪喘鍗�
- * @param ids id鍒楄〃
+ * 閫氳繃id瀹屾垚鎷涙爣閲囪喘鍗�
+ * @param id鍒楄〃
* @return R
*/
@Operation(summary = "閫氳繃id瀹屾垚鎷涙爣閲囪喘鍗�" , description = "閫氳繃id瀹屾垚鎷涙爣閲囪喘鍗�" )
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/PurchaseTendrOrderServiceImpl.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/PurchaseTendrOrderServiceImpl.java
index 8ebf5de..56d49de 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/PurchaseTendrOrderServiceImpl.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/PurchaseTendrOrderServiceImpl.java
@@ -1,6 +1,7 @@
package com.by4cloud.platformx.device.service.impl;
import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.by4cloud.platformx.device.constant.MaxSizeContant;
import com.by4cloud.platformx.device.entity.PurchaseTendrOrderEntity;
@@ -12,6 +13,7 @@
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
+import java.awt.geom.QuadCurve2D;
import java.util.List;
/**
@@ -46,7 +48,9 @@
@Override
public List<PurchaseTendrOrderEntity> getPurchaseRenderList() {
- List<PurchaseTendrOrderEntity> list = baseMapper.selectList(null);
+ QueryWrapper<PurchaseTendrOrderEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("status","2");
+ List<PurchaseTendrOrderEntity> list = baseMapper.selectList(queryWrapper);
return list;
}
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/PurchaseWinningLetterServiceImpl.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/PurchaseWinningLetterServiceImpl.java
index 61bcee2..56725e3 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/PurchaseWinningLetterServiceImpl.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/PurchaseWinningLetterServiceImpl.java
@@ -36,7 +36,7 @@
baseMapper.insert(purchaseWinningLetter);
PurchaseTendrOrderEntity orderEntity = orderMapper.selectById(purchaseWinningLetter.getOrderId());
if (orderEntity!=null){
- orderEntity.setStatus("2");
+ orderEntity.setStatus("3");
orderMapper.updateById(orderEntity);
}
return R.ok();
--
Gitblit v1.9.1