Merge branch 'zdsz3.0' of http://192.168.10.18:3000/sunwei/zdsz_java into zdsz3.0

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringCivilController.java

@@ -102,6 +102,16 @@ public class ZEngineeringCivilController extends BaseController {
     public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngineeringCivilBo bo) {
         return toAjax(iZEngineeringCivilService.insertByBo(bo));
     }
+    /**
+     * 新增民用工程
+     */
+    @SaCheckPermission("zdsz:engineeringCivil:add")
+    @Log(title = "民用工程", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping("add")
+    public R<Void> addList(@Validated(AddGroup.class) @RequestBody ZEngineeringCivilBo bo) {
+        return toAjax(iZEngineeringCivilService.insertByBo(bo));
+    }
 
     /**
      * 修改民用工程

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringDangerousController.java

@@ -79,7 +79,7 @@ public class ZEngineeringDangerousController extends BaseController {
      */
     @SaCheckPermission("system:engineeringDangerous:query")
     @GetMapping("/query/{id}")
-    public R<ZEngineeringDangerousBo> query(@NotNull(message = "主键不能为空")
+    public R<ZEngineeringDangerousVo> query(@NotNull(message = "主键不能为空")
                                                 @PathVariable String id) {
         return R.ok(iZEngineeringDangerousService.query(id));
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringIndustryController.java

@@ -12,7 +12,6 @@ import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringIndustryBo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringReviewBo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
 import com.ruoyi.zdsz.service.IZEngineeringIndustryService;
 import lombok.RequiredArgsConstructor;
@@ -105,4 +104,14 @@ public class ZEngineeringIndustryController extends BaseController {
         return toAjax(iZEngineeringIndustryService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
 
+    /**
+     * 工业工程|市政工程历史
+     *
+     */
+    @SaCheckPermission("zdsz:engineeringIndustry:query")
+    @GetMapping("/{id}/{type}")
+    public R<ZEngineeringIndustryVo> query(@NotNull(message = "主键不能为空") @PathVariable String id, @NotNull(message = "节点类型不能为空") @PathVariable String type) {
+        return R.ok(iZEngineeringIndustryService.query(id,type));
+    }
+
 }

ruoyi-admin/src/main/resources/application.yml

@@ -71,9 +71,9 @@ spring:
   servlet:
     multipart:
       # 单个文件大小
-      max-file-size: 10MB
+      max-file-size: 100MB
       # 设置总上传的文件大小
-      max-request-size: 20MB
+      max-request-size: 100MB
   # 服务模块
   devtools:
     restart:

ruoyi-framework/src/main/java/com/ruoyi/framework/obs/ObsService.java

@@ -51,6 +51,7 @@ public class ObsService {
         Map map = new HashMap();
         map.put("url", accessEndPoint + "/" + objectKey + fileName);
         map.put("objectKey", objectKey + fileName);
+        map.put("fileName", file.getOriginalFilename());
         return map;
     }
 

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZEngiineeringPhoto.java

@@ -35,6 +35,8 @@ public class ZEngiineeringPhoto extends BaseEntity {
      * 图片地址
      */
     private String picUrl;
+
+    private String fileName;
     /**
      * 备注
      */

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

@@ -33,6 +33,8 @@ public class ZEngiineeringPhotoBo extends BaseEntity {
     @NotBlank(message = "上级id不能为空", groups = { AddGroup.class, EditGroup.class })
     private String parentId;
 
+    private String fileName;
+
     /**
      * 图片地址
      */

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

@@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
 import javax.validation.constraints.*;
 
 import java.util.Date;
+import java.util.List;
 
 import com.ruoyi.common.core.domain.BaseEntity;
 
@@ -24,55 +25,46 @@ public class  ZEngineeringCivilBo extends BaseEntity {
     /**
      * 主键
      */
-    @NotBlank(message = "主键不能为空", groups = { EditGroup.class })
     private String id;
 
     /**
      * 行政区
      */
-    @NotBlank(message = "行政区不能为空", groups = { AddGroup.class, EditGroup.class })
     private String district;
 
     /**
      * 小区id
      */
-    @NotBlank(message = "小区id不能为空", groups = { AddGroup.class, EditGroup.class })
     private String areaId;
 
     /**
      * 楼宇id
      */
-    @NotBlank(message = "楼宇id不能为空", groups = { AddGroup.class, EditGroup.class })
     private String buildingId;
 
     /**
      * 单元id
      */
-    @NotBlank(message = "单元id不能为空", groups = { AddGroup.class, EditGroup.class })
     private String unitId;
 
     /**
      * 房间id
      */
-    @NotBlank(message = "房间id不能为空", groups = { AddGroup.class, EditGroup.class })
     private String houseId;
 
     /**
      * 工程类型
      */
-    @NotBlank(message = "工程类型不能为空", groups = { AddGroup.class, EditGroup.class })
     private String enginType;
 
     /**
      * 工程分类
      */
-    @NotBlank(message = "工程分类不能为空", groups = { AddGroup.class, EditGroup.class })
     private String enginClassification;
 
     /**
      * 工程周期
      */
-    @NotBlank(message = "工程周期不能为空", groups = { AddGroup.class, EditGroup.class })
     private String enginCycle;
 
     /**
@@ -91,6 +83,15 @@ public class  ZEngineeringCivilBo extends BaseEntity {
     private String remark;
 
     private ZEngineeringNodeBo zEngineeringNodeBo;
+    private List<ZEngineeringNodeBo> zEngineeringNodeBoList;
+
+    public List<ZEngineeringNodeBo> getzEngineeringNodeBoList() {
+        return zEngineeringNodeBoList;
+    }
+
+    public void setzEngineeringNodeBoList(List<ZEngineeringNodeBo> zEngineeringNodeBoList) {
+        this.zEngineeringNodeBoList = zEngineeringNodeBoList;
+    }
 
     public ZEngineeringNodeBo getzEngineeringNodeBo() {
         return zEngineeringNodeBo;

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

@@ -11,6 +11,7 @@ import java.util.Date;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 危险工程业务对象 z_engineering_dangerous

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

@@ -46,62 +46,52 @@ public class ZEngineeringInfoBo extends BaseEntity {
     /**
      * 施工地址
      */
-    @NotBlank(message = "施工地址不能为空", groups = { AddGroup.class, EditGroup.class })
     private String constructAddre;
 
     /**
      * 是否按图纸施工
      */
-    @NotBlank(message = "是否按图纸施工不能为空", groups = { AddGroup.class, EditGroup.class })
     private String constructAccordingDrawings;
 
     /**
      * 分段打压是否合格
      */
-    @NotBlank(message = "分段打压是否合格不能为空", groups = { AddGroup.class, EditGroup.class })
     private String segmentedCompressionQualified;
 
     /**
      * 回填时间
      */
-    @NotNull(message = "回填时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date backfillTime;
 
     /**
      * 施工人电话
      */
-//    @NotBlank(message = "施工人电话不能为空", groups = { AddGroup.class, EditGroup.class })
     private String constructPhone;
 
     /**
      * 施工人
      */
-    /*@NotBlank(message = "施工人不能为空", groups = { AddGroup.class, EditGroup.class })*/
     private String constructUser;
 
     /**
      * 施工时间
      */
-    @NotNull(message = "施工时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date constructTime;
 
     /**
      * 负责人名称
      */
-//    @NotBlank(message = "负责人名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String headName;
 
     /**
      * 负责人电话
      */
-//    @NotBlank(message = "负责人电话不能为空", groups = { AddGroup.class, EditGroup.class })
     private String headPhone;
 
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
     public List<String> getzEngiineeringPhotoBoList() {

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

@@ -35,48 +35,42 @@ public class ZEngineeringMaterialBo extends BaseEntity {
     /**
      * 上门类型
      */
-    @NotBlank(message = "上门类型不能为空", groups = { AddGroup.class, EditGroup.class })
     private String visitType;
 
     /**
      * 自闭阀类型
      */
-    @NotBlank(message = "自闭阀类型不能为空", groups = { AddGroup.class, EditGroup.class })
     private String selfClosingValveType;
     /**
      * 腐蚀等级
      */
-    @NotBlank(message = "腐蚀等级不能为空", groups = { AddGroup.class, EditGroup.class })
     private String corrosionLevel;
 
     /**
      * 品牌
      */
-    @NotBlank(message = "品牌不能为空", groups = { AddGroup.class, EditGroup.class })
     private String brand;
 
     /**
      * 材质
      */
-    @NotBlank(message = "材质不能为空", groups = { AddGroup.class, EditGroup.class })
     private String materialQuality;
+    private String materialQualityName;
 
     /**
      * 规格
      */
-    @NotBlank(message = "规格不能为空", groups = { AddGroup.class, EditGroup.class })
     private String specifications;
+    private String specificationsName;
 
     /**
      * 数量
      */
-    @NotNull(message = "数量不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long number;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
 

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

@@ -9,6 +9,8 @@ import lombok.EqualsAndHashCode;
 import javax.validation.constraints.*;
 
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 import com.ruoyi.common.core.domain.BaseEntity;
 
@@ -87,6 +89,16 @@ public class ZEngineeringPipeJackingBo extends BaseEntity {
 
     private ZEngineeringNodeBo zEngineeringNodeBo;
 
+    public List<ZFileBo> getFiles() {
+        return files;
+    }
+
+    public void setFiles(List<ZFileBo> files) {
+        this.files = files;
+    }
+
+    private List<ZFileBo> files;
+
     public ZEngineeringNodeBo getzEngineeringNodeBo() {
         return zEngineeringNodeBo;
     }

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

@@ -0,0 +1,24 @@
+package com.ruoyi.zdsz.domain.bo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+
+
+@Data
+public class ZFileBo {
+
+    /**
+     *
+     */
+    private String name;
+
+    private String url;
+
+}

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

@@ -40,6 +40,8 @@ public class ZEngiineeringPhotoVo extends BaseEntity implements Serializable {
     @ExcelProperty(value = "图片地址")
     private String picUrl;
 
+    @ExcelProperty(value = "文件名称")
+    private String fileName;
     /**
      * 备注
      */

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

@@ -42,24 +42,28 @@ public class ZEngineeringCivilVo extends BaseEntity implements Serializable {
      */
     @ExcelProperty(value = "小区id")
     private String areaId;
+    private String areaName;
 
     /**
      * 楼宇id
      */
     @ExcelProperty(value = "楼宇id")
     private String buildingId;
+    private String buildingName;
 
     /**
      * 单元id
      */
     @ExcelProperty(value = "单元id")
     private String unitId;
+    private String unitName;
 
     /**
      * 房间id
      */
     @ExcelProperty(value = "房间id")
     private String houseId;
+    private String houseName;
 
     /**
      * 工程类型
@@ -72,6 +76,7 @@ public class ZEngineeringCivilVo extends BaseEntity implements Serializable {
      */
     @ExcelProperty(value = "工程分类")
     private String enginClassification;
+    private String enginClassificationName;
 
     /**
      * 工程周期

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

@@ -7,10 +7,12 @@ 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 com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
 import lombok.Data;
 import java.util.Date;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 危险工程视图对象 z_engineering_dangerous
@@ -234,5 +236,13 @@ public class ZEngineeringDangerousVo extends BaseEntity implements Serializable
     @ExcelProperty(value = "备注")
     private String remark;
 
+    private List<ZEngineeringNodeBo> zEngineeringNodeBos;
 
+    public List<ZEngineeringNodeBo> getzEngineeringNodeBos() {
+        return zEngineeringNodeBos;
+    }
+
+    public void setzEngineeringNodeBos(List<ZEngineeringNodeBo> zEngineeringNodeBos) {
+        this.zEngineeringNodeBos = zEngineeringNodeBos;
+    }
 }

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

@@ -108,6 +108,6 @@ public class ZEngineeringIndustryVo extends BaseEntity implements Serializable {
     @ExcelProperty(value = "工程分类")
     private String enginClassification;
 
-
-    private List<ZEngineeringNodeBo> zEngineeringNodeBo;
+    private ZEngineeringNodeBo zEngineeringNodeBo;
+    private List<ZEngineeringNodeBo> zEngineeringNodeBoList;
 }

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

@@ -81,5 +81,6 @@ public class ZEngineeringPipeJackingVo extends BaseEntity implements Serializabl
     private String remark;
 
     private List<ZEngineeringNodeBo> zEngineeringNodeBoList;
+    private List<ZEngiineeringPhotoVo> pics;
 
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/mapper/ZEngineeringCivilMapper.java

@@ -1,8 +1,13 @@
 package com.ruoyi.zdsz.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.zdsz.domain.ZEngineeringCivil;
+import com.ruoyi.zdsz.domain.bo.ZBuildingBo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringCivilBo;
+import com.ruoyi.zdsz.domain.vo.ZBuildingVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilVo;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 民用工程Mapper接口
@@ -12,4 +17,8 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  */
 public interface ZEngineeringCivilMapper extends BaseMapperPlus<ZEngineeringCivilMapper, ZEngineeringCivil, ZEngineeringCivilVo> {
 
+
+    Page<ZEngineeringCivilVo> queryPageList(@Param("p") ZEngineeringCivilBo bo, Page<?> page);
+
+
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/mapper/ZEngineeringDangerousMapper.java

@@ -12,5 +12,5 @@ import org.apache.ibatis.annotations.Param;
  * @date 2024-01-02
  */
 public interface ZEngineeringDangerousMapper extends BaseMapperPlus<ZEngineeringDangerousMapper, ZEngineeringDangerous, ZEngineeringDangerousVo> {
-
+    String selectIdByCid(@Param("id") String id);
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/mapper/ZEngineeringPipeJackingMapper.java

@@ -19,5 +19,5 @@ public interface ZEngineeringPipeJackingMapper extends BaseMapperPlus<ZEngineeri
     List<Map<String,Object>> getDangerous(String enginId);
     List<Map<String,Object>> getInfrastructure(String enginId);
 
-    List<Map<String, Object>> getSg(String enginId,String type);
+    List<Map<String, Object>> getSg(String enginId);
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZEngineeringDangerousService.java

@@ -27,7 +27,7 @@ public interface IZEngineeringDangerousService {
      */
     TableDataInfo<ZEngineeringDangerousVo> queryPageList(ZEngineeringDangerousBo bo, PageQuery pageQuery);
 
-     ZEngineeringDangerousBo query(String id) ;
+    ZEngineeringDangerousVo query(String id) ;
 
     /**
      * 查询危险工程列表

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZEngineeringIndustryService.java

@@ -47,4 +47,5 @@ public interface IZEngineeringIndustryService {
      */
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
 
+    ZEngineeringIndustryVo query(String id, String type);
 }

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

@@ -112,8 +112,8 @@ public class ZComprehensiveServiceImpl implements IZComprehensiveService {
                 ZEngiineeringPhoto pic = new ZEngiineeringPhoto();
                 pic.setParentId(bo.getId());
                 pic.setPicUrl(o);
-                pic.setUpdateBy(String.valueOf(LoginHelper.getUserId()));
-                pic.setUpdateTime(new Date());
+                pic.setCreateBy(String.valueOf(LoginHelper.getUserId()));
+                pic.setCreateTime(new Date());
                 list.add(pic);
             });
             if (!list.isEmpty()) {

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

@@ -112,7 +112,7 @@ public class ZEngiineeringPhotoServiceImpl implements IZEngiineeringPhotoService
     @Override
     @Transactional(rollbackFor=Exception.class)
     @DynamicName(spel = "#bo[0].createTime")
-    @Async("threadPoolTaskExecutor")
+//    @Async("threadPoolTaskExecutor")
     public Boolean insertBatch(List<ZEngiineeringPhoto> bo) {
         boolean flag = baseMapper.insertBatch(bo);
         return flag;
@@ -131,7 +131,7 @@ public class ZEngiineeringPhotoServiceImpl implements IZEngiineeringPhotoService
     @Override
     @DynamicName(spel = "#bo[0].createTime")
     @Transactional(rollbackFor = Exception.class)
-    @Async("threadPoolTaskExecutor")
+//    @Async("threadPoolTaskExecutor")
     public Boolean updateBatch(List<ZEngiineeringPhoto> bo) {
         ZEngiineeringPhoto zEngiineeringPhoto = bo.get(0);
         LambdaQueryWrapper<ZEngiineeringPhoto> lqw = Wrappers.lambdaQuery();
@@ -158,7 +158,7 @@ public class ZEngiineeringPhotoServiceImpl implements IZEngiineeringPhotoService
             });
 
         });
-        if (dlList.size()!=0)
+        if (dlIdList.size()!=0)
         {
             baseMapper.deleteBatchIds(dlIdList);
 
@@ -182,7 +182,7 @@ public class ZEngiineeringPhotoServiceImpl implements IZEngiineeringPhotoService
     @Override
     @DynamicName(spel = "#bo.createTime")
     @Transactional(rollbackFor = Exception.class)
-    @Async("threadPoolTaskExecutor")
+//    @Async("threadPoolTaskExecutor")
     public Boolean delete(ZEngineeringInfoBo bo) {
         LambdaQueryWrapper<ZEngiineeringPhoto> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getId()), ZEngiineeringPhoto::getParentId, bo.getId());

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

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.zdsz.domain.ZBuilding;
+import com.ruoyi.zdsz.domain.bo.ZBuildingBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringInfoBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
 import com.ruoyi.zdsz.service.IZEngineeringInfoService;
@@ -81,10 +82,12 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
     public ZEngineeringCivilVo queryByEntityBo(ZEngineeringCivilBo zEngineeringCivilBo) {
         LambdaQueryWrapper<ZEngineeringCivil> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getAreaId()), ZEngineeringCivil::getAreaId, zEngineeringCivilBo.getAreaId());
-        lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getBuildingId()), ZEngineeringCivil::getBuildingId, zEngineeringCivilBo.getBuildingId());
-        lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getUnitId()), ZEngineeringCivil::getUnitId, zEngineeringCivilBo.getUnitId());
-        lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getHouseId()), ZEngineeringCivil::getHouseId, zEngineeringCivilBo.getHouseId());
+        lqw.eq(ZEngineeringCivil::getBuildingId, zEngineeringCivilBo.getBuildingId());
+        lqw.eq(ZEngineeringCivil::getUnitId, zEngineeringCivilBo.getUnitId());
+        lqw.eq(ZEngineeringCivil::getHouseId, zEngineeringCivilBo.getHouseId());
         lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getEnginCycle()), ZEngineeringCivil::getEnginCycle, zEngineeringCivilBo.getEnginCycle());
+        lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getEnginType()), ZEngineeringCivil::getEnginType, zEngineeringCivilBo.getEnginType());
+        lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getEnginClassification()), ZEngineeringCivil::getEnginClassification, zEngineeringCivilBo.getEnginClassification());
         return baseMapper.selectVoOne(lqw);
     }
 
@@ -93,8 +96,8 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
      */
     @Override
     public TableDataInfo<ZEngineeringCivilVo> queryPageList(ZEngineeringCivilBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<ZEngineeringCivil> lqw = buildQueryWrapper(bo);
-        Page<ZEngineeringCivilVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<ZBuildingBo> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
+        Page<ZEngineeringCivilVo> result = baseMapper.queryPageList(bo, page);
         return TableDataInfo.build(result);
     }
 
@@ -108,13 +111,12 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
     }
 
     private LambdaQueryWrapper<ZEngineeringCivil> buildQueryWrapper(ZEngineeringCivilBo bo) {
-        Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<ZEngineeringCivil> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getDistrict()), ZEngineeringCivil::getDistrict, bo.getDistrict());
         lqw.eq(StringUtils.isNotBlank(bo.getAreaId()), ZEngineeringCivil::getAreaId, bo.getAreaId());
