From 2d523c06a0bfcc48a91bc0b52926cf3c15b83537 Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Wed, 13 Dec 2023 09:06:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/op/device/domain/EquCheckItem.java     |  9 ++++-----
 .../com/op/device/domain/EquFaultType.java     |  4 ----
 .../java/com/op/device/domain/EquPlan.java     | 18 +++++++-----------
 .../resources/mapper/device/EquOrderMapper.xml |  2 +-
 4 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquCheckItem.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquCheckItem.java
index 7afc7db7..3063c2ca 100644
--- a/op-modules/op-device/src/main/java/com/op/device/domain/EquCheckItem.java
+++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquCheckItem.java
@@ -30,7 +30,7 @@ public class EquCheckItem extends BaseEntity {
 	private String itemName;
 
 	/** 检查项方法/工具 */
-	@Excel(name = "检查项方法/工具")
+	@Excel(name = "检查项方法")
 	private String itemMethod;
 
 	/** 维护类型编码 */
@@ -50,19 +50,15 @@ public class EquCheckItem extends BaseEntity {
 	private String factoryCode;
 
 	/** 备用字段1 */
-	@Excel(name = "备用字段1")
 	private String attr1;
 
 	/** 备用字段2 */
-	@Excel(name = "备用字段2")
 	private String attr2;
 
 	/** 备用字段3 */
-	@Excel(name = "备用字段3")
 	private String attr3;
 
 	/** 删除标识 */
-	@Excel(name = "删除标识")
 	private String delFlag;
 
 	/** 创建时间 */
@@ -96,12 +92,15 @@ public class EquCheckItem extends BaseEntity {
 	private String updateTimeEnd;
 
 	// 检查项工具
+	@Excel(name = "检查项工具")
 	private String itemTools;
 
 	// 循环周期类型
+	@Excel(name = "循环周期类型")
 	private String itemLoopType;
 
 	// 循环周期
+	@Excel(name = "循环周期")
 	private int itemLoop;
 
 	public int getItemLoop() {
diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultType.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultType.java
index 0afa5673..c389e4dc 100644
--- a/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultType.java
+++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultType.java
@@ -41,19 +41,15 @@ public class EquFaultType extends BaseEntity {
 	private String factoryCode;
 
 	/** 备用字段1 */
-	@Excel(name = "备用字段1")
 	private String attr1;
 
 	/** 备用字段2 */
-	@Excel(name = "备用字段2")
 	private String attr2;
 
 	/** 备用字段3 */
-	@Excel(name = "备用字段3")
 	private String attr3;
 
 	/** 删除标志 */
-	@Excel(name = "删除标志")
 	private String delFlag;
 
 	// 创建日期范围list
diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquPlan.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlan.java
index ea70141f..c3e6c8ac 100644
--- a/op-modules/op-device/src/main/java/com/op/device/domain/EquPlan.java
+++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlan.java
@@ -31,19 +31,16 @@ public class EquPlan extends BaseEntity {
 	private String planName;
 
 	/** 车间 */
-	@Excel(name = "车间")
+	@Excel(name = "车间编码")
 	private String planWorkshop;
 
 	/** 产线 */
-	@Excel(name = "产线")
 	private String planProdLine;
 
 	/** 设备名称 */
-	@Excel(name = "设备名称")
 	private String equipmentName;
 
 	/** 设备编码 */
-	@Excel(name = "设备编码")
 	private String equipmentCode;
 
 	/** 循环周期 */
@@ -65,7 +62,6 @@ public class EquPlan extends BaseEntity {
 	private Date planLoopEnd;
 
 	/** 巡检人员 */
-	@Excel(name = "巡检人员")
 	private String planPerson;
 
 	/** 计划状态 */
@@ -77,11 +73,9 @@ public class EquPlan extends BaseEntity {
 	private String planRestrict;
 
 	/** 维护类型 */
-	@Excel(name = "维护类型")
 	private String planType;
 
 	/** 是否委外 */
-	@Excel(name = "是否委外")
 	private String planOutsource;
 
 	/** 委外工单编码 */
@@ -93,19 +87,15 @@ public class EquPlan extends BaseEntity {
 	private String factoryCode;
 
 	/** 备用字段1 */
-	@Excel(name = "备用字段1")
 	private String attr1;
 
 	/** 备用字段2 */
-	@Excel(name = "备用字段2")
 	private String attr2;
 
 	/** 备用字段3 */
-	@Excel(name = "备用字段3")
 	private String attr3;
 
 	/** 删除标志 */
-	@Excel(name = "删除标志")
 	private String delFlag;
 
 	// 创建日期范围list
@@ -136,12 +126,14 @@ public class EquPlan extends BaseEntity {
 	private String workCenterName;
 
 	// 保养类型
+	@Excel(name = "保养类型")
 	private String upkeep;
 
 	// 计划保养时间计算规则
 	private String calculationRule;
 
 	// 是否停机保养
+	@Excel(name = "是否停机保养")
 	private String shutDown;
 	private String planEquId;
 
@@ -157,12 +149,16 @@ public class EquPlan extends BaseEntity {
 
 	private Date getLoopEndArrayEnd;
 
+	@Excel(name = "委外人员")
 	private String workPerson;
 
+	@Excel(name = "委外单位")
 	private String workOutsourcingUnit;
 
+	@Excel(name = "联系方式")
 	private String workConnection;
 
+	@Excel(name = "委外原因")
 	private String workReason;
 
 	public String getWorkOutsourcingUnit() {
diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml
index 549eed37..0a0ab9fb 100644
--- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml
+++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml
@@ -74,7 +74,7 @@
 			<if test="planLoopStart != null "> and plan_loop_start = #{planLoopStart}</if>
 			<if test="planLoopEnd != null "> and plan_loop_end = #{planLoopEnd}</if>
 			<if test="orderStart != null "> and order_start = #{orderStart}</if>
-			<if test="orderEnd != null "> and order_end = #{orderEnd}</if>
+			<if test="orderEnd != null "> and order_end = #{ord5erEnd}</if>
 			<if test="orderStatus != null  and orderStatus != ''"> and order_status = #{orderStatus}</if>
 			<if test="orderCost != null "> and order_cost = #{orderCost}</if>
 			<if test="planPerson != null  and planPerson != ''"> and plan_person like concat('%', #{planPerson}, '%')</if>