fix维修工单管理分页查询

module_cmms/src/main/java/org/jeecg/modules/cmmsRepair/controller/CmmsRepairController.java

@@ -60,7 +60,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class CmmsRepairController extends JeecgController<CmmsRepair, ICmmsRepairService> {
 	@Autowired
 	private ICmmsRepairService cmmsRepairService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -70,21 +70,45 @@ public class CmmsRepairController extends JeecgController<CmmsRepair, ICmmsRepai
 	 * @param req
 	 * @return
 	 */
-	//@AutoLog(value = "维修工单-分页列表查询")
 	@ApiOperation(value="维修工单-分页列表查询", notes="维修工单-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<CmmsRepair>> queryPageList(CmmsRepair cmmsRepair,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		//QueryWrapper<CmmsRepair> queryWrapper = QueryGenerator.initQueryWrapper(cmmsRepair, req.getParameterMap());
+												   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+												   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+												   HttpServletRequest req) {
+		CmmsRepair cmmsRepair1 = new CmmsRepair();
+		cmmsRepair1.setPriority(cmmsRepair.getPriority());
+		cmmsRepair1.setStatus(cmmsRepair.getStatus());
+		cmmsRepair1.setRepairstatus(cmmsRepair.getRepairstatus());
+		cmmsRepair1.setEquipmentid(cmmsRepair.getEquipmentid());
+		cmmsRepair1.setRepairuser(cmmsRepair.getRepairuser());
+		QueryWrapper<CmmsRepair> queryWrapper = QueryGenerator.initQueryWrapper(cmmsRepair1, req.getParameterMap());
+		queryWrapper.like(cmmsRepair.getRepaircode()!=null && !cmmsRepair.getRepaircode().equals(""),"repaircode",cmmsRepair.getRepaircode());
+		queryWrapper.like(cmmsRepair.getRepairname()!=null && !cmmsRepair.getRepairname().equals(""),"repairname",cmmsRepair.getRepairname());
+//		queryWrapper.like(cmmsRepair.getEquipmentid()!=null && !cmmsRepair.getEquipmentid().equals(""),"equipmentid",cmmsRepair.getEquipmentid());
+//		queryWrapper.like(cmmsRepair.getRepairuser()!=null && !cmmsRepair.getRepairuser().equals(""),"repairuser",cmmsRepair.getRepairuser());
+//		queryWrapper.like(cmmsRepair.getRepairstatus()!=null && !cmmsRepair.getRepairstatus().equals(""),"repairstatus",cmmsRepair.getRepairstatus());
 		Page<CmmsRepair> page = new Page<CmmsRepair>(pageNo, pageSize);
-		//IPage<CmmsRepair> pageList = cmmsRepairService.page(page, queryWrapper);
-		List<CmmsRepair> list = cmmsRepairService.getPageList(page,cmmsRepair);
-		page.setRecords(list);
-		return Result.OK(page);
+		IPage<CmmsRepair> pageList = cmmsRepairService.page(page, queryWrapper);
+		return Result.OK(pageList);
 	}
-	
+
+
+	//@AutoLog(value = "维修工单-分页列表查询")
+//	@ApiOperation(value="维修工单-分页列表查询", notes="维修工单-分页列表查询")
+//	@GetMapping(value = "/list")
+//	public Result<IPage<CmmsRepair>> queryPageList(CmmsRepair cmmsRepair,
+//								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+//								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+//								   HttpServletRequest req) {
+//		//QueryWrapper<CmmsRepair> queryWrapper = QueryGenerator.initQueryWrapper(cmmsRepair, req.getParameterMap());
+//		Page<CmmsRepair> page = new Page<CmmsRepair>(pageNo, pageSize);
+//		//IPage<CmmsRepair> pageList = cmmsRepairService.page(page, queryWrapper);
+//		List<CmmsRepair> list = cmmsRepairService.getPageList(page,cmmsRepair);
+//		page.setRecords(list);
+//		return Result.OK(page);
+//	}
+
 	/**
 	 *   添加
 	 *
@@ -102,7 +126,7 @@ public class CmmsRepairController extends JeecgController<CmmsRepair, ICmmsRepai
 		}
 		return Result.error("添加失败！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -117,7 +141,7 @@ public class CmmsRepairController extends JeecgController<CmmsRepair, ICmmsRepai
 		cmmsRepairService.updateById(cmmsRepair);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -132,7 +156,7 @@ public class CmmsRepairController extends JeecgController<CmmsRepair, ICmmsRepai
 		cmmsRepairService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -147,7 +171,7 @@ public class CmmsRepairController extends JeecgController<CmmsRepair, ICmmsRepai
 		this.cmmsRepairService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *