fix我的维修工单分页查询

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

@@ -93,6 +93,35 @@ public class CmmsRepairController extends JeecgController<CmmsRepair, ICmmsRepai
 		return Result.OK(pageList);
 	}
 
+	 /**
+	  * 查询列表(我的)
+	  */
+	 @ApiOperation(value="我的维修工单-查询", notes="我的维修工单-查询")
+	 @GetMapping("/listMy")
+	 public Result<IPage<CmmsRepair>> selectMyList(@Param("cmmsrepair") CmmsRepair cmmsRepair,
+												   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+												   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+												   HttpServletRequest req) {
+		 Subject subject = SecurityUtils.getSubject();
+		 LoginUser loginUser = (LoginUser)subject.getPrincipal();
+		 String userId = loginUser.getId();
+
+		 CmmsRepair cmmsRepair1 = new CmmsRepair();
+		 cmmsRepair1.setPriority(cmmsRepair.getPriority());
+		 cmmsRepair1.setStatus(cmmsRepair.getStatus());
+		 cmmsRepair1.setRepairstatus(cmmsRepair.getRepairstatus());
+		 cmmsRepair1.setEquipmentid(cmmsRepair.getEquipmentid());
+		 cmmsRepair1.setRepairuser(userId);
+
+		 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());
+
+		 Page<CmmsRepair> page = new Page<CmmsRepair>(pageNo, pageSize);
+		 IPage<CmmsRepair> pageList = cmmsRepairService.page(page, queryWrapper);
+		 return Result.OK(pageList);
+	 }
+
 
 	//@AutoLog(value = "维修工单-分页列表查询")
 //	@ApiOperation(value="维修工单-分页列表查询", notes="维修工单-分页列表查询")
@@ -214,26 +243,26 @@ public class CmmsRepairController extends JeecgController<CmmsRepair, ICmmsRepai
         return super.importExcel(request, response, CmmsRepair.class);
     }
 
-	 /**
-	  * 查询列表(我的)
-	  */
-	 @ApiOperation(value="我的维修工单-查询", notes="我的维修工单-查询")
-	 @GetMapping("/listMy")
-	 public Result<IPage<CmmsRepair>> selectMyList(@Param("cmmsrepair") CmmsRepair cmmsRepair,
-												   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-												   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-												   HttpServletRequest req) {
-		 Subject subject = SecurityUtils.getSubject();
-		 LoginUser loginUser = (LoginUser)subject.getPrincipal();
-		 String username = loginUser.getUsername();
-		 String userId = loginUser.getId();
-		 //cmmsRepair.setRepairuser(username);
-		 cmmsRepair.setRepairuser(userId);
-		 Page<CmmsRepair> page = new Page<CmmsRepair>(pageNo, pageSize);
-		 List<CmmsRepair> list = cmmsRepairService.selectList(page,cmmsRepair);
-		 page.setRecords(list);
-		 return Result.OK(page);
-	 }
+//	 /**
+//	  * 查询列表(我的)
+//	  */
+//	 @ApiOperation(value="我的维修工单-查询", notes="我的维修工单-查询")
+//	 @GetMapping("/listMy")
+//	 public Result<IPage<CmmsRepair>> selectMyList(@Param("cmmsrepair") CmmsRepair cmmsRepair,
+//												   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+//												   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+//												   HttpServletRequest req) {
+//		 Subject subject = SecurityUtils.getSubject();
+//		 LoginUser loginUser = (LoginUser)subject.getPrincipal();
+//		 String username = loginUser.getUsername();
+//		 String userId = loginUser.getId();
+//		 //cmmsRepair.setRepairuser(username);
+//		 cmmsRepair.setRepairuser(userId);
+//		 Page<CmmsRepair> page = new Page<CmmsRepair>(pageNo, pageSize);
+//		 List<CmmsRepair> list = cmmsRepairService.selectList(page,cmmsRepair);
+//		 page.setRecords(list);
+//		 return Result.OK(page);
+//	 }
 
 
 	 /**