From 2d3ded65b3c30b4f5cba6080d9c28e16a0b296cc Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 15 七月 2025 20:31:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java |  556 ++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 343 insertions(+), 213 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 9ce89d0..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
@@ -1,5 +1,6 @@
 package org.jeecg.modules.eam.entity;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -14,6 +15,7 @@
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.awt.*;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -69,287 +71,415 @@
     @ApiModelProperty(value = "鍒犻櫎鏍囪")
     private Integer delFlag;
     /**
-     * 璁惧缁熶竴缂栧彿
+     * 鍏抽敭璁惧鏍囪瘑
      */
-    @Excel(name = "璁惧缂栧彿", width = 15, orderNum = "1")
-    @ApiModelProperty(value = "璁惧缂栧彿")
+    @Excel(name = "鍏抽敭璁惧鏍囪瘑", width = 15, orderNum = "1")
+    @ApiModelProperty(value = "鍏抽敭璁惧鏍囪瘑")
+    @Dict(dicCode = "equipment_importance")
+    private String equipmentImportance;
+
+    /**
+     * 缁熶竴缂栫爜
+     */
+    @Excel(name = "缁熶竴缂栫爜", width = 15, orderNum = "2")
+    @ApiModelProperty(value = "缁熶竴缂栫爜")
     private String equipmentCode;
     /**
      * 璁惧鍚嶇О
      */
-    @Excel(name = "璁惧鍚嶇О", width = 15, orderNum = "2")
+    @Excel(name = "璁惧鍚嶇О", width = 15, orderNum = "3")
     @ApiModelProperty(value = "璁惧鍚嶇О")
     private String equipmentName;
+
     /**
-     * 浣跨敤閮ㄩ棬
+     * 鍏徃
      */
-    @Excel(name = "浣跨敤杞﹂棿", width = 25, dictTable = "mdc_production", dicText = "production_name", dicCode = "id", orderNum = "9")
-    @ApiModelProperty(value = "浣跨敤閮ㄩ棬")
-    @Dict(dicCode = "mdc_production, production_name, id")
-    private String orgId;
+//    @Excel(name = "鍏徃", width = 15, orderNum = "4")
+    @ApiModelProperty(value = "鍏徃")
+    @Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "org_code")
+    private transient String gsfactoryOrgCode;
+
     /**
-     * 璁惧绠＄悊鍛�
+     * 涓績
      */
-    @Excel(name = "璁惧绠＄悊鍛�", width = 35, dictTable = "sys_user", dicText = "realname", dicCode = "username", orderNum = "10")
-    @ApiModelProperty(value = "璁惧绠＄悊鍛�")
-    @Dict(dicCode = "sys_user, realname, username")
-    private String equipmentManager;
+//    @Excel(name = "涓績", width = 15, orderNum = "5")
+    @ApiModelProperty(value = "涓績")
+    @Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "org_code")
+    private transient String zxfactoryOrgCode;
+
     /**
-     * 璁惧绫诲埆
+     * 宸ュ尯
      */
-    @Excel(name = "璁惧绫诲埆", width = 15, dicCode = "equipment_category", orderNum = "5")
-    @ApiModelProperty(value = "璁惧绫诲埆")
+//    @Excel(name = "宸ュ尯", width = 15, orderNum = "6")
+    @ApiModelProperty(value = "宸ュ尯")
+    @Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "org_code")
+    private transient String gqfactoryOrgCode;
+
+    /**
+     * 宸ユ
+     */
+    @Excel(name = "涓績/宸ュ尯/宸ユ", width = 15, orderNum = "4")
+    @ApiModelProperty(value = "涓績/宸ュ尯/宸ユ")
+    @Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "org_code")
+    private String factoryOrgCode;
+
+    /**
+     * 鎵�灞炲垎绫�
+     */
+    @Excel(name = "鎵�灞炲垎绫�", width = 15, orderNum = "5",dicCode = "equipment_category")
+    @ApiModelProperty(value = "鎵�灞炲垎绫�")
     @Dict(dicCode = "equipment_category")
     private String equipmentCategory;
-    /**
-     * 璁惧鍨嬪彿
-     */
-    @Excel(name = "璁惧鍨嬪彿", width = 15, orderNum = "3")
-    @ApiModelProperty(value = "璁惧鍨嬪彿")
-    private String equipmentModel;
-    /**
-     * 璁惧瑙勬牸
-     */
-    @Excel(name = "璁惧瑙勬牸", width = 15, orderNum = "4")
-    @ApiModelProperty(value = "璁惧瑙勬牸")
-    private String equipmentSpecification;
 
