带气封堵查询

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

@@ -45,8 +45,10 @@ public class ZEngineeringAirWallController extends BaseController {
      */
 //    @SaCheckPermission("zdsz:engineeringIndustry:list")
     @GetMapping("/list")
-    public TableDataInfo<ZEngineeringAirWallVo> list(ZEngineeringAirWallBo bo, PageQuery pageQuery, String type) {
+    public TableDataInfo<ZEngineeringAirWallVo> list(ZEngineeringAirWallBo bo, PageQuery pageQuery, String enginType) {
 //        bo.setType(type);
+        bo.setEnginType(enginType);
+        System.out.println("enginType==="+enginType);
         return iZEngineeringAirWallService.queryPageList(bo, pageQuery);
     }
 

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

@@ -26,10 +26,10 @@ public class ZEngineeringAirWall extends BaseEntity {
      */
     @TableId(value = "id")
     private String id;
-//    /**
-//     * 工程类型
-//     */
-//    private String enginType;
+    /**
+     * 工程类型
+     */
+    private String enginType;
 //    /**
 //     * 建筑单位
 //     */

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

@@ -22,10 +22,10 @@ public class ZEngineeringAirWallBo extends BaseEntity {
      */
     private String id;
 
-//    /**
-//     * 工程类型
-//     */
-//    private String enginType;
+    /**
+     * 工程类型
+     */
+    private String enginType;
 //
 //    /**
 //     * 建筑单位

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

@@ -27,11 +27,11 @@ public class ZEngineeringAirWallVo extends BaseEntity {
     @ExcelProperty(value = "")
     private String id;
 
-//    /**
-//     * 工程类型
-//     */
-//    @ExcelProperty(value = "工程类型")
-//    private String enginType;
+    /**
+     * 工程类型
+     */
+    @ExcelProperty(value = "工程类型")
+    private String enginType;
 //
 //    /**
 //     * 建筑单位

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

@@ -11,6 +11,7 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.zdsz.domain.ZEngiineeringPhoto;
 import com.ruoyi.zdsz.domain.ZEngineeringAirWall;
 import com.ruoyi.zdsz.domain.ZEngineeringIndustry;
+import com.ruoyi.zdsz.domain.ZEngineeringNode;
 import com.ruoyi.zdsz.domain.bo.*;
 import com.ruoyi.zdsz.domain.vo.ZEngiineeringPhotoVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringAirWallVo;
@@ -81,6 +82,8 @@ public class ZEngineeringAirWallServiceImpl implements IZEngineeringAirWallServi
     @Override
     public TableDataInfo<ZEngineeringAirWallVo> queryPageList(ZEngineeringAirWallBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<ZEngineeringAirWall> lqw = buildQueryWrapper(bo);
+        lqw.like(StringUtils.isNotBlank(bo.getEnginName()), ZEngineeringAirWall::getEnginName, bo.getEnginName());
+        lqw.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringAirWall::getEnginType, bo.getEnginType());
         Page<ZEngineeringAirWallVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }