From dd10536a21d6117a971f6d283702e9a5c06d0eef Mon Sep 17 00:00:00 2001
From: guo <guo@guo>
Date: Thu, 7 Dec 2023 18:19:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=99=BA=E6=85=A7=E6=A2=81=E5=9C=BA=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xml/SmartBeamFieldProductionLineMapper.xml     | 12 ++++++++++--
 .../SmartBeamFieldProductionLineServiceImpl.java   | 11 ++++++++++-
 .../SmartBeamFieldSaveBeamDistrictServiceImpl.java | 14 +++++++++-----
 3 files changed, 29 insertions(+), 8 deletions(-)

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 @@
         </collection>
     </resultMap>
     <select id="queryById" resultMap="getProductionLineAndMakeBeamPedestals">
-        select sbfpl.*, mb.smart_beam_field_make_beam_pedestal_id, mb.process_sort, bp.*
+        select sbfpl.*,
+        mb.smart_beam_field_make_beam_pedestal_id,
+        mb.process_sort,
+        bp.*,
+        group_concat(sbfp.process_name) pedestalProcess
         from smart_beam_field_production_line sbfpl
         left join smart_beam_field_production_line_to_make_beam_pedestal mb
         on mb.smart_beam_field_production_line_id = sbfpl.id
         left join smart_beam_field_make_beam_pedestal bp on mb.smart_beam_field_make_beam_pedestal_id = bp.id
+        left join smart_beam_field_make_beam_pedestal_to_process sbfmbptp
+        on bp.id = sbfmbptp.smart_beam_field_make_beam_pedestal_id
+        left join smart_beam_field_process sbfp on sbfmbptp.smart_beam_field_process_id = sbfp.id
         where sbfpl.id = #{id}
-        order by sbfpl.id desc,mb.process_sort
+        group by bp.id
+        order by sbfpl.id desc, mb.process_sort
     </select>
 </mapper>
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<SmartBe
 
     @Override
     public SmartBeamFieldProductionLine queryById(String id) {
-        return baseMapper.queryById(id);
+        SmartBeamFieldProductionLine line = baseMapper.queryById(id);
+        List<SmartBeamFieldMakeBeamPedestal> 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<Smart
 
     @Override
     public boolean delete(String id) {
-        List<SmartBeamFieldBeam> beamList = smartBeamFieldBeamMapper.selectList(new LambdaQueryWrapper<SmartBeamFieldBeam>()
-                .eq(SmartBeamFieldBeam::getSmartBeamFieldBridgeSectionId, id));
-        for (SmartBeamFieldBeam beam : beamList) {
-            smartBeamFieldSaveBeamPedestalService.delete(String.valueOf(beam.getId()));
-
+        List<SmartBeamFieldSaveBeamPedestal> pedestals = smartBeamFieldSaveBeamPedestalMapper.selectList(new LambdaQueryWrapper<SmartBeamFieldSaveBeamPedestal>()
+                .eq(SmartBeamFieldSaveBeamPedestal::getSmartBeamFieldSaveBeamDistrictId, id));
+        smartBeamFieldSaveBeamPedestalMapper.delete(new LambdaQueryWrapper<SmartBeamFieldSaveBeamPedestal>()
+                .eq(SmartBeamFieldSaveBeamPedestal::getSmartBeamFieldSaveBeamDistrictId, id));
+        for (SmartBeamFieldSaveBeamPedestal pedestal : pedestals) {
+            smartBeamFieldBeamToSaveBeamPedestalMapper.delete(new LambdaQueryWrapper<SmartBeamFieldBeamToSaveBeamPedestal>()
+                    .eq(SmartBeamFieldBeamToSaveBeamPedestal::getSmartBeamFieldSaveBeamPedestalId, pedestal.getId()));
         }
         baseMapper.deleteById(id);
         return true;