From d16cd328de1fe61f666f1c6cdd081b9ec1dabe02 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 03 四月 2026 15:10:46 +0800
Subject: [PATCH] 规格型号导入字段增加有效期和备案凭证号
---
src/main/java/com/ruoyi/basic/dto/ProductModelExportDto.java | 14 ++++++++++++++
src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java | 5 ++---
src/main/java/com/ruoyi/basic/pojo/ProductModel.java | 2 ++
3 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/dto/ProductModelExportDto.java b/src/main/java/com/ruoyi/basic/dto/ProductModelExportDto.java
index 0ee8d7b..444c94d 100644
--- a/src/main/java/com/ruoyi/basic/dto/ProductModelExportDto.java
+++ b/src/main/java/com/ruoyi/basic/dto/ProductModelExportDto.java
@@ -3,6 +3,8 @@
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import lombok.Data;
+import java.math.BigDecimal;
+
/**
* <br>
* 浜у搧瀵煎嚭妯℃澘
@@ -21,6 +23,18 @@
@Excel(name = "鍗曚綅")
private String unit;
+ /**
+ * 鏈夋晥鏈�
+ */
+ @Excel(name = "鏈夋晥鏈燂紙骞达級")
+ private BigDecimal validityPeriod;
+
+ /**
+ * 澶囨鍑瘉鍙�
+ */
+ @Excel(name = "澶囨鍑瘉鍙�")
+ private String filingCertificateNo;
+
@Excel(name = "UID鐮�")
private String uidNo;
}
diff --git a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
index ce92abf..72cf0c4 100644
--- a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
+++ b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
@@ -71,11 +71,13 @@
/**
* 鏈夋晥鏈�
*/
+ @Excel(name = "鏈夋晥鏈燂紙骞达級")
private BigDecimal validityPeriod;
/**
* 澶囨鍑瘉鍙�
*/
+ @Excel(name = "澶囨鍑瘉鍙�")
private String filingCertificateNo;
/**
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 56c339b..96f7a87 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
@@ -114,7 +114,6 @@
List<ProductModel> waitToSaveList = new ArrayList<>();
int skipCount = 0;
- System.out.println(productModelList);
for (int i = 0; i < productModelList.size(); i++) {
ProductModel item = productModelList.get(i);
int rowNum = i + 2;
@@ -125,8 +124,8 @@
if (StringUtils.isEmpty(item.getUnit())) {
return AjaxResult.error("绗� " + rowNum + " 琛屽鍏ュけ璐�: [鍗曚綅] 涓嶈兘涓虹┖");
}
- if (StringUtils.isEmpty(item.getUidNo())) {
- return AjaxResult.error("绗� " + rowNum + " 琛屽鍏ュけ璐�: [UID鐮乚 涓嶈兘涓虹┖");
+ if (item.getValidityPeriod() == null) {
+ return AjaxResult.error("绗� " + rowNum + " 琛屽鍏ュけ璐�: [鏈夋晥鏈燂紙骞达級] 涓嶈兘涓虹┖");
}
// 鍘婚噸,濡傛灉宸插寘鍚鍨嬪彿,鍒欒烦杩�
--
Gitblit v1.9.3