From a917964c9668acc74e8fc83688a23d7a93b8f1f5 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Fri, 6 Sep 2024 17:31:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=B8=AD=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=E3=80=81=E6=95=B0=E9=87=8F=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/sgzb/material/domain/LeaseInfo.java | 12 ++++++----
 .../sgzb/material/domain/LeaseRecord.java     |  4 ++--
 .../bonus/sgzb/material/domain/LoseInfo.java  | 10 ++++----
 .../sgzb/material/domain/MonthRepairInfo.java | 24 +++++++++----------
 .../material/domain/PurchaseMacodeInfo.java   | 12 +++++-----
 .../sgzb/material/domain/RepairInfo.java      | 22 +++++++++--------
 .../sgzb/material/domain/RepairPart.java      |  6 +++--
 .../bonus/sgzb/material/domain/ScrapInfo.java | 10 ++++----
 .../sgzb/material/domain/preScrapInfo.java    | 10 ++++----
 9 files changed, 61 insertions(+), 49 deletions(-)

diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LeaseInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LeaseInfo.java
index 5fda1ac..f09b7a2 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LeaseInfo.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LeaseInfo.java
@@ -4,6 +4,8 @@ import com.bonus.sgzb.common.core.annotation.Excel;
 import com.bonus.sgzb.common.core.annotation.Excels;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * @author c liu
  * @date 2024/2/21
