From 57945f688fd21076e36ab5332028c8b4a6dcf59c Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 04 九月 2025 16:37:31 +0800
Subject: [PATCH] 同步密网设备管理代码

---
 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/SecondMaintenanceStatusEnum.java       |    5 
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/ThirdMaintenanceOrderExpiredJob.java               |    4 
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EquipmentHomeMapper.java                        |   29 ++
 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamEquipmentQuery.java                  |    8 
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartsController.java                |    6 
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandard.java                     |    2 
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java  |   14 
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportRepairController.java              |    2 
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEquipmentHomeService.java                     |   26 ++
 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java                        |   87 ++++---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentHomeMapper.xml                     |   37 +++
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentLeanOutService.java               |    7 
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentLeanOutServiceImpl.java       |   58 ++++
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentLeanOutController.java          |   17 +
 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java                 |    6 
 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java     |    3 
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceOrderController.java     |    8 
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentSealUpServiceImpl.java        |    6 
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java       |   21 +
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentFluid.java                          |   14 +
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java |   15 
 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentHistoryLog.java              |   16 
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentHomeController.java                |   64 +++++
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartInventory.java                      |    2 
 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java       |   26 ++
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml                |    6 
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentFluidMapper.xml                 |    3 
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java    |   32 ++
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/SecondMaintenanceOrderExpiredJob.java              |    4 
 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentExtend.java                  |   10 
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentHomeServiceImpl.java             |   72 ++++++
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamMaintenanceStandardService.java            |    6 
 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/ThirdMaintenanceStatusEnum.java        |    5 
 33 files changed, 522 insertions(+), 99 deletions(-)

diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java
index 0ab95d0..8e7cd95 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java
@@ -58,13 +58,13 @@
     String PCR0001 = "PCR0001";
     //缁翠慨宸�
     String PCR0002 = "PCR0002";
-    //鐝粍闀�
+    //缁翠慨涓讳换
     String PCR0003 = "PCR0003";
-    //璁惧绠＄悊鍛�
+    //杞﹂棿璁惧绠＄悊鍛�
     String PCR0004 = "PCR0004";
     //璁惧鑳芥簮閮�
     String PCR0005 = "PCR0005";
