From 51ebb09a85d622cae75dc169b4c86723977d3756 Mon Sep 17 00:00:00 2001
From: yangkang <yangkang@xalxzn.com>
Date: 星期三, 13 九月 2023 15:39:48 +0800
Subject: [PATCH] 预测维护修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PredictiveWorkOrderController.java | 31 ++++++++-----------------------
1 files changed, 8 insertions(+), 23 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PredictiveWorkOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PredictiveWorkOrderController.java
index 5d8456a..dae24cf 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PredictiveWorkOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PredictiveWorkOrderController.java
@@ -12,7 +12,9 @@
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.eam.entity.Equipment;
import org.jeecg.modules.eam.entity.MaintenanceOrderActualWorkingHour;
+import org.jeecg.modules.eam.entity.PredictiveWorkOrder;
import org.jeecg.modules.eam.entity.SpecialtyMaintenanceOrder;
import org.jeecg.modules.eam.service.IMaintenanceOrderActualWorkingHourService;
import org.jeecg.modules.eam.service.IPredictiveWorkOrderService;
@@ -66,29 +68,12 @@
* 2023-4-25 qsw
*/
@GetMapping(value = "/pageOrderList")
- public Result<?> pageOrderList(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) {
- IPage<Map<String, Object>> specialtyMaintenanceOrderList = predictiveWorkOrderService.pageOrderList(pageNo, pageSize, params);
-// for (Map<String, Object> record : specialtyMaintenanceOrderList.getRecords()) {
-// String id = (String) record.get("id");
-//
-// QueryWrapper<MaintenanceOrderActualWorkingHour> actualWorkingHourWrapper = new QueryWrapper<>();
-// actualWorkingHourWrapper.eq("maintenance_order_id", id)
-// .eq("del_flag", 0);
-// actualWorkingHourWrapper.select("sum(actual_working_hour_quota) as actualQuantity");
-// Map<String, Object> map = maintenanceOrderActualWorkingHourService.getMap(actualWorkingHourWrapper);
-// BigDecimal actualQuantity = new BigDecimal(0);
-// if (map != null) {
-// actualQuantity = (BigDecimal) map.get("actualQuantity");
-// }
-// record.put("actualWorkingHourQuota", actualQuantity);
-//
-// String status = (String) record.get("status");
-// if ("2".equals(status)) {
-// record.put("distable", false);
-// } else {
-// record.put("distable", true);
-// }
-// }
+ public Result<?> pageOrderList(PredictiveWorkOrder predictiveWorkOrder,
+ @RequestParam(name = "pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ Page<PredictiveWorkOrder> page = new Page<PredictiveWorkOrder>(pageNo, pageSize);
+ IPage<PredictiveWorkOrder> specialtyMaintenanceOrderList = predictiveWorkOrderService.pageOrderList(page,predictiveWorkOrder);
return Result.ok(specialtyMaintenanceOrderList);
}
--
Gitblit v1.9.3