设备点位、设备档案名称模糊查询

jeecg_module_ems/src/main/java/org/jeecg/modules/tpmEquipment/controller/TpmEquipmentController.java

@@ -70,7 +70,11 @@ public class TpmEquipmentController extends JeecgController<TpmEquipment, ITpmEq
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<TpmEquipment> queryWrapper = QueryGenerator.initQueryWrapper(tpmEquipment, req.getParameterMap());
+		TpmEquipment tpmEquipment1 = new TpmEquipment();
+		tpmEquipment1.setEquipmentcode(tpmEquipment.getEquipmentcode());
+		tpmEquipment1.setEquipmenttreeid(tpmEquipment.getEquipmenttreeid());
+		QueryWrapper<TpmEquipment> queryWrapper = QueryGenerator.initQueryWrapper(tpmEquipment1, req.getParameterMap());
+		queryWrapper.like(tpmEquipment.getEquipmentname()!=null && !"".equals(tpmEquipment.getEquipmentname()),"equipmentname",tpmEquipment.getEquipmentname());
 		Page<TpmEquipment> page = new Page<TpmEquipment>(pageNo, pageSize);
 		IPage<TpmEquipment> pageList = tpmEquipmentService.page(page, queryWrapper);
 		return Result.OK(pageList);

jeecg_module_ems/src/main/java/org/jeecg/modules/tpmEquipmentTree/entity/TpmEquipmentTree.java

@@ -65,7 +65,4 @@ public class TpmEquipmentTree implements Serializable {
     @ApiModelProperty(value = "是否有子节点")
     private java.lang.String hasChild;
 
-    /** 子设备定义 */
-    @TableField(exist = false)
-    private List<TpmEquipmentTree> children = new ArrayList<TpmEquipmentTree>();
 }

jeecg_module_ems/src/main/java/org/jeecg/modules/tpmTag/controller/TpmTagController.java

@@ -81,7 +81,10 @@ public class TpmTagController extends JeecgController<TpmTag, ITpmTagService> {
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<TpmTag> queryWrapper = QueryGenerator.initQueryWrapper(tpmTag, req.getParameterMap());
+		TpmTag tpmTag1 = new TpmTag();
+		tpmTag1.setEnergyitemid(tpmTag.getEnergyitemid());
+		QueryWrapper<TpmTag> queryWrapper = QueryGenerator.initQueryWrapper(tpmTag1, req.getParameterMap());
+		queryWrapper.like(tpmTag.getTagname()!=null && !"".equals(tpmTag.getTagname()),"tagname",tpmTag.getTagname());
 		Page<TpmTag> page = new Page<TpmTag>(pageNo, pageSize);
 		IPage<TpmTag> pageList = tpmTagService.page(page, queryWrapper);
 		return Result.OK(pageList);