From 15ae1e3b5cda40a8248a1addf4a64c1e0a9e2b13 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期五, 12 七月 2024 18:02:04 +0800
Subject: [PATCH] 设备管理修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 48 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java
index 63b372f..96a5797 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java
@@ -135,6 +135,16 @@
HttpServletRequest req) {
Page<RepairOrder> page = new Page<RepairOrder>(pageNo, pageSize);
IPage<RepairOrder> pageList = repairOrderService.getRepairOrderList(page, repairOrder);
+ List<RepairOrder> records = pageList.getRecords();
+ for (RepairOrder record : records) {
+ record.setFaultCauseCount("鏁呴殰鍘熷洜缁熻");
+ List<Map<String, Object>> allFaultCause = repairOrderService.getAllFaultCause();
+ record.setAllFaultCause(allFaultCause);
+
+ String equipmentId = record.getEquipmentId();
+ List<Map<String, Object>> faultCause = repairOrderService.getFaultCause(equipmentId);
+ record.setEquipmentFaultCause(faultCause);
+ }
// for(RepairOrder repairOrder1 : pageList.getRecords()){
// if(StringUtils.isNotBlank(repairOrder1.getReportRepairId())){
// EquipmentReportRepair equipmentReportRepair = equipmentReportRepairService.getById(repairOrder1.getReportRepairId());
@@ -364,7 +374,8 @@
repairOrder.getFaultEndTime(),
repairOrder.getCreateStartTime(),
repairOrder.getCreateEndTime(),
- repairOrder.getEquipmentImportanceId());
+ repairOrder.getEquipmentImportanceId(),
+ repairOrder.getFaultCause());
// Step.3 AutoPoi 瀵煎嚭Excel
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
@@ -1812,4 +1823,39 @@
jsonObject.put("data",list);
return jsonObject;
}
-}
+
+
+ /**
+ * 璁惧缁翠慨鏌辩姸鍥�
+ * qsw 2024-7-11
+ */
+ @GetMapping("getFaultCausePie")
+ public Result<?> getFaultCausePie(@RequestParam Map<String, Object> params) {
+ List<Map<String, Object>> faultCausePie = repairOrderService.getFaultCausePie(params);
+ return Result.ok(faultCausePie);
+ }
+
+ /**
+ * 璁惧缁翠慨鎵囧舰鍥�
+ * qsw 2024-7-11
+ */
+ @GetMapping("getFaultCauseBar")
+ public Result<?> getFaultCauseBar(@RequestParam Map<String, Object> params) {
+ List<Map<String, Object>> faultCauseBar = repairOrderService.getFaultCauseBar(params);
+ return Result.ok(faultCauseBar);
+ }
+
+
+ /**
+ * MTPF
+ * qsw 2024-7-11
+ */
+ @GetMapping("getMTPF")
+ public Result<?> getMTPF(@RequestParam("pageNo") Integer pageNo,
+ @RequestParam("pageSize") Integer pageSize,
+ @RequestParam Map<String, Object> params) {
+ IPage<Map<String, Object>> mtpf = repairOrderService.getMTPF(pageNo, pageSize, params);
+ return Result.ok(mtpf);
+ }
+
+ }
--
Gitblit v1.9.3