删除危大和特种作业，把关联的四个东西也删除

src/main/java/com/zhgd/xmgl/modules/dangerous/controller/DangerousEngineeringRecordController.java

@@ -225,18 +225,8 @@ public class DangerousEngineeringRecordController {
     @ApiImplicitParam(name = "id", value = "现场危大工程ID", paramType = "body", required = true, dataType = "Integer")
     @PostMapping(value = "/delete")
     public Result<DangerousEngineeringRecord> delete(@RequestBody Map<String, Object> map) {
-        Result<DangerousEngineeringRecord> result = new Result<DangerousEngineeringRecord>();
+        dangerousEngineeringRecordService.delete(map);
-        DangerousEngineeringRecord dangerousEngineeringRecord = dangerousEngineeringRecordService.getById(MapUtils.getString(map, "id"));
+        return Result.ok();
-        if (dangerousEngineeringRecord == null) {
-            result.error500(MessageUtil.get("notFindErr"));
-        } else {
-            boolean ok = dangerousEngineeringRecordService.removeById(MapUtils.getString(map, "id"));
-            if (ok) {
-                result.successMsg(MessageUtil.get("deleteSucess"));
-            }
-        }
-
-        return result;
     }
 
     /**

src/main/java/com/zhgd/xmgl/modules/dangerous/service/IDangerousEngineeringRecordService.java

@@ -66,4 +66,10 @@ public interface IDangerousEngineeringRecordService extends IService<DangerousEn
      * @param engineeringId
      */
     void finish(Long engineeringId);
+
+    /**
+     *
+     * @param map
+     */
+    void delete(Map<String, Object> map);
 }

src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringRecordServiceImpl.java

@@ -25,13 +25,16 @@ import com.zhgd.xmgl.modules.dangerous.service.IDangerousEngineeringRecordServic
 import com.zhgd.xmgl.modules.dangerous.service.IDangerousEngineeringSideStationService;
 import com.zhgd.xmgl.modules.dangerous.service.IHiddenDangerInspectRecordService;
 import com.zhgd.xmgl.modules.worker.mapper.EnterpriseInfoMapper;
+import com.zhgd.xmgl.modules.xz.entity.XzDangerousEngineeringAcceptance;
 import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityQualityInspectionRecord;
 import com.zhgd.xmgl.modules.xz.security.entity.vo.GetStatScoreVo;
 import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityQualityInspectionRecordService;
+import com.zhgd.xmgl.modules.xz.service.IXzDangerousEngineeringAcceptanceService;
 import com.zhgd.xmgl.util.MapBuilder;
 import com.zhgd.xmgl.util.MessageUtil;
 import org.apache.commons.collections.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -53,6 +56,12 @@ public class DangerousEngineeringRecordServiceImpl extends ServiceImpl<Dangerous
     SystemUserMapper systemUserMapper;
     @Autowired
     INoticeService noticeService;
+    @Lazy
+    @Autowired
+    DangerousEngineeringProgressRecordServiceImpl dangerousEngineeringProgressRecordService;
+    @Lazy
+    @Autowired
+    IXzDangerousEngineeringAcceptanceService xzDangerousEngineeringAcceptanceService;
     @Autowired
     private DangerousEngineeringAcceptanceCheckMapper dangerousEngineeringAcceptanceCheckMapper;
     @Autowired
@@ -284,4 +293,32 @@ public class DangerousEngineeringRecordServiceImpl extends ServiceImpl<Dangerous
                 .set(DangerousEngineeringRecord::getFinalAcceptanceStatus, 2)
         );
     }
+
+    @Override
+    public void delete(Map<String, Object> map) {
+        String id = MapUtils.getString(map, "id");
+        DangerousEngineeringRecord dangerousEngineeringRecord = getById(id);
+        if (dangerousEngineeringRecord == null) {
+            throw new OpenAlertException(MessageUtil.get("notFindErr"));
+        }
+        removeById(id);
+
+        int val = 1;
+        dangerousEngineeringProgressRecordService.remove(new LambdaQueryWrapper<DangerousEngineeringProgressRecord>()
+                .eq(DangerousEngineeringProgressRecord::getEngineeringId, id)
+                .eq(DangerousEngineeringProgressRecord::getType, val)
+        );
+        dangerousEngineeringSideStationService.remove(new LambdaQueryWrapper<DangerousEngineeringSideStation>()
+                .eq(DangerousEngineeringSideStation::getDangerousEngineeringId, id)
+                .eq(DangerousEngineeringSideStation::getType, val)
+        );
+        xzDangerousEngineeringAcceptanceService.remove(new LambdaQueryWrapper<XzDangerousEngineeringAcceptance>()
+                .eq(XzDangerousEngineeringAcceptance::getEngineeringId, id)
+                .eq(XzDangerousEngineeringAcceptance::getType, val)
+        );
+        xzSecurityQualityInspectionRecordService.remove(new LambdaQueryWrapper<XzSecurityQualityInspectionRecord>()
+                .eq(XzSecurityQualityInspectionRecord::getEngineeringId, id)
+                .eq(XzSecurityQualityInspectionRecord::getType, val)
+        );
+    }
 }