-    //鏈哄姩鍔炵鐞嗗憳
+    //鏈哄姩鍔�
     String PCR0006 = "PCR0006";
     //澶囦欢绠＄悊鍛�
     String PCR0007 = "PCR0007";
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/SecondMaintenanceStatusEnum.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/SecondMaintenanceStatusEnum.java
index c897f44..2bc275b 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/SecondMaintenanceStatusEnum.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/SecondMaintenanceStatusEnum.java
@@ -3,10 +3,11 @@
 public enum SecondMaintenanceStatusEnum {
     WAIT_MAINTENANCE, //寰呬繚鍏�
     UNDER_MAINTENANCE, //淇濆吇涓�
-    WAIT_CONFIRM, //寰呯‘璁�
-    WAIT_LEADER_CONFIRM, // 寰呴瀵肩‘璁�
+    WAIT_CONFIRM, //寰呰溅闂磋澶囩鐞嗗憳纭
+    WAIT_LEADER_CONFIRM, // 寰呯淮淇富浠荤‘璁�
     COMPLETE,  //宸插畬鎴�
     ABOLISH, //宸蹭綔搴�
+    EXPIRED, //宸茶繃鏈�
     ;
 
     public static SecondMaintenanceStatusEnum getInstance(String code) {
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/ThirdMaintenanceStatusEnum.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/ThirdMaintenanceStatusEnum.java
index 55d0ea6..e4b4329 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/ThirdMaintenanceStatusEnum.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/ThirdMaintenanceStatusEnum.java
@@ -3,10 +3,11 @@
 public enum ThirdMaintenanceStatusEnum {
     WAIT_MAINTENANCE, //寰呬繚鍏�
     UNDER_MAINTENANCE, //淇濆吇涓�
-    WAIT_CONFIRM, //寰呯鐞嗗憳纭
-    WAIT_LEADER_CONFIRM, // 寰呴瀵肩‘璁�
+    WAIT_CONFIRM, //寰呮満鍔ㄥ姙纭
+    WAIT_LEADER_CONFIRM, // 寰呯淮淇富浠荤‘璁�
     COMPLETE,  //宸插畬鎴�
     ABOLISH, //宸蹭綔搴�
+    EXPIRED, //宸茶繃鏈�
     ;
 
     public static ThirdMaintenanceStatusEnum getInstance(String code) {
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 59e3040..33c9701 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
@@ -36,115 +36,115 @@
      */
     @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "涓婚敭")
-    private java.lang.String id;
+    private String id;
     /**
      * 鍒涘缓浜�
      */
     @ApiModelProperty(value = "鍒涘缓浜�")
     @Dict(dicCode = "sys_user, realname, username")
-    private java.lang.String createBy;
+    private String createBy;
     /**
      * 鍒涘缓鏃堕棿
      */
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss ")
-    private java.util.Date createTime;
+    private Date createTime;
     /**
      * 鏇存柊浜�
      */
     @ApiModelProperty(value = "鏇存柊浜�")
     @Dict(dicCode = "sys_user, realname, username")
-    private java.lang.String updateBy;
+    private String updateBy;
     /**
      * 鏇存柊鏃堕棿
      */
     @ApiModelProperty(value = "鏇存柊鏃堕棿")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss ")
-    private java.util.Date updateTime;
+    private Date updateTime;
     /**
      * 鍒犻櫎鏍囪
      */
     @ApiModelProperty(value = "鍒犻櫎鏍囪")
-    private java.lang.Integer delFlag;
+    private Integer delFlag;
     /**
      * 璁惧缁熶竴缂栧彿
      */
     @Excel(name = "璁惧缂栧彿", width = 15, orderNum = "1")
     @ApiModelProperty(value = "璁惧缂栧彿")
-    private java.lang.String equipmentCode;
+    private String equipmentCode;
     /**
      * 璁惧鍚嶇О
      */
     @Excel(name = "璁惧鍚嶇О", width = 15, orderNum = "2")
     @ApiModelProperty(value = "璁惧鍚嶇О")
-    private java.lang.String equipmentName;
+    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 java.lang.String orgId;
+    private String orgId;
     /**
      * 璁惧绠＄悊鍛�
      */
     @Excel(name = "璁惧绠＄悊鍛�", width = 35, dictTable = "sys_user", dicText = "realname", dicCode = "username", orderNum = "10")
     @ApiModelProperty(value = "璁惧绠＄悊鍛�")
     @Dict(dicCode = "sys_user, realname, username")
-    private java.lang.String equipmentManager;
+    private String equipmentManager;
     /**
      * 璁惧绫诲埆
      */
     @Excel(name = "璁惧绫诲埆", width = 15, dicCode = "equipment_category", orderNum = "5")
     @ApiModelProperty(value = "璁惧绫诲埆")
     @Dict(dicCode = "equipment_category")
-    private java.lang.String equipmentCategory;
+    private String equipmentCategory;
     /**
      * 璁惧鍨嬪彿
      */
     @Excel(name = "璁惧鍨嬪彿", width = 15, orderNum = "3")
     @ApiModelProperty(value = "璁惧鍨嬪彿")
-    private java.lang.String equipmentModel;
+    private String equipmentModel;
     /**
      * 璁惧瑙勬牸
      */
     @Excel(name = "璁惧瑙勬牸", width = 15, orderNum = "4")
     @ApiModelProperty(value = "璁惧瑙勬牸")
-    private java.lang.String equipmentSpecification;
+    private String equipmentSpecification;
 
     /**
      * 瀹夎浣嶇疆
      */
     @Excel(name = "瀹夎浣嶇疆", width = 15, orderNum = "11")
     @ApiModelProperty(value = "瀹夎浣嶇疆")
-    private java.lang.String installationPosition;
+    private String installationPosition;
     /**
      * 璧勪骇浣跨敤鐘舵��
      */
     @Excel(name = "璧勪骇浣跨敤鐘舵��", width = 15, dicCode = "asset_status", orderNum = "7")
     @ApiModelProperty(value = "璧勪骇鐘舵��")
     @Dict(dicCode = "asset_status")
-    private java.lang.String assetStatus;
+    private String assetStatus;
     /**
      * 鍑哄巶缂栧彿
      */
     @Excel(name = "鍑哄巶缂栧彿", width = 15, orderNum = "12")
     @ApiModelProperty(value = "鍑哄巶缂栧彿")
-    private java.lang.String factoryNumber;
+    private String factoryNumber;
     /**
      * 鏈哄簥鍘傚
      */
     @Excel(name = "鏈哄簥鍘傚", width = 15, orderNum = "13")
     @ApiModelProperty(value = "鏈哄簥鍘傚")
-    private java.lang.String manufacturingEnterprise;
+    private String manufacturingEnterprise;
     /**
      * 鏉ユ簮鍥藉
      */
     @Excel(name = "鏉ユ簮鍥藉", width = 25, orderNum = "14")
     @ApiModelProperty(value = "鏉ユ簮鍥藉")
-    private java.lang.String originCountry;
+    private String originCountry;
     /**
      * 璁惧渚涘簲鍟�
      */
@@ -158,7 +158,7 @@
     @ApiModelProperty(value = "鍑哄巶鏃ユ湡")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private java.util.Date leaveFactoryDate;
+    private Date leaveFactoryDate;
     /**
      * 楠屾敹鏃ユ湡
      */
@@ -166,12 +166,12 @@
     @ApiModelProperty(value = "楠屾敹鏃ユ湡")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private java.util.Date acceptanceCheckDate;
+    private Date acceptanceCheckDate;
     /**
      * 璁惧鍥剧墖
      */
     @ApiModelProperty(value = "璁惧鍥剧墖")
-    private java.lang.String equipmentImage;
+    private String equipmentImage;
     /**
      * 鐢垫満鍙版暟
      */
@@ -183,32 +183,32 @@
      */
     @Excel(name = "鎬诲姛鐜�(KW)", width = 15, orderNum = "19")
     @ApiModelProperty(value = "鎬诲姛鐜�")
-    private java.lang.String equipmentPower;
+    private String equipmentPower;
     /**
      * 閲嶉噺(鍚�)
      */
     @Excel(name = "閲嶉噺(鍚�)", width = 15, orderNum = "20")
     @ApiModelProperty(value = "閲嶉噺(鍚�)")
-    private java.lang.String equipmentWeight;
+    private String equipmentWeight;
     /**
      * 鏄惁鏈夊伐鑹哄弬鏁�
      */
     @Excel(name = "鏈夋棤宸ヨ壓鍙傛暟", width = 15, dicCode = "has_no", orderNum = "21")
     @ApiModelProperty(value = "鏄惁鏈夊伐鑹哄弬鏁�")
-    private java.lang.String processParametersFlag;
+    private String processParametersFlag;
     /**
      * 鏄惁鏈夌簿搴﹀弬鏁�
      */
     @Excel(name = "鏈夋棤绮惧害鍙傛暟", width = 15, dicCode = "has_no", orderNum = "22")
     @ApiModelProperty(value = "鏄惁鏈夌簿搴﹀弬鏁�")
-    private java.lang.String precisionParametersFlag;
+    private String precisionParametersFlag;
 
     /**
      * 澶囨敞
      */
     @Excel(name = "澶囨敞", width = 50, orderNum = "99")
     @ApiModelProperty(value = "澶囨敞")
-    private java.lang.String remark;
+    private String remark;
     /**
      * 澶栧舰灏哄
      */
@@ -263,7 +263,7 @@
     @Excel(name = "绠＄悊鍒嗙被", width = 15, dicCode = "equipment_abc_flag", orderNum = "8")
     @ApiModelProperty(value = "绠＄悊鍒嗙被")
     @Dict(dicCode = "equipment_abc_flag")
-    private java.lang.String equipmentImportance;
+    private String equipmentImportance;
 
     /**
      * 鎶�鏈姸鎬�
@@ -271,9 +271,22 @@
     @Excel(name = "鎶�鏈姸鎬�", width = 15, dicCode = "technology_status", orderNum = "7")
     @ApiModelProperty(value = "鎶�鏈姸鎬�")
     @Dict(dicCode = "technology_status")
-    private java.lang.String technologyStatus;
+    private String technologyStatus;
 
+    /**
+     * 璁惧鐢ㄩ��
+     */
+    @Excel(name = "璁惧鐢ㄩ��", width = 15, dicCode = "equipment_use", orderNum = "7")
+    @ApiModelProperty(value = "璁惧鐢ㄩ��")
+    @Dict(dicCode = "equipment_use")
+    private String equipmentUse;
 
+    /**
+     * 鎿嶄綔宸�
+     */
+    @Excel(name = "鎿嶄綔宸�", width = 15, orderNum = "28")
+    @ApiModelProperty(value = "鎿嶄綔宸�")
+    private String operator;
 
     /** =================== 鑸畤鏁戠敓 鏈敤鐨勫瓧娈�  寮�濮�  ==========================**/
 
@@ -281,22 +294,22 @@
      * 鎿嶄綔绯荤粺
      */
     @ApiModelProperty(value = "鎿嶄綔绯荤粺")
-    private java.lang.String operationSystem;
+    private String operationSystem;
     /**
      * 涓昏酱杩炴帴灏哄
      */
     @ApiModelProperty(value = "涓昏酱杩炴帴灏哄")
-    private java.lang.String spindleConnectDimension;
+    private String spindleConnectDimension;
     /**
      * 绔嬮」鍗″彿
      */
     @ApiModelProperty(value = "绔嬮」鍗″彿")
-    private java.lang.String cardNumber;
+    private String cardNumber;
     /**
      * 鏄惁瀹炴柦MDC
      */
     @ApiModelProperty(value = "鏄惁瀹炴柦MDC")
-    private java.lang.String mdcFlag;
+    private String mdcFlag;
 
     @ApiModelProperty(value = "MDC璁惧绫诲瀷")
     private String deviceType;
@@ -304,17 +317,17 @@
      * 璁惧绔彛
      */
     @ApiModelProperty(value = "璁惧绔彛")
-    private java.lang.String equipmentPort;
+    private String equipmentPort;
     /**
      * 鍧愭爣鏁伴噺
      */
     @ApiModelProperty(value = "鍧愭爣鏁伴噺")
-    private java.lang.Integer coordinateNum;
+    private Integer coordinateNum;
     /**
      * 鐗圭璁惧;鏄惁涓虹壒绉嶈澶�
      */
     @ApiModelProperty(value = "鏄惁鐗圭璁惧")
-    private java.lang.String specialEquipment;
+    private String specialEquipment;
 
 
 
@@ -324,14 +337,14 @@
     @ApiModelProperty(value = "璐ㄤ繚寮�濮嬫棩鏈�")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private java.util.Date warrantyStartDate;
+    private Date warrantyStartDate;
     /**
      * 璐ㄤ繚缁撴潫鏃ユ湡
      */
     @ApiModelProperty(value = "璐ㄤ繚缁撴潫鏃ユ湡")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private java.util.Date warrantyEndDate;
+    private Date warrantyEndDate;
 
     /** =================== 鑸畤鏁戠敓 鏈敤鐨勫瓧娈�  缁撴潫  ==========================**/
 
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentExtend.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentExtend.java
index 25c8c5d..a2b06c8 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentExtend.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentExtend.java
@@ -28,27 +28,27 @@
 	/**涓婚敭*/
 	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "涓婚敭")
-	private java.lang.String id;
+	private String id;
 	/**鍒涘缓浜�*/
     @ApiModelProperty(value = "鍒涘缓浜�")
-	private java.lang.String createBy;
+	private String createBy;
 	/**鍒涘缓鏃堕棿*/
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
 	private java.util.Date createTime;
 	/**鏇存柊浜�*/
     @ApiModelProperty(value = "鏇存柊浜�")
-	private java.lang.String updateBy;
+	private String updateBy;
 	/**鏇存柊鏃堕棿*/
     @ApiModelProperty(value = "鏇存柊鏃堕棿")
 	private java.util.Date updateTime;
 	/**淇濆吇鐘舵��*/
 	@Excel(name = "淇濆吇鐘舵��", width = 15)
     @ApiModelProperty(value = "淇濆吇鐘舵��")
-	private java.lang.String maintenanceStatus;
+	private String maintenanceStatus;
 	/**缁翠慨鐘舵��*/
 	@Excel(name = "缁翠慨鐘舵��", width = 15)
     @ApiModelProperty(value = "缁翠慨鐘舵��")
-	private java.lang.String repairStatus;
+	private String repairStatus;
 	/**鏈�鏂颁簩淇濇棩鏈�*/
     @ApiModelProperty(value = "鏈�鏂颁簩淇濇棩鏈�")
 	private java.util.Date latestSecondMaintenance;
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentHistoryLog.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentHistoryLog.java
index 6008547..814d3ad 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentHistoryLog.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentHistoryLog.java
@@ -31,11 +31,11 @@
 	/**涓婚敭*/
 	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "涓婚敭")
-	private java.lang.String id;
+	private String id;
 	/**鍒涘缓浜�*/
 	@Excel(name = "鍒涘缓浜�", width = 15)
     @ApiModelProperty(value = "鍒涘缓浜�")
-	private java.lang.String createBy;
+	private String createBy;
 	/**鍒涘缓鏃堕棿*/
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
 	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@@ -44,27 +44,27 @@
 	/**璁惧ID*/
 	@Excel(name = "璁惧ID", width = 15)
     @ApiModelProperty(value = "璁惧ID")
-	private java.lang.String equipmentId;
+	private String equipmentId;
 	/**鎿嶄綔鏍囩*/
 	@Excel(name = "鎿嶄綔鏍囩", width = 15)
     @ApiModelProperty(value = "鎿嶄綔鏍囩")
 	@Dict(dicCode = "equipment_operation_tag")
-	private java.lang.String operationTag;
+	private String operationTag;
 	/**鎿嶄綔浜�*/
 	@Excel(name = "鎿嶄綔浜�", width = 15)
     @ApiModelProperty(value = "鎿嶄綔浜�")
 	@Dict(dicCode = "sys_user, realname, username")
-	private java.lang.String operator;
+	private String operator;
 	/**鎿嶄綔鎻忚堪*/
 	@Excel(name = "鎿嶄綔鎻忚堪", width = 15)
     @ApiModelProperty(value = "鎿嶄綔鎻忚堪")
-	private java.lang.String description;
+	private String description;
 	/**涓氬姟涓昏〃*/
 	@Excel(name = "涓氬姟涓昏〃", width = 15)
     @ApiModelProperty(value = "涓氬姟涓昏〃")
-	private java.lang.String businessTable;
+	private String businessTable;
 	/**涓氬姟id*/
 	@Excel(name = "涓氬姟id", width = 15)
     @ApiModelProperty(value = "涓氬姟id")
-	private java.lang.String businessId;
+	private String businessId;
 }
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamEquipmentQuery.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamEquipmentQuery.java
index 40293d6..d2dba34 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamEquipmentQuery.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamEquipmentQuery.java
@@ -13,6 +13,14 @@
     private String operationSystem;
     private String orgId;
     private String equipmentCategory;
