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'