|
|
|
@ -161,7 +161,7 @@ public class DmsBaseMachineInfoServiceImpl implements IDmsBaseMachineInfoService
|
|
|
|
.leftJoin(ProdBaseWorkshopInfo.class, ProdBaseWorkshopInfo::getWorkshopId, ProdBaseMachineInfo::getWorkshopId)
|
|
|
|
.leftJoin(ProdBaseWorkshopInfo.class, ProdBaseWorkshopInfo::getWorkshopId, ProdBaseMachineInfo::getWorkshopId)
|
|
|
|
.leftJoin(ProdBaseDeviceMode.class, ProdBaseDeviceMode::getDeviceModeId, ProdBaseMachineInfo::getDeviceModeId)*/
|
|
|
|
.leftJoin(ProdBaseDeviceMode.class, ProdBaseDeviceMode::getDeviceModeId, ProdBaseMachineInfo::getDeviceModeId)*/
|
|
|
|
|
|
|
|
|
|
|
|
.select(DmsBaseDeviceType::getDeviceTypeName)
|
|
|
|
.selectAs(DmsBaseDeviceType::getDeviceTypeName, DmsBaseMachineInfo::getDeviceTypeName)
|
|
|
|
.leftJoin(DmsBaseDeviceType.class, DmsBaseDeviceType::getDeviceTypeId, DmsBaseMachineInfo::getMachineType)
|
|
|
|
.leftJoin(DmsBaseDeviceType.class, DmsBaseDeviceType::getDeviceTypeId, DmsBaseMachineInfo::getMachineType)
|
|
|
|
|
|
|
|
|
|
|
|
.eq(bo.getMachineId() != null, DmsBaseMachineInfo::getMachineId, bo.getMachineId())
|
|
|
|
.eq(bo.getMachineId() != null, DmsBaseMachineInfo::getMachineId, bo.getMachineId())
|
|
|
|
|