From 4a94e29ebaafe130430848a42935d86f777794c2 Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Fri, 5 Jan 2024 17:28:24 +0800
Subject: [PATCH] =?UTF-8?q?PDA=E8=AF=A6=E6=83=85=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/device/EquOperationMapper.xml      |  8 ++-
 .../mapper/device/EquOrderMapper.xml          | 52 +++++++++++++++++--
 2 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOperationMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOperationMapper.xml
index 14afae5c..981c7e2b 100644
--- a/op-modules/op-device/src/main/resources/mapper/device/EquOperationMapper.xml
+++ b/op-modules/op-device/src/main/resources/mapper/device/EquOperationMapper.xml
@@ -105,13 +105,17 @@
     </select>
 
     <select id="selectEquipments" resultType="com.op.device.domain.EquOperation">
-        select be.equipment_code AS 'equipmentCode',be.equipment_name AS 'equipmentName',zx.equipment_name AS 'groupLine',be.workshop_name AS 'workshop'
+        select be.equipment_code AS 'equipmentCode',
+               be.equipment_name AS 'equipmentName',
+               zx.equipment_name AS 'groupLine',
+               be.workshop_name  AS 'workshop'
         from base_equipment be
                  left join equ_bind_auxiliary_equipment bae
                            on bae.auxiliary_equipment_code = be.equipment_code
                  left join base_equipment zx
                            on bae.equipment_code = zx.equipment_code
-        where be.del_flag = '0' and be.equipment_category = '0'
+        where be.del_flag = '0'
+          and be.equipment_category = '0'
     </select>
 
     <select id="checkInsertOperation" resultType="java.lang.Integer">
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 114dfa96..2fe00c62 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
@@ -189,11 +189,53 @@
 	</select>
 
 	<select id="selectTaskRecord" parameterType="String" resultMap="EquOrderResult">
-		<include refid="selectEquOrderVo"/>
-		where del_flag = '0' and order_status = '1' and plan_type = #{planType} and plan_person = #{userId} and order_code in (
-		select order_code from equ_order_person where del_flag = '0' and user_name = #{userId} GROUP BY order_code
-		)
-		order by update_time desc
+		select eo.order_id,
+			   eo.plan_id,
+			   eo.plan_code,
+			   eo.plan_type,
+			   eo.order_code,
+			   eo.plan_workshop,
+			   eo.plan_prod_line,
+			   eo.plan_loop,
+			   eo.plan_loop_type,
+			   eo.plan_loop_start,
+			   eo.plan_loop_end,
+			   eo.order_start,
+			   eo.order_end,
+			   eo.equipment_code,
+			   eo.order_status,
+			   eo.order_cost,
+			   eo.plan_person,
+			   eo.order_cost_time,
+			   eo.order_sign_person,
+			   eo.factory_code,
+			   eo.attr1,
+			   eo.attr2,
+			   eo.attr3,
+			   eo.del_flag,
+			   eo.create_by,
+			   eo.create_time,
+			   eo.update_by,
+			   eo.update_time,
+			   eo.upkeep,
+			   eo.calculation_rule,
+			   eo.shut_down,
+			   eo.order_inspect,
+			   eo.repair_code,
+			   eo.work_code,
+			   eo.outsource_code,
+			   be.equipment_name
+		from equ_order eo
+				 left join base_equipment be on eo.equipment_code = be.equipment_code
+		where eo.del_flag = '0'
+		  and eo.order_status = '1'
+		  and eo.plan_type = #{planType}
+		  and eo.plan_person = #{userId}
+		  and eo.order_code in (select order_code
+								from equ_order_person
+								where del_flag = '0' and user_name = #{userId}
+								GROUP BY order_code)
+		order by eo.update_time desc
 	</select>
 
 	<select id="selectEquipmentNameByEquCode" resultType="java.lang.String">