From 654dc30c50b1c176966ad8e6e7d791b92531de83 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 25 七月 2024 09:53:25 +0800
Subject: [PATCH] 问题项修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 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 96a5797..5a0f8fd 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;
@@ -375,7 +377,9 @@
repairOrder.getCreateStartTime(),
repairOrder.getCreateEndTime(),
repairOrder.getEquipmentImportanceId(),
- repairOrder.getFaultCause());
+ repairOrder.getFaultCause(),
+ null
+ );
// Step.3 AutoPoi 瀵煎嚭Excel
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
@@ -1845,6 +1849,22 @@
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
--
Gitblit v1.9.3