From 9729cb7cb30ba7a11119f84dc680c8f302098dc3 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 07 七月 2025 11:36:17 +0800
Subject: [PATCH] update
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java | 4 ++++
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamWeekInspectionDetail.java | 8 ++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml | 2 +-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java | 2 +-
4 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java
index 277a3a9..5f8f044 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java
@@ -113,4 +113,8 @@
@ApiModelProperty(value = "璁惧鍚嶇О")
@TableField(exist = false)
private String equipmentName;
+
+ @ApiModelProperty(value = "璁惧鍨嬪彿")
+ @TableField(exist = false)
+ private String equipmentModel;
}
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamWeekInspectionDetail.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamWeekInspectionDetail.java
index 744467c..5d3ecea 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamWeekInspectionDetail.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamWeekInspectionDetail.java
@@ -65,6 +65,14 @@
/**淇濆吇瑕佹眰*/
@ApiModelProperty(value = "淇濆吇瑕佹眰")
private String itemDemand;
+ /**鐐规浜�*/
+ @Excel(name = "鐐规浜�", width = 15)
+ @ApiModelProperty(value = "鐐规浜�")
+ private String inspector;
+ /**鐐规鏃堕棿*/
+ @Excel(name = "鐐规鏃堕棿", width = 15)
+ @ApiModelProperty(value = "鐐规鏃堕棿")
+ private String inspectTime;
public EamWeekInspectionDetail(){}
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 9461c66..2c34c4a 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
@@ -3,7 +3,7 @@
<mapper namespace="org.jeecg.modules.eam.mapper.EamInspectionOrderMapper">
<select id="queryPageList" resultType="org.jeecg.modules.eam.entity.EamInspectionOrder">
- select wmo.*, e.equipment_code, e.equipment_name
+ select wmo.*, e.equipment_code, e.equipment_name, e.equipment_model
from eam_inspection_order wmo
inner join eam_equipment e
on wmo.equipment_id = e.id
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 724dfbf..596714b 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
@@ -291,7 +291,7 @@
query.setEquipmentId(equipmentId);
query.setKeyword(keyword);
query.setMaintenanceCategory(maintenanceCategory);
- query.setStandardStatus(MaintenanceStandardStatusEnum.WAIT_SUBMIT.name());
+ query.setStandardStatus(MaintenanceStandardStatusEnum.START.name());
IPage<EamMaintenanceStandard> pageData = this.queryPageList(page, query);
return pageData.getRecords();
}
--
Gitblit v1.9.3