diff --git a/src/main/java/mjkf/xinke/main/controller/LocalMaterialController.java b/src/main/java/mjkf/xinke/main/controller/LocalMaterialController.java index 9232b7d..a3fb199 100644 --- a/src/main/java/mjkf/xinke/main/controller/LocalMaterialController.java +++ b/src/main/java/mjkf/xinke/main/controller/LocalMaterialController.java @@ -20,7 +20,6 @@ import javax.annotation.Resource; import java.time.LocalDate; import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.stream.Collectors; /** diff --git a/src/main/java/mjkf/xinke/main/model/db/LocalMaterial.java b/src/main/java/mjkf/xinke/main/model/db/LocalMaterial.java index d3a25e5..d4709ef 100644 --- a/src/main/java/mjkf/xinke/main/model/db/LocalMaterial.java +++ b/src/main/java/mjkf/xinke/main/model/db/LocalMaterial.java @@ -11,6 +11,8 @@ import java.math.BigDecimal; import java.time.LocalDate; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.annotation.JsonNaming; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; @@ -29,6 +31,7 @@ import org.apache.poi.ss.usermodel.Row; @Setter @TableName("LOCAL_MATERIAL") @ApiModel(value = "LocalMaterial对象", description = "地材") +@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class) public class LocalMaterial extends Model { private static final long serialVersionUID = 1L; @@ -65,6 +68,10 @@ public class LocalMaterial extends Model { @TableField("PRICE") private BigDecimal price; + @ApiModelProperty("除税价") + @TableField("PRICE_WITHOUT_TAX") + private BigDecimal priceWithoutTax; + @ApiModelProperty("日期") @TableField("`DATE`") private LocalDate date; @@ -93,6 +100,7 @@ public class LocalMaterial extends Model { this.setSpec(row.getCell(4, policy).getStringCellValue()); this.setUnit(row.getCell(5, policy).getStringCellValue()); this.setPrice(BigDecimal.valueOf(row.getCell(6, policy).getNumericCellValue())); + this.setPriceWithoutTax(BigDecimal.valueOf(row.getCell(7, policy).getNumericCellValue())); this.setPosition(row.getCell(8, policy).getStringCellValue()); this.setRemark(row.getCell(9, policy).getStringCellValue());