导出数字类型格式转换

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;
 

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 = "入库人员")

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 = "出库人员")

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 = "关键字")

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 = "设备编码")

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 = "设备编码")

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 = "设备编码")

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 = "五年以内成新率")

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 = "设备编码")

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 = "设备编码")

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 = "设备编码")

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 = "设备编码")

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 = "退料日期")

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 = "退料日期")

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 = "数量")

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 = "购置单价")

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 = "数量")

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 = "已发布数量")

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;

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 = "预领数量")

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;
 

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 = "购置价")

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;