-        lqw.eq(StringUtils.isNotBlank(bo.getBuildingId()), ZEngineeringCivil::getBuildingId, bo.getBuildingId());
-        lqw.eq(StringUtils.isNotBlank(bo.getUnitId()), ZEngineeringCivil::getUnitId, bo.getUnitId());
-        lqw.eq(StringUtils.isNotBlank(bo.getHouseId()), ZEngineeringCivil::getHouseId, bo.getHouseId());
+        lqw.eq(ZEngineeringCivil::getBuildingId, bo.getBuildingId());
+        lqw.eq(ZEngineeringCivil::getUnitId, bo.getUnitId());
+        lqw.eq(ZEngineeringCivil::getHouseId, bo.getHouseId());
         lqw.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringCivil::getEnginType, bo.getEnginType());
         lqw.eq(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringCivil::getEnginClassification, bo.getEnginClassification());
         lqw.eq(StringUtils.isNotBlank(bo.getEnginCycle()), ZEngineeringCivil::getEnginCycle, bo.getEnginCycle());
@@ -136,35 +138,53 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         validEntityBeforeSave(add);
         LambdaQueryWrapper<ZEngineeringCivil> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getAreaId()), ZEngineeringCivil::getAreaId, bo.getAreaId());
-        lqw.eq(StringUtils.isNotBlank(bo.getBuildingId()), ZEngineeringCivil::getBuildingId, bo.getBuildingId());
-        lqw.eq(StringUtils.isNotBlank(bo.getUnitId()), ZEngineeringCivil::getUnitId, bo.getUnitId());
-        lqw.eq(StringUtils.isNotBlank(bo.getHouseId()), ZEngineeringCivil::getHouseId, bo.getHouseId());
+        lqw.eq(ZEngineeringCivil::getBuildingId, bo.getBuildingId());
+        lqw.eq(ZEngineeringCivil::getUnitId, bo.getUnitId());
+        lqw.eq(ZEngineeringCivil::getHouseId, bo.getHouseId());
         lqw.eq(StringUtils.isNotBlank(bo.getEnginCycle()), ZEngineeringCivil::getEnginCycle, bo.getEnginCycle());