+    private String manufacturingEnterprise;
+    private String originalValue;
+    private String performanceIndicators;
+    private String leaveFactoryStartTime;
+    private String leaveFactoryEndTime;
+    private String acceptanceCheckStartTime;
+    private String acceptanceCheckEndTime;
+    private String equipmentUse;
 
     private String column;
     private String order;
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
index c2ec226..e92de4b 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
@@ -137,6 +137,23 @@
             if (StringUtils.isNotBlank(eamEquipment.getOperationSystem())) {
                 queryWrapper.like("e.operation_system", eamEquipment.getOperationSystem());
             }
+            if (StringUtils.isNotBlank(eamEquipment.getManufacturingEnterprise())) {
+                queryWrapper.like("e.manufacturing_enterprise", eamEquipment.getManufacturingEnterprise());
+            }
+            if (StringUtils.isNotBlank(eamEquipment.getOriginalValue())) {
+                queryWrapper.like("e.original_value", eamEquipment.getOriginalValue());
+            }
+            if (StringUtils.isNotBlank(eamEquipment.getPerformanceIndicators())) {
+                queryWrapper.like("e.performance_indicators", eamEquipment.getPerformanceIndicators());
+            }
+            if(oConvertUtils.isNotEmpty(eamEquipment.getLeaveFactoryStartTime()) && oConvertUtils.isNotEmpty(eamEquipment.getLeaveFactoryEndTime())){
+                queryWrapper.ge("e.leave_factory_date",eamEquipment.getLeaveFactoryStartTime());
+                queryWrapper.le("e.leave_factory_date",eamEquipment.getLeaveFactoryEndTime());
+            }
+            if(oConvertUtils.isNotEmpty(eamEquipment.getAcceptanceCheckStartTime()) && oConvertUtils.isNotEmpty(eamEquipment.getAcceptanceCheckEndTime())){
+                queryWrapper.ge("e.acceptance_check_date",eamEquipment.getAcceptanceCheckStartTime());
+                queryWrapper.le("e.acceptance_check_date",eamEquipment.getAcceptanceCheckEndTime());
+            }
             if (StringUtils.isNotBlank(eamEquipment.getOrgId())) {
                 //杞﹂棿缂栫爜涓嶄负绌�
                 List<String> productIds = mdcProductionService.recursionChildren(eamEquipment.getOrgId());
@@ -147,6 +164,9 @@
             }
             if (StringUtils.isNotBlank(eamEquipment.getEquipmentCategory())) {
                 queryWrapper.like("e.equipment_category", eamEquipment.getEquipmentCategory());
+            }
+            if (StringUtils.isNotBlank(eamEquipment.getEquipmentUse())) {
+                queryWrapper.like("e.equipment_use", eamEquipment.getEquipmentUse());
             }
             if (StringUtils.isNotBlank(eamEquipment.getId())) {
                 queryWrapper.eq("e.id", eamEquipment.getId());
@@ -161,13 +181,13 @@
                 if (DataBaseConstant.SQL_ASC.equalsIgnoreCase(eamEquipment.getOrder())) {
                     queryWrapper.orderByAsc("e." + oConvertUtils.camelToUnderline(column));
                 } else {
-                    queryWrapper.orderByDesc("e." + oConvertUtils.camelToUnderline(column));
+                    queryWrapper.orderByAsc("e." + oConvertUtils.camelToUnderline(column));
                 }
             } else {
-                queryWrapper.orderByDesc("e.create_time");
+                queryWrapper.orderByAsc("e.equipment_code");
             }
         } else {
-            queryWrapper.orderByDesc("e.create_time");
+            queryWrapper.orderByAsc("e.equipment_code");
         }
 
         IPage<EamEquipment> ipage = eamEquipmentMapper.queryPageList(page, queryWrapper);
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
index 6045e70..884f418 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
@@ -221,6 +221,7 @@
         eamRepairOrder.setRepairStatus(ReportRepairEnum.WAIT_INTERNAL_CONFIRM.name());
         eamRepairOrder.setActualStartTime(DateUtils.getNow());
         eamRepairOrder.setRepairer(eamReportRepairQuery.getRepairer());
+        eamRepairOrder.setReportId(eamReportRepairQuery.getId());
         super.save(eamRepairOrder);
         EamEquipment eamEquipment = eamEquipmentService.getById(eamReportRepair.getEquipmentId());
         // 鍚姩缁翠慨娴佺▼
