From 5044c07eb967aa81fe96a4adb1ee5354c8cb1311 Mon Sep 17 00:00:00 2001
From: han0 <wslshanlin@sina.com>
Date: Thu, 4 Jan 2024 16:09:52 +0800
Subject: [PATCH] =?UTF-8?q?feat(local-material):=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=9C=B0=E6=9D=90=E9=99=A4=E7=A8=8E=E4=BB=B7=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xinke/main/controller/LocalMaterialController.java    | 1 -
 src/main/java/mjkf/xinke/main/model/db/LocalMaterial.java | 8 ++++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

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<LocalMaterial> {
 
     private static final long serialVersionUID = 1L;
@@ -65,6 +68,10 @@ public class LocalMaterial extends Model<LocalMaterial> {
     @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<LocalMaterial> {
         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());