From 22ff83a17a6bcde1d057b6c9512f85448506d2b0 Mon Sep 17 00:00:00 2001 From: han0 Date: Tue, 10 Dec 2024 15:48:55 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8F=98=E6=9B=B4=E4=B8=89=E6=98=8E?= =?UTF-8?q?=E9=92=A2=E9=93=81=E6=A8=A1=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/mjkf/xinke/main/model/db/SanmingSteel.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) 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) {