From 132c2dd84ddd79259d3434643d7f749947d61631 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Mon, 1 Apr 2024 16:51:19 +0800 Subject: [PATCH] =?UTF-8?q?2024-4-1=20=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?= =?UTF-8?q?-=E8=AE=BE=E5=A4=87=E8=BF=90=E8=A1=8C=E8=AE=B0=E5=BD=95-?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1-=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=94=9F=E6=88=90=E4=B8=8D=E5=85=A8+=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E4=BA=BA=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/device/service/impl/DeviceTaskServiceImpl.java | 3 +-- .../main/resources/mapper/device/EquOperationMapper.xml | 8 +++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java index ef618dfa..f9bdb462 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java @@ -460,10 +460,9 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { for (EquOperation operation : operationList) { operation.setId(IdUtils.fastSimpleUUID());// id operation.setFactoryCode(poolName.replace("ds_", ""));// 工厂 - operation.setOperationTime(DateUtils.getTime());// 日期 operation.setOperationTime(operationTime);// 运行时间（默认运行时间） operation.setActualOperationTime(operationTime);// 实际运行时间（默认运行时间） - operation.setCreateBy("jod"); + operation.setCreateBy("job"); operation.setCreateTime(DateUtils.getNowDate()); } 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 86b7e668..cb968da2 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 @@ -118,12 +118,10 @@ 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 + 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' + and be.equipment_category != '1'