From b9a5b3fc44250cc8b9274f5c0a1acdf022550b12 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期二, 28 十一月 2023 15:07:42 +0800
Subject: [PATCH] 状态变更
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 54 insertions(+), 0 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 9af40e8..5e968fc 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
@@ -1,5 +1,6 @@
package org.jeecg.modules.eam.controller;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -19,6 +20,7 @@
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.service.*;
+import org.jeecg.modules.eam.vo.EquipmentAvailabilityVo;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -36,6 +38,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.math.BigDecimal;
+import java.text.ParseException;
import java.util.*;
import java.util.stream.Collectors;
@@ -1586,6 +1589,11 @@
repairOrder.setActualHour(hours);
repairOrder.setRecipientUserId(user.getId());
repairOrderService.updateById(repairOrder);
+ if(StringUtils.isNotBlank(repairOrder.getEquipmentId())){
+ Equipment equipment = equipmentService.getById(repairOrder.getEquipmentId());
+ equipment.setEquipmentStatus("4");
+ equipmentService.updateById(equipment);
+ }
return Result.OK("鎶ュ伐鎴愬姛");
}
/**
@@ -1647,6 +1655,11 @@
repairOrder.setRepairOrderUda2(new Date());
repairOrder.setRepairOrderUda1("needSpare");
repairOrderService.updateById(repairOrder);
+ if(StringUtils.isNotBlank(repairOrder.getEquipmentId())){
+ Equipment equipment = equipmentService.getById(repairOrder.getEquipmentId());
+ equipment.setEquipmentStatus("8");
+ equipmentService.updateById(equipment);
+ }
return Result.OK("鎿嶄綔鎴愬姛");
}
/**
@@ -1666,6 +1679,11 @@
repairOrder.setRepairOrderUda1("normal");
repairOrder.setSpareTime(hours);
repairOrderService.updateById(repairOrder);
+ if(StringUtils.isNotBlank(repairOrder.getEquipmentId())){
+ Equipment equipment = equipmentService.getById(repairOrder.getEquipmentId());
+ equipment.setEquipmentStatus("7");
+ equipmentService.updateById(equipment);
+ }
return Result.OK("鎿嶄綔鎴愬姛");
}
/**
@@ -1679,6 +1697,11 @@
repairOrder.setRepairOrderUda4(new Date());
repairOrder.setRepairOrderUda1("needPart");
repairOrderService.updateById(repairOrder);
+ if(StringUtils.isNotBlank(repairOrder.getEquipmentId())){
+ Equipment equipment = equipmentService.getById(repairOrder.getEquipmentId());
+ equipment.setEquipmentStatus("9");
+ equipmentService.updateById(equipment);
+ }
return Result.OK("鎿嶄綔鎴愬姛");
}
/**
@@ -1698,6 +1721,37 @@
repairOrder.setRepairOrderUda1("normal");
repairOrder.setPartTime(hours);
repairOrderService.updateById(repairOrder);
+ if(StringUtils.isNotBlank(repairOrder.getEquipmentId())){
+ Equipment equipment = equipmentService.getById(repairOrder.getEquipmentId());
+ equipment.setEquipmentStatus("7");
+ equipmentService.updateById(equipment);
+ }
return Result.OK("鎿嶄綔鎴愬姛");
}
+
+ /**
+ * 璁惧瀹屽ソ鐜�
+ *
+ * @return
+ */
+ @GetMapping("/equipmentAvailability")
+ public JSONObject equipmentAvailability(@RequestParam Map<String, String> query) throws ParseException {
+ List<EquipmentAvailabilityVo> list = repairOrderService.equipmentAvailability(query);
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("data",list);
+ return jsonObject;
+ }
+
+ /**
+ * 璁惧鍙紑鍔ㄧ巼
+ *
+ * @return
+ */
+ @GetMapping("/getStartRate")
+ public JSONObject getStartRate(@RequestParam Map<String, String> query) throws ParseException {
+ List<EquipmentAvailabilityVo> list = repairOrderService.getStartRate(query);
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("data",list);
+ return jsonObject;
+ }
}
--
Gitblit v1.9.3