From 37b697351e8e0a9200eee1276c4081c07588dc10 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 17 六月 2025 20:39:48 +0800
Subject: [PATCH] 未回款金额(元)为NaN修复
---
src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
index 754d93f..eb9eedb 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
@@ -1,18 +1,26 @@
package com.ruoyi.basic.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.ruoyi.basic.dto.ProductDto;
import com.ruoyi.basic.dto.ProductModelDto;
+import com.ruoyi.basic.mapper.ProductMapper;
import com.ruoyi.basic.mapper.ProductModelMapper;
+import com.ruoyi.basic.pojo.Product;
import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.basic.service.IProductModelService;
import com.ruoyi.common.utils.bean.BeanUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
import java.util.Arrays;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* 銆愯濉啓鍔熻兘鍚嶇О銆慡ervice涓氬姟灞傚鐞�
@@ -24,6 +32,7 @@
@AllArgsConstructor
public class ProductModelServiceImpl extends ServiceImpl<ProductModelMapper, ProductModel> implements IProductModelService {
+ private final ProductMapper productMapper;
private ProductModelMapper productModelMapper;
@Override
@@ -49,4 +58,39 @@
queryWrapper.eq(ProductModel::getProductId, productDto.getId());
return productModelMapper.selectList(queryWrapper);
}
+
+ /**
+ * 鏍规嵁id鏌ヨ浜у搧瑙勬牸鍒嗛〉鏌ヨ
+ * @param page
+ * @param productDto
+ * @return
+ */
+ @Override
+ public IPage<ProductModel> modelListPage(Page page, ProductDto productDto) {
+ LambdaQueryWrapper<ProductModel> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(ProductModel::getProductId, productDto.getId());
+ return productModelMapper.selectPage(page, queryWrapper);
+ }
+
+ @Override
+ public Boolean importProduct(MultipartFile file) {
+ try {
+ ExcelUtil<ProductModel> productModelExcelUtil = new ExcelUtil<>(ProductModel.class);
+ List<ProductModel> productModelList = productModelExcelUtil.importExcel(file.getInputStream());
+ Map<String, List<ProductModel>> collect = productModelList.stream().collect(Collectors.groupingBy(ProductModel::getProductName));
+ collect.forEach((k,v)->{
+ Product product = productMapper.selectOne(new LambdaQueryWrapper<Product>().eq(Product::getProductName, k).last("LIMIT 1"));
+ if (product != null) {
+ v.forEach(productModel -> {
+ productModel.setProductId(product.getId());
+ });
+ this.saveOrUpdateBatch(v);
+ }
+ });
+ return true;
+ }catch (Exception e) {
+ e.printStackTrace();
+ }
+ return false;
+ }
}
--
Gitblit v1.9.3