From 783150feedca1a9668be8e94b79a00022f073005 Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Fri, 5 Jan 2024 15:40:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=85=BB=E6=89=8B=E6=8C=81=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4BUG=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DevicePDAController.java       |  2 +
 .../service/impl/DevicePDAServiceImpl.java    |  8 ++-
 .../mapper/device/EquOrderMapper.xml          | 50 +++++++++++++++++--
 3 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java b/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java
index c6bbdb7f..8d4602a5 100644
--- a/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java
+++ b/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java
@@ -198,4 +198,6 @@ public class DevicePDAController extends BaseController {
     public AjaxResult getFaultReasonList(EquFaultReason equFaultReason) {
         return devicePDAService.selectEquFaultReasonList(equFaultReason);
     }
+
+
 }
diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java
index 8d4d6e3e..79cc9f17 100644
--- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java
+++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java
@@ -366,7 +366,13 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
             // 费用
             BigDecimal sparePartsCost = equSpareApplyMapper.getSparePartsCost(equOrder.getOrderCode());
             BigDecimal orderCost = equOrder.getOrderCost();
-            equOrder.setOrderCost(sparePartsCost.add(orderCost));
+            if (orderCost!=null) {
+                if (sparePartsCost==null) {
+                    equOrder.setOrderCost(orderCost);
+                }else {
+                    equOrder.setOrderCost(sparePartsCost.add(orderCost));
+                }
+            }
 
             // 更新设备状态为正常运行
             equ.setStatus("1");
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 cefc4601..6f3e7531 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
@@ -48,6 +48,7 @@
 		<result property="itemTools"	column="item_tools"	/>
 
 		<result property="outsourceCode"	column="outsource_code"	/>
+		<result property="equipmentName"	column="equipment_name"	/>
 	</resultMap>
 
 	<sql id="selectEquOrderVo">
@@ -138,10 +139,51 @@
 	</select>
 
 	<select id="selectTodayTask" parameterType="String" resultMap="EquOrderResult">
-		<include refid="selectEquOrderVo"/>
-		where plan_type = #{planType} and del_flag = '0' and order_status != '1' and order_code in (
-		select order_code from equ_order_person where del_flag = '0' and user_name = #{userId} GROUP BY order_code
-		)
+		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.plan_type = #{planType}
+		  and eo.del_flag = '0'
+		  and eo.order_status != '1'
+		  and eo.order_code in (select order_code
+								from equ_order_person
+								where del_flag = '0' and user_name = #{userId}
+								GROUP BY order_code)
 	</select>
 
 	<select id="selectTaskRecord" parameterType="String" resultMap="EquOrderResult">