From 218ab860ed4708f6f70a519775c56c9554000fe7 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 27 六月 2025 13:42:41 +0800
Subject: [PATCH] 去除多余引用

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java |   72 +++++++++++++++++++++++++++++++++++-
 1 files changed, 70 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..5a753b2 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
@@ -17,6 +17,7 @@
 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.common.util.DateUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.eam.entity.*;
 import org.jeecg.modules.eam.mapper.RepairOrderMapper;
@@ -44,6 +45,7 @@
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -135,6 +137,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 +376,12 @@
 				 repairOrder.getFaultEndTime(),
 				 repairOrder.getCreateStartTime(),
 				 repairOrder.getCreateEndTime(),
-				 repairOrder.getEquipmentImportanceId());
+				 repairOrder.getEquipmentImportanceId(),
+				 repairOrder.getFaultCause(),
+				 null,
+				 null,
+				 null
+		 );
 
 		 // Step.3 AutoPoi 瀵煎嚭Excel
 		 ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
@@ -1812,4 +1829,55 @@
 		 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);
+	 }
+
+	 /**
+	  * 璁惧鏁呴殰鎶樼幇鍥�
+	  * qsw 2024-7-24
+	  */
+	 @GetMapping("getEquipmentFaultCause")
+	 public Result<?> getEquipmentFaultCause(@RequestParam Map<String, Object> params) {
+		 String faultStartTime = (String)params.get("faultStartTime");
+		 if(StringUtils.isBlank(faultStartTime)){
+			 Date dayAfter = DateUtils.getDayAfter(new Date(),15);
+			 params.put("faultStartTime",DateUtils.date2Str(DateUtils.getDayAfter(new Date(),-15),new SimpleDateFormat("yyyy-MM-dd hh:MM:ss")));
+			 params.put("faultEndTime", DateUtils.getCurrentDateStr()+" 23:59:59");
+		 }
+		 List<Map<String, Object>> equipmentFaultCause = repairOrderService.getEquipmentFaultCause(params);
+		 return Result.ok(equipmentFaultCause);
+	 }
+
+
+	 /**
+	  * 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