From 02a0d10ddb2cd3aec6df2df18095cb25292e318e Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Wed, 19 Mar 2025 10:31:36 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E8=B5=84=E7=B1=BB=E5=9E=8B=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=AF=BC=E5=87=BA=E6=98=AF=E4=B8=8D=E6=98=AF=E8=A1=A8?= =?UTF-8?q?=E5=A4=B4=E5=92=8C=E5=88=97=E8=A1=A8=E9=A1=B9=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E4=B8=8D=E4=B8=8A=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/material/ma/domain/Type.java | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Type.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Type.java index d65e9d1f..e10a5c11 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Type.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Type.java @@ -40,12 +40,12 @@ public class Type extends BaseEntity { /** 库管员昵称 */ @ApiModelProperty(value = "库管员昵称") - @Excel(name = "库管员昵称") + @Excel(name = "库管员昵称",sort = 7) private String keeperNickName; /** 库管员昵称 */ @ApiModelProperty(value = "库管员昵称id") - @Excel(name = "库管员昵称id") + @Excel(name = "库管员昵称id",sort = 8) private String keeperId; /** 左侧树用户id */ @@ -55,12 +55,12 @@ public class Type extends BaseEntity { /** 维修员昵称 */ @ApiModelProperty(value = "维修员昵称") - @Excel(name = "维修员昵称") + @Excel(name = "维修员昵称",sort = 9) private String repairNickName; /** 维修员昵称 */ @ApiModelProperty(value = "维修员昵称id") - @Excel(name = "维修员昵称id") + @Excel(name = "维修员昵称id",sort = 10) private String repairerId; private List repairerArr; /** 仓库名称 */ @@ -77,7 +77,7 @@ public class Type extends BaseEntity { private Long parentId; /** 实时库存 */ - @Excel(name = "实时库存") + @Excel(name = "实时库存",sort = 11) @ApiModelProperty(value = "实时库存") private BigDecimal storageNum; @@ -106,29 +106,29 @@ public class Type extends BaseEntity { /** 计量单位名称 */ @ApiModelProperty(value = "计量单位名称") - @Excel(name = "计量单位") + @Excel(name = "计量单位",sort = 12) private String unitName; /** 计量单位名称值0整型1小数 */ @ApiModelProperty(value = "计量单位名称0整型1小数") - @Excel(name = "计量单位0整型1小数") + @Excel(name = "计量单位0整型1小数",sort = 13) private String unitValue; /** 排序 */ @ApiModelProperty(value = "排序") - @Excel(name = "排序") + @Excel(name = "排序",sort = 14) private int sortNum; @ApiModelProperty(value = "最大排序，用于Tree排序") private transient int maxSortPriority; /** 管理方式(0编号 1计数) */ - @Excel(name = "管理方式(0编号 1计数)", readConverterExp = "0=编号,1=计数") + @Excel(name = "管理方式(0编号 1计数)",sort = 15) @ApiModelProperty(value = "管理方式(0编号 1计数)") private String manageType; /** 内部租赁单价 */ - @Excel(name = "内部租赁单价") + @Excel(name = "内部租赁单价",sort = 16) @ApiModelProperty(value = "内部租赁单价") private BigDecimal leasePrice; @@ -138,21 +138,21 @@ public class Type extends BaseEntity { /** 租赁费用生效时间 */ @ApiModelProperty(value = "租赁费用生效时间") @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "租赁费用生效时间", width = 30, dateFormat = "yyyy-MM-dd") + @Excel(name = "租赁费用生效时间", width = 30, dateFormat = "yyyy-MM-dd",sort = 17) private Date effTime; /** 外部租赁单价 */ - @Excel(name = "外部租赁单价") + @Excel(name = "外部租赁单价",sort = 18) @ApiModelProperty(value = "外部租赁单价") private BigDecimal rentPrice; /** 采购价原值 */ - @Excel(name = "采购价原值") + @Excel(name = "采购价原值",sort = 19) @ApiModelProperty(value = "采购价原值") private BigDecimal buyPrice; /** 丢失赔偿比率 */ - @Excel(name = "丢失赔偿比率") + @Excel(name = "丢失赔偿比率",sort = 20) @ApiModelProperty(value = "丢失赔偿比率") private BigDecimal payRatio; @@ -172,23 +172,23 @@ public class Type extends BaseEntity { private String level; /** 额定载荷 */ - @Excel(name = "额定载荷") + @Excel(name = "额定载荷",sort = 21) @ApiModelProperty(value = "额定载荷") private String ratedLoad; /** 试验载荷 */ - @Excel(name = "试验载荷") + @Excel(name = "试验载荷",sort = 22) @ApiModelProperty(value = "试验载荷") private String testLoad; /** 持荷时间 */ @ApiModelProperty(value = "持荷时间") @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "持荷时间", width = 30, dateFormat = "yyyy-MM-dd") + @Excel(name = "持荷时间", width = 30, dateFormat = "yyyy-MM-dd",sort = 23) private String holdingTime; /** 库存预警数量 */ - @Excel(name = "库存预警数量") + @Excel(name = "库存预警数量",sort = 24) @ApiModelProperty(value = "库存预警数量") private Long warnNum; @@ -196,20 +196,20 @@ public class Type extends BaseEntity { private String delFlag; /** 是否计划管理（0代表否 1代表是） */ - @Excel(name = "是否计划管理", readConverterExp = "0=代表否,1=代表是") + @Excel(name = "是否计划管理", readConverterExp = "0=代表否,1=代表是",sort = 25) private String isPlan; /** 是否安措费机具（0代表否1代表是） */ - @Excel(name = "是否安措费机具", readConverterExp = "0=代表否1代表是") + @Excel(name = "是否安措费机具", readConverterExp = "0=代表否1代表是",sort = 26) private String isAncuo; /** 厂家规格型号 */ - @Excel(name = "厂家规格型号") + @Excel(name = "厂家规格型号",sort = 27) @ApiModelProperty(value = "厂家规格型号") private String facModel; /** 左侧树用户id */ - @Excel(name = "左侧树用户id") + @Excel(name = "左侧树用户id",sort = 28) @ApiModelProperty(value = "左侧树用户id") private Long userId; @@ -217,7 +217,7 @@ public class Type extends BaseEntity { private Long companyId; /** 推送智慧工程定义的门类分类机具编码 */ - @Excel(name = "推送智慧工程定义的门类分类机具编码") + @Excel(name = "推送智慧工程定义的门类分类机具编码",sort = 29) @ApiModelProperty(value = "推送智慧工程定义的门类分类机具编码") private String intelligentCode;