From 2ac14cef837ceaa5201d6266485ab672f6f3d650 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 03 二月 2026 15:08:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sqd_new' into sqd_new
---
src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 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 bc3840f..fce4c7f 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
@@ -12,6 +12,7 @@
import com.ruoyi.basic.pojo.Product;
import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.basic.service.IProductModelService;
+import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.utils.uuid.IdUtils;
@@ -23,9 +24,7 @@
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -48,14 +47,7 @@
if (productModelDto.getId() == null) {
ProductModel productModel = new ProductModel();
BeanUtils.copyProperties(productModelDto,productModel);
- productModelMapper.insert(productModel);
-
- String dateStr = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
- String idStr = String.format("%06d", productModel.getId()); // 鍏綅琛�0
- String newProductCode = "BM" + dateStr + idStr;
- // 鏇存柊鏁版嵁搴撲腑鐨刾roductCode
- productModel.setProductCode(newProductCode);
- return productModelMapper.updateById(productModel);
+ return productModelMapper.insert(productModel);
} else {
return productModelMapper.updateById(productModelDto);
}
@@ -115,4 +107,9 @@
}
return false;
}
+
+ @Override
+ public List<HashMap<String, Object>> listProduct() {
+ return productModelMapper.listProduct();
+ }
}
--
Gitblit v1.9.3