危险工程

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZEngineeringDangerousBo.java

@@ -26,211 +26,211 @@ public class ZEngineeringDangerousBo extends BaseEntity {
     /**
      *
      */
-    @NotBlank(message = "不能为空", groups = { EditGroup.class })
+    //@NotBlank(message = "不能为空", groups = { EditGroup.class })
     private String id;
 
     /**
      * 作业基本信息
      */
-    @NotBlank(message = "作业基本信息不能为空", groups = { AddGroup.class, EditGroup.class })
+   // @NotBlank(message = "作业基本信息不能为空", groups = { AddGroup.class, EditGroup.class })
     private String basicInformation;
 
     /**
      * 工程名称
      */
-    @NotBlank(message = "工程名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "工程名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String enginName;
 
     /**
      * 工程地点
      */
-    @NotBlank(message = "工程地点不能为空", groups = { AddGroup.class, EditGroup.class })
+   // @NotBlank(message = "工程地点不能为空", groups = { AddGroup.class, EditGroup.class })
     private String enginAddre;
 
     /**
      * 工程时间
      */
-    @NotNull(message = "工程时间不能为空", groups = { AddGroup.class, EditGroup.class })
+   // @NotNull(message = "工程时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date enginTime;
 
     /**
      * 管径
      */
-    @NotBlank(message = "管径不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "管径不能为空", groups = { AddGroup.class, EditGroup.class })
     private String pipeDiameter;
 
     /**
      * 管材
      */
-    @NotBlank(message = "管材不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "管材不能为空", groups = { AddGroup.class, EditGroup.class })
     private String tubularProduct;
 
     /**
      * 是否存在套管
      */
-    @NotBlank(message = "是否存在套管不能为空", groups = { AddGroup.class, EditGroup.class })
+   // @NotBlank(message = "是否存在套管不能为空", groups = { AddGroup.class, EditGroup.class })
     private String casingPresent;
 
     /**
      * 管道压力
      */
-    @NotBlank(message = "管道压力不能为空", groups = { AddGroup.class, EditGroup.class })
+   // @NotBlank(message = "管道压力不能为空", groups = { AddGroup.class, EditGroup.class })
     private String pipePressure;
 
     /**
      * 气源方向
      */
-    @NotBlank(message = "气源方向不能为空", groups = { AddGroup.class, EditGroup.class })
+   // @NotBlank(message = "气源方向不能为空", groups = { AddGroup.class, EditGroup.class })
     private String gasSourceDirection;
 
     /**
      * 作业位置
      */
-    @NotBlank(message = "作业位置不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "作业位置不能为空", groups = { AddGroup.class, EditGroup.class })
     private String taskPosition;
 
     /**
      * 与作业相关阀门位置
      */
-    @NotBlank(message = "与作业相关阀门位置不能为空", groups = { AddGroup.class, EditGroup.class })
+   // @NotBlank(message = "与作业相关阀门位置不能为空", groups = { AddGroup.class, EditGroup.class })
     private String valvePosition;
 
     /**
      * 压力报告
      */
-    @NotBlank(message = "压力报告不能为空", groups = { AddGroup.class, EditGroup.class })
+   // @NotBlank(message = "压力报告不能为空", groups = { AddGroup.class, EditGroup.class })
     private String stressReport;
 
     /**
      * 监理旁站记录
      */
-    @NotBlank(message = "监理旁站记录不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "监理旁站记录不能为空", groups = { AddGroup.class, EditGroup.class })
     private String supervisionRecord;
 
     /**
      * 工作联系单
      */
-    @NotBlank(message = "工作联系单不能为空", groups = { AddGroup.class, EditGroup.class })
+   // @NotBlank(message = "工作联系单不能为空", groups = { AddGroup.class, EditGroup.class })
     private String workContactForm;
 
     /**
      * 巡线确认单
      */
-    @NotBlank(message = "巡线确认单不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "巡线确认单不能为空", groups = { AddGroup.class, EditGroup.class })
     private String linePatrolConfirmationForm;
 
     /**
      * 危险作业坑大小(长)
      */
-    @NotNull(message = "危险作业坑大小(长)不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "危险作业坑大小(长)不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long hazardousWorkPitsLong;
 
     /**
      * 危险作业坑大小(宽)
      */
-    @NotNull(message = "危险作业坑大小(宽)不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "危险作业坑大小(宽)不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long hazardousWorkPitsWide;
 
     /**
      * 危险作业坑大小(深)
      */
-    @NotNull(message = "危险作业坑大小(深)不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "危险作业坑大小(深)不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long hazardousWorkPitsDeep;
 
     /**
      * 是否需要支护
      */
-    @NotBlank(message = "是否需要支护不能为空", groups = { AddGroup.class, EditGroup.class })
+   // @NotBlank(message = "是否需要支护不能为空", groups = { AddGroup.class, EditGroup.class })
     private String needSupport;
 
     /**
      * 作业坑内其他管道情况
      */
-    @NotBlank(message = "作业坑内其他管道情况不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "作业坑内其他管道情况不能为空", groups = { AddGroup.class, EditGroup.class })
     private String otherPipelineConditionsWorkPit;
 
     /**
      * 现场负责人
      */
-    @NotBlank(message = "现场负责人不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "现场负责人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String siteHead;
 
     /**
      * 现场负责人电话
      */
-    @NotBlank(message = "现场负责人电话不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "现场负责人电话不能为空", groups = { AddGroup.class, EditGroup.class })
     private String siteHeadPhone;
 
     /**
      * 作业人员信息
      */
-    @NotBlank(message = "作业人员信息不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "作业人员信息不能为空", groups = { AddGroup.class, EditGroup.class })
     private String operatorInformation;
 
     /**
      * 检口
      */
-    @NotBlank(message = "检口不能为空", groups = { AddGroup.class, EditGroup.class })
+   // @NotBlank(message = "检口不能为空", groups = { AddGroup.class, EditGroup.class })
     private String inspectionPort;
 
     /**
      * 管道刷油
      */
-    @NotBlank(message = "管道刷油不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "管道刷油不能为空", groups = { AddGroup.class, EditGroup.class })
     private String pipelinePainting;
 
     /**
      * 管道支护
      */
-    @NotBlank(message = "管道支护不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "管道支护不能为空", groups = { AddGroup.class, EditGroup.class })
     private String pipelineSupport;
 
     /**
      * 管道防腐
      */
-    @NotBlank(message = "管道防腐不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "管道防腐不能为空", groups = { AddGroup.class, EditGroup.class })
     private String pipelineCorrosionProtection;
 
     /**
      * 砌筑阀门井
      */
-    @NotBlank(message = "砌筑阀门井不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "砌筑阀门井不能为空", groups = { AddGroup.class, EditGroup.class })
     private String masonryValveWell;
 
     /**
      * 保护井
      */
-    @NotBlank(message = "保护井不能为空", groups = { AddGroup.class, EditGroup.class })
+   // @NotBlank(message = "保护井不能为空", groups = { AddGroup.class, EditGroup.class })
     private String protectionWell;
 
     /**
      * 管件保护井砌筑
      */
-    @NotBlank(message = "管件保护井砌筑不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "管件保护井砌筑不能为空", groups = { AddGroup.class, EditGroup.class })
     private String pipeProtectionWelMasonry;
 
     /**
      * 回填
      */
-    @NotBlank(message = "回填不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "回填不能为空", groups = { AddGroup.class, EditGroup.class })
     private String backfill;
 
     /**
      * 夯实
      */
-    @NotBlank(message = "夯实不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "夯实不能为空", groups = { AddGroup.class, EditGroup.class })
     private String tamp;
 
     /**
      * 平整场地
      */
-    @NotBlank(message = "平整场地不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "平整场地不能为空", groups = { AddGroup.class, EditGroup.class })
     private String levelingTheSite;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+   // @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
     private ZEngineeringNodeBo zEngineeringNodeBo;

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZEngineeringDangerousVo.java

@@ -6,6 +6,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
 import java.util.Date;
 
@@ -19,7 +20,7 @@ import java.io.Serializable;
  */
 @Data
 @ExcelIgnoreUnannotated
-public class ZEngineeringDangerousVo implements Serializable {
+public class ZEngineeringDangerousVo extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringDangerousServiceImpl.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.zdsz.domain.ZEngineeringInfo;
 import com.ruoyi.zdsz.domain.bo.*;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringPipeJackingVo;
 import com.ruoyi.zdsz.service.IZEngineeringNodeService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -197,7 +198,16 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
         }
-
+        ids.forEach(item -> {
+            ZEngineeringDangerousVo vo = baseMapper.selectVoById(item);
+            ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
+            zEngineeringNodeBo.setCreateTime(vo.getCreateTime());
+            zEngineeringNodeBo.setCivliId(vo.getId());
+            List<ZEngineeringNodeBo> zEngineeringNodeBos = izEngineeringNodeService.queryListDetails(zEngineeringNodeBo);
+            zEngineeringNodeBos.stream().forEach(ite ->
+                izEngineeringNodeService.delete(ite)
+            );
+        });
         return baseMapper.deleteBatchIds(ids) > 0;
     }
 }