fix巡检路线、巡检计划、巡检点-分页列表查询

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectLine/controller/CmmsInspectLineController.java

@@ -58,7 +58,7 @@ public class CmmsInspectLineController extends JeecgController<CmmsInspectLine,
     @Autowired
     @SuppressWarnings("all")
     private ICmmsInspectLineDetailService inspectLineDetailService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -72,21 +72,37 @@ public class CmmsInspectLineController extends JeecgController<CmmsInspectLine,
 	@ApiOperation(value="巡检路线-分页列表查询", notes="巡检路线-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<CmmsInspectLine>> queryPageList(CmmsInspectLine cmmsInspectLine,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		QueryWrapper<CmmsInspectLine> queryWrapper = QueryGenerator.initQueryWrapper(cmmsInspectLine, req.getParameterMap());
+														@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+														@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+														HttpServletRequest req) {
+		CmmsInspectLine cmmsInspectLine1 = new CmmsInspectLine();
+		QueryWrapper<CmmsInspectLine> queryWrapper = QueryGenerator.initQueryWrapper(cmmsInspectLine1, req.getParameterMap());
 		Page<CmmsInspectLine> page = new Page<CmmsInspectLine>(pageNo, pageSize);
-		if (ObjectUtil.isNotNull(cmmsInspectLine.getLinename())){
-			QueryWrapper<CmmsInspectLine> query = new QueryWrapper<>();
-			query.like("linename",cmmsInspectLine.getLinename()).orderByDesc("create_time");
-			IPage<CmmsInspectLine> page1 = cmmsInspectLineService.page(page, query);
-			return Result.OK(page1);
-		}
+		queryWrapper.like(cmmsInspectLine.getLinename()!=null && !cmmsInspectLine.getLinename().equals(""),"linename",cmmsInspectLine.getLinename());
 		IPage<CmmsInspectLine> pageList = cmmsInspectLineService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
+
+//	//@AutoLog(value = "巡检路线-分页列表查询")
+//	@ApiOperation(value="巡检路线-分页列表查询", notes="巡检路线-分页列表查询")
+//	@GetMapping(value = "/list")
+//	public Result<IPage<CmmsInspectLine>> queryPageList(CmmsInspectLine cmmsInspectLine,
+//								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+//								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+//								   HttpServletRequest req) {
+//		QueryWrapper<CmmsInspectLine> queryWrapper = QueryGenerator.initQueryWrapper(cmmsInspectLine, req.getParameterMap());
+//		Page<CmmsInspectLine> page = new Page<CmmsInspectLine>(pageNo, pageSize);
+//		if (ObjectUtil.isNotNull(cmmsInspectLine.getLinename())){
+//			QueryWrapper<CmmsInspectLine> query = new QueryWrapper<>();
+//			query.like("linename",cmmsInspectLine.getLinename()).orderByDesc("create_time");
+//			IPage<CmmsInspectLine> page1 = cmmsInspectLineService.page(page, query);
+//			return Result.OK(page1);
+//		}
+//		IPage<CmmsInspectLine> pageList = cmmsInspectLineService.page(page, queryWrapper);
+//		return Result.OK(pageList);
+//	}
+
 	/**
 	 *   添加
 	 *
@@ -105,7 +121,7 @@ public class CmmsInspectLineController extends JeecgController<CmmsInspectLine,
 		}
 		return Result.error("添加失败！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -124,7 +140,7 @@ public class CmmsInspectLineController extends JeecgController<CmmsInspectLine,
 		}
 		return Result.error("编辑失败!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -145,7 +161,7 @@ public class CmmsInspectLineController extends JeecgController<CmmsInspectLine,
 		}
 		return Result.error("删除失败!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -166,7 +182,7 @@ public class CmmsInspectLineController extends JeecgController<CmmsInspectLine,
 		}
 		return Result.error("批量删除失败!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectPlan/controller/CmmsInspectPlanController.java

@@ -52,7 +52,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class CmmsInspectPlanController extends JeecgController<CmmsInspectPlan, ICmmsInspectPlanService> {
 	@Autowired
 	private ICmmsInspectPlanService cmmsInspectPlanService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -66,21 +66,37 @@ public class CmmsInspectPlanController extends JeecgController<CmmsInspectPlan,
 	@ApiOperation(value="巡检计划-分页列表查询", notes="巡检计划-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<CmmsInspectPlan>> queryPageList(CmmsInspectPlan cmmsInspectPlan,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		QueryWrapper<CmmsInspectPlan> queryWrapper = QueryGenerator.initQueryWrapper(cmmsInspectPlan, req.getParameterMap());
+														@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+														@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+														HttpServletRequest req) {
+		CmmsInspectPlan cmmsInspectPlan1 = new CmmsInspectPlan();
+		QueryWrapper<CmmsInspectPlan> queryWrapper = QueryGenerator.initQueryWrapper(cmmsInspectPlan1, req.getParameterMap());
 		Page<CmmsInspectPlan> page = new Page<CmmsInspectPlan>(pageNo, pageSize);
-		if(ObjectUtil.isNotNull(cmmsInspectPlan.getPlanname())){
-			QueryWrapper<CmmsInspectPlan> query = new QueryWrapper<>();
-			query.like("planname",cmmsInspectPlan.getPlanname()).orderByDesc("create_time");
-			IPage<CmmsInspectPlan> page1 = cmmsInspectPlanService.page(page, query);
-			return Result.OK(page1);
-		}
+		queryWrapper.like(cmmsInspectPlan.getPlanname()!=null && !cmmsInspectPlan.getPlanname().equals(""),"planname",cmmsInspectPlan.getPlanname());
 		IPage<CmmsInspectPlan> pageList = cmmsInspectPlanService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
+
+//	//@AutoLog(value = "巡检计划-分页列表查询")
+//	@ApiOperation(value="巡检计划-分页列表查询", notes="巡检计划-分页列表查询")
+//	@GetMapping(value = "/list")
+//	public Result<IPage<CmmsInspectPlan>> queryPageList(CmmsInspectPlan cmmsInspectPlan,
+//								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+//								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+//								   HttpServletRequest req) {
+//		QueryWrapper<CmmsInspectPlan> queryWrapper = QueryGenerator.initQueryWrapper(cmmsInspectPlan, req.getParameterMap());
+//		Page<CmmsInspectPlan> page = new Page<CmmsInspectPlan>(pageNo, pageSize);
+//		if(ObjectUtil.isNotNull(cmmsInspectPlan.getPlanname())){
+//			QueryWrapper<CmmsInspectPlan> query = new QueryWrapper<>();
+//			query.like("planname",cmmsInspectPlan.getPlanname()).orderByDesc("create_time");
+//			IPage<CmmsInspectPlan> page1 = cmmsInspectPlanService.page(page, query);
+//			return Result.OK(page1);
+//		}
+//		IPage<CmmsInspectPlan> pageList = cmmsInspectPlanService.page(page, queryWrapper);
+//		return Result.OK(pageList);
+//	}
+
 	/**
 	 *   添加
 	 *
@@ -99,7 +115,7 @@ public class CmmsInspectPlanController extends JeecgController<CmmsInspectPlan,
 		}
 		return Result.error("添加失败！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -118,7 +134,7 @@ public class CmmsInspectPlanController extends JeecgController<CmmsInspectPlan,
 		}
 		return Result.error("编辑失败!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -137,7 +153,7 @@ public class CmmsInspectPlanController extends JeecgController<CmmsInspectPlan,
 		}
 		return Result.error("删除失败!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -156,7 +172,7 @@ public class CmmsInspectPlanController extends JeecgController<CmmsInspectPlan,
 		}
 		return Result.error("批量删除失败!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectSpot/controller/CmmsInspectSpotController.java

@@ -56,7 +56,7 @@ public class CmmsInspectSpotController extends JeecgController<CmmsInspectSpot,
 	@Autowired
 	@SuppressWarnings("all")
 	private ICmmsInspectSpotEquipService inspectSpotEquipService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -69,18 +69,37 @@ public class CmmsInspectSpotController extends JeecgController<CmmsInspectSpot,
 	//@AutoLog(value = "巡检点-分页列表查询")
 	@ApiOperation(value="巡检点-分页列表查询", notes="巡检点-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<CmmsInspectSpotVo>> queryPageList(CmmsInspectSpot cmmsInspectSpot,
+	public Result<IPage<CmmsInspectSpot>> queryPageList(CmmsInspectSpot cmmsInspectSpot,
 														  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 														  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 														  HttpServletRequest req) {
-		//QueryWrapper<CmmsInspectSpot> queryWrapper = QueryGenerator.initQueryWrapper(cmmsInspectSpot, req.getParameterMap());
-		Page<CmmsInspectSpotVo> page = new Page<CmmsInspectSpotVo>(pageNo, pageSize);
-		//IPage<CmmsInspectSpot> pageList = cmmsInspectSpotService.page(page, queryWrapper);
-		List<CmmsInspectSpotVo> list = cmmsInspectSpotService.getCmmsInspectSpotList(page, cmmsInspectSpot);
-		page.setRecords(list);
-		return Result.OK(page);
+		CmmsInspectSpot cmmsInspectSpot1 = new CmmsInspectSpot();
+		cmmsInspectSpot1.setStatus(cmmsInspectSpot.getStatus());
+		cmmsInspectSpot1.setEquipdefid(cmmsInspectSpot.getEquipdefid());
+		QueryWrapper<CmmsInspectSpot> queryWrapper = QueryGenerator.initQueryWrapper(cmmsInspectSpot1, req.getParameterMap());
+		queryWrapper.like(cmmsInspectSpot.getContentcode()!=null && !cmmsInspectSpot.getContentcode().equals(""),"contentcode",cmmsInspectSpot.getContentcode());
+		queryWrapper.like(cmmsInspectSpot.getContentname()!=null && !cmmsInspectSpot.getContentname().equals(""),"contentname",cmmsInspectSpot.getContentname());
+		Page<CmmsInspectSpot> page = new Page<CmmsInspectSpot>(pageNo, pageSize);
+		IPage<CmmsInspectSpot> pageList = cmmsInspectSpotService.page(page, queryWrapper);
+		return Result.OK(pageList);
 	}
-	
+
+
+//	//@AutoLog(value = "巡检点-分页列表查询")
+//	@ApiOperation(value="巡检点-分页列表查询", notes="巡检点-分页列表查询")
+//	@GetMapping(value = "/list")
+//	public Result<IPage<CmmsInspectSpotVo>> queryPageList(CmmsInspectSpot cmmsInspectSpot,
+//														  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+//														  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+//														  HttpServletRequest req) {
+//		//QueryWrapper<CmmsInspectSpot> queryWrapper = QueryGenerator.initQueryWrapper(cmmsInspectSpot, req.getParameterMap());
+//		Page<CmmsInspectSpotVo> page = new Page<CmmsInspectSpotVo>(pageNo, pageSize);
+//		//IPage<CmmsInspectSpot> pageList = cmmsInspectSpotService.page(page, queryWrapper);
+//		List<CmmsInspectSpotVo> list = cmmsInspectSpotService.getCmmsInspectSpotList(page, cmmsInspectSpot);
+//		page.setRecords(list);
+//		return Result.OK(page);
+//	}
+
 	/**
 	 *   添加
 	 *
@@ -99,7 +118,7 @@ public class CmmsInspectSpotController extends JeecgController<CmmsInspectSpot,
 		}
 		return Result.error("添加失败！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -118,7 +137,7 @@ public class CmmsInspectSpotController extends JeecgController<CmmsInspectSpot,
 		}
 		return Result.error("编辑失败!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -139,7 +158,7 @@ public class CmmsInspectSpotController extends JeecgController<CmmsInspectSpot,
 		}
 		return Result.error("删除失败!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -160,7 +179,7 @@ public class CmmsInspectSpotController extends JeecgController<CmmsInspectSpot,
 		}
 		return Result.error("批量删除失败!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectSpot/entity/CmmsInspectSpot.java

@@ -67,6 +67,7 @@ public class CmmsInspectSpot implements Serializable {
 	/**设备类型*/
 	@Excel(name = "设备类型", width = 15)
     @ApiModelProperty(value = "设备类型")
+    @Dict(dictTable = "tpm_equipment_tree", dicText = "name", dicCode = "id")
     private java.lang.String equipdefid;
     /**状态：启用：0、禁用:1*/
     @Excel(name = "状态：启用：0、禁用:1", width = 15, dicCode = "common_status")