-    /**
-     * 瀹夎浣嶇疆
-     */
-    @Excel(name = "瀹夎浣嶇疆", width = 15, orderNum = "11")
-    @ApiModelProperty(value = "瀹夎浣嶇疆")
-    private String installationPosition;
-    /**
-     * 璧勪骇浣跨敤鐘舵��
-     */
-    @Excel(name = "璧勪骇浣跨敤鐘舵��", width = 15, dicCode = "asset_status", orderNum = "7")
-    @ApiModelProperty(value = "璧勪骇鐘舵��")
-    @Dict(dicCode = "asset_status")
-    private String assetStatus;
-    /**
-     * 鍑哄巶缂栧彿
-     */
-    @Excel(name = "鍑哄巶缂栧彿", width = 15, orderNum = "12")
-    @ApiModelProperty(value = "鍑哄巶缂栧彿")
-    private String factoryNumber;
-    /**
-     * 鏈哄簥鍘傚
-     */
-    @Excel(name = "鏈哄簥鍘傚", width = 15, orderNum = "13")
-    @ApiModelProperty(value = "鏈哄簥鍘傚")
-    private String manufacturingEnterprise;
-    /**
-     * 鏉ユ簮鍥藉
-     */
-    @Excel(name = "鏉ユ簮鍥藉", width = 25, orderNum = "14")
-    @ApiModelProperty(value = "鏉ユ簮鍥藉")
-    private String originCountry;
-    /**
-     * 璁惧渚涘簲鍟�
-     */
-    @Excel(name = "璁惧渚涘簲鍟�", width = 25, orderNum = "15")
-    @ApiModelProperty(value = "璁惧渚涘簲鍟�")
-    private String supplier;
-    /**
-     * 鍑哄巶鏃ユ湡
-     */
-    @Excel(name = "鍑哄巶鏃ユ湡", width = 25, format = "yyyy/MM/dd", orderNum = "16")
-    @ApiModelProperty(value = "鍑哄巶鏃ユ湡")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date leaveFactoryDate;
-    /**
-     * 楠屾敹鏃ユ湡
-     */
-    @Excel(name = "鎶曠敤鏃ユ湡", width = 25, format = "yyyy/MM/dd", orderNum = "17")
-    @ApiModelProperty(value = "楠屾敹鏃ユ湡")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date acceptanceCheckDate;
-    /**
-     * 璁惧鍥剧墖
-     */
-    @ApiModelProperty(value = "璁惧鍥剧墖")
-    private String equipmentImage;
-    /**
-     * 鐢垫満鍙版暟
-     */
-    @Excel(name = "鐢垫満鍙版暟", width = 15, orderNum = "18")
-    @ApiModelProperty(value = "鐢垫満鍙版暟")
-    private Integer motorsNumber;
-    /**
-     * 鎬诲姛鐜�(KW)
-     */
-    @Excel(name = "鎬诲姛鐜�(KW)", width = 15, orderNum = "19")
-    @ApiModelProperty(value = "鎬诲姛鐜�")
-    private String equipmentPower;
-    /**
-     * 閲嶉噺(鍚�)
-     */
-    @Excel(name = "閲嶉噺(鍚�)", width = 15, orderNum = "20")
-    @ApiModelProperty(value = "閲嶉噺(鍚�)")
-    private String equipmentWeight;
-    /**
-     * 鏄惁鏈夊伐鑹哄弬鏁�
-     */
-    @Excel(name = "鏈夋棤宸ヨ壓鍙傛暟", width = 15, dicCode = "has_no", orderNum = "21")
-    @ApiModelProperty(value = "鏄惁鏈夊伐鑹哄弬鏁�")
-    private String processParametersFlag;
-    /**
-     * 鏄惁鏈夌簿搴﹀弬鏁�
-     */
-    @Excel(name = "鏈夋棤绮惧害鍙傛暟", width = 15, dicCode = "has_no", orderNum = "22")
-    @ApiModelProperty(value = "鏄惁鏈夌簿搴﹀弬鏁�")
-    private String precisionParametersFlag;
+    @TableField(exist = false)
+    @Excel(name = "淇濆吇鐘舵��", width = 15, orderNum = "6",dicCode = "equipment_maintenance_status")
+    @ApiModelProperty(value = "淇濆吇鐘舵��")
+    @Dict(dicCode = "equipment_maintenance_status")
+    private String maintenanceStatus;
 
