From 7d5d6d104b0ad994b62b53683d752b4fec61b8c1 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期二, 15 七月 2025 21:13:29 +0800 Subject: [PATCH] art: 技术状态鉴定工单-字段转译 --- lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java | 40 ++++++++++++++++++++++++---------------- 1 files changed, 24 insertions(+), 16 deletions(-) diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java index 97be295..8723d08 100644 --- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java +++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java @@ -322,16 +322,24 @@ private String equipmentSpecification; /** + * 鐪熺┖鐑鐞嗙倝 + */ + @Excel(name = "鐪熺┖鐑鐞嗙倝", width = 15, orderNum = "35") + @ApiModelProperty(value = "鐪熺┖鐑鐞嗙倝") + @Dict(dicCode = "yn") + private String trueHeatTreatment; + + /** * 鎬诲姛鐜�(KW) */ - @Excel(name = "鎬诲姛鐜�(KW)", width = 15, orderNum = "35") + @Excel(name = "鎬诲姛鐜�(KW)", width = 15, orderNum = "36") @ApiModelProperty(value = "鎬诲姛鐜�") private String equipmentPower; /** * 璐ㄤ繚寮�濮嬫棩鏈� */ - @Excel(name = "璐ㄤ繚寮�濮嬫棩鏈�", width = 25, format = "yyyy/MM/dd", orderNum = "36") + @Excel(name = "璐ㄤ繚寮�濮嬫棩鏈�", width = 25, format = "yyyy/MM/dd", orderNum = "37") @ApiModelProperty(value = "璐ㄤ繚寮�濮嬫棩鏈�") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") @@ -340,7 +348,7 @@ /** * 璐ㄤ繚缁撴潫鏃ユ湡 */ - @Excel(name = "璐ㄤ繚缁撴潫鏃ユ湡", width = 15, format = "yyyy/MM/dd", orderNum = "37") + @Excel(name = "璐ㄤ繚缁撴潫鏃ユ湡", width = 15, format = "yyyy/MM/dd", orderNum = "38") @ApiModelProperty(value = "璐ㄤ繚缁撴潫鏃ユ湡") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") @@ -349,14 +357,14 @@ /** * 璧勪骇鐘舵�� */ - @Excel(name = "璧勪骇鐘舵��", width = 15, orderNum = "38",dicCode = "asset_status") + @Excel(name = "璧勪骇鐘舵��", width = 15, orderNum = "39",dicCode = "asset_status") @ApiModelProperty(value = "璧勪骇鐘舵��") @Dict(dicCode = "asset_status") private String assetStatus; /**鏈�鏂颁簩淇濇棩鏈�*/ @TableField(exist = false) - @Excel(name = "鏈�鏂颁簩淇濇棩鏈�", width = 15, format = "yyyy/MM/dd", orderNum = "39") + @Excel(name = "鏈�鏂颁簩淇濇棩鏈�", width = 15, format = "yyyy/MM/dd", orderNum = "40") @ApiModelProperty(value = "鏈�鏂颁簩淇濇棩鏈�") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") @@ -364,7 +372,7 @@ /**涓嬫浜屼繚鏃ユ湡*/ @TableField(exist = false) - @Excel(name = "涓嬫浜屼繚鏃ユ湡", width = 15, format = "yyyy/MM/dd", orderNum = "40") + @Excel(name = "涓嬫浜屼繚鏃ユ湡", width = 15, format = "yyyy/MM/dd", orderNum = "41") @ApiModelProperty(value = "涓嬫浜屼繚鏃ユ湡") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") @@ -373,7 +381,7 @@ /**鏈涓変繚鏃ユ湡*/ @TableField(exist = false) - @Excel(name = "鏈涓変繚鏃ユ湡", width = 15, format = "yyyy/MM/dd",orderNum = "41") + @Excel(name = "鏈涓変繚鏃ユ湡", width = 15, format = "yyyy/MM/dd",orderNum = "42") @ApiModelProperty(value = "鏈涓変繚鏃ユ湡") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") @@ -381,7 +389,7 @@ /**涓嬫涓変繚鏃ユ湡*/ @TableField(exist = false) - @Excel(name = "涓嬫涓変繚鏃ユ湡", width = 15, format = "yyyy/MM/dd", orderNum = "42") + @Excel(name = "涓嬫涓変繚鏃ユ湡", width = 15, format = "yyyy/MM/dd", orderNum = "43") @ApiModelProperty(value = "涓嬫涓変繚鏃ユ湡") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") @@ -389,34 +397,34 @@ /**涓変繚鍛ㄦ湡(骞�)*/ @TableField(exist = false) - @Excel(name = "涓変繚鍛ㄦ湡(骞�)", width = 15, orderNum = "43") + @Excel(name = "涓変繚鍛ㄦ湡(骞�)", width = 15, orderNum = "44") @ApiModelProperty(value = "涓変繚鍛ㄦ湡(骞�)") private Integer thirdMaintenancePeriod; /**鏈�鏂版妧鏈姸鎬侀壌瀹氭棩鏈�*/ @TableField(exist = false) - @Excel(name = "鏈�鏂版妧鏈姸鎬侀壌瀹氭棩鏈�", width = 15, format = "yyyy/MM/dd", orderNum = "44") + @Excel(name = "鏈�鏂版妧鏈姸鎬侀壌瀹氭棩鏈�", width = 15, format = "yyyy/MM/dd", orderNum = "45") @ApiModelProperty(value = "鏈�鏂版妧鏈姸鎬侀壌瀹氭棩鏈�") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") private java.util.Date latestTechnologyCheck; /**鎶�鏈姸鎬佷笅娆¢壌瀹氭棩鏈�*/ @TableField(exist = false) - @Excel(name = "鎶�鏈姸鎬佷笅娆¢壌瀹氭棩鏈�", width = 15, format = "yyyy/MM/dd", orderNum = "45") + @Excel(name = "鎶�鏈姸鎬佷笅娆¢壌瀹氭棩鏈�", width = 15, format = "yyyy/MM/dd", orderNum = "46") @ApiModelProperty(value = "鎶�鏈姸鎬佷笅娆¢壌瀹氭棩鏈�") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") private java.util.Date nextTechnologyCheck; /**鎶�鏈壌瀹氬懆鏈�(骞�)*/ @TableField(exist = false) - @Excel(name = "鎶�鏈壌瀹氬懆鏈�(骞�)", width = 15, orderNum = "46") + @Excel(name = "鎶�鏈壌瀹氬懆鏈�(骞�)", width = 15, orderNum = "47") @ApiModelProperty(value = "鎶�鏈壌瀹氬懆鏈�(骞�)") private Integer technologyCheckPeriod; /** * 鏄惁涓昏澶� */ - @Excel(name = "鏄惁涓昏澶�", width = 15, dicCode = "yn", orderNum = "47") + @Excel(name = "鏄惁涓昏澶�", width = 15, dicCode = "yn", orderNum = "48") @ApiModelProperty(value = "鏄惁涓昏澶�") @Dict(dicCode = "yn") private String masterFlag; @@ -425,14 +433,14 @@ /** * 鏄惁鏈夊伐鑹哄弬鏁� */ - @Excel(name = "鏈夋棤宸ヨ壓鍙傛暟", width = 15, dicCode = "yn", orderNum = "48") + @Excel(name = "鏈夋棤宸ヨ壓鍙傛暟", width = 15, dicCode = "yn", orderNum = "49") @ApiModelProperty(value = "鏄惁鏈夊伐鑹哄弬鏁�") @Dict(dicCode = "yn") private String processParametersFlag; /** * 鏄惁鏈夌簿搴﹀弬鏁� */ - @Excel(name = "鏈夋棤绮惧害鍙傛暟", width = 15, dicCode = "yn", orderNum = "49") + @Excel(name = "鏈夋棤绮惧害鍙傛暟", width = 15, dicCode = "yn", orderNum = "50") @ApiModelProperty(value = "鏄惁鏈夌簿搴﹀弬鏁�") @Dict(dicCode = "yn") private String precisionParametersFlag; @@ -441,7 +449,7 @@ /** * 澶囨敞 */ - @Excel(name = "澶囨敞", width = 50, orderNum = "50") + @Excel(name = "澶囨敞", width = 50, orderNum = "51") @ApiModelProperty(value = "澶囨敞") private String remark; -- Gitblit v1.9.3