From ad7474b151b11acf9f09c15a131e871a50fec4d5 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期一, 16 十月 2023 19:04:17 +0800
Subject: [PATCH] 保养计划
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
index 4d588b7..47949e0 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
@@ -12,6 +12,7 @@
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.dto.message.MessageDTO;
import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.PermissionData;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.common.system.base.entity.SysUpload;
@@ -179,16 +180,22 @@
* 璁惧淇濅慨 鑾峰彇璁惧鍒楄〃缁勪欢
* qsw 2023-7-14
*/
+
@GetMapping(value = "/getEquipmentList")
+ @PermissionData
public Result<IPage<Equipment>> getEquipmentList(Equipment equipment,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<Equipment> queryWrapper = QueryGenerator.initQueryWrapper(equipment, req.getParameterMap());
- queryWrapper.eq("status","1");
- queryWrapper.eq("del_flag",0);
Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
- IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
+ IPage<Equipment> pageList = equipmentService.getEquipmentList(page, equipment);
+ return Result.OK(pageList);
+ }
+
+ @GetMapping(value = "/pageEquipment")
+ public Result<IPage<Equipment>> pageEquipment(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) {
+ IPage<Equipment> pageList = equipmentService.pageEquipment(pageNo, pageSize, params);
return Result.OK(pageList);
}
@@ -516,7 +523,8 @@
queryWrapper.in("equipment_status",statusList);
IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
return Result.OK(pageList);
- }/**
+ }
+ /**
* 瀵煎叆
* @return
*/
--
Gitblit v1.9.3