-    /**
-     * 澶囨敞
-     */
-    @Excel(name = "澶囨敞", width = 50, orderNum = "99")
-    @ApiModelProperty(value = "澶囨敞")
-    private String remark;
-    /**
-     * 澶栧舰灏哄
-     */
-    @Excel(name = "澶栧舰灏哄", width = 15, orderNum = "24")
-    @ApiModelProperty(value = "澶栧舰灏哄")
-    private String overallDimensions;
-    /**
-     * 璁惧绉嶇被
-     */
-    @Excel(name = "璁惧绉嶇被", width = 15, orderNum = "6", dictTable = "sys_category", dicCode = "code", dicText = "name")
-    @ApiModelProperty(value = "璁惧绉嶇被")
-    @Dict(dictTable = "sys_category", dicCode = "code", dicText = "name")
-    private String equipmentType;
-    /**
-     * 鍘熷浠峰��
-     */
-    @Excel(name = "鍘熷��(鍏�)", width = 15, orderNum = "25")
-    @ApiModelProperty(value = "鍘熷浠峰��")
-    private BigDecimal originalValue;
-    /**
-     * 璧勯噾鏉ユ簮
-     */
-    @Excel(name = "璧勯噾鏉ユ簮", width = 15, orderNum = "26")
-    @ApiModelProperty(value = "璧勯噾鏉ユ簮")
-    private String fundingSource;
+    @TableField(exist = false)
+    @Excel(name = "缁翠慨鐘舵��", width = 15, orderNum = "7",dicCode = "equipment_repair_status")
+    @ApiModelProperty(value = "缁翠慨鐘舵��")
+    @Dict(dicCode = "equipment_repair_status")
+    private String repairStatus;
 
-    /**
-     * 鍔熻兘鐢ㄩ��
-     */
-    @Excel(name = "鍔熻兘鐢ㄩ��", width = 15, orderNum = "27")
-    @ApiModelProperty(value = "鍔熻兘鐢ㄩ��")
-    private String functionUse;
-    /**
-     * 鎬ц兘鎸囨爣
-     */
-    @Excel(name = "鎬ц兘鎸囨爣", width = 15, orderNum = "28")
-    @ApiModelProperty(value = "鎬ц兘鎸囨爣")
-    private String performanceIndicators;
 
-    /**
-     * 鍏ュ笎鏃堕棿
-     */
-    @Excel(name = "鍏ュ笎鏃堕棿", width = 15, format = "yyyy/MM/dd", orderNum = "29")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @ApiModelProperty(value = "鍏ュ笎鏃堕棿")
-    private Date bookingTime;
-
-    /**
-     * 绠＄悊鍒嗙被锛圓\B\C锛�
-     */
-    @Excel(name = "绠＄悊鍒嗙被", width = 15, dicCode = "equipment_abc_flag", orderNum = "8")
-    @ApiModelProperty(value = "绠＄悊鍒嗙被")
-    @Dict(dicCode = "equipment_abc_flag")
-    private String equipmentImportance;
-
-    /**
-     * 鎶�鏈姸鎬�
-     */
-    @Excel(name = "鎶�鏈姸鎬�", width = 15, dicCode = "technology_status", orderNum = "7")
+    /**鎶�鏈姸鎬�*/
+    @TableField(exist = false)
+    @Excel(name = "鎶�鏈姸鎬�", width = 15, orderNum = "8",dicCode = "equipment_technology_status")
     @ApiModelProperty(value = "鎶�鏈姸鎬�")
-    @Dict(dicCode = "technology_status")
+    @Dict(dicCode = "equipment_technology_status")
     private String technologyStatus;
 
+    /**
+     * ABC鏍囪瘑
+     */
+    @Excel(name = "ABC鏍囪瘑", width = 15, orderNum = "9",dicCode = "abc_flag")
+    @ApiModelProperty(value = "ABC鏍囪瘑")
+    @Dict(dicCode = "abc_flag")
+    private String abcFlag;
 
+    /**
+     * 缁翠慨鐝粍
+     */
+    @Excel(name = "缁翠慨鐝粍", width = 15, orderNum = "10")
+    @ApiModelProperty(value = "缁翠慨鐝粍")
+    @Dict(dictTable = "eam_base_repair_depart",dicText = "depart_name",dicCode = "org_code")
+    private String repairDepartOrgCode;
 
