fix保养计划-分页查询

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepPlan/controller/CmmsUpkeepPlanController.java

@@ -65,21 +65,40 @@ public class CmmsUpkeepPlanController extends JeecgController<CmmsUpkeepPlan, IC
 	 * @param req
 	 * @return
 	 */
-	//@AutoLog(value = "保养计划-分页列表查询")
 	@ApiOperation(value="保养计划-分页列表查询", notes="保养计划-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<CmmsUpkeepPlanDto>> queryPageList(CmmsUpkeepPlan cmmsUpkeepPlan,
+	public Result<IPage<CmmsUpkeepPlan>> queryPageList(CmmsUpkeepPlan cmmsUpkeepPlan,
 														  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 														  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 														  HttpServletRequest req) {
-//		QueryWrapper<CmmsUpkeepPlan> queryWrapper = QueryGenerator.initQueryWrapper(cmmsUpkeepPlan, req.getParameterMap());
-		Page<CmmsUpkeepPlanDto> page = new Page<CmmsUpkeepPlanDto>(pageNo, pageSize);
-//		IPage<CmmsUpkeepPlan> pageList = cmmsUpkeepPlanService.page(page, queryWrapper);
-		List<CmmsUpkeepPlanDto> pageList = cmmsUpkeepPlanService.getAllCmmsUpkeepPlan(page, cmmsUpkeepPlan);
-		page.setRecords(pageList);
+		CmmsUpkeepPlan cmmsUpkeepPlan1 = new CmmsUpkeepPlan();
+		cmmsUpkeepPlan1.setStatus(cmmsUpkeepPlan.getStatus());
+		cmmsUpkeepPlan1.setEquipmentid(cmmsUpkeepPlan.getEquipmentid());
+		cmmsUpkeepPlan1.setChargeruser(cmmsUpkeepPlan.getChargeruser());
+		QueryWrapper<CmmsUpkeepPlan> queryWrapper = QueryGenerator.initQueryWrapper(cmmsUpkeepPlan1, req.getParameterMap());
+		queryWrapper.like(cmmsUpkeepPlan.getPlanname()!=null && ! cmmsUpkeepPlan.getPlanname().equals(""),"planname",cmmsUpkeepPlan.getPlanname());
+		queryWrapper.like(cmmsUpkeepPlan.getPlancode()!=null && ! cmmsUpkeepPlan.getPlancode().equals(""),"plancode",cmmsUpkeepPlan.getPlancode());
+		Page<CmmsUpkeepPlan> page = new Page<CmmsUpkeepPlan>(pageNo, pageSize);
+		IPage<CmmsUpkeepPlan> pageList = cmmsUpkeepPlanService.page(page, queryWrapper);
 		return Result.OK(page);
 	}
 
+
+//	//@AutoLog(value = "保养计划-分页列表查询")
+//	@ApiOperation(value="保养计划-分页列表查询", notes="保养计划-分页列表查询")
+//	@GetMapping(value = "/list")
+//	public Result<IPage<CmmsUpkeepPlanDto>> queryPageList(CmmsUpkeepPlan cmmsUpkeepPlan,
+//														  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+//														  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+//														  HttpServletRequest req) {
+////		QueryWrapper<CmmsUpkeepPlan> queryWrapper = QueryGenerator.initQueryWrapper(cmmsUpkeepPlan, req.getParameterMap());
+//		Page<CmmsUpkeepPlanDto> page = new Page<CmmsUpkeepPlanDto>(pageNo, pageSize);
+////		IPage<CmmsUpkeepPlan> pageList = cmmsUpkeepPlanService.page(page, queryWrapper);
+//		List<CmmsUpkeepPlanDto> pageList = cmmsUpkeepPlanService.getAllCmmsUpkeepPlan(page, cmmsUpkeepPlan);
+//		page.setRecords(pageList);
+//		return Result.OK(page);
+//	}
+
 	/**
 	 *   添加
 	 *