From 2f9c7c1c030d6d48831386d42dd927188552848f Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Thu, 16 Nov 2023 17:39:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=85=BB=E5=A7=94=E5=A4=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/op/device/domain/EquOrder.java   |  9 +++++
 .../java/com/op/device/domain/EquPlan.java    | 40 +++++++++++++++++++
 .../mapper/device/EquOrderMapper.xml          |  7 +++-
 .../resources/mapper/device/EquPlanMapper.xml | 22 +++++++++-
 4 files changed, 76 insertions(+), 2 deletions(-)

diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java
index 259e990e..439b112c 100644
--- a/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java
+++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java
@@ -151,6 +151,15 @@ public class EquOrder extends BaseEntity {
 
 	private String equipmentName;
 	private String planRestrict;
+	private String outsourceCode;
+
+	public String getOutsourceCode() {
+		return outsourceCode;
+	}
+
+	public void setOutsourceCode(String outsourceCode) {
+		this.outsourceCode = outsourceCode;
+	}
 
 	private List<EquOrderDetail> detailList;
 
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 9dcc738c..a630e7d8 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
@@ -157,6 +157,46 @@ public class EquPlan extends BaseEntity {
 
 	private Date getLoopEndArrayEnd;
 
+	private String workPerson;
+
+	private String workOutsourcingUnit;
+
+	private String workConnection;
+
+	private String workReason;
+
+	public String getWorkOutsourcingUnit() {
+		return workOutsourcingUnit;
+	}
+
+	public void setWorkOutsourcingUnit(String workOutsourcingUnit) {
+		this.workOutsourcingUnit = workOutsourcingUnit;
+	}
+
+	public String getWorkConnection() {
+		return workConnection;
+	}
+
+	public void setWorkConnection(String workConnection) {
+		this.workConnection = workConnection;
+	}
+
+	public String getWorkReason() {
+		return workReason;
+	}
+
+	public void setWorkReason(String workReason) {
+		this.workReason = workReason;
+	}
+
+	public String getWorkPerson() {
+		return workPerson;
+	}
+
+	public void setWorkPerson(String workPerson) {
+		this.workPerson = workPerson;
+	}
+
 	public List<Date> getLoopEndArray() {
 		return loopEndArray;
 	}
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 6394d68f..db97cf3c 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
@@ -39,6 +39,7 @@
 		<result property="orderInspect"	column="order_inspect"	/>
 		<result property="repairCode"	column="repair_code"	/>
 		<result property="workCode"	column="work_code"	/>
+		<result property="outsourceCode"	column="outsource_code"	/>
 	</resultMap>
 
 	<sql id="selectEquOrderVo">
@@ -46,7 +47,7 @@
 		       plan_loop_start, plan_loop_end, order_start, order_end, equipment_code, order_status,
 		       order_cost, plan_person, order_cost_time, order_sign_person,
 		       factory_code, attr1, attr2, attr3, del_flag, create_by, create_time,
-		       update_by, update_time,upkeep,calculation_rule,shut_down,order_inspect,repair_code,work_code
+		       update_by, update_time,upkeep,calculation_rule,shut_down,order_inspect,repair_code,work_code,outsource_code
 		from equ_order
 	</sql>
 
@@ -84,6 +85,7 @@
 			<if test="shutDown != null "> and shut_down = #{shutDown}</if>
 			<if test="orderInspect != null "> and order_inspect = #{orderInspect}</if>
 			<if test="repairCode != null "> and repair_code = #{repairCode}</if>
+			<if test="outsourceCode != null "> and outsource_code = #{outsourceCode}</if>
 			<if test="workCode != null "> and work_code = #{workCode}</if>
 			and del_flag = '0'
 			<if test="(equipmentCode != null  and equipmentCode != '') or (equipmentName != null and equipmentName != '')">
@@ -182,6 +184,7 @@
 			<if test="repairCode != null">repair_code,</if>
 			<if test="workCode != null">work_code,</if>
 			<if test="planRestrict != null">plan_restrict,</if>
+			<if test="outsourceCode != null">outsource_code,</if>
 		</trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
 			<if test="orderId != null">#{orderId},</if>
@@ -219,6 +222,7 @@
 			<if test="repairCode != null">#{repairCode},</if>
 			<if test="workCode != null">#{workCode},</if>
 			<if test="planRestrict != null">#{planRestrict},</if>
+			<if test="outsourceCode != null">#{outsourceCode},</if>
 		</trim>
 	</insert>
 
@@ -258,6 +262,7 @@
 			<if test="orderInspect != null">order_inspect = #{orderInspect},</if>
 			<if test="repairCode != null">repair_code = #{repairCode},</if>
 			<if test="workCode != null">work_code = #{workCode},</if>
+			<if test="outsourceCode != null">outsource_code = #{outsourceCode},</if>
 		</trim>
 		where order_id = #{orderId}
 	</update>
diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquPlanMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquPlanMapper.xml
index a0eb4be8..a73fcf74 100644
--- a/op-modules/op-device/src/main/resources/mapper/device/EquPlanMapper.xml
+++ b/op-modules/op-device/src/main/resources/mapper/device/EquPlanMapper.xml
@@ -34,10 +34,14 @@
 		<result property="createTime"	column="create_time"	/>
 		<result property="updateBy"	column="update_by"	/>
 		<result property="updateTime"	column="update_time"	/>
+		<result property="workPerson"	column="work_person"	/>
+		<result property="workOutsourcingUnit"	column="work_outsourcing_unit"	/>
+		<result property="workConnection"	column="work_connection"	/>
+		<result property="workReason"	column="work_reason"	/>
 	</resultMap>
 
 	<sql id="selectEquPlanVo">
-		select plan_id, plan_code, plan_name, plan_workshop, plan_prod_line, equipment_name, equipment_code, plan_loop, plan_loop_type, plan_loop_start, plan_loop_end, plan_person, plan_status, plan_restrict, plan_type, plan_outsource, work_code, upkeep, calculation_rule, shut_down, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time from equ_plan
+		select plan_id, plan_code, plan_name, plan_workshop, plan_prod_line, equipment_name, equipment_code, plan_loop, plan_loop_type, plan_loop_start, plan_loop_end, plan_person, plan_status, plan_restrict, plan_type, plan_outsource, work_code, upkeep, calculation_rule, shut_down, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time , work_person, work_outsourcing_unit, work_connection,work_reason from equ_plan
 	</sql>
 
 	<select id="selectEquPlanList" parameterType="EquPlan" resultMap="EquPlanResult">
@@ -60,6 +64,10 @@
 			<if test="planOutsource != null  and planOutsource != ''"> and plan_outsource = #{planOutsource}</if>
 			<if test="workCode != null  and workCode != ''"> and work_code like concat('%', #{workCode}, '%')</if>
 			<if test="factoryCode != null  and factoryCode != ''"> and factory_code = #{factoryCode}</if>
+			<if test="workPerson != null  and workPerson != ''"> and work_person = #{workPerson}</if>
+			<if test="workOutsourcingUnit != null  and workOutsourcingUnit != ''"> and work_outsourcing_unit = #{workOutsourcingUnit}</if>
+			<if test="workConnection != null  and workConnection != ''"> and work_connection = #{workConnection}</if>
+			<if test="workReason != null  and workReason != ''"> and work_reason = #{workReason}</if>
 			<if test="attr1 != null  and attr1 != ''"> and attr1 = #{attr1}</if>
 			<if test="attr2 != null  and attr2 != ''"> and attr2 = #{attr2}</if>
 			<if test="attr3 != null  and attr3 != ''"> and attr3 = #{attr3}</if>
@@ -135,6 +143,10 @@
 			<if test="createTime != null">create_time,</if>
 			<if test="updateBy != null and updateBy != ''">update_by,</if>
 			<if test="updateTime != null">update_time,</if>
+			<if test="workPerson != null">work_person,</if>
+			<if test="workOutsourcingUnit != null">work_outsourcing_unit,</if>
+			<if test="workConnection != null">work_connection,</if>
+			<if test="workReason != null">work_reason,</if>
 		</trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
 			<if test="planId != null">#{planId},</if>
@@ -166,6 +178,10 @@
 			<if test="createTime != null">#{createTime},</if>
 			<if test="updateBy != null and updateBy != ''">#{updateBy},</if>
 			<if test="updateTime != null">#{updateTime},</if>
+			<if test="workPerson != null">#{workPerson},</if>
+			<if test="workOutsourcingUnit != null">#{workOutsourcingUnit},</if>
+			<if test="workConnection != null">#{workConnection},</if>
+			<if test="workReason != null">#{workReason},</if>
 		</trim>
 	</insert>
 
@@ -200,6 +216,10 @@
 			<if test="createTime != null">create_time = #{createTime},</if>
 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
 			<if test="updateTime != null">update_time = #{updateTime},</if>
+			<if test="workPerson != null">work_person = #{workPerson},</if>
+			<if test="workOutsourcingUnit != null">work_outsourcing_unit = #{workOutsourcingUnit},</if>
+			<if test="workConnection != null">work_connection = #{workConnection},</if>
+			<if test="workReason != null">work_reason = #{workReason},</if>
 		</trim>
 		where plan_id = #{planId}
 	</update>