-    /** =================== 鑸畤鏁戠敓 鏈敤鐨勫瓧娈�  寮�濮�  ==========================**/
+    /**
+     * 瀹夊叏閰嶇疆
+     */
+    @Excel(name = "瀹夊叏閰嶇疆", width = 15, orderNum = "11")
+    @ApiModelProperty(value = "瀹夊叏閰嶇疆")
+    private String securityConfiguration;
+
+    /**
+     * 鍐峰嵈绯荤粺
+     */
+    @Excel(name = "鍐峰嵈绯荤粺", width = 15, orderNum = "15",dicCode = "cooling_system")
+    @ApiModelProperty(value = "鍐峰嵈绯荤粺")
+    @Dict(dicCode = "cooling_system")
+    private String coolSystem;
+
+    /**
+     * 鐏伀鍣�
+     */
+    @Excel(name = "鐏伀鍣�", width = 15, orderNum = "16",dicCode = "yn")
+    @ApiModelProperty(value = "鐏伀鍣�")
+    @Dict(dicCode = "yn")
+    private String fireExtinguisher;
+
+    /**
+     * 鐏伀鍣ㄦ湁鏁堟湡鑷�
+     */
+    @Excel(name = "鐏伀鍣ㄦ湁鏁堟湡鑷�", width = 15, orderNum = "17")
+    @ApiModelProperty(value = "鐏伀鍣ㄦ湁鏁堟湡鑷�")
+    private String fireExtinguisherExpirationDate;
 
     /**
      * 鎿嶄綔绯荤粺
      */
+    @Excel(name = "鎿嶄綔绯荤粺", width = 15, orderNum = "18",dicCode = "yn")
     @ApiModelProperty(value = "鎿嶄綔绯荤粺")
+    @Dict(dicCode = "yn")
     private String operationSystem;
-    /**
-     * 涓昏酱杩炴帴灏哄
-     */
-    @ApiModelProperty(value = "涓昏酱杩炴帴灏哄")
-    private String spindleConnectDimension;
-    /**
-     * 绔嬮」鍗″彿
-     */
-    @ApiModelProperty(value = "绔嬮」鍗″彿")
-    private String cardNumber;
-    /**
-     * 鏄惁瀹炴柦MDC
-     */
-    @ApiModelProperty(value = "鏄惁瀹炴柦MDC")
-    private String mdcFlag;
 
-    @ApiModelProperty(value = "MDC璁惧绫诲瀷")
-    private String deviceType;
+    /**
+     * 绯荤粺
+     */
+    @Excel(name = "绯荤粺", width = 15, orderNum = "19")
+    @ApiModelProperty(value = "绯荤粺")
+    private String system;
+
     /**
      * 璁惧绔彛
      */
+    @Excel(name = "璁惧绔彛", width = 15, orderNum = "20")
     @ApiModelProperty(value = "璁惧绔彛")
     private String equipmentPort;
+
     /**
      * 鍧愭爣鏁伴噺
      */
+    @Excel(name = "鍧愭爣鏁伴噺", width = 15, orderNum = "21")
     @ApiModelProperty(value = "鍧愭爣鏁伴噺")
     private Integer coordinateNum;
+
     /**
-     * 鐗圭璁惧;鏄惁涓虹壒绉嶈澶�
+     * 閲嶉噺(鍚�)
      */
-    @ApiModelProperty(value = "鏄惁鐗圭璁惧")
-    private String specialEquipment;
+    @Excel(name = "閲嶉噺(鍚�)", width = 15, orderNum = "22")
+    @ApiModelProperty(value = "閲嶉噺(鍚�)")
+    private BigDecimal equipmentWeight;
 
+    /**
+     * 閲嶉噺璁￠噺鍗曚綅
+     */
+    @Excel(name = "閲嶉噺璁￠噺鍗曚綅", width = 15, orderNum = "23")
+    @ApiModelProperty(value = "閲嶉噺璁￠噺鍗曚綅")
+    private String weightUnit;
 
