民用接口修改

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/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-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/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/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/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/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/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/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>