+        lqw.eq(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringCivil::getEnginClassification, bo.getEnginClassification());
         ZEngineeringCivilVo zEngineeringCivilVo = baseMapper.selectVoOne(lqw);
-        if(bo.getEnginType().equals("室内工程"))
-        {
+        if (bo.getEnginType().equals("室内工程")) {
             izMaterialStatisticsService.insert(bo);
         }
         if (ObjectUtils.isEmpty(zEngineeringCivilVo)) {
             boolean flag = baseMapper.insert(add) > 0;
             if (flag) {
                 bo.setId(add.getId());
-                ZEngineeringNodeBo zEngineeringNodeBo = bo.getzEngineeringNodeBo();
-                zEngineeringNodeBo.setCivliId(add.getId());
-                zEngineeringNodeBo.setCreateTime(add.getCreateTime());
-                zEngineeringNodeService.insert(zEngineeringNodeBo);
+                if (ObjectUtils.isEmpty(bo.getzEngineeringNodeBo())) {
+                    for (ZEngineeringNodeBo zEngineeringNodeBo : bo.getzEngineeringNodeBoList()) {
+                        zEngineeringNodeBo.setCivliId(add.getId());
+                        zEngineeringNodeBo.setCreateTime(add.getCreateTime());
+                        zEngineeringNodeService.insert(zEngineeringNodeBo);
+                    }
+
+                } else {
+                    ZEngineeringNodeBo zEngineeringNodeBo = bo.getzEngineeringNodeBo();
+                    zEngineeringNodeBo.setCivliId(add.getId());
+                    zEngineeringNodeBo.setCreateTime(add.getCreateTime());
+                    zEngineeringNodeService.insert(zEngineeringNodeBo);
+                }
             }
             return flag;
         } else {
-            ZEngineeringNodeBo zEngineeringNodeBo = bo.getzEngineeringNodeBo();
-            zEngineeringNodeBo.setCivliId(zEngineeringCivilVo.getId());
-            zEngineeringNodeBo.setType(zEngineeringNodeBo.getType());
-            zEngineeringNodeBo.setCreateTime(zEngineeringCivilVo.getCreateTime());
-            ZEngineeringNodeBo query = zEngineeringNodeService.query(zEngineeringNodeBo);
-            if (!ObjectUtils.isEmpty(query)) {
-                zEngineeringNodeBo.setId(query.getId());
+            if (ObjectUtils.isEmpty(bo.getzEngineeringNodeBo())) {
+                for (ZEngineeringNodeBo zEngineeringNodeBo : bo.getzEngineeringNodeBoList()) {
+                    zEngineeringNodeBo.setCivliId(add.getId());
+                    zEngineeringNodeBo.setCreateTime(add.getCreateTime());
+                    zEngineeringNodeService.insert(zEngineeringNodeBo);
+                }
+
+            } else {
+                ZEngineeringNodeBo zEngineeringNodeBo = bo.getzEngineeringNodeBo();
+                zEngineeringNodeBo.setCivliId(zEngineeringCivilVo.getId());
+                zEngineeringNodeBo.setType(zEngineeringNodeBo.getType());
+                zEngineeringNodeBo.setCreateTime(zEngineeringCivilVo.getCreateTime());
+                ZEngineeringNodeBo query = zEngineeringNodeService.query(zEngineeringNodeBo);
+                if (!ObjectUtils.isEmpty(query)) {
+                    zEngineeringNodeBo.setId(query.getId());
+                }
+                zEngineeringNodeService.insert(zEngineeringNodeBo);
             }
-            zEngineeringNodeService.insert(zEngineeringNodeBo);
             return true;
         }
     }

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

@@ -65,15 +65,14 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
      * 查询危险工程详情
      */
     @Override
-    public ZEngineeringDangerousBo query(String id)  {
-        ZEngineeringDangerousVo zEngineeringDangerousVo = baseMapper.selectVoById(id);
-        ZEngineeringDangerousBo zEngineeringDangerousBo = BeanUtil.toBean(zEngineeringDangerousVo, ZEngineeringDangerousBo.class);
+    public ZEngineeringDangerousVo query(String id)  {
+        ZEngineeringDangerousVo vo = baseMapper.selectVoById(id);
         ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
-        zEngineeringNodeBo.setCivliId(zEngineeringDangerousBo.getId());
-        zEngineeringNodeBo.setCreateTime(zEngineeringDangerousBo.getCreateTime());
-        ZEngineeringNodeBo query = izEngineeringNodeService.query(zEngineeringNodeBo);
-        zEngineeringDangerousBo.setzEngineeringNodeBo(query);
-        return zEngineeringDangerousBo;
+        zEngineeringNodeBo.setCivliId(vo.getId());
+        zEngineeringNodeBo.setCreateTime(vo.getCreateTime());
+        List<ZEngineeringNodeBo> zEngineeringNodeBos = izEngineeringNodeService.queryListDetails(zEngineeringNodeBo);
+        vo.setzEngineeringNodeBos(zEngineeringNodeBos);
+        return vo;
     }
 
     /**
@@ -88,11 +87,11 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
     private LambdaQueryWrapper<ZEngineeringDangerous> buildQueryWrapper(ZEngineeringDangerousBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<ZEngineeringDangerous> lqw = Wrappers.lambdaQuery();
-        lqw.eq(StringUtils.isNotBlank(bo.getBasicInformation()), ZEngineeringDangerous::getBasicInformation, bo.getBasicInformation());
+        lqw.like(StringUtils.isNotBlank(bo.getBasicInformation()), ZEngineeringDangerous::getBasicInformation, bo.getBasicInformation());
         lqw.like(StringUtils.isNotBlank(bo.getEnginName()), ZEngineeringDangerous::getEnginName, bo.getEnginName());
-        lqw.eq(StringUtils.isNotBlank(bo.getEnginAddre()), ZEngineeringDangerous::getEnginAddre, bo.getEnginAddre());
-        lqw.eq(bo.getEnginTime() != null, ZEngineeringDangerous::getEnginTime, bo.getEnginTime());
-        lqw.eq(StringUtils.isNotBlank(bo.getPipeDiameter()), ZEngineeringDangerous::getPipeDiameter, bo.getPipeDiameter());
+        lqw.like(StringUtils.isNotBlank(bo.getEnginAddre()), ZEngineeringDangerous::getEnginAddre, bo.getEnginAddre());
+        //lqw.like(bo.getEnginTime() != null, ZEngineeringDangerous::getEnginTime, bo.getEnginTime());
+       /* lqw.eq(StringUtils.isNotBlank(bo.getPipeDiameter()), ZEngineeringDangerous::getPipeDiameter, bo.getPipeDiameter());
         lqw.eq(StringUtils.isNotBlank(bo.getTubularProduct()), ZEngineeringDangerous::getTubularProduct, bo.getTubularProduct());
         lqw.eq(StringUtils.isNotBlank(bo.getCasingPresent()), ZEngineeringDangerous::getCasingPresent, bo.getCasingPresent());
         lqw.eq(StringUtils.isNotBlank(bo.getPipePressure()), ZEngineeringDangerous::getPipePressure, bo.getPipePressure());
@@ -120,7 +119,7 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
         lqw.eq(StringUtils.isNotBlank(bo.getPipeProtectionWelMasonry()), ZEngineeringDangerous::getPipeProtectionWelMasonry, bo.getPipeProtectionWelMasonry());
         lqw.eq(StringUtils.isNotBlank(bo.getBackfill()), ZEngineeringDangerous::getBackfill, bo.getBackfill());
         lqw.eq(StringUtils.isNotBlank(bo.getTamp()), ZEngineeringDangerous::getTamp, bo.getTamp());
-        lqw.eq(StringUtils.isNotBlank(bo.getLevelingTheSite()), ZEngineeringDangerous::getLevelingTheSite, bo.getLevelingTheSite());
+        lqw.eq(StringUtils.isNotBlank(bo.getLevelingTheSite()), ZEngineeringDangerous::getLevelingTheSite, bo.getLevelingTheSite());*/
         return lqw;
     }
 
@@ -176,8 +175,9 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
     public Boolean update(ZEngineeringDangerousBo bo) {
         ZEngineeringDangerous update = BeanUtil.toBean(bo, ZEngineeringDangerous.class);
         validEntityBeforeSave(update);
-        ZEngineeringNodeBo zEngineeringNodeBo = bo.getzEngineeringNodeBo();
+        ZEngineeringNodeBo zEngineeringNodeBo =bo.getzEngineeringNodeBo();
         zEngineeringNodeBo.setCivliId(update.getId());
+        zEngineeringNodeBo.setId(baseMapper.selectIdByCid(zEngineeringNodeBo.getCivliId()));
         zEngineeringNodeBo.setCreateTime(update.getCreateTime());
         izEngineeringNodeService.update(zEngineeringNodeBo);
         return baseMapper.updateById(update) > 0;

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

@@ -2,26 +2,19 @@ package com.ruoyi.zdsz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.zdsz.domain.ZEngineeringIndustry;
-import com.ruoyi.zdsz.domain.ZEngineeringReview;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringIndustryBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringReviewBo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringNodeVo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringReviewVo;
 import com.ruoyi.zdsz.mapper.ZEngineeringIndustryMapper;
 import com.ruoyi.zdsz.service.IZEngineeringIndustryService;
 import com.ruoyi.zdsz.service.IZEngineeringNodeService;
-import com.ruoyi.zdsz.service.IZEngineeringReviewService;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -59,7 +52,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
         zEngineeringNodeBo.setCivliId(id);
         zEngineeringNodeBo.setCreateTime(zEngineeringIndustryVo.getCreateTime());
         List<ZEngineeringNodeBo> zEngineeringNodeBos = izEngineeringNodeService.queryListDetails(zEngineeringNodeBo);
-        zEngineeringIndustryVo.setZEngineeringNodeBo(zEngineeringNodeBos);
+        zEngineeringIndustryVo.setZEngineeringNodeBoList(zEngineeringNodeBos);
         return zEngineeringIndustryVo;
     }
 
@@ -161,4 +154,15 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
         return baseMapper.deleteBatchIds(ids) > 0;
     }
 