@@ -324,7 +325,7 @@
                     //鎻愪氦鏈哄姩鍔炵淮淇紝杞﹂棿绠＄悊鍛樼‘璁�
                     userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getOrgId(), BusinessCodeConst.PCR0003);
                     if (CollectionUtil.isEmpty(userSelectors)) {
-                        throw new JeecgBootException("璁惧鏈垎閰嶇粰鐝粍闀匡紝鏃犳硶杩涘叆涓嬬骇瀹℃壒锛�");
+                        throw new JeecgBootException("璁惧鏈垎閰嶇粰缁翠慨涓讳换锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
                     }
                     userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
                     values.put("NextAssignee", userApprovalList);
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentLeanOutController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentLeanOutController.java
index d9a1ad8..078d4c2 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentLeanOutController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentLeanOutController.java
@@ -194,6 +194,23 @@
     }
 
     /**
+     * 褰掕繕
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "璁惧鍊熷嚭褰掕繕-褰掕繕")
+    @ApiOperation(value = "璁惧鍊熷嚭褰掕繕-褰掕繕", notes = "璁惧鍊熷嚭褰掕繕-褰掕繕")
+    @GetMapping(value = "/equipmentReturn")
+    public Result<?> equipmentReturn(@RequestParam(name = "id", required = true) String id) {
+        boolean b = eamEquipmentLeanOutService.equipmentReturn(id);
+        if (!b) {
+            return Result.error("鎿嶄綔澶辫触锛�");
+        }
+        return Result.OK("鎿嶄綔鎴愬姛!");
+    }
+
+    /**
      * 瀹℃壒
      *
      * @param request
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java
index 48d0bef..416a747 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java
@@ -3,6 +3,8 @@
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -16,6 +18,7 @@
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.exception.ExceptionCast;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.util.FileUtil;
@@ -29,6 +32,7 @@
 import org.jeecg.modules.eam.entity.EamEquipment;
 import org.jeecg.modules.eam.entity.EamMaintenanceStandard;
 import org.jeecg.modules.eam.entity.EamMaintenanceStandardDetail;
+import org.jeecg.modules.eam.entity.EamSysFiles;
 import org.jeecg.modules.eam.request.EamMaintenanceStandardRequest;
 import org.jeecg.modules.eam.service.IEamEquipmentService;
 import org.jeecg.modules.eam.service.IEamMaintenanceStandardService;
@@ -80,10 +84,19 @@
     public Result<?> queryPageList(EamMaintenanceStandard eamMaintenanceStandard,
                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                   HttpServletRequest req) {
+                                   HttpServletRequest req) throws JsonProcessingException {
 //        QueryWrapper<EamMaintenanceStandard> queryWrapper = QueryGenerator.initQueryWrapper(eamMaintenanceStandard, req.getParameterMap());
         Page<EamMaintenanceStandard> page = new Page<EamMaintenanceStandard>(pageNo, pageSize);
         IPage<EamMaintenanceStandard> pageList = eamMaintenanceStandardService.queryPageList(page, eamMaintenanceStandard);
+        for (EamMaintenanceStandard record : pageList.getRecords()) {
+            String json = record.getReferenceFile();
+            if(StringUtils.isNotBlank(json)){
+                ObjectMapper mapper = new ObjectMapper();
+                Map<String, Object> map = mapper.readValue(json, Map.class);
+                String fileName = (String) map.get("fileName");
+                record.setFileName(fileName);
+            }
+        }
         return Result.OK(pageList);
     }
 
@@ -623,4 +636,10 @@
             log.error("璇诲彇Excel淇℃伅澶辫触锛歿}", e.getMessage(), e);
         }
     }
+
+    @GetMapping("/downloadFile")
+    public void downloadFile(@RequestParam("id") String id, HttpServletResponse response) throws JsonProcessingException {
+
+        eamMaintenanceStandardService.downloadFile(response, eamMaintenanceStandardService.getById(id));
+    }
 }
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportRepairController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportRepairController.java
index 02044ac..2da7669 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportRepairController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportRepairController.java
@@ -136,7 +136,7 @@
     public Result<?> abolishBatch(@RequestParam(name = "ids", required = true) String ids) {
         List<EamReportRepair> eamReportRepairs = eamReportRepairService.listByIds(Arrays.asList(ids.split(",")));
         eamReportRepairs.forEach(eamReportRepair -> {
-            if(ReportRepairEnum.ABOLISH.name().equals(eamReportRepair.getReportStatus())) {
+            if(ReportRepairEnum.WAIT_REPAIR.name().equals(eamReportRepair.getReportStatus())) {
                 eamReportRepair.setReportStatus(ReportRepairEnum.ABOLISH.name());
             }
         });
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartsController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartsController.java
index 377f682..0b25e95 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartsController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartsController.java
@@ -64,7 +64,11 @@
             QueryWrapper<EamSparePartInventory> wrapper = new QueryWrapper<>();
             wrapper.eq("spare_part_id",record.getId()).select("sum(inventory) as inventory");
             EamSparePartInventory one = eamSparePartInventoryService.getOne(wrapper);
-            record.setTotalQuantity(one.getInventory().toString());
+            if(one == null){
+                record.setTotalQuantity("0");
+            }else{
+                record.setTotalQuantity(one.getInventory().toString());
+            }
         }
         return Result.OK(pageList);
     }
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceOrderController.java
index 9f1260a..15e64a9 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceOrderController.java
@@ -172,8 +172,8 @@
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "鍛ㄤ繚宸ュ崟-鎵归噺浣滃簾")
-	@ApiOperation(value = "鍛ㄤ繚宸ュ崟-鎵归噺浣滃簾", notes = "鍛ㄤ繚宸ュ崟-鎵归噺浣滃簾")
+	@AutoLog(value = "涓変繚宸ュ崟-鎵归噺浣滃簾")
+	@ApiOperation(value = "涓変繚宸ュ崟-鎵归噺浣滃簾", notes = "涓変繚宸ュ崟-鎵归噺浣滃簾")
 	@DeleteMapping(value = "/abolishBatch")
 	public Result<?> abolishBatch(@RequestParam(name = "ids", required = true) String ids) {
 		List<String> list = Arrays.asList(ids.split(","));
@@ -195,8 +195,8 @@
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "鍛ㄤ繚宸ュ崟-鎵归噺棰嗗彇")
-	@ApiOperation(value = "鍛ㄤ繚宸ュ崟-鎵归噺棰嗗彇", notes = "鍛ㄤ繚宸ュ崟-鎵归噺棰嗗彇")
+	@AutoLog(value = "涓変繚宸ュ崟-鎵归噺棰嗗彇")
+	@ApiOperation(value = "涓変繚宸ュ崟-鎵归噺棰嗗彇", notes = "涓変繚宸ュ崟-鎵归噺棰嗗彇")
 	@DeleteMapping(value = "/collectBatch")
 	public Result<?> collectBatch(@RequestParam(name = "ids", required = true) String ids) {
 		List<String> list = Arrays.asList(ids.split(","));
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentHomeController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentHomeController.java
new file mode 100644
index 0000000..4bf1049
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentHomeController.java
@@ -0,0 +1,64 @@
+package org.jeecg.modules.eam.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.eam.service.IEquipmentHomeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@Api(tags = "璁惧绠＄悊棣栭〉鎺ュ彛")
+@RestController
+@RequestMapping("/equipment/home")
+public class EquipmentHomeController {
+
+    @Autowired
+    private IEquipmentHomeService equipmentHomeService;
+
+    /**
+     *棣栭〉 鎶�鏈姸鎬佹暟閲忕粺璁�
+     */
+    @ApiOperation(value = "棣栭〉 鎶�鏈姸鎬佹暟閲忕粺璁�", notes = "棣栭〉 鎶�鏈姸鎬佹暟閲忕粺璁�")
+    @GetMapping("getEquipmentTechnologyStatusList")
+    public Result<?> getFactoryEquipmentTechnologyStatusList() {
+        List<Map<String, Object>> list = equipmentHomeService.getEquipmentTechnologyStatusList();
+        return Result.ok(list);
+    }
+
+    /**
+     *棣栭〉 璁惧鎶ヤ慨鎯呭喌缁熻
+     */
+    @ApiOperation(value = "棣栭〉 璁惧鎶ヤ慨鎯呭喌缁熻", notes = "棣栭〉 璁惧鎶ヤ慨鎯呭喌缁熻")
+    @GetMapping("getReportRepairEquipmentList")
+    public Result<?> getFactoryReportRepairEquipmentList() {
+        List<Map<String, Object>> list = equipmentHomeService.getReportRepairEquipmentList();
+        return Result.ok(list);
+    }
+
+    /**
+     *棣栭〉 涓変繚璁″垝
+     */
+    @ApiOperation(value = "棣栭〉 涓変繚璁″垝", notes = "棣栭〉 涓変繚璁″垝")
+    @GetMapping("getThirdGuaranteesPlan")
+    public Result<?> getThirdGuaranteesPlan() {
+        Map<String, Object> map = equipmentHomeService.getThirdGuaranteesPlan();
+        return Result.ok(map);
+    }
+
+    /**
+     *棣栭〉 浜屼繚璁″垝
+     */
+    @ApiOperation(value = "棣栭〉 浜屼繚璁″垝", notes = "棣栭〉 浜屼繚璁″垝")
+    @GetMapping("getSecondGuaranteesPlan")
+    public Result<?> getSecondGuaranteesPlan() {
+        Map<String, Object> map = equipmentHomeService.getSecondGuaranteesPlan();
+        return Result.ok(map);
+    }
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentFluid.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentFluid.java
index 01e4088..c79dacb 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentFluid.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentFluid.java
@@ -54,6 +54,20 @@
 	@Excel(name = "娌规恫ID", width = 15)
     @ApiModelProperty(value = "娌规恫ID")
     private String fluidId;
