From 5677ab158fb78d1267c16bbbf29eb690e0b4039f Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 13 十二月 2023 16:53:39 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
index 0a74de7..bde0eee 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
@@ -74,6 +74,9 @@
@Resource
private IEquipmentLogService equipmentLogService;
+ @Resource
+ private IEquipmentBaseInfoService equipmentBaseInfoService;
+
@Override
public Map<String, String> getDepNamesByEquipmentIds(List<String> equipmentIds) {
List<MdcEquipmentDepVo> list = this.baseMapper.getDepNamesByEquipmentIds(equipmentIds);
@@ -424,6 +427,11 @@
}
mdcEquipmentDto.setMdcDriveTypeParamConfigList(mdcDriveTypeParamList);
}
+ EquipmentBaseInfo equipmentBaseInfo = equipmentBaseInfoService.getByEquipmentId(mdcEquipment.getEquipmentId());
+ if (equipmentBaseInfo != null) {
+ mdcEquipmentDto.setMaxAxis(equipmentBaseInfo.getMaxAxis());
+ mdcEquipmentDto.setValidAxis(equipmentBaseInfo.getValidAxis());
+ }
}
}
return mdcEquipmentDto;
--
Gitblit v1.9.3