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 { 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 { 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> extends Model { } 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());