Merge remote-tracking branch 'origin/master'

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectContent/controller/CmmsInspectContentController.java

@@ -58,7 +58,7 @@ public class CmmsInspectContentController extends JeecgController<CmmsInspectCon
  	@Autowired
  	@SuppressWarnings("all")
  	private ICmmsInspectContentItemService iCmmsInspectContentItemService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -71,18 +71,38 @@ public class CmmsInspectContentController extends JeecgController<CmmsInspectCon
 	//@AutoLog(value = "巡检内容-分页列表查询")
 	@ApiOperation(value="巡检内容-分页列表查询", notes="巡检内容-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<CmmsInspectContentVo>> queryPageList(CmmsInspectContent cmmsInspectContent,
+	public Result<IPage<CmmsInspectContent>> queryPageList(CmmsInspectContent cmmsInspectContent,
 															 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 															 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 															 HttpServletRequest req) {
-		//QueryWrapper<CmmsInspectContent> queryWrapper = QueryGenerator.initQueryWrapper(cmmsInspectContent, req.getParameterMap());
-		Page<CmmsInspectContentVo> page = new Page<>(pageNo, pageSize);
-		//IPage<CmmsInspectContent> pageList = cmmsInspectContentService.page(page, queryWrapper);
-		List<CmmsInspectContentVo> list = cmmsInspectContentService.getCmmsInspectContent(page, cmmsInspectContent);
-		page.setRecords(list);
-		return Result.OK(page);
+		CmmsInspectContent cmmsInspectContent1 = new CmmsInspectContent();
+		cmmsInspectContent1.setEquipmentid(cmmsInspectContent.getEquipmentid());
+		cmmsInspectContent1.setStatus(cmmsInspectContent.getStatus());
+		cmmsInspectContent1.setClassification(cmmsInspectContent.getClassification());
+		QueryWrapper<CmmsInspectContent> queryWrapper = QueryGenerator.initQueryWrapper(cmmsInspectContent1, req.getParameterMap());
+		queryWrapper.like(cmmsInspectContent.getContentname()!=null && !cmmsInspectContent.getContentname().equals(""),"contentname",cmmsInspectContent.getContentname());
+		queryWrapper.like(cmmsInspectContent.getContentcode()!=null && !cmmsInspectContent.getContentcode().equals(""),"contentcode",cmmsInspectContent.getContentcode());
+		Page<CmmsInspectContent> page = new Page<>(pageNo, pageSize);
+		IPage<CmmsInspectContent> pageList = cmmsInspectContentService.page(page, queryWrapper);
+		return Result.OK(pageList);
 	}
-	
+
+
+//	//@AutoLog(value = "巡检内容-分页列表查询")
+//	@ApiOperation(value="巡检内容-分页列表查询", notes="巡检内容-分页列表查询")
+//	@GetMapping(value = "/list")
+//	public Result<IPage<CmmsInspectContentVo>> queryPageList(CmmsInspectContent cmmsInspectContent,
+//															 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+//															 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+//															 HttpServletRequest req) {
+//		//QueryWrapper<CmmsInspectContent> queryWrapper = QueryGenerator.initQueryWrapper(cmmsInspectContent, req.getParameterMap());
+//		Page<CmmsInspectContentVo> page = new Page<>(pageNo, pageSize);
+//		//IPage<CmmsInspectContent> pageList = cmmsInspectContentService.page(page, queryWrapper);
+//		List<CmmsInspectContentVo> list = cmmsInspectContentService.getCmmsInspectContent(page, cmmsInspectContent);
+//		page.setRecords(list);
+//		return Result.OK(page);
+//	}
+
 	/**
 	 *   添加
 	 *
@@ -100,7 +120,7 @@ public class CmmsInspectContentController extends JeecgController<CmmsInspectCon
 		}
 		return Result.error("添加失败！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -119,7 +139,7 @@ public class CmmsInspectContentController extends JeecgController<CmmsInspectCon
 		}
 		return Result.error("编辑失败!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -140,7 +160,7 @@ public class CmmsInspectContentController extends JeecgController<CmmsInspectCon
 		}
 		return Result.error("删除失败!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -161,7 +181,7 @@ public class CmmsInspectContentController extends JeecgController<CmmsInspectCon
 		}
 		return Result.error("批量删除失败!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectItem/controller/CmmsInspectItemController.java

@@ -57,10 +57,10 @@ public class CmmsInspectItemController extends JeecgController<CmmsInspectItem,
 	@Autowired
 	@SuppressWarnings("all")
 	private AutoCodeUtil autoCodeUtil;
-	
+
 	/**
 	 * 分页列表查询
-	 *
+	 *CmmsInspectItem
 	 * @param cmmsInspectItem
 	 * @param pageNo
 	 * @param pageSize
@@ -70,18 +70,37 @@ public class CmmsInspectItemController extends JeecgController<CmmsInspectItem,
 	//@AutoLog(value = "巡检项-分页列表查询")
 	@ApiOperation(value="巡检项-分页列表查询", notes="巡检项-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<CmmsInspectItemVo>> queryPageList(CmmsInspectItem cmmsInspectItem,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		//QueryWrapper<CmmsInspectItem> queryWrapper = QueryGenerator.initQueryWrapper(cmmsInspectItem, req.getParameterMap());
-		Page<CmmsInspectItemVo> page = new Page<CmmsInspectItemVo>(pageNo, pageSize);
-		//IPage<CmmsInspectItem> pageList = cmmsInspectItemService.page(page, queryWrapper);
-		List<CmmsInspectItemVo> list = cmmsInspectItemService.getCmmsInspectItems(page, cmmsInspectItem);
-		page.setRecords(list);
-		return Result.OK(page);
+	public Result<IPage<CmmsInspectItem>> queryPageList(CmmsInspectItem cmmsInspectItem,
+														  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+														  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+														  HttpServletRequest req) {
+		CmmsInspectItem cmmsInspectItem1 = new CmmsInspectItem();
+		cmmsInspectItem1.setClassification(cmmsInspectItem.getClassification());
+		cmmsInspectItem1.setEquipdefid(cmmsInspectItem.getEquipdefid());
+		QueryWrapper<CmmsInspectItem> queryWrapper = QueryGenerator.initQueryWrapper(cmmsInspectItem1, req.getParameterMap());
+		queryWrapper.like(cmmsInspectItem.getItemname()!=null && !cmmsInspectItem.getItemname().equals(""),"itemname",cmmsInspectItem.getItemname());
+		queryWrapper.like(cmmsInspectItem.getItemcode()!=null && !cmmsInspectItem.getItemcode().equals(""),"itemcode",cmmsInspectItem.getItemcode());
+		Page<CmmsInspectItem> page = new Page<CmmsInspectItem>(pageNo, pageSize);
+		IPage<CmmsInspectItem> pageList = cmmsInspectItemService.page(page, queryWrapper);
+		return Result.OK(pageList);
 	}
-	
+
+
+//	//@AutoLog(value = "巡检项-分页列表查询")
+//	@ApiOperation(value="巡检项-分页列表查询", notes="巡检项-分页列表查询")
+//	@GetMapping(value = "/list")
+//	public Result<IPage<CmmsInspectItemVo>> queryPageList(CmmsInspectItem cmmsInspectItem,
+//								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+//								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+//								   HttpServletRequest req) {
+//		//QueryWrapper<CmmsInspectItem> queryWrapper = QueryGenerator.initQueryWrapper(cmmsInspectItem, req.getParameterMap());
+//		Page<CmmsInspectItemVo> page = new Page<CmmsInspectItemVo>(pageNo, pageSize);
+//		//IPage<CmmsInspectItem> pageList = cmmsInspectItemService.page(page, queryWrapper);
+//		List<CmmsInspectItemVo> list = cmmsInspectItemService.getCmmsInspectItems(page, cmmsInspectItem);
+//		page.setRecords(list);
+//		return Result.OK(page);
+//	}
+
 	/**
 	 *   添加
 	 *
@@ -99,7 +118,7 @@ public class CmmsInspectItemController extends JeecgController<CmmsInspectItem,
 		}
 		return Result.OK("添加失败！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -114,7 +133,7 @@ public class CmmsInspectItemController extends JeecgController<CmmsInspectItem,
 		cmmsInspectItemService.updateById(cmmsInspectItem);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -129,7 +148,7 @@ public class CmmsInspectItemController extends JeecgController<CmmsInspectItem,
 		cmmsInspectItemService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -144,7 +163,7 @@ public class CmmsInspectItemController extends JeecgController<CmmsInspectItem,
 		this.cmmsInspectItemService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectItem/entity/CmmsInspectItem.java

@@ -67,6 +67,7 @@ public class CmmsInspectItem implements Serializable {
 	/**设备类型ID(设备定义)*/
 	@Excel(name = "设备类型ID(设备定义)", width = 15)
     @ApiModelProperty(value = "设备类型ID(设备定义)")
+    @Dict(dictTable = "tpm_equipment_tree", dicText = "name", dicCode = "id")
     private java.lang.String equipdefid;
 	/**条件(字典中定义)*/
 	@Excel(name = "条件(字典中定义)", width = 15)