From 784c20f17212e813d964264fc8514028f73ff33e Mon Sep 17 00:00:00 2001 From: A0010407 Date: Wed, 28 Feb 2024 14:58:38 +0800 Subject: [PATCH] =?UTF-8?q?2024-2-28=20=E8=AE=BE=E5=A4=87=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF=20=E7=BB=B4=E4=BF=AE=E5=B7=A5=E5=8D=95=E5=88=A4?= =?UTF-8?q?=E7=A9=BA=E5=A4=84=E7=90=86+=E6=98=BE=E7=A4=BA=E9=99=90?= =?UTF-8?q?=E5=88=B6=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/service/impl/DeviceInterfaceServiceImpl.java | 8 ++------ .../resources/mapper/device/DeviceInterfaceMapper.xml | 7 +++---- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java index 7a323b58..0a560a28 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java @@ -5,18 +5,14 @@ import com.op.common.core.utils.DateUtils; import com.op.common.core.web.domain.AjaxResult; import com.op.device.domain.*; import com.op.device.mapper.*; -import com.op.device.domain.EquOperationRecord; import com.op.device.domain.EquRepairWorkOrder; -import com.op.device.domain.MesReportWork; import com.op.device.domain.vo.IEquFaultVO; -import com.op.device.mapper.EquEquipmentMapper; import com.op.device.domain.vo.IEquipmentVO; import com.op.device.domain.vo.IRepairWorkOrderVO; import com.op.device.service.IDeviceInterfaceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; @@ -45,9 +41,9 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService { if(orderVO.getWorkHandle() != null){ if (orderVO.getWorkHandle().equals("0")) { orderVO.setWorkHandle("立即"); - } else { - orderVO.setWorkHandle("计划"); } + }else { + orderVO.setWorkHandle("计划"); } } } diff --git a/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml index e79b6ece..b21f9adb 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml @@ -13,11 +13,10 @@ wo.work_plan_time AS "workPlanTime", be.equipment_location AS "equipmentLocation" from equ_repair_work_order wo - left join base_equipment be - on wo.equipment_code = be.equipment_code - left join equ_team et - on wo.work_team = et.team_code + left join base_equipment be on wo.equipment_code = be.equipment_code + left join equ_team et on wo.work_team = et.team_code where wo.work_status = '0' + and wo.del_flag = '0'