fix保养项-分页查询

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepItem/controller/CmmsUpkeepItemController.java

@@ -78,21 +78,37 @@ public class CmmsUpkeepItemController extends JeecgController<CmmsUpkeepItem, IC
 	 * @param req
 	 * @return
 	 */
-	//@AutoLog(value = "保养项-分页列表查询")
 	@ApiOperation(value="保养项-分页列表查询", notes="保养项-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<CmmsUpkeepItemDto>> queryPageList(CmmsUpkeepItem cmmsUpkeepItem,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-//		QueryWrapper<CmmsUpkeepItem> queryWrapper = QueryGenerator.initQueryWrapper(cmmsUpkeepItem, req.getParameterMap());
-		Page<CmmsUpkeepItemDto> page = new Page<CmmsUpkeepItemDto>(pageNo, pageSize);
-//		IPage<CmmsUpkeepItem> pageList = cmmsUpkeepItemService.page(page, queryWrapper);
-		List<CmmsUpkeepItemDto> pageList = cmmsUpkeepItemService.getAllCmmsUpkeepItem(page, cmmsUpkeepItem);
-		page.setRecords(pageList);
-		return Result.OK(page);
+	public Result<IPage<CmmsUpkeepItem>> queryPageList(CmmsUpkeepItem cmmsUpkeepItem,
+													   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+													   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+													   HttpServletRequest req) {
+		CmmsUpkeepItem cmmsUpkeepItem1 = new CmmsUpkeepItem();
+		cmmsUpkeepItem1.setEquipdefid(cmmsUpkeepItem.getEquipdefid());
+		QueryWrapper<CmmsUpkeepItem> queryWrapper = QueryGenerator.initQueryWrapper(cmmsUpkeepItem1, req.getParameterMap());
+		queryWrapper.like(cmmsUpkeepItem.getItemcode()!=null && !cmmsUpkeepItem.getItemcode().equals(""),"itemcode",cmmsUpkeepItem.getItemcode());
+		queryWrapper.like(cmmsUpkeepItem.getItemname()!=null && !cmmsUpkeepItem.getItemname().equals(""),"itemname",cmmsUpkeepItem.getItemname());
+		Page<CmmsUpkeepItem> page = new Page<CmmsUpkeepItem>(pageNo, pageSize);
+		IPage<CmmsUpkeepItem> pageList = cmmsUpkeepItemService.page(page, queryWrapper);
+		return Result.OK(pageList);
 	}
 
+//	//@AutoLog(value = "保养项-分页列表查询")
+//	@ApiOperation(value="保养项-分页列表查询", notes="保养项-分页列表查询")
+//	@GetMapping(value = "/list")
+//	public Result<IPage<CmmsUpkeepItemDto>> queryPageList(CmmsUpkeepItem cmmsUpkeepItem,
+//								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+//								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+//								   HttpServletRequest req) {
+////		QueryWrapper<CmmsUpkeepItem> queryWrapper = QueryGenerator.initQueryWrapper(cmmsUpkeepItem, req.getParameterMap());
+//		Page<CmmsUpkeepItemDto> page = new Page<CmmsUpkeepItemDto>(pageNo, pageSize);
+////		IPage<CmmsUpkeepItem> pageList = cmmsUpkeepItemService.page(page, queryWrapper);
+//		List<CmmsUpkeepItemDto> pageList = cmmsUpkeepItemService.getAllCmmsUpkeepItem(page, cmmsUpkeepItem);
+//		page.setRecords(pageList);
+//		return Result.OK(page);
+//	}
+
 
 	/**
 	 *   添加

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepItem/entity/CmmsUpkeepItem.java

@@ -63,6 +63,7 @@ public class CmmsUpkeepItem 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)