From a35ceb8ce18a9dcdb87c3160dfcc9555b130f34a Mon Sep 17 00:00:00 2001 From: mashuai Date: Mon, 29 Sep 2025 16:16:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=95=B0=E5=AD=97=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=A0=BC=E5=BC=8F=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/domain/lease/LeaseOutDetails.java | 2 +- .../basic/domain/InputRecordInfo.java | 2 +- .../material/basic/domain/OutRecordInfo.java | 2 +- .../basic/domain/ProjUsingRecord.java | 10 ++++----- .../basic/domain/PurchaseInputInfo.java | 4 ++-- .../basic/domain/RepairInputRecord.java | 4 ++-- .../basic/domain/RepairStorageInfo.java | 4 ++-- .../basic/domain/RetainedEquipmentInfo.java | 22 +++++++++---------- .../material/basic/domain/ScrapAuditInfo.java | 4 ++-- .../basic/domain/ScrapRecordInfo.java | 4 ++-- .../material/basic/domain/StorageInfo.java | 4 ++-- .../material/basic/domain/UseStorageInfo.java | 4 ++-- .../basic/domain/report/BackInputInfo.java | 2 +- .../back/MaterialBackApplyTotalInfo.java | 2 +- .../clz/domain/vo/MaterialProvideNumInfo.java | 10 ++++----- .../clz/domain/vo/MaterialSecondInfo.java | 6 ++--- .../vo/MaterialStorageAndUseNumInfo.java | 4 ++-- .../lease/domain/LeaseApplyDetails.java | 2 +- .../bonus/material/ma/domain/PartType.java | 2 +- .../ma/domain/vo/StandardConfigDetailsVo.java | 2 +- .../push/domain/PushDataReceiveDetail.java | 2 +- .../scrap/domain/vo/ScrapDetailsListVo.java | 4 ++-- .../settlement/domain/SltAgreementApply.java | 2 +- 23 files changed, 52 insertions(+), 52 deletions(-) diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseOutDetails.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseOutDetails.java index e19dce57..a38bd050 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseOutDetails.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseOutDetails.java @@ -63,7 +63,7 @@ public class LeaseOutDetails extends BaseEntity { private Integer outType; /** 预领料数 */ - @Excel(name = "预领料数", align = HorizontalAlignment.RIGHT) + @Excel(name = "预领料数", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) @ApiModelProperty(value = "预领料数") private BigDecimal outNum; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/InputRecordInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/InputRecordInfo.java index b5623762..1159b0b5 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/InputRecordInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/InputRecordInfo.java @@ -45,7 +45,7 @@ public class InputRecordInfo { private String unit; @ApiModelProperty(value = "入库数量") - @Excel(name = "入库数量", align = HorizontalAlignment.RIGHT) + @Excel(name = "入库数量", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal inputNum; @ApiModelProperty(value = "入库人员") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/OutRecordInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/OutRecordInfo.java index 243c270d..bd3973ea 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/OutRecordInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/OutRecordInfo.java @@ -68,7 +68,7 @@ public class OutRecordInfo { private String unit; @ApiModelProperty(value = "出库数量") - @Excel(name = "出库数量", align = HorizontalAlignment.RIGHT) + @Excel(name = "出库数量", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal outNum; @ApiModelProperty(value = "出库人员") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ProjUsingRecord.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ProjUsingRecord.java index c50c1a9d..18540f0a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ProjUsingRecord.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ProjUsingRecord.java @@ -70,23 +70,23 @@ public class ProjUsingRecord { private String unit; @ApiModelProperty(value = "领用数量") - @Excel(name = "领用数量", align = HorizontalAlignment.RIGHT) + @Excel(name = "领用数量", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal leaseNum; @ApiModelProperty(value = "归还数量") - @Excel(name = "归还数量", align = HorizontalAlignment.RIGHT) + @Excel(name = "归还数量", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal backNum; @ApiModelProperty(value = "在用数量") - @Excel(name = "在用数量", align = HorizontalAlignment.RIGHT) + @Excel(name = "在用数量", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal usNum; @ApiModelProperty(value = "在用总价值（元）") - @Excel(name = "在用总价值(元)", align = HorizontalAlignment.RIGHT) + @Excel(name = "在用总价值(元)", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal usPrice; @ApiModelProperty(value = "投入总价值（元）") - @Excel(name = "投入总价值(元)", align = HorizontalAlignment.RIGHT) + @Excel(name = "投入总价值(元)", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal totalPrice; @ApiModelProperty(value = "关键字") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/PurchaseInputInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/PurchaseInputInfo.java index 365bcff6..b4706d89 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/PurchaseInputInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/PurchaseInputInfo.java @@ -36,11 +36,11 @@ public class PurchaseInputInfo { private String typeModelName; @ApiModelProperty(value = "新购待入库数量") - @Excel(name = "新购待入库数量", align = HorizontalAlignment.RIGHT) + @Excel(name = "新购待入库数量", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal inputNum; @ApiModelProperty(value = "购置单价") - @Excel(name = "原值（元）", align = HorizontalAlignment.RIGHT) + @Excel(name = "原值（元）", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal buyPrice; @ApiModelProperty(value = "设备编码") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/RepairInputRecord.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/RepairInputRecord.java index a3383701..9e4adece 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/RepairInputRecord.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/RepairInputRecord.java @@ -33,11 +33,11 @@ public class RepairInputRecord { private String typeModelName; @ApiModelProperty(value = "修饰待入库数量") - @Excel(name = "修饰待入库数量", align = HorizontalAlignment.RIGHT) + @Excel(name = "修饰待入库数量", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal repairInputNum; @ApiModelProperty(value = "购置单价") - @Excel(name = "原值（元）", align = HorizontalAlignment.RIGHT) + @Excel(name = "原值（元）", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal buyPrice; @ApiModelProperty(value = "设备编码") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/RepairStorageInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/RepairStorageInfo.java index 95315634..bfc21a60 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/RepairStorageInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/RepairStorageInfo.java @@ -36,11 +36,11 @@ public class RepairStorageInfo { private BigDecimal dsNum; @ApiModelProperty(value = "在修数量") - @Excel(name = "数量", align = HorizontalAlignment.RIGHT) + @Excel(name = "数量", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal repairNum; @ApiModelProperty(value = "购置单价") - @Excel(name = "原值（元）", align = HorizontalAlignment.RIGHT) + @Excel(name = "原值（元）", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal buyPrice; @ApiModelProperty(value = "设备编码") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/RetainedEquipmentInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/RetainedEquipmentInfo.java index 32a4fb6a..1319e255 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/RetainedEquipmentInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/RetainedEquipmentInfo.java @@ -59,50 +59,50 @@ public class RetainedEquipmentInfo { private String unit; @ApiModelProperty(value = "在库数量") - @Excel(name = "在库数量", align = HorizontalAlignment.RIGHT) + @Excel(name = "在库数量", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal storeNum; @ApiModelProperty(value = "在用数量") - @Excel(name = "在用数量", align = HorizontalAlignment.RIGHT) + @Excel(name = "在用数量", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal usNum; @ApiModelProperty(value = "定损数量") - @Excel(name = "定损数量", align = HorizontalAlignment.RIGHT) + @Excel(name = "定损数量", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal dsNum; @ApiModelProperty(value = "在修数量") - @Excel(name = "在修数量", align = HorizontalAlignment.RIGHT) + @Excel(name = "在修数量", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal repairNum; @ApiModelProperty(value = "修试待审核数量") - @Excel(name = "修试待审核数量", align = HorizontalAlignment.RIGHT) + @Excel(name = "修试待审核数量", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal repairAuditNum; @ApiModelProperty(value = "新购待入库") - @Excel(name = "新购待入库数量", align = HorizontalAlignment.RIGHT) + @Excel(name = "新购待入库数量", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal inputNum; @ApiModelProperty(value = "修试后待入库") - @Excel(name = "修试后待入库数量", align = HorizontalAlignment.RIGHT) + @Excel(name = "修试后待入库数量", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal repairInputNum; @ApiModelProperty(value = "待报废数量") - //@Excel(name = "待报废数量", align = HorizontalAlignment.RIGHT) + //@Excel(name = "待报废数量", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal pendingScrapNum; @ApiModelProperty(value = "已审核报废数量") - @Excel(name = "已审核报废数量", align = HorizontalAlignment.RIGHT) + @Excel(name = "已审核报废数量", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal scrapNum; @ApiModelProperty(value = "总保有量") - @Excel(name = "总保有数量", align = HorizontalAlignment.RIGHT) + @Excel(name = "总保有数量", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal allNum; @ApiModelProperty(value = "购置单价") private BigDecimal buyPrice; @ApiModelProperty(value = "投入总价值") - @Excel(name = "总保有量资产(万元)", align = HorizontalAlignment.RIGHT) + @Excel(name = "总保有量资产(万元)", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal totalPrice; @ApiModelProperty(value = "五年以内成新率") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ScrapAuditInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ScrapAuditInfo.java index 514d76cf..aa984a22 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ScrapAuditInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ScrapAuditInfo.java @@ -33,11 +33,11 @@ public class ScrapAuditInfo { private String typeModelName; @ApiModelProperty(value = "报废数量") - @Excel(name = "报废数量", align = HorizontalAlignment.RIGHT) + @Excel(name = "报废数量", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal scrapNum; @ApiModelProperty(value = "购置单价") - @Excel(name = "原值（元）", align = HorizontalAlignment.RIGHT) + @Excel(name = "原值（元）", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal buyPrice; @ApiModelProperty(value = "设备编码") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ScrapRecordInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ScrapRecordInfo.java index 866dd1f1..b7ceefc6 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ScrapRecordInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ScrapRecordInfo.java @@ -33,11 +33,11 @@ public class ScrapRecordInfo { private String typeModelName; @ApiModelProperty(value = "报废数量") - @Excel(name = "报废数量", align = HorizontalAlignment.RIGHT) + @Excel(name = "报废数量", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal scrapNum; @ApiModelProperty(value = "购置单价") - @Excel(name = "原值（元）", align = HorizontalAlignment.RIGHT) + @Excel(name = "原值（元）", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal buyPrice; @ApiModelProperty(value = "设备编码") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/StorageInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/StorageInfo.java index 44d9b1a6..d2382cc8 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/StorageInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/StorageInfo.java @@ -33,11 +33,11 @@ public class StorageInfo { private String typeModelName; @ApiModelProperty(value = "入库数量") - @Excel(name = "入库数量", align = HorizontalAlignment.RIGHT) + @Excel(name = "入库数量", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal storeNum; @ApiModelProperty(value = "购置单价") - @Excel(name = "原值（元）", align = HorizontalAlignment.RIGHT) + @Excel(name = "原值（元）", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal buyPrice; @ApiModelProperty(value = "设备编码") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/UseStorageInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/UseStorageInfo.java index 850bf4ef..9b37ade0 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/UseStorageInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/UseStorageInfo.java @@ -36,11 +36,11 @@ public class UseStorageInfo { private String typeModelName; @ApiModelProperty(value = "在用数量") - @Excel(name = "在用数量", align = HorizontalAlignment.RIGHT) + @Excel(name = "在用数量", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal usNum; @ApiModelProperty(value = "购置单价") - @Excel(name = "原值（元）", align = HorizontalAlignment.RIGHT) + @Excel(name = "原值（元）", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal buyPrice; @ApiModelProperty(value = "设备编码") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/report/BackInputInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/report/BackInputInfo.java index ec13f856..7e73f205 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/report/BackInputInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/report/BackInputInfo.java @@ -39,7 +39,7 @@ public class BackInputInfo { private String unitName; @ApiModelProperty(value = "退料数量") - @Excel(name = "退料数量", align = HorizontalAlignment.RIGHT) + @Excel(name = "退料数量", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal backNum; @ApiModelProperty(value = "退料日期") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/back/MaterialBackApplyTotalInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/back/MaterialBackApplyTotalInfo.java index 0be174d1..b4b74b8d 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/back/MaterialBackApplyTotalInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/back/MaterialBackApplyTotalInfo.java @@ -58,7 +58,7 @@ public class MaterialBackApplyTotalInfo implements Serializable { /** 退料数量 */ @ApiModelProperty(value = "退料数量") - @Excel(name = "退料数量", align = HorizontalAlignment.RIGHT) + @Excel(name = "退料数量", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal backNum; @ApiModelProperty(value = "退料日期") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialProvideNumInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialProvideNumInfo.java index 7ceb76e5..2eeb1c73 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialProvideNumInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialProvideNumInfo.java @@ -42,7 +42,7 @@ public class MaterialProvideNumInfo { private String departName; @ApiModelProperty(value = "工程名称") - @Excel(name = "工程名称", width = 50) + @Excel(name = "工程名称", width = 65) private String proName; @ApiModelProperty(value = "施工类型") @@ -70,19 +70,19 @@ public class MaterialProvideNumInfo { private String unit; @ApiModelProperty(value = "业务需求数量") - @Excel(name = "业务需求数量",align = HorizontalAlignment.RIGHT) + @Excel(name = "业务需求数量",align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal businessNum; @ApiModelProperty(value = "实际供应数量") - @Excel(name = "实际供应数量",align = HorizontalAlignment.RIGHT) + @Excel(name = "实际供应数量",align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal supplyNum; @ApiModelProperty(value = "在库数量") - @Excel(name = "在库数量",align = HorizontalAlignment.RIGHT) + @Excel(name = "在库数量",align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal storeNum; @ApiModelProperty(value = "在用数量") - @Excel(name = "在用数量",align = HorizontalAlignment.RIGHT) + @Excel(name = "在用数量",align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal useNum; @ApiModelProperty(value = "数量") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialSecondInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialSecondInfo.java index 77531821..501427d1 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialSecondInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialSecondInfo.java @@ -66,15 +66,15 @@ public class MaterialSecondInfo { private String unit; @ApiModelProperty(value = "领用数量") - @Excel(name = "领用数量", align = HorizontalAlignment.RIGHT) + @Excel(name = "领用数量", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal leaseNum; @ApiModelProperty(value = "退料数量") - @Excel(name = "退料数量", align = HorizontalAlignment.RIGHT) + @Excel(name = "退料数量", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal backNum; @ApiModelProperty(value = "在用数量") - @Excel(name = "在用数量", align = HorizontalAlignment.RIGHT) + @Excel(name = "在用数量", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal useNum; @ApiModelProperty(value = "购置单价") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialStorageAndUseNumInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialStorageAndUseNumInfo.java index 6316059a..d16b4de5 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialStorageAndUseNumInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialStorageAndUseNumInfo.java @@ -72,11 +72,11 @@ public class MaterialStorageAndUseNumInfo { private String unit; @ApiModelProperty(value = "在库数量") - @Excel(name = "在库数量",align = HorizontalAlignment.RIGHT) + @Excel(name = "在库数量",align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal storeNum; @ApiModelProperty(value = "在用数量") - @Excel(name = "在用数量",align = HorizontalAlignment.RIGHT) + @Excel(name = "在用数量",align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal usNum; @ApiModelProperty(value = "数量") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyDetails.java index 17d1d6f3..965c3116 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyDetails.java @@ -79,7 +79,7 @@ public class LeaseApplyDetails extends BaseEntity { private String unitValue; /** 库存数量 */ @ApiModelProperty(value = "库存数量") - @Excel(name = "当前库存", align = HorizontalAlignment.RIGHT) + @Excel(name = "当前库存", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal storageNum; @ApiModelProperty(value = "已发布数量") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/PartType.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/PartType.java index 83d14650..3ceb4d6b 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/PartType.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/PartType.java @@ -63,7 +63,7 @@ public class PartType extends BaseEntity private String unitName; /** 原值 */ - @Excel(name = "购置价格（元）",sort=5, align = HorizontalAlignment.RIGHT) + @Excel(name = "购置价格（元）",sort=5, align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) @ApiModelProperty(value = "原值") @Size(max=10, message = "购置价格长度不能超过10") private BigDecimal buyPrice; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/StandardConfigDetailsVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/StandardConfigDetailsVo.java index 1a1d9335..156eecbc 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/StandardConfigDetailsVo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/StandardConfigDetailsVo.java @@ -70,7 +70,7 @@ public class StandardConfigDetailsVo { private String unitName; @ApiModelProperty(value = "数量") - @Excel(name = "数量", align = HorizontalAlignment.RIGHT) + @Excel(name = "数量", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal num; @ApiModelProperty(value = "预领数量") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/PushDataReceiveDetail.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/PushDataReceiveDetail.java index 0e734cdc..ab023449 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/PushDataReceiveDetail.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/PushDataReceiveDetail.java @@ -48,7 +48,7 @@ public class PushDataReceiveDetail extends BaseEntity { private Date rentTime; /** 租赁价格 */ - @Excel(name = "租赁价格", align = HorizontalAlignment.RIGHT) + @Excel(name = "租赁价格", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) @ApiModelProperty(value = "租赁价格") private BigDecimal rentPrice; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/domain/vo/ScrapDetailsListVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/domain/vo/ScrapDetailsListVo.java index 360ef5e5..3bc83d51 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/domain/vo/ScrapDetailsListVo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/domain/vo/ScrapDetailsListVo.java @@ -32,12 +32,12 @@ public class ScrapDetailsListVo { private String unitName; /** 报废数量 */ - @Excel(name = "报废数量", align = HorizontalAlignment.RIGHT) + @Excel(name = "报废数量", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) @ApiModelProperty(value = "报废数量") private BigDecimal scrapNum; @ApiModelProperty(value = "费用合计") - @Excel(name = "报废费用(万元)", align = HorizontalAlignment.RIGHT) + @Excel(name = "报废费用(万元)", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) private BigDecimal totalCost; @ApiModelProperty(value = "购置价") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementApply.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementApply.java index 1e7c02cd..77fa49b8 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementApply.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementApply.java @@ -69,7 +69,7 @@ public class SltAgreementApply extends BaseEntity { private Long companyId; /** 结算总费用 */ - @Excel(name = "结算总费用", align = HorizontalAlignment.RIGHT) + @Excel(name = "结算总费用", align = HorizontalAlignment.RIGHT, cellType = Excel.ColumnType.NUMERIC) @ApiModelProperty(value = "结算总费用") private BigDecimal cost;