@@ -42,7 +44,7 @@ public class LeaseInfo {
     /**
      *原值
      */
-    private String buyPrice;
+    private BigDecimal buyPrice;
     /**
      *
      */
@@ -84,12 +86,12 @@ public class LeaseInfo {
      *租赁单价
      */
     @Excel(name = "台班费单价（元/天）")
-    private String leasePrice;
+    private BigDecimal leasePrice;
     /**
      *领料数量
      */
     @Excel(name = "数量")
-    private String num;
+    private Integer num;
     /**
      *领料时间
      */
@@ -114,12 +116,12 @@ public class LeaseInfo {
      * 应结算金额
      */
     @Excel(name = "应结算金额（元）")
-    private String costs;
+    private BigDecimal costs;
     /**
      * 实际结算金额
      */
     @Excel(name = "实际结算金额（元）")
-    private String realCosts;
+    private BigDecimal realCosts;
     /**
      * 实际结算金额
      */
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LeaseRecord.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LeaseRecord.java
index 88cb727..e04d14a 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LeaseRecord.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LeaseRecord.java
@@ -70,7 +70,7 @@ public class LeaseRecord{
      */
     @ApiModelProperty(value = "预领料数")
     @Excel(name = "领料数量",cellType = Excel.ColumnType.NUMERIC)
-    private Double preNum;
+    private Integer preNum;
 
     /**
      * 领料人
@@ -177,6 +177,6 @@ public class LeaseRecord{
      * 实时库存
      */
     @ApiModelProperty(value = "实时库存")
-    private Double num;
+    private Integer num;
 
 }
\ No newline at end of file
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LoseInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LoseInfo.java
index 9454405..1f08e73 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LoseInfo.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LoseInfo.java
@@ -3,6 +3,8 @@ package com.bonus.sgzb.material.domain;
 import com.bonus.sgzb.common.core.annotation.Excel;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * @author c liu
  * @date 2024/2/21
@@ -42,7 +44,7 @@ public class LoseInfo {
      *原值
      */
     @Excel(name = "赔偿单价")
-    private String buyPrice;
+    private BigDecimal buyPrice;
     /**
      *
      */
@@ -78,12 +80,12 @@ public class LoseInfo {
     /**
      *租赁单价
      */
-    private String leasePrice;
+    private BigDecimal leasePrice;
     /**
      *领料数量
      */
     @Excel(name = "未还数量")
-    private String num;
+    private Integer num;
     /**
      *领料时间
      */
@@ -100,7 +102,7 @@ public class LoseInfo {
      * 租赁费用
      */
     @Excel(name = "赔偿金额")
-    private String costs;
+    private BigDecimal costs;
     /**
      * 类型（0不收费，1收费）
      */
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MonthRepairInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MonthRepairInfo.java
index eea8b38..a992750 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MonthRepairInfo.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MonthRepairInfo.java
@@ -17,13 +17,13 @@ public class MonthRepairInfo {
      */
 //    @Excel(name = "数量",sort = 4)
     @ExcelProperty(index = 4, value = "数量")
-    private String num;
+    private Integer num;
 
-    public String getNum() {
+    public Integer getNum() {
         return num;
     }
 
-    public void setNum(String num) {
+    public void setNum(Integer num) {
         this.num = num;
     }
 
@@ -43,11 +43,11 @@ public class MonthRepairInfo {
         this.endTime = endTime;
     }
 
-    public String getLeasePrice() {
+    public BigDecimal getLeasePrice() {
         return leasePrice;
     }
 
-    public void setLeasePrice(String leasePrice) {
+    public void setLeasePrice(BigDecimal leasePrice) {
         this.leasePrice = leasePrice;
     }
 
@@ -99,19 +99,19 @@ public class MonthRepairInfo {
         this.leaseDays = leaseDays;
     }
 
-    public String getCosts() {
+    public BigDecimal getCosts() {
         return costs;
     }
 
-    public void setCosts(String costs) {
+    public void setCosts(BigDecimal costs) {
         this.costs = costs;
     }
 
-    public String getRealCosts() {
+    public BigDecimal getRealCosts() {
         return realCosts;
     }
 
-    public void setRealCosts(String realCosts) {
+    public void setRealCosts(BigDecimal realCosts) {
         this.realCosts = realCosts;
     }
 
@@ -148,7 +148,7 @@ public class MonthRepairInfo {
      */
 //    @Excel(name = "台班费单价（元/天）",sort = 5)
     @ExcelProperty(index = 5, value = "台班费单价（元/天）")
-    private String leasePrice;
+    private BigDecimal leasePrice;
 
     /**
      * 项目名称
@@ -191,14 +191,14 @@ public class MonthRepairInfo {
      */
 //    @Excel(name = "结算金额",sort = 9)
     @ExcelProperty(index = 9, value = "结算金额")
-    private String costs;
+    private BigDecimal costs;
 
     /**
      * 真实租赁费用
      */
 //    @Excel(name = "本月暂计金额",sort = 10)
     @ExcelProperty(index = 10, value = "本月暂计金额")
-    private String realCosts;
+    private BigDecimal realCosts;
 
     /**
      * 费用承担方
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java
index 5f3d277..72ac4bd 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java
@@ -84,11 +84,11 @@ public class PurchaseMacodeInfo extends BaseEntity
 
     /** 采购数量 */
     @ApiModelProperty(value = "采购数量")
-    private Long purchaseNum;
+    private Integer purchaseNum;
 
     /** 验收数量 */
     @ApiModelProperty(value = "验收数量")
-    private BigDecimal checkNum;
+    private Integer checkNum;
 
     /** 验收数量 */
     @ApiModelProperty(value = "绑定数量")
@@ -276,19 +276,19 @@ public class PurchaseMacodeInfo extends BaseEntity
         this.maId = maId;
     }
 
-    public Long getPurchaseNum() {
+    public Integer getPurchaseNum() {
         return purchaseNum;
     }
 
-    public void setPurchaseNum(Long purchaseNum) {
+    public void setPurchaseNum(Integer purchaseNum) {
         this.purchaseNum = purchaseNum;
     }
 
-    public BigDecimal getCheckNum() {
+    public Integer getCheckNum() {
         return checkNum;
     }
 
-    public void setCheckNum(BigDecimal checkNum) {
+    public void setCheckNum(Integer checkNum) {
         this.checkNum = checkNum;
     }
 
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairInfo.java
index cab0d9d..2027199 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairInfo.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairInfo.java
@@ -3,6 +3,8 @@ package com.bonus.sgzb.material.domain;
 import com.bonus.sgzb.common.core.annotation.Excel;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * @author c liu
  * @date 2024/2/21
@@ -41,7 +43,7 @@ public class RepairInfo {
     /**
      *原值
      */
-    private String buyPrice;
+    private BigDecimal buyPrice;
     /**
      *
      */
@@ -82,16 +84,16 @@ public class RepairInfo {
     /**
      *租赁单价
      */
-    private String leasePrice;
+    private BigDecimal leasePrice;
     /**
      *领料数量
      */
-    private String num;
+    private Integer num;
     /**
      *领料数量
      */
     @Excel(name = "配件数量",sort = 6)
-    private String partNum;
+    private Integer partNum;
     /**
      *领料时间
      */
@@ -111,30 +113,30 @@ public class RepairInfo {
     /**
      * 应结算金额
      */
-    private String costs;
+    private BigDecimal costs;
 
     @Excel(name = "配件单价",sort = 7)
-    private String partPrice;
+    private BigDecimal partPrice;
     /**
      * 实际结算金额
      */
 //    @Excel(name = "实际结算金额（元）")
-    private String realCosts;
+    private BigDecimal realCosts;
     /**
      * 配件总价
      */
     @Excel(name = "配件总价（元）",sort = 8)
-    private String partAllCosts;
+    private BigDecimal partAllCosts;
     /**
      * 费用总价
      */
 //    @Excel(name = "费用总价")
-    private String allCosts;
+    private BigDecimal allCosts;
     /**
      * 委外维修费用
      */
 //    @Excel(name = "委外维修费用")
-    private String outSourceCosts;
+    private BigDecimal outSourceCosts;
     /**
      * 实际结算金额
      */
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairPart.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairPart.java
index 1ca3301..0efc4ca 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairPart.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairPart.java
@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * @author c liu
  * @date 2023/12/11
@@ -50,12 +52,12 @@ public class RepairPart {
      * 配件费用
      */
     @ApiModelProperty(value = "配件费用")
-    private String partCost;
+    private BigDecimal partCost;
     /**
      * 配件单价
      */
     @ApiModelProperty(value = "配件单价")
-    private String partPrice;
+    private BigDecimal partPrice;
     /**
      * 类型（0不收费，1收费）
      */
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ScrapInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ScrapInfo.java
index 6d179f5..0ba0da8 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ScrapInfo.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ScrapInfo.java
@@ -3,6 +3,8 @@ package com.bonus.sgzb.material.domain;
 import com.bonus.sgzb.common.core.annotation.Excel;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * @author c liu
  * @date 2024/2/21
@@ -47,7 +49,7 @@ public class ScrapInfo {
      *原值
      */
     @Excel(name = "赔偿单价",sort = 6)
-    private String buyPrice;
+    private BigDecimal buyPrice;
     /**
      *
      */
@@ -78,12 +80,12 @@ public class ScrapInfo {
     /**
      *租赁单价
      */
-    private String leasePrice;
+    private BigDecimal leasePrice;
     /**
      *领料数量
      */
     @Excel(name = "报废数量",sort = 5)
-    private String num;
+    private Integer num;
     /**
      *领料时间
      */
@@ -104,7 +106,7 @@ public class ScrapInfo {
      * 租赁费用
      */
     @Excel(name = "赔偿金额",sort = 7)
-    private String costs;
+    private BigDecimal costs;
     /**
      * 类型（0不收费，1收费）
      */
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/preScrapInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/preScrapInfo.java
index 6e2db97..1bb879e 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/preScrapInfo.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/preScrapInfo.java
@@ -3,6 +3,8 @@ package com.bonus.sgzb.material.domain;
 import com.bonus.sgzb.common.core.annotation.Excel;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * @author c liu
  * @date 2024/2/21
@@ -47,7 +49,7 @@ public class preScrapInfo {
     /**
      *原值
      */
-    private String buyPrice;
+    private BigDecimal buyPrice;
     /**
      *
      */
@@ -78,14 +80,14 @@ public class preScrapInfo {
     /**
      *租赁单价
      */
-    private String leasePrice;
+    private BigDecimal leasePrice;
 
 
     /**
      *领料数量
      */
     @Excel(name = "报废数量",sort = 5)
-    private String num;
+    private Integer num;
     /**
      *领料时间
      */
@@ -105,7 +107,7 @@ public class preScrapInfo {
     /**
      * 租赁费用
      */
-    private String costs;
+    private BigDecimal costs;
     /**
      * 类型（0不收费，1收费）
      */