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 414fbcf..d8ada1b 100644 --- a/src/main/java/mjkf/xinke/main/model/db/SanmingSteel.java +++ b/src/main/java/mjkf/xinke/main/model/db/SanmingSteel.java @@ -42,7 +42,7 @@ public class SanmingSteel extends Model { @TableField("SPEC") private String spec; - @ApiModelProperty("材质") + @ApiModelProperty("材料id") @TableField("MATERIAL") private String material; @@ -65,15 +65,16 @@ public class SanmingSteel extends Model { public SanmingSteel () {} - public SanmingSteel (Row row, MaterialTask data) { + public SanmingSteel (Row row, MaterialTask task) { var policy = Row.MissingCellPolicy.CREATE_NULL_AS_BLANK; row.getCell(1).setCellType(CellType.STRING); - this.setName(row.getCell(0, policy).getStringCellValue()); - this.setSpec(row.getCell(1, policy).getStringCellValue()); - this.setMaterial(row.getCell(2, policy).getStringCellValue()); + this.setName(row.getCell(1, policy).getStringCellValue()); + this.setSpec(row.getCell(2, policy).getStringCellValue()); + this.setMaterial(row.getCell(0, policy).getStringCellValue()); this.setPrice(BigDecimal.valueOf(row.getCell(3, policy).getNumericCellValue())); this.setFluctuating(BigDecimal.valueOf(row.getCell(4, policy).getNumericCellValue())); - this.setDate(row.getCell(5, policy).getLocalDateTimeCellValue().toLocalDate()); + // this.setDate(row.getCell(5, policy).getLocalDateTimeCellValue().toLocalDate()); + this.setDate(LocalDate.of(task.getYear(), task.getMonth(), 1)); // 从任务获取日期 } public SanmingSteel update(SanmingSteel item) {