From 79d889a76e7086d0e088e55a36d0cea5edb62ff6 Mon Sep 17 00:00:00 2001
From: han0 <wslshanlin@sina.com>
Date: Thu, 30 Nov 2023 16:22:46 +0800
Subject: [PATCH] =?UTF-8?q?feat(material-task):=20=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E7=A6=8F=E5=BB=BA=E8=B0=83=E6=9F=A5=E8=A1=A8=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/MaterialTaskController.java    |  6 ---
 .../xinke/main/model/db/FujianSurvey.java     | 34 +++++++++++--
 .../java/mjkf/xinke/main/model/db/Oil.java    | 51 +++++++++++++++++++
 3 files changed, 81 insertions(+), 10 deletions(-)
 create mode 100644 src/main/java/mjkf/xinke/main/model/db/Oil.java

diff --git a/src/main/java/mjkf/xinke/main/controller/MaterialTaskController.java b/src/main/java/mjkf/xinke/main/controller/MaterialTaskController.java
index 277de39..96f0d03 100644
--- a/src/main/java/mjkf/xinke/main/controller/MaterialTaskController.java
+++ b/src/main/java/mjkf/xinke/main/controller/MaterialTaskController.java
@@ -2,23 +2,17 @@ package mjkf.xinke.main.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.google.gson.JsonObject;
-import com.jgy.xxs.core.http.exp.NcHttpException;
 import com.jgy.xxs.core.http.resp.HttpResponse;
-import com.jgy.xxs.core.http.resp.NcHttpResponse;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import mjkf.xinke.auth.core.util.StpLoginUserUtil;
 import mjkf.xinke.main.common.http.FuHttpResponse;
-import mjkf.xinke.main.constant.HttpErrorResponseEnum;
 import mjkf.xinke.main.model.db.MaterialTask;
 import mjkf.xinke.main.model.vo.MaterialTaskCreateRequest;
-import mjkf.xinke.main.service.DataToolService;
 import mjkf.xinke.main.service.MaterialTaskService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 
 /**
diff --git a/src/main/java/mjkf/xinke/main/model/db/FujianSurvey.java b/src/main/java/mjkf/xinke/main/model/db/FujianSurvey.java
index ad039a6..d04866d 100644
--- a/src/main/java/mjkf/xinke/main/model/db/FujianSurvey.java
+++ b/src/main/java/mjkf/xinke/main/model/db/FujianSurvey.java
@@ -12,6 +12,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;
 
 /**
@@ -49,6 +50,22 @@ public class FujianSurvey extends Model<FujianSurvey> {
     @TableField("`DATE`")
     private LocalDate date;
 
+    @ApiModelProperty("材料id")
+    @TableField("`MATERIAL_ID`")
+    private String materialId;
+
+    @ApiModelProperty("单位")
+    @TableField("`UNIT`")
+    private String unit;
+
+    @ApiModelProperty("品牌")
+    @TableField("`BRAND`")
+    private String brand;
+
+    @ApiModelProperty("税率")
+    @TableField("`TAX`")
+    private Integer tax;
+
     @Override
     public Serializable pkVal() {
         return this.id;
@@ -57,16 +74,25 @@ public class FujianSurvey extends Model<FujianSurvey> {
     public FujianSurvey () {}
 
     public FujianSurvey (Row row) {
-        this.setName(row.getCell(0).getStringCellValue());
-        this.setSpec(row.getCell(1).getStringCellValue());
-        this.setPrice(BigDecimal.valueOf(row.getCell(2).getNumericCellValue()));
-        this.setDate(row.getCell(3).getLocalDateTimeCellValue().toLocalDate());
+        var policy = Row.MissingCellPolicy.CREATE_NULL_AS_BLANK;
+        row.getCell(0).setCellType(CellType.STRING);
+        this.setMaterialId(row.getCell(0, policy).getStringCellValue());
+        this.setName(row.getCell(1, policy).getStringCellValue());
+        this.setSpec(row.getCell(2, policy).getStringCellValue());
+        this.setUnit(row.getCell(3, policy).getStringCellValue());
+        this.setBrand(row.getCell(4, policy).getStringCellValue());
+        this.setPrice(BigDecimal.valueOf(row.getCell(5, policy).getNumericCellValue()));
+        this.setTax(((Double) row.getCell(6, policy).getNumericCellValue()).intValue());
+        this.setDate(row.getCell(7, policy).getLocalDateTimeCellValue().toLocalDate());
     }
 
     public FujianSurvey update(FujianSurvey item) {
         this.setName(item.getName());
         this.setSpec(item.getSpec());
         this.setPrice(item.getPrice());
+        this.setUnit(item.getUnit());
+        this.setBrand(item.getBrand());
+        this.setTax(item.getTax());
         this.setDate(item.getDate());
         return this;
     }
diff --git a/src/main/java/mjkf/xinke/main/model/db/Oil.java b/src/main/java/mjkf/xinke/main/model/db/Oil.java
new file mode 100644
index 0000000..774763f
--- /dev/null
+++ b/src/main/java/mjkf/xinke/main/model/db/Oil.java
@@ -0,0 +1,51 @@
+package mjkf.xinke.main.model.db;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 成品油
+ * </p>
+ *
+ * @author han0
+ * @since 2023-11-07
+ */
+@Getter
+@Setter
+@TableName("OIL")
+@ApiModel(value = "Oil对象", description = "成品油")
+public class Oil extends Model<Oil> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty("名称")
+    @TableField("`NAME`")
+    private String name;
+
+    @ApiModelProperty("价格")
+    @TableField("PRICE")
+    private BigDecimal price;
+
+    @ApiModelProperty("日期")
+    @TableField("`DATE`")
+    private LocalDate date;
+
+    @Override
+    public Serializable pkVal() {
+        return this.id;
+    }
+}