src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzBlindPlatePlugSafeServiceImpl.java

@@ -9,11 +9,16 @@ 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.dangerous.entity.DangerousEngineeringProgressRecord;
+import com.zhgd.xmgl.modules.dangerous.entity.DangerousEngineeringSideStation;
+import com.zhgd.xmgl.modules.dangerous.service.IDangerousEngineeringSideStationService;
+import com.zhgd.xmgl.modules.dangerous.service.impl.DangerousEngineeringProgressRecordServiceImpl;
 import com.zhgd.xmgl.modules.worker.service.IUserEnterpriseService;
+import com.zhgd.xmgl.modules.xz.entity.XzDangerousEngineeringAcceptance;
 import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityQualityInspectionRecord;
 import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityQualityInspectionRecordService;
+import com.zhgd.xmgl.modules.xz.service.IXzDangerousEngineeringAcceptanceService;
 import com.zhgd.xmgl.modules.xz.special.entity.XzBlindPlatePlugSafe;
-import com.zhgd.xmgl.modules.xz.special.entity.vo.CountSpecialByFinalStatusVo;
 import com.zhgd.xmgl.modules.xz.special.entity.vo.CountSpecialVo;
 import com.zhgd.xmgl.modules.xz.special.mapper.XzBlindPlatePlugSafeMapper;
 import com.zhgd.xmgl.modules.xz.special.mapper.XzGasAnalyzeMapper;
@@ -47,6 +52,15 @@ public class XzBlindPlatePlugSafeServiceImpl extends ServiceImpl<XzBlindPlatePlu
     IUserEnterpriseService userEnterpriseService;
     @Lazy
     @Autowired
+    DangerousEngineeringProgressRecordServiceImpl dangerousEngineeringProgressRecordService;
+    @Lazy
+    @Autowired
+    IXzDangerousEngineeringAcceptanceService xzDangerousEngineeringAcceptanceService;
+    @Lazy
+    @Autowired
+    IDangerousEngineeringSideStationService dangerousEngineeringSideStationService;
+    @Lazy
+    @Autowired
     private XzBlindPlatePlugSafeMapper xzSpecialOperationFireSafetyMapper;
     @Lazy
     @Autowired
@@ -108,9 +122,22 @@ public class XzBlindPlatePlugSafeServiceImpl extends ServiceImpl<XzBlindPlatePlu
             throw new OpenAlertException("未找到对应实体");
         }
         baseMapper.deleteById(id);
+        int val = 4;
+        dangerousEngineeringProgressRecordService.remove(new LambdaQueryWrapper<DangerousEngineeringProgressRecord>()
+                .eq(DangerousEngineeringProgressRecord::getEngineeringId, id)
+                .eq(DangerousEngineeringProgressRecord::getType, val)
+        );
+        dangerousEngineeringSideStationService.remove(new LambdaQueryWrapper<DangerousEngineeringSideStation>()
+                .eq(DangerousEngineeringSideStation::getDangerousEngineeringId, id)
+                .eq(DangerousEngineeringSideStation::getType, val)
+        );
+        xzDangerousEngineeringAcceptanceService.remove(new LambdaQueryWrapper<XzDangerousEngineeringAcceptance>()
+                .eq(XzDangerousEngineeringAcceptance::getEngineeringId, id)
+                .eq(XzDangerousEngineeringAcceptance::getType, val)
+        );
         xzSecurityQualityInspectionRecordService.remove(new LambdaQueryWrapper<XzSecurityQualityInspectionRecord>()
                 .eq(XzSecurityQualityInspectionRecord::getEngineeringId, id)
-                .eq(XzSecurityQualityInspectionRecord::getType, 4)
+                .eq(XzSecurityQualityInspectionRecord::getType, val)
         );
     }
 

src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzGroundSafetServiceImpl.java

@@ -9,9 +9,15 @@ 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.dangerous.entity.DangerousEngineeringProgressRecord;
+import com.zhgd.xmgl.modules.dangerous.entity.DangerousEngineeringSideStation;
+import com.zhgd.xmgl.modules.dangerous.service.IDangerousEngineeringSideStationService;
+import com.zhgd.xmgl.modules.dangerous.service.impl.DangerousEngineeringProgressRecordServiceImpl;
 import com.zhgd.xmgl.modules.worker.service.IUserEnterpriseService;