+    /**
+     * 鍔熻兘浣嶇疆
+     */
+    @Excel(name = "鍔熻兘浣嶇疆", width = 15, orderNum = "24")
+    @ApiModelProperty(value = "鍔熻兘浣嶇疆")
+    private String functionalLocation;
+
+    /**
+     * 瀹夎浣嶇疆
+     */
+    @Excel(name = "瀹夎浣嶇疆", width = 15, orderNum = "25")
+    @ApiModelProperty(value = "瀹夎浣嶇疆")
+    private String installationPosition;
+
+    /**
+     * 鍑哄巶鏃ユ湡
+     */
+    @Excel(name = "鍑哄巶鏃ユ湡", width = 25, format = "yyyy/MM/dd", orderNum = "26")
+    @ApiModelProperty(value = "鍑哄巶鏃ユ湡")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date leaveFactoryDate;
+
+    /**
+     * 绔嬮」鍗″彿
+     */
+    @Excel(name = "绔嬮」鍗″彿", width = 15, orderNum = "27")
+    @ApiModelProperty(value = "绔嬮」鍗″彿")
+    private String cardNumber;
+
+    /**
+     * 璧勯噾鏉ユ簮
+     */
+    @Excel(name = "璧勯噾鏉ユ簮", width = 15, orderNum = "28")
+    @ApiModelProperty(value = "璧勯噾鏉ユ簮")
+    private String fundingSource;
+
+    /**
+     * 楠屾敹鏃ユ湡
+     */
+    @Excel(name = "鎶曠敤鏃ユ湡", width = 25, format = "yyyy/MM/dd", orderNum = "29")
+    @ApiModelProperty(value = "楠屾敹鏃ユ湡")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date acceptanceCheckDate;
+
+    /**
+     * 鍑哄巶缂栧彿
+     */
+    @Excel(name = "鍑哄巶缂栧彿", width = 15, orderNum = "30")
+    @ApiModelProperty(value = "鍑哄巶缂栧彿")
+    private String factoryNumber;
+
+    /**
+     * 璧勪骇鍒堕�犲晢
+     */
+    @Excel(name = "璧勪骇鍒堕�犲晢", width = 25, orderNum = "31")
+    @ApiModelProperty(value = "璧勪骇鍒堕�犲晢")
+    private String manufacturingEnterprise;
+
+    /**
+     * 璧勪骇鏉ユ簮鍥藉
+     */
+    @Excel(name = "璧勪骇鏉ユ簮鍥藉", width = 25, orderNum = "32")
+    @ApiModelProperty(value = "璧勪骇鏉ユ簮鍥藉")
+    private String originCountry;
+
+    /**
+     * 鍨嬪彿
+     */
+    @Excel(name = "鍨嬪彿", width = 15, orderNum = "33")
+    @ApiModelProperty(value = "鍨嬪彿")
+    private String equipmentModel;
+
+    /**
+     * 璁惧瑙勬牸
+     */
+    @Excel(name = "璁惧瑙勬牸", width = 15, orderNum = "34")
+    @ApiModelProperty(value = "璁惧瑙勬牸")
+    private String equipmentSpecification;
+
+    /**
+     * 鐪熺┖鐑鐞嗙倝
+     */
+    @Excel(name = "鐪熺┖鐑鐞嗙倝", width = 15, orderNum = "35")
+    @ApiModelProperty(value = "鐪熺┖鐑鐞嗙倝")
+    @Dict(dicCode = "yn")
+    private String trueHeatTreatment;
+
+    /**
+     * 鎬诲姛鐜�(KW)
+     */
+    @Excel(name = "鎬诲姛鐜�(KW)", width = 15, orderNum = "36")
+    @ApiModelProperty(value = "鎬诲姛鐜�")
+    private String equipmentPower;
 
     /**
      * 璐ㄤ繚寮�濮嬫棩鏈�
      */
+    @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")
     private Date warrantyStartDate;
+
     /**
      * 璐ㄤ繚缁撴潫鏃ユ湡
      */
+    @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")
     private Date warrantyEndDate;
 
-    /** =================== 鑸畤鏁戠敓 鏈敤鐨勫瓧娈�  缁撴潫  ==========================**/
+    /**
+     * 璧勪骇鐘舵��
+     */
+    @Excel(name = "璧勪骇鐘舵��", width = 15, orderNum = "39",dicCode = "asset_status")
+    @ApiModelProperty(value = "璧勪骇鐘舵��")
+    @Dict(dicCode = "asset_status")
+    private String assetStatus;
 
+    /**鏈�鏂颁簩淇濇棩鏈�*/
     @TableField(exist = false)