+    /**浣跨敤鏁伴噺*/
+    @Excel(name = "浣跨敤鏁伴噺", width = 15)
+    @ApiModelProperty(value = "浣跨敤鏁伴噺")
+    private Integer usageQuantity;
+    /**鍔犲叆閮ㄤ綅*/
+    @Excel(name = "鍔犲叆閮ㄤ綅", width = 15)
+    @ApiModelProperty(value = "鍔犲叆閮ㄤ綅")
+    private String additionSite;
+    /**鏃堕棿*/
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "鏃堕棿", width = 15)
+    @ApiModelProperty(value = "鏃堕棿")
+    private Date oilTime;
     /**娌规恫缂栫爜*/
     @TableField(exist = false)
     private String fluidCode;
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandard.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandard.java
index 5dabd18..23906e4 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandard.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandard.java
@@ -129,6 +129,8 @@
     private String equipmentName;
     @TableField(exist = false)
     private String keyword;
+    @TableField(exist = false)
+    private String fileName;
     /**
      * 璁惧缂栧彿鎷兼帴
      */
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartInventory.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartInventory.java
index dc1f96b..9eee09d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartInventory.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartInventory.java
@@ -61,7 +61,7 @@
      * 鍑哄巶鏃ユ湡(鐢熶骇鏃ユ湡)
      */
     @ApiModelProperty(value = "鍑哄巶鏃ユ湡(鐢熶骇鏃ユ湡)")