+import com.zhgd.xmgl.modules.xz.entity.XzDangerousEngineeringAcceptance;
 import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityQualityInspectionRecord;
 import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityQualityInspectionRecordService;
+import com.zhgd.xmgl.modules.xz.service.IXzDangerousEngineeringAcceptanceService;
 import com.zhgd.xmgl.modules.xz.special.entity.XzGroundSafet;
 import com.zhgd.xmgl.modules.xz.special.mapper.XzGasAnalyzeMapper;
 import com.zhgd.xmgl.modules.xz.special.mapper.XzGroundSafetMapper;
@@ -41,6 +47,15 @@ import java.util.Objects;
 public class XzGroundSafetServiceImpl extends ServiceImpl<XzGroundSafetMapper, XzGroundSafet> implements IXzGroundSafetService {
     @Autowired
     IUserEnterpriseService userEnterpriseService;
+    @Lazy
+    @Autowired
+    DangerousEngineeringProgressRecordServiceImpl dangerousEngineeringProgressRecordService;
+    @Lazy
+    @Autowired
+    IXzDangerousEngineeringAcceptanceService xzDangerousEngineeringAcceptanceService;
+    @Lazy
+    @Autowired
+    IDangerousEngineeringSideStationService dangerousEngineeringSideStationService;
     @Autowired
     private XzGroundSafetMapper xzSpecialOperationFireSafetyMapper;
     @Autowired
@@ -48,6 +63,7 @@ public class XzGroundSafetServiceImpl extends ServiceImpl<XzGroundSafetMapper, X
     @Lazy
     @Autowired
     private IXzSecurityQualityInspectionRecordService xzSecurityQualityInspectionRecordService;
+
     @Override
     public IPage<XzGroundSafet> queryPageList(HashMap<String, Object> paramMap) {
         QueryWrapper<XzGroundSafet> queryWrapper = getQueryWrapper(paramMap);
@@ -102,11 +118,23 @@ public class XzGroundSafetServiceImpl extends ServiceImpl<XzGroundSafetMapper, X
             throw new OpenAlertException("未找到对应实体");
         }
         baseMapper.deleteById(id);
+        int val = 8;
+        dangerousEngineeringProgressRecordService.remove(new LambdaQueryWrapper<DangerousEngineeringProgressRecord>()
+                .eq(DangerousEngineeringProgressRecord::getEngineeringId, id)
+                .eq(DangerousEngineeringProgressRecord::getType, val)
+        );
+        dangerousEngineeringSideStationService.remove(new LambdaQueryWrapper<DangerousEngineeringSideStation>()
+                .eq(DangerousEngineeringSideStation::getDangerousEngineeringId, id)
+                .eq(DangerousEngineeringSideStation::getType, val)
+        );
+        xzDangerousEngineeringAcceptanceService.remove(new LambdaQueryWrapper<XzDangerousEngineeringAcceptance>()
+                .eq(XzDangerousEngineeringAcceptance::getEngineeringId, id)
+                .eq(XzDangerousEngineeringAcceptance::getType, val)
+        );
         xzSecurityQualityInspectionRecordService.remove(new LambdaQueryWrapper<XzSecurityQualityInspectionRecord>()
                 .eq(XzSecurityQualityInspectionRecord::getEngineeringId, id)
-                .eq(XzSecurityQualityInspectionRecord::getType, 8)
+                .eq(XzSecurityQualityInspectionRecord::getType, val)
         );
-
     }
 
     @Override

src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHighJobSafeServiceImpl.java

@@ -9,9 +9,15 @@ 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.dangerous.entity.DangerousEngineeringProgressRecord;
+import com.zhgd.xmgl.modules.dangerous.entity.DangerousEngineeringSideStation;
+import com.zhgd.xmgl.modules.dangerous.service.IDangerousEngineeringSideStationService;
+import com.zhgd.xmgl.modules.dangerous.service.impl.DangerousEngineeringProgressRecordServiceImpl;
 import com.zhgd.xmgl.modules.worker.service.IUserEnterpriseService;
+import com.zhgd.xmgl.modules.xz.entity.XzDangerousEngineeringAcceptance;
 import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityQualityInspectionRecord;
 import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityQualityInspectionRecordService;
+import com.zhgd.xmgl.modules.xz.service.IXzDangerousEngineeringAcceptanceService;
 import com.zhgd.xmgl.modules.xz.special.entity.XzHighJobSafe;
 import com.zhgd.xmgl.modules.xz.special.mapper.XzGasAnalyzeMapper;
 import com.zhgd.xmgl.modules.xz.special.mapper.XzHighJobSafeMapper;
