mula
/
unis_sip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix：产品类型问题处理

dev_1.0.2
UNISINSIGHT\rdpnr_jiangpeng 2026-04-10 15:24:42 +08:00
parent 6328264f90
commit 9fd0d3caf4
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/DeliveryListServiceImpl.java
View File

@ -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<ProductInfo> productInfos = productInfoMapper.selectProductInfoList(productInfo);
// 设置服务等级和服务结束时间
for (DeliveryInfoVo deliveryInfoVo : deliveryInfoVos) {

4
ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java
View File

@ -365,9 +365,9 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService {
Map<Long, List<ProjectProductInfo>> 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<ProductInfo> productInfos = productInfoService.selectProductInfoList(productInfo);
// 设置服务等级和服务结束时间
for (DeliveryInfoVo deliveryInfoVo : resultList) {

4
ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java
View File

@ -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<ProjectProductInfo> maintenanceProjectProductInfoList = productListMap.getOrDefault(ProductInfo.ProductTypeEnum.SERVICE.getType(), new ArrayList<>());
List<ProjectProductInfo> maintenanceProjectProductInfoList = productListMap.getOrDefault(ProductInfo.ProductTypeEnum.HARDWARE_MAINTENANCE.getType(), new ArrayList<>());
// 服务
maintenanceProjectProductInfoList.addAll(productListMap.getOrDefault(ProductInfo.ProductTypeEnum.SERVICE.getType(), new ArrayList<>()));
projectInfo.setMaintenanceProjectProductInfoList(maintenanceProjectProductInfoList);
//查询变更记录信息
List<ProjectWorkProgress> projectWorkProgresses = workProgressService.selectProjectWorkProgressListByProjectId(Collections.singletonList((projectInfo.getId())));

1
ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java
View File

@ -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<ProjectProductInfo> maintenanceProjectProductInfoList = productListMap.getOrDefault(ProductInfo.ProductTypeEnum.SERVICE.getType(), new ArrayList<>());
maintenanceProjectProductInfoList.addAll(productListMap.getOrDefault(ProductInfo.ProductTypeEnum.HARDWARE_MAINTENANCE.getType(), new ArrayList<>()));
projectOrderInfo.setMaintenanceProjectProductInfoList(maintenanceProjectProductInfoList);

3
ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/QuotationServiceImpl.java
View File

@ -94,7 +94,8 @@ public class QuotationServiceImpl implements IQuotationService {
Map<String, List<QuotationProductInfo>> 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<QuotationProductInfo> maintenanceProjectProductInfoList = productListMap.getOrDefault(ProductInfo.ProductTypeEnum.SERVICE.getType(), new ArrayList<>());
List<QuotationProductInfo> 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();