-    private java.util.Date manufactureDate;
+    private Date manufactureDate;
     /**
      * 渚涘簲鍟�
      */
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/SecondMaintenanceOrderExpiredJob.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/SecondMaintenanceOrderExpiredJob.java
index 8da6f51..f7606d7 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/SecondMaintenanceOrderExpiredJob.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/SecondMaintenanceOrderExpiredJob.java
@@ -70,10 +70,10 @@
             }
             for (EamSecondMaintenanceOrder order : unCompleteOrderList) {
                 if (SecondMaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(order.getMaintenanceStatus())) {
-                    order.setMaintenanceStatus(SecondMaintenanceStatusEnum.ABOLISH.name());
+                    order.setMaintenanceStatus(SecondMaintenanceStatusEnum.EXPIRED.name());
                 } else if (WeekMaintenanceStatusEnum.UNDER_MAINTENANCE.name().equals(order.getMaintenanceStatus())) {
                     //宸茬粡琚帴鍗� 浣嗘湭鎵ц瀹屾垚
-                    order.setMaintenanceStatus(SecondMaintenanceStatusEnum.ABOLISH.name());
+                    order.setMaintenanceStatus(SecondMaintenanceStatusEnum.EXPIRED.name());
                     //寮哄埗缁撴潫娴佺▼ 鍒犻櫎鐢ㄦ埛鐨勬寰呭姙浠诲姟
                     FlowMyBusiness flowMyBusiness = flowMyBusinessService.selectByDataId(order.getId());
                     if (flowMyBusiness != null) {
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/ThirdMaintenanceOrderExpiredJob.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/ThirdMaintenanceOrderExpiredJob.java
index 8a90fee..a1e91aa 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/ThirdMaintenanceOrderExpiredJob.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/ThirdMaintenanceOrderExpiredJob.java
@@ -70,10 +70,10 @@
             }
             for (EamThirdMaintenanceOrder order : unCompleteOrderList) {
                 if (ThirdMaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(order.getMaintenanceStatus())) {
-                    order.setMaintenanceStatus(ThirdMaintenanceStatusEnum.ABOLISH.name());
+                    order.setMaintenanceStatus(ThirdMaintenanceStatusEnum.EXPIRED.name());
                 } else if (ThirdMaintenanceStatusEnum.UNDER_MAINTENANCE.name().equals(order.getMaintenanceStatus())) {
                     //宸茬粡琚帴鍗� 浣嗘湭鎵ц瀹屾垚
-                    order.setMaintenanceStatus(ThirdMaintenanceStatusEnum.ABOLISH.name());
+                    order.setMaintenanceStatus(ThirdMaintenanceStatusEnum.EXPIRED.name());
                     //寮哄埗缁撴潫娴佺▼ 鍒犻櫎鐢ㄦ埛鐨勬寰呭姙浠诲姟
                     FlowMyBusiness flowMyBusiness = flowMyBusinessService.selectByDataId(order.getId());
                     if (flowMyBusiness != null) {
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EquipmentHomeMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EquipmentHomeMapper.java
new file mode 100644
index 0000000..b6114b0
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EquipmentHomeMapper.java
@@ -0,0 +1,29 @@
+package org.jeecg.modules.eam.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.eam.entity.EamSecondMaintenanceOrder;
+import org.jeecg.modules.eam.entity.EamThirdMaintenanceOrder;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+@Repository
+public interface EquipmentHomeMapper {
+
+    /**
+     *棣栭〉 鎶�鏈姸鎬佹暟閲忕粺璁�
+     */
+    List<Map<String, Object>> getEquipmentTechnologyStatusList();
+
+    /**
+     *棣栭〉 璁惧鎶ヤ慨鎯呭喌缁熻
+     */
+    List<Map<String, Object>> getReportRepairEquipmentList();
+
+    List<EamThirdMaintenanceOrder> getThirdGuaranteesPlan(@Param("date") String date);
+
+    List<EamSecondMaintenanceOrder> getSecondGuaranteesPlan(@Param("date") String date);
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentFluidMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentFluidMapper.xml
index b31cee0..3d9a7d8 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentFluidMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentFluidMapper.xml
@@ -6,6 +6,9 @@
         SELECT
             t1.id,
             t1.equipment_id equipmentId,
+            t1.usage_quantity usageQuantity,
+            t1.addition_site additionSite,
+            t1.oil_time oilTime,
             t1.fluid_id fluidId,
             t2.fluid_code fluidCode,
             t2.fluid_name fluidName
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml
index 3884cd3..9461c66 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml
@@ -13,11 +13,13 @@
     <select id="findInspectionUser"  parameterType="String" resultType="org.jeecg.modules.eam.vo.InspectionVo">
 
         SELECT
-            t1.operator,
-            t1.confirm_user as confirmUser,
+            t2.realname operator,
+            t3.realname as confirmUser,
             CONVERT(VARCHAR, DATEPART(DAY, t1.inspection_date)) as dayTime
         FROM
             eam_inspection_order t1
+            left join sys_user t2 on t1.operator = t2.username
+            left join sys_user t3 on t1.confirm_user = t3.username
         WHERE t1.del_flag = '0'
           AND t1.equipment_id = #{equipmentId}
         AND SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t1.inspection_date, 120 ), 1, 7 ) = SUBSTRING(CONVERT(VARCHAR(10),#{yearMonth}, 120 ), 1, 7 )
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentHomeMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentHomeMapper.xml
new file mode 100644
index 0000000..f86c224
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentHomeMapper.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.eam.mapper.EquipmentHomeMapper">
+
+
+    <select id="getEquipmentTechnologyStatusList"  parameterType="String" resultType="Map">
+        SELECT
+            ( SELECT COUNT ( 0 ) FROM eam_equipment WHERE del_flag = '0' and technology_status = '1') as qualifiedCount,
+            ( SELECT COUNT ( 0 ) FROM eam_equipment WHERE del_flag = '0' and technology_status = '2') as  limitedUseCount,
+            ( SELECT COUNT ( 0 ) FROM eam_equipment WHERE del_flag = '0' and technology_status = '3')  as disabledCount
+    </select>
+
+    <select id="getReportRepairEquipmentList"  parameterType="String" resultType="Map">
+        SELECT
+            ( select COUNT(0) from eam_report_repair t1 left join eam_equipment t2 on t1.equipment_id = t2.id WHERE t1.del_flag = '0' and SUBSTRING(CONVERT(VARCHAR(10), t1.fault_start_time, 120), 1, 10) = SUBSTRING(CONVERT(VARCHAR(10), GETDATE(), 120), 1, 10)) as failurTotalCount,
+            ( select COUNT(0) from eam_report_repair t1 left join eam_equipment t2 on t1.equipment_id = t2.id where t1.del_flag = '0' and t1.breakdown_flag = '1' and SUBSTRING(CONVERT(VARCHAR(10), t1.fault_start_time, 120), 1, 10) = SUBSTRING(CONVERT(VARCHAR(10), GETDATE(), 120), 1, 10)) as  noStopCount,
+            ( select COUNT(0) from eam_report_repair t1 left join eam_equipment t2 on t1.equipment_id = t2.id where t1.del_flag = '0' and t1.breakdown_flag = '0' and SUBSTRING(CONVERT(VARCHAR(10), t1.fault_start_time, 120), 1, 10) = SUBSTRING(CONVERT(VARCHAR(10), GETDATE(), 120), 1, 10)) as  stopCount
+    </select>
+    <select id="getThirdGuaranteesPlan" resultType="org.jeecg.modules.eam.entity.EamThirdMaintenanceOrder">
+        SELECT
+          *
+        FROM
+          eam_third_maintenance_order
+        WHERE
+          del_flag = '0'
+          AND SUBSTRING(CONVERT (VARCHAR (10), maintenance_date, 120), 1, 7) = #{date}
+    </select>
+    <select id="getSecondGuaranteesPlan" resultType="org.jeecg.modules.eam.entity.EamSecondMaintenanceOrder">
+        SELECT
+          *
+        FROM
+            eam_second_maintenance_order
+        WHERE
+          del_flag = '0'
+          AND SUBSTRING(CONVERT (VARCHAR (10), maintenance_date, 120), 1, 7) = #{date}
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentLeanOutService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentLeanOutService.java
index 62acdb9..536bb59 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentLeanOutService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentLeanOutService.java
@@ -47,6 +47,13 @@
     boolean submit(String id);
 
     /**
+     * 褰掕繕
+     * @param id
+     * @return
+     */
+    boolean equipmentReturn(String id);
+
+    /**
      * 瀹℃壒娴佺▼鎺у埗
      * @param request
      * @return
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamMaintenanceStandardService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamMaintenanceStandardService.java
index c136e81..0a4fa35 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamMaintenanceStandardService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamMaintenanceStandardService.java
@@ -3,9 +3,12 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import org.jeecg.modules.eam.entity.EamMaintenanceStandard;
+import org.jeecg.modules.eam.entity.EamSysFiles;
 import org.jeecg.modules.eam.request.EamMaintenanceStandardRequest;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -64,4 +67,7 @@
      * @return
      */
     List<EamMaintenanceStandard> queryListByCategory(String maintenanceCategory);
+
+
+    void downloadFile(HttpServletResponse response,EamMaintenanceStandard maintenanceStandard) throws JsonProcessingException;
 }
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEquipmentHomeService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEquipmentHomeService.java
new file mode 100644
index 0000000..7f79246
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEquipmentHomeService.java
@@ -0,0 +1,26 @@
+package org.jeecg.modules.eam.service;
+
+import java.util.List;
+import java.util.Map;
+
+public interface IEquipmentHomeService {
+    /**
+     *棣栭〉 鎶�鏈姸鎬佹暟閲忕粺璁�
+     */
+    List<Map<String, Object>> getEquipmentTechnologyStatusList();
+
+    /**
+     *棣栭〉 璁惧鎶ヤ慨鎯呭喌缁熻
+     */
+    List<Map<String, Object>> getReportRepairEquipmentList();
+
+    /**
+     *棣栭〉 涓変繚璁″垝
+     */
+    Map<String, Object> getThirdGuaranteesPlan();
+
+    /**
+     *棣栭〉 浜屼繚璁″垝
+     */
+    Map<String, Object> getSecondGuaranteesPlan();
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentLeanOutServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentLeanOutServiceImpl.java
index 5ee5fac..96b741d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentLeanOutServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentLeanOutServiceImpl.java
@@ -1,5 +1,6 @@
 package org.jeecg.modules.eam.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -18,11 +19,10 @@
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
-import org.jeecg.modules.eam.constant.AssetStatusEnum;
-import org.jeecg.modules.eam.constant.EquipmentLeanOutStatusEnum;
-import org.jeecg.modules.eam.constant.EquipmentOperationTagEnum;
+import org.jeecg.modules.eam.constant.*;
 import org.jeecg.modules.eam.entity.EamEquipment;
 import org.jeecg.modules.eam.entity.EamEquipmentLeanOut;
+import org.jeecg.modules.eam.entity.EamEquipmentSealUp;
 import org.jeecg.modules.eam.mapper.EamEquipmentLeanOutMapper;
 import org.jeecg.modules.eam.request.EamEquipmentLeanOutQuery;
 import org.jeecg.modules.eam.request.EamEquipmentLeanOutRequest;
@@ -35,12 +35,14 @@
 import org.jeecg.modules.flowable.service.IFlowDefinitionService;
 import org.jeecg.modules.flowable.service.IFlowTaskService;
 import org.jeecg.modules.system.service.ISysUserService;
+import org.jeecg.modules.system.vo.UserSelector;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 璁惧鍊熷嚭褰掕繕
@@ -245,6 +247,51 @@
 
     @Override
     @Transactional(rollbackFor = Exception.class)
+    public boolean equipmentReturn(String id) {
+        EamEquipmentLeanOut entity = equipmentLeanOutMapper.selectById(id);
+        if (entity == null) {
+            throw new JeecgBootException("瑕佹彁浜ょ殑鏁版嵁涓嶅瓨鍦紝璇峰埛鏂伴噸璇曪紒");
+        }
+        if (!EquipmentLeanOutStatusEnum.WAIT_RETURN.name().equals(entity.getLeanStatus())) {
+            throw new JeecgBootException("褰撳墠鏁版嵁鐘舵�佷笉鍏佽缂栬緫锛�");
+        }
+        //妫�鏌ヨ澶�
+        EamEquipment equipment = eamEquipmentService.getById(entity.getEquipmentId());
+        if (equipment == null) {
+            throw new JeecgBootException("璁惧涓嶅瓨鍦紒");
+        }
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        if (sysUser == null) {
+            throw new JeecgBootException("褰撳墠鐢ㄦ埛鏃犳硶缂栬緫灏佸瓨璁板綍锛�");
+        }
+        //鍚姩瀹℃壒娴佺▼
+        flowCommonService.initActBusiness("宸ュ崟鍙�:" + entity.getCode() + ";璁惧缂栧彿: " + equipment.getEquipmentCode() + ";杩涜璁惧褰掕繕",
+                entity.getId(), "IEamEquipmentLeanOutService", "equipment_return", null);
+        Map<String, Object> variables = new HashMap<>();
+        variables.put("dataId", entity.getId());
+        variables.put("organization", "鏂板褰掕繕榛樿褰掕繕娴佺▼");
+        variables.put("comment", "鏂板褰掕繕榛樿褰掕繕娴佺▼");
+        variables.put("proofreading", true);
+        // 鍒嗛厤缁欒澶囩鐞嗗憳
+        List<UserSelector> userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getOrgId(), BusinessCodeConst.PCR0004);
+        if (CollectionUtil.isEmpty(userSelectors)) {
+            throw new JeecgBootException("璁惧鏈垎閰嶇粰璁惧绠＄悊鍛橈紝鏃犳硶杩涘叆涓嬬骇瀹℃壒锛�");
+        }
+        List<String> usernames = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
+        variables.put("NextAssignee", usernames);
+        Result result = flowDefinitionService.startProcessInstanceByKey("equipment_return", variables);
+        if (result != null) {
+            entity.setLeanEndTime(new Date());
+            entity.setLeanStatus(EquipmentLeanOutStatusEnum.WAIT_CONFIRM.name());
+            //淇濆瓨宸ュ崟
+            equipmentLeanOutMapper.updateById(entity);
+            return result.isSuccess();
+        }
+        return true;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
     @EquipmentHistoryLog(operationTag = EquipmentOperationTagEnum.LEAN_OUT, businessTable = "eam_equipment_lean_out")
     public EamEquipmentLeanOut approval(EamEquipmentLeanOutRequest request) {
         EamEquipmentLeanOut entity = equipmentLeanOutMapper.selectById(request.getId());
@@ -321,6 +368,7 @@
                 values.put("organization", request.getReturnComment());
                 values.put("comment", request.getReturnComment());
                 values.put("NextAssignee", userApprovalList);
+                values.put("approvalDealType", "1");
                 request.setComment(request.getReturnComment());
                 entity.setLeanEndTime(new Date()); //褰掕繕鏃堕棿
                 //璁剧疆entity
@@ -331,16 +379,18 @@
                 break;
             // 褰掕繕纭
             case WAIT_CONFIRM:
+                values.put("approvalDealType", "1");
                 values.put("dataId", entity.getId());
                 values.put("organization", request.getConfirmComment());
                 values.put("comment", request.getConfirmComment());
                 request.setComment(request.getConfirmComment());
                 //璁剧疆entity
+                entity.setApprovalUser(user.getUsername());// 瀹℃牳浜�
                 entity.setLeanStatus(EquipmentLeanOutStatusEnum.COMPLETE.name());
                 entity.setConfirmUser(user.getUsername());
                 entity.setConfirmComment(request.getConfirmComment());
                 entity.setConfirmTime(new Date());
-                // 淇敼璁惧鐘舵��
+                // 淇敼璁惧鐘舵��0
                 equipment.setAssetStatus(AssetStatusEnum.NORMAL.name());
                 eamEquipmentService.updateById(equipment);
                 break;
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentSealUpServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentSealUpServiceImpl.java
index 390ec70..55c3f18 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentSealUpServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentSealUpServiceImpl.java
@@ -360,6 +360,9 @@
                     entity.setSealStatus(EquipmentSealUpStatusEnum.COMPLETE.name());
                     // 淇敼璁惧鐘舵��
                     equipment.setAssetStatus(AssetStatusEnum.NORMAL.name());
+                    // 淇敼璁惧鐘舵��
+                    equipment.setAssetStatus(AssetStatusEnum.NORMAL.name());
+                    eamEquipmentService.updateById(equipment);
                 } else {
                     //璁剧疆entity
                     entity.setSealStatus(EquipmentSealUpStatusEnum.SEALED.name());
@@ -369,9 +372,6 @@
                 entity.setUnsealApprovalComment(request.getUnsealApprovalComment());
                 entity.setUnsealApprovalDealType(request.getUnsealApprovalDealType());
                 entity.setUnsealApprovalTime(new Date());
-                // 淇敼璁惧鐘舵��
-                equipment.setAssetStatus(AssetStatusEnum.NORMAL.name());
-                eamEquipmentService.updateById(equipment);
                 break;
         }
         request.setValues(values);
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
index 6d30e4b..f0507d6 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
@@ -12,24 +12,27 @@
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.FileUploadResult;
 import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.exception.ExceptionCast;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.FileUtil;
 import org.jeecg.modules.eam.constant.MaintenanceStandardStatusEnum;
 import org.jeecg.modules.eam.entity.EamMaintenanceStandard;
 import org.jeecg.modules.eam.entity.EamMaintenanceStandardDetail;
+import org.jeecg.modules.eam.entity.EamSysFiles;
 import org.jeecg.modules.eam.mapper.EamMaintenanceStandardMapper;
 import org.jeecg.modules.eam.request.EamMaintenanceStandardRequest;
 import org.jeecg.modules.eam.service.IEamMaintenanceStandardDetailService;
 import org.jeecg.modules.eam.service.IEamMaintenanceStandardService;
+import org.jeecg.modules.eam.service.IEamSysFilesService;
+import org.jeecg.modules.system.service.ISysFilesService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -46,6 +49,9 @@
 
     @Autowired
     private IEamMaintenanceStandardDetailService eamMaintenanceStandardDetailService;
+
+    @Autowired
+    private IEamSysFilesService sysFilesService;
 
     @Override
     public IPage<EamMaintenanceStandard> queryPageList(Page<EamMaintenanceStandard> page, EamMaintenanceStandard eamMaintenanceStandard) {
@@ -71,7 +77,7 @@
             }
             //鍚嶇О 妯＄硦鏌ヨ
             if(StringUtils.isNotBlank(eamMaintenanceStandard.getStandardName())) {
-                queryWrapper.like("ems.standard_name", eamMaintenanceStandard.getStandardCode());
+                queryWrapper.like("ems.standard_name", eamMaintenanceStandard.getStandardName());
             }
             //璁惧
             if(StringUtils.isNotBlank(eamMaintenanceStandard.getEquipmentId())) {
@@ -290,4 +296,20 @@
         queryWrapper.eq(EamMaintenanceStandard::getStandardStatus, MaintenanceStandardStatusEnum.NORMAL.name());
         return eamMaintenanceStandardMapper.selectList(queryWrapper);
     }
+
+    @Override
+    public void downloadFile(HttpServletResponse response, EamMaintenanceStandard eamMaintenanceStandard) throws JsonProcessingException {
+        String json = eamMaintenanceStandard.getReferenceFile();
+        if(StringUtils.isNotBlank(json)){
+            ObjectMapper mapper = new ObjectMapper();
+            Map<String, Object> map = mapper.readValue(json, Map.class);
+            String fileEncodeName = (String) map.get("fileEncodeName");
+            List<EamSysFiles> list = sysFilesService.lambdaQuery().eq(EamSysFiles::getFileEncodeName, fileEncodeName).list();
+            if(list.size()>0){
+                FileUtil.downLoadFile(response, list.get(0).getFilePath(), list.get(0).getFileName());
+            }else{
+                ExceptionCast.cast("鏂囦欢涓嶅瓨鍦�");
+            }
+        }
+    }
 }
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java
index a9242cb..42ec1ff 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java
@@ -356,12 +356,12 @@
         switch (status) {
             case UNDER_MAINTENANCE:
                 //鎵ц瀹屾垚
-                //璁惧绠＄悊鍛樼‘璁�
-                String equipmentManager = equipment.getEquipmentManager();
-                if(StringUtils.isBlank(equipmentManager)) {
-                    throw new JeecgBootException("璁惧鏈垎閰嶈澶囩鐞嗗憳锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
+                //杞﹂棿璁惧绠＄悊鍛樼‘璁�
+                userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getOrgId(), BusinessCodeConst.PCR0004);
+                if (CollectionUtil.isEmpty(userSelectors)) {
+                    throw new JeecgBootException("璁惧鏈垎閰嶇粰杞﹂棿璁惧绠＄悊鍛橈紝鏃犳硶杩涘叆涓嬬骇瀹℃壒锛�");
                 }
-                userApprovalList = Collections.singletonList(equipmentManager);
+                userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
                 values.put("dataId", entity.getId());
                 values.put("organization", "浜屼繚鎵ц缁撴潫");
                 values.put("comment", "浜屼繚鎵ц缁撴潫");
@@ -389,11 +389,12 @@
                 eamEquipmentExtendService.updateEquipmentMaintenanceStatus(entity.getEquipmentId(), EquipmentMaintenanceStatus.SECOND_MAINTENANCE_WAIT_CONFIRM.name());
                 break;
             case WAIT_CONFIRM:
+                // 缁翠慨涓讳换纭
                 userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getOrgId(), BusinessCodeConst.PCR0003);
                 if (CollectionUtil.isEmpty(userSelectors)) {
-                    throw new JeecgBootException("璁惧鏈垎閰嶇粰杞﹂棿鐝粍闀匡紝鏃犳硶杩涘叆涓嬬骇瀹℃壒锛�");
+                    throw new JeecgBootException("璁惧鏈垎閰嶇粰缁翠慨涓讳换锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
                 }
-                //鐝粍闀跨‘璁�
+                //缁翠慨涓讳换纭
                 userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
                 values.put("dataId", entity.getId());
                 values.put("organization", request.getConfirmComment());
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
index 6121b18..86a24d7 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
@@ -283,9 +283,11 @@
         if (equipment == null) {
             throw new JeecgBootException("璁惧涓嶅瓨鍦紝娣诲姞澶辫触锛�");
         }
-        if (StringUtils.isBlank(equipment.getEquipmentManager())) {
-            throw new JeecgBootException("璁惧鏈垎閰嶈澶囩鐞嗗憳锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
+        List<UserSelector> userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getOrgId(), BusinessCodeConst.PCR0002);
+        if (CollectionUtil.isEmpty(userSelectors)) {
+            throw new JeecgBootException("璁惧鏈垎閰嶇粰缁翠慨宸ワ紝鏃犳硶杩涘叆涓嬬骇瀹℃壒锛�");
         }
+        List<String> userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         if (sysUser == null || !BusinessCodeConst.PCR0001.equals(sysUser.getPost())) {
             throw new JeecgBootException("涓嶆槸鎿嶄綔宸ワ紝鏃犳硶棰嗗彇姝ゅ伐鍗曪紒");
@@ -311,8 +313,10 @@
         }
         variables.put("proofreading", true);
         //骞惰浠诲姟浼氱
+        //鎿嶄綔宸ユ墽琛屼繚鍏�
         variables.put("maintenance_execution", Collections.singletonList(sysUser.getUsername()));
-        variables.put("precision_check", Collections.singletonList(equipment.getEquipmentManager()));
+        //缁翠慨宸ョ簿搴︽楠�
+        variables.put("precision_check", userApprovalList);
         Result result = flowDefinitionService.startProcessInstanceByKey("third_maintenance_process", variables);
         if (result != null) {
             //鏇存柊璁惧淇濆吇鐘舵��
@@ -370,7 +374,7 @@
                 //鎵ц瀹屾垚
                 userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getOrgId(), BusinessCodeConst.PCR0006);
                 if (CollectionUtil.isEmpty(userSelectors)) {
-                    throw new JeecgBootException("璁惧鏈垎閰嶇粰杞﹂棿鐝粍闀匡紝鏃犳硶杩涘叆涓嬬骇瀹℃壒锛�");
+                    throw new JeecgBootException("璁惧鏈垎閰嶇粰鏈哄姩鍔烇紝鏃犳硶杩涘叆涓嬬骇瀹℃壒锛�");
                 }
                 userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
                 values.put("dataId", entity.getId());
@@ -418,7 +422,7 @@
             case WAIT_CONFIRM:
                 userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getOrgId(), BusinessCodeConst.PCR0003);
                 if (CollectionUtil.isEmpty(userSelectors)) {
-                    throw new JeecgBootException("璁惧鏈垎閰嶇粰杞﹂棿鐝粍闀匡紝鏃犳硶杩涘叆涓嬬骇瀹℃壒锛�");
+                    throw new JeecgBootException("璁惧鏈垎閰嶇粰缁翠慨涓讳换锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
                 }
                 //鐝粍闀跨‘璁�
                 userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentHomeServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentHomeServiceImpl.java
new file mode 100644
index 0000000..52ad643
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentHomeServiceImpl.java
@@ -0,0 +1,72 @@
+package org.jeecg.modules.eam.service.impl;
+
+import cn.hutool.core.date.DateUtil;
+import org.jeecg.modules.eam.constant.SecondMaintenanceStatusEnum;
+import org.jeecg.modules.eam.constant.ThirdMaintenanceStatusEnum;
+import org.jeecg.modules.eam.entity.EamSecondMaintenanceOrder;
+import org.jeecg.modules.eam.entity.EamThirdMaintenanceOrder;
+import org.jeecg.modules.eam.mapper.EquipmentHomeMapper;
+import org.jeecg.modules.eam.service.IEquipmentHomeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+public class EquipmentHomeServiceImpl implements IEquipmentHomeService {
+
+    @Autowired
+    private EquipmentHomeMapper equipmentHomeMapper;
+
+    /**
+     *棣栭〉 鎶�鏈姸鎬佹暟閲忕粺璁�
+     */
+    @Override
+    public List<Map<String, Object>> getEquipmentTechnologyStatusList() {
+        return this.equipmentHomeMapper.getEquipmentTechnologyStatusList();
+    }
+
+    /**
+     *棣栭〉 璁惧鎶ヤ慨鎯呭喌缁熻
+     */
+    @Override
+    public List<Map<String, Object>> getReportRepairEquipmentList() {
+        return this.equipmentHomeMapper.getReportRepairEquipmentList();
+    }
+
+    /**
+     *棣栭〉 涓変繚璁″垝
+     * @return
+     */
+    @Override
+    public Map<String, Object> getThirdGuaranteesPlan() {
+        Map<String, Object> map = new HashMap<>();
+        //鑾峰彇鏈湀涓変繚璁″垝
+        List<EamThirdMaintenanceOrder> thirdMaintenanceOrderList = equipmentHomeMapper.getThirdGuaranteesPlan(DateUtil.format(new Date(), "yyyy-MM"));
+        //鑾峰彇涓嬫湀涓変繚璁″垝
+        List<EamThirdMaintenanceOrder> nextThirdMaintenanceOrderList = equipmentHomeMapper.getThirdGuaranteesPlan(DateUtil.format(DateUtil.nextMonth(), "yyyy-MM"));
+        map.put("thisMonthCount", thirdMaintenanceOrderList.size());
+        map.put("thisMonthFinishCount", thirdMaintenanceOrderList.stream().filter(eamThirdMaintenanceOrder -> ThirdMaintenanceStatusEnum.COMPLETE.name().equals(eamThirdMaintenanceOrder.getMaintenanceStatus())).collect(Collectors.toList()).size());
+        map.put("thisMonthOverdueCount", thirdMaintenanceOrderList.stream().filter(eamThirdMaintenanceOrder -> ThirdMaintenanceStatusEnum.EXPIRED.name().equals(eamThirdMaintenanceOrder.getMaintenanceStatus())).collect(Collectors.toList()).size());
+        map.put("nextMonthCount", nextThirdMaintenanceOrderList.size());
+        return map;
+    }
+
+    /**
+     *棣栭〉 浜屼繚璁″垝
+     */
+    @Override
+    public Map<String, Object> getSecondGuaranteesPlan() {
+        Map<String, Object> map = new HashMap<>();
+        //鑾峰彇鏈湀浜屼繚璁″垝
+        List<EamSecondMaintenanceOrder> secondMaintenanceOrderList = equipmentHomeMapper.getSecondGuaranteesPlan(DateUtil.format(new Date(), "yyyy-MM"));
+        //鑾峰彇涓嬫湀浜屼繚璁″垝
+        List<EamSecondMaintenanceOrder> nextsecondMaintenanceOrderList = equipmentHomeMapper.getSecondGuaranteesPlan(DateUtil.format(DateUtil.nextMonth(), "yyyy-MM"));
+        map.put("thisMonthCount", secondMaintenanceOrderList.size());
+        map.put("thisMonthFinishCount", secondMaintenanceOrderList.stream().filter(eamSecondMaintenanceOrder -> SecondMaintenanceStatusEnum.COMPLETE.name().equals(eamSecondMaintenanceOrder.getMaintenanceStatus())).collect(Collectors.toList()).size());
+        map.put("thisMonthOverdueCount", secondMaintenanceOrderList.stream().filter(eamSecondMaintenanceOrder -> SecondMaintenanceStatusEnum.EXPIRED.name().equals(eamSecondMaintenanceOrder.getMaintenanceStatus())).collect(Collectors.toList()).size());
+        map.put("nextMonthCount", nextsecondMaintenanceOrderList.size());
+        return map;
+    }
+}

--
Gitblit v1.9.3