模糊筛选修改

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/EquipmentDto.java

 package com.yeejoin.amos.boot.module.ugp.api.dto;
 
+import com.yeejoin.amos.boot.module.ugp.api.entity.Equipment;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -20,6 +21,7 @@ public class EquipmentDto  extends BaseDto {
 
    private static final long serialVersionUID = 1L;
 
+    Equipment equipment;
 
     @ApiModelProperty(value = "名称")
     private String name;

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/ProjectDto.java

@@ -2,6 +2,8 @@ package com.yeejoin.amos.boot.module.ugp.api.dto;
 
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.yeejoin.amos.boot.module.ugp.api.entity.Company;
+import com.yeejoin.amos.boot.module.ugp.api.entity.Project;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -22,6 +24,7 @@ public class ProjectDto  extends BaseDto {
 
    private static final long serialVersionUID = 1L;
 
+    Project project;
 
     @ApiModelProperty(value = "项目名称")
     private String name;

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/EquipmentController.java

@@ -118,28 +118,6 @@ public class EquipmentController extends BaseController {
 	    return ResponseHelper.buildResponse(equipmentServiceImpl.queryBySeq(sequenceNbr));
 	}
 
-//	/**
-//     * 列表分页查询
-//     *
-//     * @param current 当前页
-//     * @param current 每页大小
-//     * @return
-//     */
-//	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
-//	@GetMapping(value = "/page")
-//	@ApiOperation(httpMethod = "GET",value = "设备信息表分页查询",  notes = "设备信息表分页查询")
-//	public ResponseModel<Page<EquipmentDto>> queryForPage(
-//			@RequestParam(value = "current") int current,
-//			@RequestParam(value = "size") int size,
-//			@RequestParam(value = "name",required = false) String name,
-//			@RequestParam(value = "code",required = false) String code,
-//			@RequestParam(value = "verifyStatus",required = false)String verifyStatus) {
-//	    Page<EquipmentDto> page = new Page<EquipmentDto>();
-//	    page.setCurrent(current);
-//	    page.setSize(size);
-//
-//	    return ResponseHelper.buildResponse(equipmentServiceImpl.queryForEquipmentPage(page,name,code,verifyStatus));
-//	}
 	/**
 	 * 列表分页查询
 	 *