@@ -41,6 +47,15 @@ import java.util.Objects;
 public class XzHighJobSafeServiceImpl extends ServiceImpl<XzHighJobSafeMapper, XzHighJobSafe> implements IXzHighJobSafeService {
     @Autowired
     IUserEnterpriseService userEnterpriseService;
+    @Lazy
+    @Autowired
+    DangerousEngineeringProgressRecordServiceImpl dangerousEngineeringProgressRecordService;
+    @Lazy
+    @Autowired
+    IXzDangerousEngineeringAcceptanceService xzDangerousEngineeringAcceptanceService;
+    @Lazy
+    @Autowired
+    IDangerousEngineeringSideStationService dangerousEngineeringSideStationService;
     @Autowired
     private XzHighJobSafeMapper xzSpecialOperationFireSafetyMapper;
     @Autowired
@@ -48,6 +63,7 @@ public class XzHighJobSafeServiceImpl extends ServiceImpl<XzHighJobSafeMapper, X
     @Lazy
     @Autowired
     private IXzSecurityQualityInspectionRecordService xzSecurityQualityInspectionRecordService;
+
     @Override
     public IPage<XzHighJobSafe> queryPageList(HashMap<String, Object> paramMap) {
         QueryWrapper<XzHighJobSafe> queryWrapper = getQueryWrapper(paramMap);
@@ -102,9 +118,23 @@ public class XzHighJobSafeServiceImpl extends ServiceImpl<XzHighJobSafeMapper, X
             throw new OpenAlertException("未找到对应实体");
         }
         baseMapper.deleteById(id);
+
+        int val = 5;
+        dangerousEngineeringProgressRecordService.remove(new LambdaQueryWrapper<DangerousEngineeringProgressRecord>()
+                .eq(DangerousEngineeringProgressRecord::getEngineeringId, id)
+                .eq(DangerousEngineeringProgressRecord::getType, val)
+        );
+        dangerousEngineeringSideStationService.remove(new LambdaQueryWrapper<DangerousEngineeringSideStation>()
+                .eq(DangerousEngineeringSideStation::getDangerousEngineeringId, id)
+                .eq(DangerousEngineeringSideStation::getType, val)
+        );
+        xzDangerousEngineeringAcceptanceService.remove(new LambdaQueryWrapper<XzDangerousEngineeringAcceptance>()
+                .eq(XzDangerousEngineeringAcceptance::getEngineeringId, id)
+                .eq(XzDangerousEngineeringAcceptance::getType, val)
+        );
         xzSecurityQualityInspectionRecordService.remove(new LambdaQueryWrapper<XzSecurityQualityInspectionRecord>()
                 .eq(XzSecurityQualityInspectionRecord::getEngineeringId, id)
-                .eq(XzSecurityQualityInspectionRecord::getType, 5)
+                .eq(XzSecurityQualityInspectionRecord::getType, val)
         );
 
     }

src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHoistSafetyWorkServiceImpl.java

@@ -9,9 +9,15 @@ 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.dangerous.entity.DangerousEngineeringProgressRecord;
+import com.zhgd.xmgl.modules.dangerous.entity.DangerousEngineeringSideStation;
+import com.zhgd.xmgl.modules.dangerous.service.IDangerousEngineeringSideStationService;
+import com.zhgd.xmgl.modules.dangerous.service.impl.DangerousEngineeringProgressRecordServiceImpl;
 import com.zhgd.xmgl.modules.worker.service.IUserEnterpriseService;
+import com.zhgd.xmgl.modules.xz.entity.XzDangerousEngineeringAcceptance;
 import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityQualityInspectionRecord;
 import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityQualityInspectionRecordService;
+import com.zhgd.xmgl.modules.xz.service.IXzDangerousEngineeringAcceptanceService;
 import com.zhgd.xmgl.modules.xz.special.entity.XzHoistSafetyWork;
 import com.zhgd.xmgl.modules.xz.special.mapper.XzGasAnalyzeMapper;
 import com.zhgd.xmgl.modules.xz.special.mapper.XzHoistSafetyWorkMapper;
@@ -41,6 +47,15 @@ import java.util.Objects;
 public class XzHoistSafetyWorkServiceImpl extends ServiceImpl<XzHoistSafetyWorkMapper, XzHoistSafetyWork> implements IXzHoistSafetyWorkService {
     @Autowired
     IUserEnterpriseService userEnterpriseService;
+    @Lazy
+    @Autowired
+    DangerousEngineeringProgressRecordServiceImpl dangerousEngineeringProgressRecordService;
+    @Lazy
+    @Autowired
+    IXzDangerousEngineeringAcceptanceService xzDangerousEngineeringAcceptanceService;
+    @Lazy
+    @Autowired
+    IDangerousEngineeringSideStationService dangerousEngineeringSideStationService;
     @Autowired
     private XzHoistSafetyWorkMapper xzSpecialOperationFireSafetyMapper;
     @Autowired
@@ -48,6 +63,7 @@ public class XzHoistSafetyWorkServiceImpl extends ServiceImpl<XzHoistSafetyWorkM
     @Lazy
     @Autowired
     private IXzSecurityQualityInspectionRecordService xzSecurityQualityInspectionRecordService;
+
     @Override
     public IPage<XzHoistSafetyWork> queryPageList(HashMap<String, Object> paramMap) {
         QueryWrapper<XzHoistSafetyWork> queryWrapper = getQueryWrapper(paramMap);
@@ -102,11 +118,23 @@ public class XzHoistSafetyWorkServiceImpl extends ServiceImpl<XzHoistSafetyWorkM
             throw new OpenAlertException("未找到对应实体");
         }
         baseMapper.deleteById(id);
+        int val = 6;
+        dangerousEngineeringProgressRecordService.remove(new LambdaQueryWrapper<DangerousEngineeringProgressRecord>()
+                .eq(DangerousEngineeringProgressRecord::getEngineeringId, id)
+                .eq(DangerousEngineeringProgressRecord::getType, val)
+        );
+        dangerousEngineeringSideStationService.remove(new LambdaQueryWrapper<DangerousEngineeringSideStation>()
+                .eq(DangerousEngineeringSideStation::getDangerousEngineeringId, id)
+                .eq(DangerousEngineeringSideStation::getType, val)
+        );
+        xzDangerousEngineeringAcceptanceService.remove(new LambdaQueryWrapper<XzDangerousEngineeringAcceptance>()
+                .eq(XzDangerousEngineeringAcceptance::getEngineeringId, id)
+                .eq(XzDangerousEngineeringAcceptance::getType, val)
+        );
         xzSecurityQualityInspectionRecordService.remove(new LambdaQueryWrapper<XzSecurityQualityInspectionRecord>()
                 .eq(XzSecurityQualityInspectionRecord::getEngineeringId, id)
-                .eq(XzSecurityQualityInspectionRecord::getType, 6)
+                .eq(XzSecurityQualityInspectionRecord::getType, val)
         );
-
     }
 
     @Override

src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzLimitSpaceSafeServiceImpl.java

@@ -9,9 +9,15 @@ 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.dangerous.entity.DangerousEngineeringProgressRecord;
+import com.zhgd.xmgl.modules.dangerous.entity.DangerousEngineeringSideStation;
+import com.zhgd.xmgl.modules.dangerous.service.IDangerousEngineeringSideStationService;
+import com.zhgd.xmgl.modules.dangerous.service.impl.DangerousEngineeringProgressRecordServiceImpl;
 import com.zhgd.xmgl.modules.worker.service.IUserEnterpriseService;
+import com.zhgd.xmgl.modules.xz.entity.XzDangerousEngineeringAcceptance;
 import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityQualityInspectionRecord;
 import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityQualityInspectionRecordService;
+import com.zhgd.xmgl.modules.xz.service.IXzDangerousEngineeringAcceptanceService;
 import com.zhgd.xmgl.modules.xz.special.entity.XzLimitSpaceSafe;
 import com.zhgd.xmgl.modules.xz.special.mapper.XzGasAnalyzeMapper;
 import com.zhgd.xmgl.modules.xz.special.mapper.XzLimitSpaceSafeMapper;
