diff --git a/src/main/java/mjkf/xinke/main/controller/MaterialController.java b/src/main/java/mjkf/xinke/main/controller/MaterialController.java index e67871a..90eb348 100644 --- a/src/main/java/mjkf/xinke/main/controller/MaterialController.java +++ b/src/main/java/mjkf/xinke/main/controller/MaterialController.java @@ -1,9 +1,7 @@ package mjkf.xinke.main.controller; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.jgy.xxs.core.common.util.CommonUtil; import com.jgy.xxs.core.http.exp.NcHttpException; import com.jgy.xxs.core.http.resp.HttpResponse; import io.swagger.annotations.ApiOperation; @@ -22,7 +20,6 @@ import javax.annotation.Resource; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; /** *

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 0fd0b8c..590bb1c 100644 --- a/src/main/java/mjkf/xinke/main/model/db/SanmingSteel.java +++ b/src/main/java/mjkf/xinke/main/model/db/SanmingSteel.java @@ -13,6 +13,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; /** @@ -50,6 +51,7 @@ public class SanmingSteel extends Model { @TableField("PRICE") private BigDecimal price; + @Deprecated @ApiModelProperty("浮动") @TableField("FLUCTUATING") private BigDecimal fluctuating; @@ -67,6 +69,8 @@ public class SanmingSteel extends Model { public SanmingSteel (Row row, MaterialTask task) { var policy = Row.MissingCellPolicy.CREATE_NULL_AS_BLANK; + row.getCell(0, policy).setCellType(CellType.STRING); + row.getCell(3, policy).setCellType(CellType.NUMERIC); String material = row.getCell(0, policy).getStringCellValue(); String name = row.getCell(1, policy).getStringCellValue(); String spec = row.getCell(2, policy).getStringCellValue();