+    @Override
+    public ZEngineeringIndustryVo query(String id, String type) {
+        ZEngineeringIndustryVo zEngineeringIndustryVo = baseMapper.selectVoById(id);
+        ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
+        zEngineeringNodeBo.setCreateTime(zEngineeringIndustryVo.getCreateTime());
+        zEngineeringNodeBo.setCivliId(zEngineeringIndustryVo.getId());
+        zEngineeringNodeBo.setType(type);
+        zEngineeringIndustryVo.setZEngineeringNodeBo(izEngineeringNodeService.query(zEngineeringNodeBo));
+        return zEngineeringIndustryVo;
+    }
+
 }

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

@@ -9,7 +9,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringInfoBo;
+import com.ruoyi.zdsz.service.IZEnginMaterialQualityService;
+import com.ruoyi.zdsz.service.IZEnginSpecificationsService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringMaterialBo;
@@ -41,20 +44,29 @@ public class ZEngineeringMaterialServiceImpl implements IZEngineeringMaterialSer
      * 查询工程用料
      */
     @Override
-    public ZEngineeringMaterialVo queryById(String id){
+    public ZEngineeringMaterialVo queryById(String id) {
         return baseMapper.selectVoById(id);
     }
 
+    @Autowired
+    private IZEnginMaterialQualityService izEnginMaterialQualityService;
+    @Autowired
+    private IZEnginSpecificationsService izEnginSpecificationsService;
+
     @Override
     @DynamicName(spel = "#bo.createTime")
 //    @Async("threadPoolTaskExecutor")
     public List<ZEngineeringMaterialBo> query(ZEngineeringInfoBo bo) {
         LambdaQueryWrapper<ZEngineeringMaterial> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getId()), ZEngineeringMaterial::getDetailsId, bo.getId());