@@ -41,6 +47,15 @@ import java.util.Objects;
 public class XzLimitSpaceSafeServiceImpl extends ServiceImpl<XzLimitSpaceSafeMapper, XzLimitSpaceSafe> implements IXzLimitSpaceSafeService {
     @Autowired
     IUserEnterpriseService userEnterpriseService;
+    @Lazy
+    @Autowired
+    DangerousEngineeringProgressRecordServiceImpl dangerousEngineeringProgressRecordService;
+    @Lazy
+    @Autowired
+    IXzDangerousEngineeringAcceptanceService xzDangerousEngineeringAcceptanceService;
+    @Lazy
+    @Autowired
+    IDangerousEngineeringSideStationService dangerousEngineeringSideStationService;
     @Autowired
     private XzLimitSpaceSafeMapper xzSpecialOperationFireSafetyMapper;
     @Autowired
@@ -48,6 +63,7 @@ public class XzLimitSpaceSafeServiceImpl extends ServiceImpl<XzLimitSpaceSafeMap
     @Lazy
     @Autowired
     private IXzSecurityQualityInspectionRecordService xzSecurityQualityInspectionRecordService;
+
     @Override
     public IPage<XzLimitSpaceSafe> queryPageList(HashMap<String, Object> paramMap) {
         QueryWrapper<XzLimitSpaceSafe> queryWrapper = getQueryWrapper(paramMap);
@@ -101,11 +117,23 @@ public class XzLimitSpaceSafeServiceImpl extends ServiceImpl<XzLimitSpaceSafeMap
             throw new OpenAlertException("未找到对应实体");
         }
         baseMapper.deleteById(id);
+        int val = 3;
+        dangerousEngineeringProgressRecordService.remove(new LambdaQueryWrapper<DangerousEngineeringProgressRecord>()
+                .eq(DangerousEngineeringProgressRecord::getEngineeringId, id)
+                .eq(DangerousEngineeringProgressRecord::getType, val)
+        );
+        dangerousEngineeringSideStationService.remove(new LambdaQueryWrapper<DangerousEngineeringSideStation>()
+                .eq(DangerousEngineeringSideStation::getDangerousEngineeringId, id)
+                .eq(DangerousEngineeringSideStation::getType, val)
+        );
+        xzDangerousEngineeringAcceptanceService.remove(new LambdaQueryWrapper<XzDangerousEngineeringAcceptance>()
+                .eq(XzDangerousEngineeringAcceptance::getEngineeringId, id)
+                .eq(XzDangerousEngineeringAcceptance::getType, val)
+        );
         xzSecurityQualityInspectionRecordService.remove(new LambdaQueryWrapper<XzSecurityQualityInspectionRecord>()
                 .eq(XzSecurityQualityInspectionRecord::getEngineeringId, id)
-                .eq(XzSecurityQualityInspectionRecord::getType, 3)
+                .eq(XzSecurityQualityInspectionRecord::getType, val)
         );
-
     }
 
     @Override

src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzOpenCircuitSafeServiceImpl.java

@@ -9,9 +9,15 @@ 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.dangerous.entity.DangerousEngineeringProgressRecord;
+import com.zhgd.xmgl.modules.dangerous.entity.DangerousEngineeringSideStation;
+import com.zhgd.xmgl.modules.dangerous.service.IDangerousEngineeringSideStationService;
+import com.zhgd.xmgl.modules.dangerous.service.impl.DangerousEngineeringProgressRecordServiceImpl;
 import com.zhgd.xmgl.modules.worker.service.IUserEnterpriseService;
+import com.zhgd.xmgl.modules.xz.entity.XzDangerousEngineeringAcceptance;
 import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityQualityInspectionRecord;
 import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityQualityInspectionRecordService;
+import com.zhgd.xmgl.modules.xz.service.IXzDangerousEngineeringAcceptanceService;
 import com.zhgd.xmgl.modules.xz.special.entity.XzOpenCircuitSafe;
 import com.zhgd.xmgl.modules.xz.special.mapper.XzGasAnalyzeMapper;
 import com.zhgd.xmgl.modules.xz.special.mapper.XzOpenCircuitSafeMapper;
@@ -41,6 +47,15 @@ import java.util.Objects;
 public class XzOpenCircuitSafeServiceImpl extends ServiceImpl<XzOpenCircuitSafeMapper, XzOpenCircuitSafe> implements IXzOpenCircuitSafeService {
     @Autowired
     IUserEnterpriseService userEnterpriseService;
+    @Lazy
+    @Autowired
+    DangerousEngineeringProgressRecordServiceImpl dangerousEngineeringProgressRecordService;
+    @Lazy
+    @Autowired
+    IXzDangerousEngineeringAcceptanceService xzDangerousEngineeringAcceptanceService;
+    @Lazy
+    @Autowired
+    IDangerousEngineeringSideStationService dangerousEngineeringSideStationService;
     @Autowired
     private XzOpenCircuitSafeMapper xzSpecialOperationFireSafetyMapper;
     @Autowired
@@ -48,6 +63,7 @@ public class XzOpenCircuitSafeServiceImpl extends ServiceImpl<XzOpenCircuitSafeM
     @Lazy
     @Autowired
     private IXzSecurityQualityInspectionRecordService xzSecurityQualityInspectionRecordService;
+
     @Override
     public IPage<XzOpenCircuitSafe> queryPageList(HashMap<String, Object> paramMap) {
         QueryWrapper<XzOpenCircuitSafe> queryWrapper = getQueryWrapper(paramMap);
@@ -102,11 +118,23 @@ public class XzOpenCircuitSafeServiceImpl extends ServiceImpl<XzOpenCircuitSafeM
             throw new OpenAlertException("未找到对应实体");
         }
         baseMapper.deleteById(id);
+        int val = 9;
+        dangerousEngineeringProgressRecordService.remove(new LambdaQueryWrapper<DangerousEngineeringProgressRecord>()
+                .eq(DangerousEngineeringProgressRecord::getEngineeringId, id)
+                .eq(DangerousEngineeringProgressRecord::getType, val)
+        );
+        dangerousEngineeringSideStationService.remove(new LambdaQueryWrapper<DangerousEngineeringSideStation>()
+                .eq(DangerousEngineeringSideStation::getDangerousEngineeringId, id)
+                .eq(DangerousEngineeringSideStation::getType, val)
+        );
+        xzDangerousEngineeringAcceptanceService.remove(new LambdaQueryWrapper<XzDangerousEngineeringAcceptance>()
+                .eq(XzDangerousEngineeringAcceptance::getEngineeringId, id)
+                .eq(XzDangerousEngineeringAcceptance::getType, val)
+        );
         xzSecurityQualityInspectionRecordService.remove(new LambdaQueryWrapper<XzSecurityQualityInspectionRecord>()
                 .eq(XzSecurityQualityInspectionRecord::getEngineeringId, id)
-                .eq(XzSecurityQualityInspectionRecord::getType, 9)
+                .eq(XzSecurityQualityInspectionRecord::getType, val)
         );
-
     }
 
     @Override

