From 870fde44b5268e056fc33cc067fc63130a30fb64 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Mon, 23 Oct 2023 15:58:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E4=BF=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/device/EquRepairOrderMapper.xml    | 44 +++++++++++++++----
 1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml
index a1b9135f..a7bd58c7 100644
--- a/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml
+++ b/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml
@@ -27,12 +27,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="updateBy"	column="update_by"	/>
 		<result property="updateTime"	column="update_time"	/>
 		<result property="repairDestination"	column="repair_destination"	/>
-
+		<!-- 设备 -->
 		<result property="equipmentTypeName"	column="equipment_type_name"	/>
 		<result property="equipmentName"	column="equipment_name"	/>
 		<result property="equipmentLocation"	column="equipment_location"	/>
 		<result property="department"	column="department"	/>
 		<result property="equipmentSpec"	column="equipment_spec"	/>
+		<!-- 计划 -->
+		<result property="workPlanTime"	column="work_plan_time"	/>
+		<result property="workPlanDownTime"	column="work_plan_down_time"	/>
+		<result property="workTeam"	column="work_team"	/>
+        <!-- 委外 -->
+		<result property="outSourcePerson"	column="work_person"	/>
+		<result property="workOutsourcingUnit"	column="work_outsourcing_unit"	/>
+		<result property="workConnection"	column="work_connection"	/>
+		<result property="outSourceReason"	column="work_reason"	/>
 	</resultMap>
 
 	<sql id="selectEquRepairOrderVo">
@@ -42,15 +51,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="selectEquRepairOrderList" parameterType="EquRepairOrder" resultMap="EquRepairOrderResult">
 		<include refid="selectEquRepairOrderVo"/>
 		<where>  
-			<if test="orderCode != null  and orderCode != ''"> and order_code = #{orderCode}</if>
-			<if test="equipmentCode != null  and equipmentCode != ''"> and equipment_code = #{equipmentCode}</if>
-			<if test="orderDesc != null  and orderDesc != ''"> and order_desc = #{orderDesc}</if>
+			<if test="orderCode != null  and orderCode != ''"> and order_code like concat('%', #{orderCode}, '%')</if>
+			<if test="equipmentCode != null  and equipmentCode != ''"> and equipment_code like concat('%', #{equipmentCode}, '%')</if>
+			<if test="orderDesc != null  and orderDesc != ''"> and order_desc like concat('%', #{orderDesc}, '%')</if>
 			<if test="orderBreakdownTime != null "> and order_breakdown_time = #{orderBreakdownTime}</if>
-			<if test="orderSource != null  and orderSource != ''"> and order_source = #{orderSource}</if>
+			<if test="orderSource != null  and orderSource != ''"> and order_source like concat('%', #{orderSource}, '%')</if>
 			<if test="orderTime != null "> and order_time = #{orderTime}</if>
 			<if test="orderHandle != null  and orderHandle != ''"> and order_handle = #{orderHandle}</if>
-			<if test="orderRepairman != null  and orderRepairman != ''"> and order_repairman = #{orderRepairman}</if>
-			<if test="orderConnection != null  and orderConnection != ''"> and order_connection = #{orderConnection}</if>
+			<if test="orderRepairman != null  and orderRepairman != ''"> and order_repairman like concat('%', #{orderRepairman}, '%')</if>
+			<if test="orderConnection != null  and orderConnection != ''"> and order_connection like concat('%', #{orderConnection}, '%')</if>
 			<if test="orderStatus != null  and orderStatus != ''"> and order_status = #{orderStatus}</if>
 			<if test="orderRelevance != null  and orderRelevance != ''"> and order_relevance = #{orderRelevance}</if>
 			<if test="orderPicture != null  and orderPicture != ''"> and order_picture = #{orderPicture}</if>
@@ -87,9 +96,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		    be.equipment_type_name,
 			be.equipment_spec,
 			be.department,
-			be.equipment_location
+			be.equipment_location,
+			rwo.work_plan_down_time,
+			rwo.work_plan_time,
+			rwo.work_team,
+			eow.work_person,
+			eow.work_outsourcing_unit,
+			eow.work_connection,
+			eow.work_reason
 		from equ_repair_order ero
 		left join base_equipment be on ero.equipment_code = be.equipment_code
+		left join equ_repair_work_order rwo on ero.order_code = rwo.order_code
+		left join equ_outsource_work eow on ero.order_code = eow.work_code
 		where ero.order_id = #{orderId}
 		and ero.del_flag = '0'
 	</select>
@@ -192,4 +210,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		and del_flag = '0'
 	</select>
 
+	<select id="getPersonList" parameterType="EquPerson" resultType="com.op.device.domain.EquPerson">
+		select
+		user_id AS userId,
+		user_name AS userName,
+		nick_name AS nickName,
+		CONCAT(nick_name,user_name) AS teamUserName
+		from sys_user
+	    where del_flag = '0'
+	</select>
+
 </mapper>
\ No newline at end of file