-    @ApiModelProperty(value = "缁翠慨鐘舵��")
-    @Dict(dicCode = "equipment_repair_status")
-    private String repairStatus;
+    @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")
+    private java.util.Date latestSecondMaintenance;
 
+    /**涓嬫浜屼繚鏃ユ湡*/
     @TableField(exist = false)
-    @ApiModelProperty(value = "淇濆吇鐘舵��")
-    @Dict(dicCode = "equipment_maintenance_status")
-    private String maintenanceStatus;
+    @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")
+    private java.util.Date nextSecondMaintenance;
 
-    // 璁惧埆绠＄悊 鎵嬫寔绔帴鍙ｄ娇鐢�
+
+    /**鏈涓変繚鏃ユ湡*/
     @TableField(exist = false)
-    private String value;
+    @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")
+    private java.util.Date latestThirdMaintenance;
+
+    /**涓嬫涓変繚鏃ユ湡*/
     @TableField(exist = false)
-    private String text;
+    @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")
+    private java.util.Date nextThirdMaintenance;
+
+    /**涓変繚鍛ㄦ湡(骞�)*/
+    @TableField(exist = false)
+    @Excel(name = "涓変繚鍛ㄦ湡(骞�)", width = 15, orderNum = "44")
+    @ApiModelProperty(value = "涓変繚鍛ㄦ湡(骞�)")
+    private Integer thirdMaintenancePeriod;
+
+    /**鏈�鏂版妧鏈姸鎬侀壌瀹氭棩鏈�*/
+    @TableField(exist = false)
+    @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 = "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 = "47")
+    @ApiModelProperty(value = "鎶�鏈壌瀹氬懆鏈�(骞�)")
+    private Integer technologyCheckPeriod;
+
+    /**
+     * 鏄惁涓昏澶�
+     */
+    @Excel(name = "鏄惁涓昏澶�", width = 15, dicCode = "yn", orderNum = "48")
+    @ApiModelProperty(value = "鏄惁涓昏澶�")
+    @Dict(dicCode = "yn")
+    private String masterFlag;
+
+
+    /**
+     * 鏄惁鏈夊伐鑹哄弬鏁�
+     */
+    @Excel(name = "鏈夋棤宸ヨ壓鍙傛暟", width = 15, dicCode = "yn", orderNum = "49")
+    @ApiModelProperty(value = "鏄惁鏈夊伐鑹哄弬鏁�")
+    @Dict(dicCode = "yn")
+    private String processParametersFlag;
+    /**
+     * 鏄惁鏈夌簿搴﹀弬鏁�
+     */
+    @Excel(name = "鏈夋棤绮惧害鍙傛暟", width = 15, dicCode = "yn", orderNum = "50")
+    @ApiModelProperty(value = "鏄惁鏈夌簿搴﹀弬鏁�")
+    @Dict(dicCode = "yn")
+    private String precisionParametersFlag;
+
+
+    /**
+     * 澶囨敞
+     */
+    @Excel(name = "澶囨敞", width = 50, orderNum = "51")
+    @ApiModelProperty(value = "澶囨敞")
+    private String remark;
+
+
+    public void setFactoryOrgCode(String factoryOrgCode){
+        this.factoryOrgCode = factoryOrgCode;
+        if(StrUtil.isNotEmpty(factoryOrgCode)){
+            if(factoryOrgCode.length()==12){
+                this.gqfactoryOrgCode = factoryOrgCode.substring(0,9);
+                this.zxfactoryOrgCode = factoryOrgCode.substring(0,6);
+                this.gsfactoryOrgCode = factoryOrgCode.substring(0,3);
+            }
+
+            if(factoryOrgCode.length()==9){
+                this.zxfactoryOrgCode = factoryOrgCode.substring(0,6);
+                this.gsfactoryOrgCode = factoryOrgCode.substring(0,3);
+            }
+
+            if(factoryOrgCode.length()==6){
+                this.gsfactoryOrgCode = factoryOrgCode.substring(0,3);
+            }
+        }
+    }
+
+    public void setEquipmentWeight(BigDecimal equipmentWeight){
+        //鍘婚櫎灏忔暟鐐瑰悗澶氫綑鐨�0
+        if(equipmentWeight!=null) {
+            this.equipmentWeight = equipmentWeight.stripTrailingZeros();
+        }
+    }
 
     public String getValue() {
         return this.id;

--
Gitblit v1.9.3