Merge remote-tracking branch 'origin/master'

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.system.controller;
 
 import java.util.Arrays;
 import java.util.Date;
+import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -10,6 +11,7 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.constant.DataBaseConstant;
 import org.jeecg.common.constant.WebsocketConst;
+import org.jeecg.common.system.api.ISysBaseAPI;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.SqlInjectionUtil;
 import org.jeecg.common.util.oConvertUtils;
@@ -51,6 +53,8 @@ public class SysAnnouncementSendController {
 	private ISysAnnouncementSendService sysAnnouncementSendService;
 	@Autowired
 	private WebSocket webSocket;
+	@Autowired
+	private ISysBaseAPI sysBaseAPI;
 
 	/**
 	  * 分页列表查询
@@ -232,6 +236,35 @@ public class SysAnnouncementSendController {
 	}
 
 	/**
+	*   author: dzc
+	*   version: 1.0
+	*   des: 消息管理 -- 消息通知（管理员角色查询所有的消息通知）
+	*   date: 2024/4/26
+	*/
+	@GetMapping(value = "/getAllAnnouncementSend")
+	public Result<IPage<AnnouncementSendModel>> getAllAnnouncementSend(AnnouncementSendModel announcementSendModel,
+																	  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+																	  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
+		Result<IPage<AnnouncementSendModel>> result = new Result<IPage<AnnouncementSendModel>>();
+		// 获取当前登录的用户
+		LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
+		// 当前登录用户 id
+		String userId = sysUser.getId();
+		// 获取当前用户的角色信息
+		List<String> roleList = sysBaseAPI.getRolesByUsername(sysUser.getUsername());
+		if (!roleList.contains("admin")){
+			announcementSendModel.setUserId(userId);
+		}
+		announcementSendModel.setPageNo((pageNo-1)*pageSize);
+		announcementSendModel.setPageSize(pageSize);
+		Page<AnnouncementSendModel> pageList = new Page<AnnouncementSendModel>(pageNo,pageSize);
+		pageList = sysAnnouncementSendService.getMyAnnouncementSendPage(pageList, announcementSendModel);
+		result.setResult(pageList);
+		result.setSuccess(true);
+		return result;
+	}
+
+	/**
 	 * @功能：一键已读
 	 * @return
 	 */

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml

@@ -44,7 +44,9 @@
 	   left join sys_announcement sa ON sas.annt_id = sa.id
 	   where sa.send_status = '1'
 	   and sa.del_flag = '0'
-	   and sas.user_id = #{announcementSendModel.userId}
+	   <if test="announcementSendModel.userId !=null and announcementSendModel.userId != ''">
+			and sas.user_id = #{announcementSendModel.userId}
+	   </if>
 	   <if test="announcementSendModel.titile !=null and announcementSendModel.titile != ''">
 	   		and sa.titile LIKE concat(concat('%',#{announcementSendModel.titile}),'%')
 	   </if>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/AnnouncementSendModel.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
@@ -24,6 +25,7 @@ public class AnnouncementSendModel implements Serializable {
 	/**通告id*/
 	private java.lang.String anntId;
 	/**用户id*/
+	@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id")
 	private java.lang.String userId;
 	/**标题*/
 	private java.lang.String titile;

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectContent/controller/CmmsInspectContentController.java

@@ -58,7 +58,7 @@ public class CmmsInspectContentController extends JeecgController<CmmsInspectCon
  	@Autowired
  	@SuppressWarnings("all")
  	private ICmmsInspectContentItemService iCmmsInspectContentItemService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -71,18 +71,38 @@ public class CmmsInspectContentController extends JeecgController<CmmsInspectCon
 	//@AutoLog(value = "巡检内容-分页列表查询")
 	@ApiOperation(value="巡检内容-分页列表查询", notes="巡检内容-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<CmmsInspectContentVo>> queryPageList(CmmsInspectContent cmmsInspectContent,
+	public Result<IPage<CmmsInspectContent>> queryPageList(CmmsInspectContent cmmsInspectContent,
 															 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 															 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 															 HttpServletRequest req) {
-		//QueryWrapper<CmmsInspectContent> queryWrapper = QueryGenerator.initQueryWrapper(cmmsInspectContent, req.getParameterMap());
-		Page<CmmsInspectContentVo> page = new Page<>(pageNo, pageSize);
-		//IPage<CmmsInspectContent> pageList = cmmsInspectContentService.page(page, queryWrapper);
-		List<CmmsInspectContentVo> list = cmmsInspectContentService.getCmmsInspectContent(page, cmmsInspectContent);
-		page.setRecords(list);
-		return Result.OK(page);
+		CmmsInspectContent cmmsInspectContent1 = new CmmsInspectContent();
+		cmmsInspectContent1.setEquipmentid(cmmsInspectContent.getEquipmentid());
+		cmmsInspectContent1.setStatus(cmmsInspectContent.getStatus());
+		cmmsInspectContent1.setClassification(cmmsInspectContent.getClassification());
+		QueryWrapper<CmmsInspectContent> queryWrapper = QueryGenerator.initQueryWrapper(cmmsInspectContent1, req.getParameterMap());
+		queryWrapper.like(cmmsInspectContent.getContentname()!=null && !cmmsInspectContent.getContentname().equals(""),"contentname",cmmsInspectContent.getContentname());
+		queryWrapper.like(cmmsInspectContent.getContentcode()!=null && !cmmsInspectContent.getContentcode().equals(""),"contentcode",cmmsInspectContent.getContentcode());
+		Page<CmmsInspectContent> page = new Page<>(pageNo, pageSize);
+		IPage<CmmsInspectContent> pageList = cmmsInspectContentService.page(page, queryWrapper);
+		return Result.OK(pageList);
 	}
-	
+
+
+//	//@AutoLog(value = "巡检内容-分页列表查询")
+//	@ApiOperation(value="巡检内容-分页列表查询", notes="巡检内容-分页列表查询")
+//	@GetMapping(value = "/list")
+//	public Result<IPage<CmmsInspectContentVo>> queryPageList(CmmsInspectContent cmmsInspectContent,
+//															 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+//															 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+//															 HttpServletRequest req) {
+//		//QueryWrapper<CmmsInspectContent> queryWrapper = QueryGenerator.initQueryWrapper(cmmsInspectContent, req.getParameterMap());
+//		Page<CmmsInspectContentVo> page = new Page<>(pageNo, pageSize);
+//		//IPage<CmmsInspectContent> pageList = cmmsInspectContentService.page(page, queryWrapper);
+//		List<CmmsInspectContentVo> list = cmmsInspectContentService.getCmmsInspectContent(page, cmmsInspectContent);
+//		page.setRecords(list);
+//		return Result.OK(page);
+//	}
+
 	/**
 	 *   添加
 	 *
@@ -100,7 +120,7 @@ public class CmmsInspectContentController extends JeecgController<CmmsInspectCon
 		}
 		return Result.error("添加失败！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -119,7 +139,7 @@ public class CmmsInspectContentController extends JeecgController<CmmsInspectCon
 		}
 		return Result.error("编辑失败!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -140,7 +160,7 @@ public class CmmsInspectContentController extends JeecgController<CmmsInspectCon
 		}
 		return Result.error("删除失败!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -161,7 +181,7 @@ public class CmmsInspectContentController extends JeecgController<CmmsInspectCon
 		}
 		return Result.error("批量删除失败!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectItem/controller/CmmsInspectItemController.java

@@ -57,10 +57,10 @@ public class CmmsInspectItemController extends JeecgController<CmmsInspectItem,
 	@Autowired
 	@SuppressWarnings("all")
 	private AutoCodeUtil autoCodeUtil;
-	
+
 	/**
 	 * 分页列表查询
-	 *
+	 *CmmsInspectItem
 	 * @param cmmsInspectItem
 	 * @param pageNo
 	 * @param pageSize
@@ -70,18 +70,37 @@ public class CmmsInspectItemController extends JeecgController<CmmsInspectItem,
 	//@AutoLog(value = "巡检项-分页列表查询")
 	@ApiOperation(value="巡检项-分页列表查询", notes="巡检项-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<CmmsInspectItemVo>> queryPageList(CmmsInspectItem cmmsInspectItem,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		//QueryWrapper<CmmsInspectItem> queryWrapper = QueryGenerator.initQueryWrapper(cmmsInspectItem, req.getParameterMap());
-		Page<CmmsInspectItemVo> page = new Page<CmmsInspectItemVo>(pageNo, pageSize);
-		//IPage<CmmsInspectItem> pageList = cmmsInspectItemService.page(page, queryWrapper);
-		List<CmmsInspectItemVo> list = cmmsInspectItemService.getCmmsInspectItems(page, cmmsInspectItem);
-		page.setRecords(list);
-		return Result.OK(page);
+	public Result<IPage<CmmsInspectItem>> queryPageList(CmmsInspectItem cmmsInspectItem,
+														  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+														  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+														  HttpServletRequest req) {
+		CmmsInspectItem cmmsInspectItem1 = new CmmsInspectItem();
+		cmmsInspectItem1.setClassification(cmmsInspectItem.getClassification());
+		cmmsInspectItem1.setEquipdefid(cmmsInspectItem.getEquipdefid());
+		QueryWrapper<CmmsInspectItem> queryWrapper = QueryGenerator.initQueryWrapper(cmmsInspectItem1, req.getParameterMap());
+		queryWrapper.like(cmmsInspectItem.getItemname()!=null && !cmmsInspectItem.getItemname().equals(""),"itemname",cmmsInspectItem.getItemname());
+		queryWrapper.like(cmmsInspectItem.getItemcode()!=null && !cmmsInspectItem.getItemcode().equals(""),"itemcode",cmmsInspectItem.getItemcode());
+		Page<CmmsInspectItem> page = new Page<CmmsInspectItem>(pageNo, pageSize);
+		IPage<CmmsInspectItem> pageList = cmmsInspectItemService.page(page, queryWrapper);
+		return Result.OK(pageList);
 	}
-	
+
+
+//	//@AutoLog(value = "巡检项-分页列表查询")
+//	@ApiOperation(value="巡检项-分页列表查询", notes="巡检项-分页列表查询")
+//	@GetMapping(value = "/list")
+//	public Result<IPage<CmmsInspectItemVo>> queryPageList(CmmsInspectItem cmmsInspectItem,
+//								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+//								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+//								   HttpServletRequest req) {
+//		//QueryWrapper<CmmsInspectItem> queryWrapper = QueryGenerator.initQueryWrapper(cmmsInspectItem, req.getParameterMap());
+//		Page<CmmsInspectItemVo> page = new Page<CmmsInspectItemVo>(pageNo, pageSize);
+//		//IPage<CmmsInspectItem> pageList = cmmsInspectItemService.page(page, queryWrapper);
+//		List<CmmsInspectItemVo> list = cmmsInspectItemService.getCmmsInspectItems(page, cmmsInspectItem);
+//		page.setRecords(list);
+//		return Result.OK(page);
+//	}
+
 	/**
 	 *   添加
 	 *
@@ -99,7 +118,7 @@ public class CmmsInspectItemController extends JeecgController<CmmsInspectItem,
 		}
 		return Result.OK("添加失败！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -114,7 +133,7 @@ public class CmmsInspectItemController extends JeecgController<CmmsInspectItem,
 		cmmsInspectItemService.updateById(cmmsInspectItem);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -129,7 +148,7 @@ public class CmmsInspectItemController extends JeecgController<CmmsInspectItem,
 		cmmsInspectItemService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -144,7 +163,7 @@ public class CmmsInspectItemController extends JeecgController<CmmsInspectItem,
 		this.cmmsInspectItemService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectItem/entity/CmmsInspectItem.java

@@ -67,6 +67,7 @@ public class CmmsInspectItem 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)

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")

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,74 @@ 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);
 	}
-	
+
+	 /**
+	  * 查询列表(我的)
+	  */
+	 @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="维修工单-分页列表查询")
+//	@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 +155,7 @@ public class CmmsRepairController extends JeecgController<CmmsRepair, ICmmsRepai
 		}
 		return Result.error("添加失败！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -117,7 +170,7 @@ public class CmmsRepairController extends JeecgController<CmmsRepair, ICmmsRepai
 		cmmsRepairService.updateById(cmmsRepair);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -132,7 +185,7 @@ public class CmmsRepairController extends JeecgController<CmmsRepair, ICmmsRepai
 		cmmsRepairService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -147,7 +200,7 @@ public class CmmsRepairController extends JeecgController<CmmsRepair, ICmmsRepai
 		this.cmmsRepairService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *
@@ -190,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);
+//	 }
 
 
 	 /**

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)

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);
+//	}
+
 	/**
 	 *   添加
 	 *