src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzSpecialOperationFireSafetyServiceImpl.java

@@ -9,9 +9,15 @@ 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.dangerous.entity.DangerousEngineeringProgressRecord;
+import com.zhgd.xmgl.modules.dangerous.entity.DangerousEngineeringSideStation;
+import com.zhgd.xmgl.modules.dangerous.service.IDangerousEngineeringSideStationService;
+import com.zhgd.xmgl.modules.dangerous.service.impl.DangerousEngineeringProgressRecordServiceImpl;
 import com.zhgd.xmgl.modules.worker.service.IUserEnterpriseService;
+import com.zhgd.xmgl.modules.xz.entity.XzDangerousEngineeringAcceptance;
 import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityQualityInspectionRecord;
 import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityQualityInspectionRecordService;
+import com.zhgd.xmgl.modules.xz.service.IXzDangerousEngineeringAcceptanceService;
 import com.zhgd.xmgl.modules.xz.special.entity.XzGasAnalyze;
 import com.zhgd.xmgl.modules.xz.special.entity.XzSpecialOperationFireSafety;
 import com.zhgd.xmgl.modules.xz.special.mapper.XzSpecialOperationFireSafetyMapper;
@@ -42,6 +48,15 @@ import java.util.Objects;
 public class XzSpecialOperationFireSafetyServiceImpl extends ServiceImpl<XzSpecialOperationFireSafetyMapper, XzSpecialOperationFireSafety> implements IXzSpecialOperationFireSafetyService {
     @Autowired
     IUserEnterpriseService userEnterpriseService;
+    @Lazy
+    @Autowired
+    DangerousEngineeringProgressRecordServiceImpl dangerousEngineeringProgressRecordService;
+    @Lazy
+    @Autowired
+    IXzDangerousEngineeringAcceptanceService xzDangerousEngineeringAcceptanceService;
+    @Lazy
+    @Autowired
+    IDangerousEngineeringSideStationService dangerousEngineeringSideStationService;
     @Autowired
     private XzSpecialOperationFireSafetyMapper xzSpecialOperationFireSafetyMapper;
     @Autowired
@@ -49,6 +64,7 @@ public class XzSpecialOperationFireSafetyServiceImpl extends ServiceImpl<XzSpeci
     @Lazy
     @Autowired
     private IXzSecurityQualityInspectionRecordService xzSecurityQualityInspectionRecordService;
+
     @Override
     public IPage<XzSpecialOperationFireSafety> queryPageList(HashMap<String, Object> paramMap) {
         QueryWrapper<XzSpecialOperationFireSafety> queryWrapper = getQueryWrapper(paramMap);
@@ -108,11 +124,23 @@ public class XzSpecialOperationFireSafetyServiceImpl extends ServiceImpl<XzSpeci
             throw new OpenAlertException("未找到对应实体");
         }
         baseMapper.deleteById(id);
+        int val = 2;
+        dangerousEngineeringProgressRecordService.remove(new LambdaQueryWrapper<DangerousEngineeringProgressRecord>()
+                .eq(DangerousEngineeringProgressRecord::getEngineeringId, id)
+                .eq(DangerousEngineeringProgressRecord::getType, val)
+        );
+        dangerousEngineeringSideStationService.remove(new LambdaQueryWrapper<DangerousEngineeringSideStation>()
+                .eq(DangerousEngineeringSideStation::getDangerousEngineeringId, id)
+                .eq(DangerousEngineeringSideStation::getType, val)
+        );
+        xzDangerousEngineeringAcceptanceService.remove(new LambdaQueryWrapper<XzDangerousEngineeringAcceptance>()
+                .eq(XzDangerousEngineeringAcceptance::getEngineeringId, id)
+                .eq(XzDangerousEngineeringAcceptance::getType, val)
+        );
         xzSecurityQualityInspectionRecordService.remove(new LambdaQueryWrapper<XzSecurityQualityInspectionRecord>()
                 .eq(XzSecurityQualityInspectionRecord::getEngineeringId, id)
-                .eq(XzSecurityQualityInspectionRecord::getType, 2)
+                .eq(XzSecurityQualityInspectionRecord::getType, val)
         );
-
     }
 
     @Override

