From d65898eeee9e6aa2d2174334b80852db3f8de1ca Mon Sep 17 00:00:00 2001
From: han0 <wslshanlin@sina.com>
Date: Mon, 3 Jun 2024 15:57:59 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=A7=A3=E6=9E=90=E5=BC=82=E5=B8=B8=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/mjkf/xinke/main/model/db/FujianSurvey.java | 3 ++-
 src/main/java/mjkf/xinke/main/model/db/SanmingSteel.java | 2 ++
 src/main/java/mjkf/xinke/main/model/db/SteelEntity.java  | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/mjkf/xinke/main/model/db/FujianSurvey.java b/src/main/java/mjkf/xinke/main/model/db/FujianSurvey.java
index c9e2c0a..cdc1fbc 100644
--- a/src/main/java/mjkf/xinke/main/model/db/FujianSurvey.java
+++ b/src/main/java/mjkf/xinke/main/model/db/FujianSurvey.java
@@ -1,5 +1,6 @@
 package mjkf.xinke.main.model.db;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -87,7 +88,7 @@ public class FujianSurvey extends Model<FujianSurvey> {
         if (this.getName().isEmpty()) {
             throw new IllegalArgumentException("名称为空");
         }
-        if (((Integer) this.getPrice().intValue()).equals(0)) {
+        if (ObjectUtil.isEmpty(this.getPrice())) {
             throw new IllegalArgumentException("缺少价格");
         }
     }
diff --git a/src/main/java/mjkf/xinke/main/model/db/SanmingSteel.java b/src/main/java/mjkf/xinke/main/model/db/SanmingSteel.java
index c8949a6..0e62e08 100644
--- a/src/main/java/mjkf/xinke/main/model/db/SanmingSteel.java
+++ b/src/main/java/mjkf/xinke/main/model/db/SanmingSteel.java
@@ -12,6 +12,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
+import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.ss.usermodel.Row;
 
 /**
@@ -65,6 +66,7 @@ public class SanmingSteel extends Model<SanmingSteel> {
     public SanmingSteel () {}
 
     public SanmingSteel (Row row) {
+        row.getCell(1).setCellType(CellType.STRING);
         this.setName(row.getCell(0).getStringCellValue());
         this.setSpec(row.getCell(1).getStringCellValue());
         this.setMaterial(row.getCell(2).getStringCellValue());
diff --git a/src/main/java/mjkf/xinke/main/model/db/SteelEntity.java b/src/main/java/mjkf/xinke/main/model/db/SteelEntity.java
index bfafc7c..6f520c9 100644
--- a/src/main/java/mjkf/xinke/main/model/db/SteelEntity.java
+++ b/src/main/java/mjkf/xinke/main/model/db/SteelEntity.java
@@ -3,6 +3,7 @@ package mjkf.xinke.main.model.db;
 
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
+import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.ss.usermodel.Row;
 
 import java.math.BigDecimal;
@@ -30,6 +31,7 @@ public class SteelEntity<T extends Model<?>> extends Model<T> {
     }
 
     public void fromRow(Row row) {
+        row.getCell(1).setCellType(CellType.STRING);
         this.setName(row.getCell(0).getStringCellValue());
         this.setSpec(row.getCell(1).getStringCellValue());
         this.setMaterial(row.getCell(2).getStringCellValue());