-        List<ZEngineeringMaterial> zEngineeringMaterialVo= baseMapper.selectList(lqw);
-        List <ZEngineeringMaterialBo> zEngineeringMaterialBoList=new ArrayList<>();
-        zEngineeringMaterialVo.stream().forEach(item->{
+        List<ZEngineeringMaterial> zEngineeringMaterialVo = baseMapper.selectList(lqw);
+        List<ZEngineeringMaterialBo> zEngineeringMaterialBoList = new ArrayList<>();
+        zEngineeringMaterialVo.stream().forEach(item -> {
             ZEngineeringMaterialBo zEngineeringMaterialBo = BeanUtil.toBean(item, ZEngineeringMaterialBo.class);
+            if (StringUtils.isNotEmpty(zEngineeringMaterialBo.getMaterialQuality()))
+                zEngineeringMaterialBo.setMaterialQualityName(izEnginMaterialQualityService.queryById(zEngineeringMaterialBo.getMaterialQuality()).getName());
+            if (StringUtils.isNotEmpty(zEngineeringMaterialBo.getSpecifications()))
+                zEngineeringMaterialBo.setSpecificationsName(izEnginSpecificationsService.queryById(zEngineeringMaterialBo.getSpecifications()).getName());
             zEngineeringMaterialBoList.add(zEngineeringMaterialBo);
         });
 
@@ -108,7 +120,7 @@ public class ZEngineeringMaterialServiceImpl implements IZEngineeringMaterialSer
 
     @Override
     @DynamicName(spel = "#bo.createTime")
-    @Transactional(rollbackFor=Exception.class)
+    @Transactional(rollbackFor = Exception.class)
     @Async("threadPoolTaskExecutor")
     public ZEngineeringMaterial insert(ZEngineeringMaterialBo bo) {
         ZEngineeringMaterial add = BeanUtil.toBean(bo, ZEngineeringMaterial.class);
@@ -138,52 +150,50 @@ public class ZEngineeringMaterialServiceImpl implements IZEngineeringMaterialSer
         validEntityBeforeSave(update);
         return baseMapper.updateById(update) > 0;
     }
+
     @Override
     @DynamicName(spel = "#Infobo.createTime")
     @Transactional(rollbackFor = Exception.class)
     @Async("threadPoolTaskExecutor")
     public Boolean updateList(ZEngineeringInfoBo Infobo) {
-        List<ZEngineeringMaterialBo> bo=Infobo.getzEngineeringMaterialBo();
+        List<ZEngineeringMaterialBo> bo = Infobo.getzEngineeringMaterialBo();
         LambdaQueryWrapper<ZEngineeringMaterial> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(Infobo.getId()), ZEngineeringMaterial::getDetailsId, Infobo.getId());
-        List boList=new ArrayList();
-        List selectList=new ArrayList();
-       List<ZEngineeringMaterial> zEngineeringMaterialVoList= baseMapper.selectList(lqw);
-        zEngineeringMaterialVoList.stream().forEach(item->{
+        List boList = new ArrayList();
+        List selectList = new ArrayList();
+        List<ZEngineeringMaterial> zEngineeringMaterialVoList = baseMapper.selectList(lqw);
+        zEngineeringMaterialVoList.stream().forEach(item -> {
             selectList.add(item.getId());
         });
-        bo.stream().forEach(item->{
+        bo.stream().forEach(item -> {
             boList.add(item.getId());
             ZEngineeringMaterial update = BeanUtil.toBean(item, ZEngineeringMaterial.class);
             validEntityBeforeSave(update);
-            boolean flag= baseMapper.updateById(update) > 0;
+            boolean flag = baseMapper.updateById(update) > 0;
         });
         ZEngineeringMaterial update = BeanUtil.toBean(bo, ZEngineeringMaterial.class);
         validEntityBeforeSave(update);
-        boolean flag= baseMapper.updateById(update) > 0;
-        List inlist = (List) boList.stream().filter(i->!selectList.contains(i)).collect(Collectors.toList());
-        List dllist= (List) selectList.stream().filter(i->!boList.contains(i)).collect(Collectors.toList());
-       if (dllist.size()!=0)
-       {
-           baseMapper.deleteBatchIds(dllist);
-       }
-       if (inlist.size()!=0)
-       {
-           List<ZEngineeringMaterial> zEngineeringMaterialList=new ArrayList<>();
-           bo.stream().forEach(item->{
-               inlist.stream().forEach(i->{
-                   if (item.getId()==i)
-                   {
-                       ZEngineeringMaterial update2 = BeanUtil.toBean(item, ZEngineeringMaterial.class);
-                       update2.setDetailsId(Infobo.getId());
-                       zEngineeringMaterialList.add(update2);
-                   }
-               });
-           });
-
-           baseMapper.insertBatch(zEngineeringMaterialList);
-       }
-        return flag ;
+        boolean flag = baseMapper.updateById(update) > 0;
+        List inlist = (List) boList.stream().filter(i -> !selectList.contains(i)).collect(Collectors.toList());
+        List dllist = (List) selectList.stream().filter(i -> !boList.contains(i)).collect(Collectors.toList());
+        if (dllist.size() != 0) {
+            baseMapper.deleteBatchIds(dllist);
+        }
+        if (inlist.size() != 0) {
+            List<ZEngineeringMaterial> zEngineeringMaterialList = new ArrayList<>();
+            bo.stream().forEach(item -> {
+                inlist.stream().forEach(i -> {
+                    if (item.getId() == i) {
+                        ZEngineeringMaterial update2 = BeanUtil.toBean(item, ZEngineeringMaterial.class);
+                        update2.setDetailsId(Infobo.getId());
+                        zEngineeringMaterialList.add(update2);
+                    }
+                });
+            });
+
+            baseMapper.insertBatch(zEngineeringMaterialList);
+        }
+        return flag;
     }
 
     @Override
@@ -193,17 +203,17 @@ public class ZEngineeringMaterialServiceImpl implements IZEngineeringMaterialSer
     public Boolean delete(ZEngineeringInfoBo bo) {
         LambdaQueryWrapper<ZEngineeringMaterial> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getId()), ZEngineeringMaterial::getDetailsId, bo.getId());
-        List<ZEngineeringMaterial> zEngineeringMaterial= baseMapper.selectList(lqw);
-        zEngineeringMaterial.stream().forEach(item->{
-             baseMapper.deleteById(item.getId()) ;
+        List<ZEngineeringMaterial> zEngineeringMaterial = baseMapper.selectList(lqw);
+        zEngineeringMaterial.stream().forEach(item -> {
+            baseMapper.deleteById(item.getId());
         });
-        return null ;
+        return null;
     }
 
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(ZEngineeringMaterial entity){
+    private void validEntityBeforeSave(ZEngineeringMaterial entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
@@ -212,7 +222,7 @@ public class ZEngineeringMaterialServiceImpl implements IZEngineeringMaterialSer
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
-        if(isValid){
+        if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
         return baseMapper.deleteBatchIds(ids) > 0;

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

@@ -4,16 +4,22 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.common.annotation.DynamicName;
+import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.zdsz.domain.ZEngiineeringPhoto;
 import com.ruoyi.zdsz.domain.ZEngineeringNode;
+import com.ruoyi.zdsz.domain.bo.ZEngiineeringPhotoBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
+import com.ruoyi.zdsz.domain.bo.ZFileBo;
+import com.ruoyi.zdsz.domain.vo.ZEngiineeringPhotoVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringNodeVo;
+import com.ruoyi.zdsz.service.IZEngiineeringPhotoService;
 import com.ruoyi.zdsz.service.IZEngineeringNodeService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,10 +32,8 @@ import com.ruoyi.zdsz.service.IZEngineeringPipeJackingService;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 顶管工程Service业务层处理
@@ -45,6 +49,8 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
 
     @Autowired
     private IZEngineeringNodeService nodeService;
+    @Autowired
+    private IZEngiineeringPhotoService photoService;
 
     /**
      * 查询顶管工程
@@ -52,6 +58,10 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
     @Override
     public ZEngineeringPipeJackingVo queryById(String id){
         ZEngineeringPipeJackingVo jackingVo = baseMapper.selectVoById(id);
+        ZEngiineeringPhotoBo bo1 = new ZEngiineeringPhotoBo();
+        bo1.setParentId(jackingVo.getId());
+        bo1.setCreateTime(jackingVo.getCreateTime());
+        jackingVo.setPics(photoService.queryList(bo1));
         ZEngineeringNodeBo bo = new ZEngineeringNodeBo();
         bo.setCreateTime(jackingVo.getCreateTime());
         bo.setCivliId(jackingVo.getId());
@@ -64,6 +74,10 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
     @Override
     public ZEngineeringPipeJackingVo queryByIdType(String id,String type){
         ZEngineeringPipeJackingVo jackingVo = baseMapper.selectVoById(id);
+        ZEngiineeringPhotoBo bo1 = new ZEngiineeringPhotoBo();
+        bo1.setParentId(jackingVo.getId());
+        bo1.setCreateTime(jackingVo.getCreateTime());
+        jackingVo.setPics(photoService.queryList(bo1));
         ZEngineeringNodeBo bo = new ZEngineeringNodeBo();
         bo.setCreateTime(jackingVo.getCreateTime());
         bo.setCivliId(jackingVo.getId());
@@ -122,14 +136,14 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
         }
         //市政
         else if("市政工程".equals(bo.getType())){
-            List<Map<String, Object>> civil = baseMapper.getSg(bo.getEnginId(),"2");
+            List<Map<String, Object>> civil = baseMapper.getSg(bo.getEnginId());
             if (!civil.isEmpty()){
                 add.setEnginAddre((String) civil.get(0).get("name"));
             }
         }
         //工业
         else if("工业工程".equals(bo.getType())){
-            List<Map<String, Object>> civil = baseMapper.getSg(bo.getEnginId(),"1");
+            List<Map<String, Object>> civil = baseMapper.getSg(bo.getEnginId());
             if (!civil.isEmpty()){
                 add.setEnginAddre((String) civil.get(0).get("name"));
             }
@@ -162,10 +176,25 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
                 bo.setId(add.getId());
                 bo.getzEngineeringNodeBo().setCivliId(add.getId());
                 bo.getzEngineeringNodeBo().setCreateTime(bo.getCreateTime());
-                nodeService.insert(bo.getzEngineeringNodeBo());
+                ZEngineeringNode entity = nodeService.insert(bo.getzEngineeringNodeBo());
+                if (!ObjectUtil.isEmpty(entity)){
+                    List<ZEngiineeringPhoto> list = new ArrayList<>();
+                    bo.getFiles().stream().forEach(o->{
+                        ZEngiineeringPhoto pic = new ZEngiineeringPhoto();
+                        pic.setParentId(bo.getId());
+                        pic.setPicUrl(o.getUrl());
+                        pic.setFileName(o.getName());
+                        pic.setUpdateBy(String.valueOf(LoginHelper.getUserId()));
+                        pic.setUpdateTime(new Date());
+                        list.add(pic);
+                    });
+                    if (!list.isEmpty()) {
+                        photoService.insertBatch(list);
+                    }
+                }
             }
         }else {
-            //存在工程
+            //存在这个类型工程
             ZEngineeringNodeBo zEngineeringNodeBo = bo.getzEngineeringNodeBo();
             zEngineeringNodeBo.setCivliId(jackingVo.getId());
             zEngineeringNodeBo.setType(zEngineeringNodeBo.getType());
@@ -197,14 +226,14 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
         }
         //市政
         else if("市政工程".equals(bo.getType())){
-            List<Map<String, Object>> civil = baseMapper.getSg(bo.getEnginId(),"2");
+            List<Map<String, Object>> civil = baseMapper.getSg(bo.getEnginId());
             if (!civil.isEmpty()){
                 update.setEnginAddre((String) civil.get(0).get("name"));
             }
         }
         //工业
         else if("工业工程".equals(bo.getType())){
-            List<Map<String, Object>> civil = baseMapper.getSg(bo.getEnginId(),"1");
+            List<Map<String, Object>> civil = baseMapper.getSg(bo.getEnginId());
             if (!civil.isEmpty()){
                 update.setEnginAddre((String) civil.get(0).get("name"));
             }
@@ -228,7 +257,46 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
         bo.getzEngineeringNodeBo().setCivliId(bo.getId());
         bo.getzEngineeringNodeBo().setCreateTime(bo.getCreateTime());
         nodeService.update(bo.getzEngineeringNodeBo());
-        return baseMapper.updateById(update) > 0;
+        int i = baseMapper.updateById(update);
+        if (i>0){
+            List<ZEngiineeringPhoto> list = new ArrayList<>();
+
+            // 查询数据库中已存在的文件列表
+            ZEngiineeringPhotoBo bo1 = new ZEngiineeringPhotoBo();
+            bo1.setParentId(update.getId());
+            List<String> existingPhotos = photoService.queryList(bo1).stream()
+                .map(ZEngiineeringPhotoVo::getPicUrl)
+                .collect(Collectors.toList());
+
+            // 插入前端传来的新文件
+            for (ZFileBo pic : bo.getFiles()) {
+                if (!existingPhotos.contains(pic)) {
+                    ZEngiineeringPhoto newPhoto = new ZEngiineeringPhoto();
+                    newPhoto.setParentId(bo.getId());
+                    newPhoto.setPicUrl(pic.getUrl());
+                    newPhoto.setFileName(pic.getName());
+                    newPhoto.setCreateBy(String.valueOf(LoginHelper.getUserId()));
+                    newPhoto.setCreateTime(new Date());
+                    list.add(newPhoto);
+                }
+            }
+
+            // 删除数据库中多余的文件
+            List<String> photosToDelete = existingPhotos.stream()
+                .filter(pic -> !bo.getFiles().contains(pic))
+                .collect(Collectors.toList());
+            if (!photosToDelete.isEmpty()) {
+                photosToDelete.forEach(item->{
+                    photoService.deleteWithValidByurls(item);
+                });
+            }
+
+            // 批量插入新图片
+            if (!list.isEmpty()) {
+                photoService.insertBatch(list);
+            }
+        }
+        return i>0;
     }
 
     /**

ruoyi-zdsz/src/main/resources/mapper/zdsz/ZEngineeringCivilMapper.xml

@@ -24,6 +24,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
     </resultMap>
-
+    <select id="queryPageList" resultType="com.ruoyi.zdsz.domain.vo.ZEngineeringCivilVo">
+        select a.*,
+               b.name AS areaName,
+               c.name AS buildingName,
+               d.name AS unitName,
+               e.name AS houseName,
+               f.dict_label AS enginClassificationName
+        from z_engineering_civil a
+                 left join z_area b on b.id = a.area_id
+                 left join z_building c on c.id = a.building_id
+                 left join z_unit d on d.id = a.unit_id
+                 left join z_house e on e.id = a.house_id
+                    left join  sys_dict_data f on f.dict_type = a.engin_type and f.dict_value = a.engin_classification
+        where a.del_flag = 0
+        <if test="p.district != null and p.district != ''">
+            and a.district = #{p.district}
+        </if>
+        <if test="p.areaId != null and p.areaId != ''">
+            and a.area_id = #{p.areaId}
+        </if>
+        <if test="p.buildingId != null and p.buildingId != ''">
+            and a.building_id = #{p.buildingId}
+        </if>
+        <if test="p.unitId != null and p.unitId != ''">
+            and a.unit_id = #{p.unitId}
+        </if>
+    </select>
 
 </mapper>

ruoyi-zdsz/src/main/resources/mapper/zdsz/ZEngineeringDangerousMapper.xml

@@ -47,4 +47,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
     </resultMap>
+
+    <select id="selectIdByCid" resultType="string">
+        select id from z_engineering_node where civli_id = #{id}
+    </select>
 </mapper>

ruoyi-zdsz/src/main/resources/mapper/zdsz/ZEngineeringPipeJackingMapper.xml

@@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             z_engineering_industry as m
         WHERE
-            m.del_flag = '0'  and m.id = #{enginId} and m.type = #{type}
+            m.del_flag = '0'  and m.id = #{enginId}
     </select>
 
 </mapper>