diff --git a/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/mapper/xml/SmartBeamFieldProductionLineMapper.xml b/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/mapper/xml/SmartBeamFieldProductionLineMapper.xml
index fb2876211..bffc3792a 100644
--- a/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/mapper/xml/SmartBeamFieldProductionLineMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/mapper/xml/SmartBeamFieldProductionLineMapper.xml
@@ -13,12 +13,20 @@
diff --git a/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/impl/SmartBeamFieldProductionLineServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/impl/SmartBeamFieldProductionLineServiceImpl.java
index e20ce5243..dd157090f 100644
--- a/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/impl/SmartBeamFieldProductionLineServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/impl/SmartBeamFieldProductionLineServiceImpl.java
@@ -8,7 +8,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zhgd.jeecg.common.execption.OpenAlertException;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
+import com.zhgd.xmgl.enums.ParamEnum;
import com.zhgd.xmgl.modules.smartbeamfield.entity.SmartBeamFieldBeam;
+import com.zhgd.xmgl.modules.smartbeamfield.entity.SmartBeamFieldMakeBeamPedestal;
import com.zhgd.xmgl.modules.smartbeamfield.entity.SmartBeamFieldProductionLine;
import com.zhgd.xmgl.modules.smartbeamfield.entity.SmartBeamFieldProductionLineToMakeBeamPedestal;
import com.zhgd.xmgl.modules.smartbeamfield.mapper.SmartBeamFieldBeamMapper;
@@ -108,7 +110,14 @@ public class SmartBeamFieldProductionLineServiceImpl extends ServiceImpl beamPedestalList = line.getMakeBeamPedestals();
+ if (CollUtil.isNotEmpty(beamPedestalList)) {
+ for (SmartBeamFieldMakeBeamPedestal pedestal : beamPedestalList) {
+ pedestal.setPedestalTypeName(ParamEnum.getStr(ParamEnum.SmartBeamFieldMakeBeamPedestalPedestalTypeEnum.values(), pedestal.getPedestalType()));
+ }
+ }
+ return line;
}
@Override
diff --git a/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/impl/SmartBeamFieldSaveBeamDistrictServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/impl/SmartBeamFieldSaveBeamDistrictServiceImpl.java
index fe907b3db..374cd1130 100644
--- a/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/impl/SmartBeamFieldSaveBeamDistrictServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/impl/SmartBeamFieldSaveBeamDistrictServiceImpl.java
@@ -7,7 +7,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.xmgl.modules.smartbeamfield.entity.SmartBeamFieldBeam;
+import com.zhgd.xmgl.modules.smartbeamfield.entity.SmartBeamFieldBeamToSaveBeamPedestal;
import com.zhgd.xmgl.modules.smartbeamfield.entity.SmartBeamFieldSaveBeamDistrict;
+import com.zhgd.xmgl.modules.smartbeamfield.entity.SmartBeamFieldSaveBeamPedestal;
import com.zhgd.xmgl.modules.smartbeamfield.mapper.SmartBeamFieldBeamMapper;
import com.zhgd.xmgl.modules.smartbeamfield.mapper.SmartBeamFieldBeamToSaveBeamPedestalMapper;
import com.zhgd.xmgl.modules.smartbeamfield.mapper.SmartBeamFieldSaveBeamDistrictMapper;
@@ -81,11 +83,13 @@ public class SmartBeamFieldSaveBeamDistrictServiceImpl extends ServiceImpl beamList = smartBeamFieldBeamMapper.selectList(new LambdaQueryWrapper()
- .eq(SmartBeamFieldBeam::getSmartBeamFieldBridgeSectionId, id));
- for (SmartBeamFieldBeam beam : beamList) {
- smartBeamFieldSaveBeamPedestalService.delete(String.valueOf(beam.getId()));
-
+ List pedestals = smartBeamFieldSaveBeamPedestalMapper.selectList(new LambdaQueryWrapper()
+ .eq(SmartBeamFieldSaveBeamPedestal::getSmartBeamFieldSaveBeamDistrictId, id));
+ smartBeamFieldSaveBeamPedestalMapper.delete(new LambdaQueryWrapper()
+ .eq(SmartBeamFieldSaveBeamPedestal::getSmartBeamFieldSaveBeamDistrictId, id));
+ for (SmartBeamFieldSaveBeamPedestal pedestal : pedestals) {
+ smartBeamFieldBeamToSaveBeamPedestalMapper.delete(new LambdaQueryWrapper()
+ .eq(SmartBeamFieldBeamToSaveBeamPedestal::getSmartBeamFieldSaveBeamPedestalId, pedestal.getId()));
}
baseMapper.deleteById(id);
return true;