From 9fd0d3caf44b3a36da4443450870e06aaf038a2d Mon Sep 17 00:00:00 2001 From: "UNISINSIGHT\\rdpnr_jiangpeng" Date: Fri, 10 Apr 2026 15:24:42 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BA=A7=E5=93=81=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/sip/service/impl/DeliveryListServiceImpl.java | 4 ++-- .../ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java | 4 ++-- .../com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java | 4 +++- .../ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java | 1 + .../java/com/ruoyi/sip/service/impl/QuotationServiceImpl.java | 3 ++- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/DeliveryListServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/DeliveryListServiceImpl.java index 469a073c..316561d9 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/DeliveryListServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/DeliveryListServiceImpl.java @@ -166,9 +166,9 @@ public class DeliveryListServiceImpl implements IDeliveryListService { Collectors.groupingBy(OrderList::getOrderId, Collectors.mapping(OrderList::getProductInfo, Collectors.toList()))); - // 查询服务的产品信息 + // 查询标准硬件维保的产品信息 ProductInfo productInfo = new ProductInfo(); - productInfo.setType(ProductInfo.ProductTypeEnum.SERVICE.getType()); + productInfo.setType(ProductInfo.ProductTypeEnum.HARDWARE_MAINTENANCE.getType()); List productInfos = productInfoMapper.selectProductInfoList(productInfo); // 设置服务等级和服务结束时间 for (DeliveryInfoVo deliveryInfoVo : deliveryInfoVos) { diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java index 358a7cfb..40da07ef 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java @@ -365,9 +365,9 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService { Map> maintenanceTypeMap = projectProductInfos.stream().collect(Collectors.groupingBy(ProjectProductInfo::getProjectId)); -// // 查询服务的产品信息 + // 查询标准硬件维保的产品信息 ProductInfo productInfo = new ProductInfo(); - productInfo.setType(ProductInfo.ProductTypeEnum.SERVICE.getType()); + productInfo.setType(ProductInfo.ProductTypeEnum.HARDWARE_MAINTENANCE.getType()); List productInfos = productInfoService.selectProductInfoList(productInfo); // 设置服务等级和服务结束时间 for (DeliveryInfoVo deliveryInfoVo : resultList) { diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java index a4e75220..b2af2d1e 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java @@ -124,7 +124,9 @@ public class ProjectInfoServiceImpl implements IProjectInfoService { projectInfo.setSoftwareProjectProductInfoList(productListMap.get(ProductInfo.ProductTypeEnum.SOFTWARE.getType())); projectInfo.setHardwareProjectProductInfoList(productListMap.get(ProductInfo.ProductTypeEnum.HARDWARE.getType())); // 硬件 - List maintenanceProjectProductInfoList = productListMap.getOrDefault(ProductInfo.ProductTypeEnum.SERVICE.getType(), new ArrayList<>()); + List maintenanceProjectProductInfoList = productListMap.getOrDefault(ProductInfo.ProductTypeEnum.HARDWARE_MAINTENANCE.getType(), new ArrayList<>()); + // 服务 + maintenanceProjectProductInfoList.addAll(productListMap.getOrDefault(ProductInfo.ProductTypeEnum.SERVICE.getType(), new ArrayList<>())); projectInfo.setMaintenanceProjectProductInfoList(maintenanceProjectProductInfoList); //查询变更记录信息 List projectWorkProgresses = workProgressService.selectProjectWorkProgressListByProjectId(Collections.singletonList((projectInfo.getId()))); diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java index c07a1575..a96c6052 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java @@ -165,6 +165,7 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To projectOrderInfo.setSoftwareProjectProductInfoList(productListMap.get(ProductInfo.ProductTypeEnum.SOFTWARE.getType())); projectOrderInfo.setHardwareProjectProductInfoList(productListMap.get(ProductInfo.ProductTypeEnum.HARDWARE.getType())); List maintenanceProjectProductInfoList = productListMap.getOrDefault(ProductInfo.ProductTypeEnum.SERVICE.getType(), new ArrayList<>()); + maintenanceProjectProductInfoList.addAll(productListMap.getOrDefault(ProductInfo.ProductTypeEnum.HARDWARE_MAINTENANCE.getType(), new ArrayList<>())); projectOrderInfo.setMaintenanceProjectProductInfoList(maintenanceProjectProductInfoList); diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/QuotationServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/QuotationServiceImpl.java index 5f482d16..f37b739b 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/QuotationServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/QuotationServiceImpl.java @@ -94,7 +94,8 @@ public class QuotationServiceImpl implements IQuotationService { Map> productListMap = productInfoList.stream().collect(Collectors.groupingBy(QuotationProductInfo::getType)); quotation.setSoftwareProjectProductInfoList(productListMap.get(ProductInfo.ProductTypeEnum.SOFTWARE.getType())); quotation.setHardwareProjectProductInfoList(productListMap.get(ProductInfo.ProductTypeEnum.HARDWARE.getType())); - List maintenanceProjectProductInfoList = productListMap.getOrDefault(ProductInfo.ProductTypeEnum.SERVICE.getType(), new ArrayList<>()); + List maintenanceProjectProductInfoList = productListMap.getOrDefault(ProductInfo.ProductTypeEnum.HARDWARE_MAINTENANCE.getType(), new ArrayList<>()); + maintenanceProjectProductInfoList.addAll(productListMap.getOrDefault(ProductInfo.ProductTypeEnum.SERVICE.getType(), new ArrayList<>())); quotation.setMaintenanceProjectProductInfoList(maintenanceProjectProductInfoList); quotation.setProvinceProductInfoList(productListMap.getOrDefault(ProductInfo.ProductTypeEnum.PROVINCE_SERVICE.getType(),new ArrayList<>())); ProjectInfo projectInfo = new ProjectInfo();