src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzTemporaryElectricitySafeServiceImpl.java

@@ -9,9 +9,15 @@ 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.dangerous.entity.DangerousEngineeringProgressRecord;
+import com.zhgd.xmgl.modules.dangerous.entity.DangerousEngineeringSideStation;
+import com.zhgd.xmgl.modules.dangerous.service.IDangerousEngineeringSideStationService;
+import com.zhgd.xmgl.modules.dangerous.service.impl.DangerousEngineeringProgressRecordServiceImpl;
 import com.zhgd.xmgl.modules.worker.service.IUserEnterpriseService;
+import com.zhgd.xmgl.modules.xz.entity.XzDangerousEngineeringAcceptance;
 import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityQualityInspectionRecord;
 import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityQualityInspectionRecordService;
+import com.zhgd.xmgl.modules.xz.service.IXzDangerousEngineeringAcceptanceService;
 import com.zhgd.xmgl.modules.xz.special.entity.XzTemporaryElectricitySafe;
 import com.zhgd.xmgl.modules.xz.special.mapper.XzGasAnalyzeMapper;
 import com.zhgd.xmgl.modules.xz.special.mapper.XzTemporaryElectricitySafeMapper;
@@ -41,6 +47,15 @@ import java.util.Objects;
 public class XzTemporaryElectricitySafeServiceImpl extends ServiceImpl<XzTemporaryElectricitySafeMapper, XzTemporaryElectricitySafe> implements IXzTemporaryElectricitySafeService {
     @Autowired
     IUserEnterpriseService userEnterpriseService;
+    @Lazy
+    @Autowired
+    DangerousEngineeringProgressRecordServiceImpl dangerousEngineeringProgressRecordService;
+    @Lazy
+    @Autowired
+    IXzDangerousEngineeringAcceptanceService xzDangerousEngineeringAcceptanceService;
+    @Lazy
+    @Autowired
+    IDangerousEngineeringSideStationService dangerousEngineeringSideStationService;
     @Autowired
     private XzTemporaryElectricitySafeMapper xzSpecialOperationFireSafetyMapper;
     @Autowired
@@ -48,6 +63,7 @@ public class XzTemporaryElectricitySafeServiceImpl extends ServiceImpl<XzTempora
     @Lazy
     @Autowired
     private IXzSecurityQualityInspectionRecordService xzSecurityQualityInspectionRecordService;
+
     @Override
     public IPage<XzTemporaryElectricitySafe> queryPageList(HashMap<String, Object> paramMap) {
         QueryWrapper<XzTemporaryElectricitySafe> queryWrapper = getQueryWrapper(paramMap);
@@ -102,11 +118,23 @@ public class XzTemporaryElectricitySafeServiceImpl extends ServiceImpl<XzTempora
             throw new OpenAlertException("未找到对应实体");
         }
         baseMapper.deleteById(id);
+        int val = 7;
+        dangerousEngineeringProgressRecordService.remove(new LambdaQueryWrapper<DangerousEngineeringProgressRecord>()
+                .eq(DangerousEngineeringProgressRecord::getEngineeringId, id)
+                .eq(DangerousEngineeringProgressRecord::getType, val)
+        );
+        dangerousEngineeringSideStationService.remove(new LambdaQueryWrapper<DangerousEngineeringSideStation>()
+                .eq(DangerousEngineeringSideStation::getDangerousEngineeringId, id)
+                .eq(DangerousEngineeringSideStation::getType, val)
+        );
+        xzDangerousEngineeringAcceptanceService.remove(new LambdaQueryWrapper<XzDangerousEngineeringAcceptance>()
+                .eq(XzDangerousEngineeringAcceptance::getEngineeringId, id)
+                .eq(XzDangerousEngineeringAcceptance::getType, val)
+        );
         xzSecurityQualityInspectionRecordService.remove(new LambdaQueryWrapper<XzSecurityQualityInspectionRecord>()
                 .eq(XzSecurityQualityInspectionRecord::getEngineeringId, id)
-                .eq(XzSecurityQualityInspectionRecord::getType, 7)
+                .eq(XzSecurityQualityInspectionRecord::getType, val)
         );
-
     }
 
     @Override