From 6cefb0802d055db3d76663f52a9683256708a8c2 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 04 三月 2024 11:03:03 +0800
Subject: [PATCH] 用户管理添加字段
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java
index a77fde9..1776799 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java
@@ -33,6 +33,7 @@
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import java.io.IOException;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -230,7 +231,7 @@
dailyMaintenanceOrder.setEquipmentId(maintenanceStandard.getEquipmentId());
dailyMaintenanceOrder.setPlanStartTime(equipmentMaintenancePlanDetail.getPlanStartTime());
dailyMaintenanceOrder.setPlanEndTime(equipmentMaintenancePlanDetail.getPlanEndTime());
- dailyMaintenanceOrder.setStatus(CommonConstant.STATUS_1);
+ dailyMaintenanceOrder.setStatus("3");//3:鏈紑濮�
dailyMaintenanceOrder.setMaintenanceStandardId(maintenanceStandard.getId());
dailyMaintenanceOrder.setCreateType(CommonConstant.ANNOUNCEMENT_SEND_STATUS_2);
List<MaintenanceStandardDetail> maintenanceStandardDetailList = equipmentMaintenancePlanService.getCycle(maintenanceStandard.getId(),equipmentMaintenancePlan.getType());
@@ -242,6 +243,7 @@
dailyMaintenanceOrder.setDelFlag(CommonConstant.DEL_FLAG_0);
dailyMaintenanceOrder.setPrecisionInspectionStatus(CommonConstant.STATUS_0);
dailyMaintenanceOrder.setStoveExemptStatus(CommonConstant.STATUS_0);
+ dailyMaintenanceOrder.setConfirmStatus(CommonConstant.STATUS_0);
dailyMaintenanceOrderService.save(dailyMaintenanceOrder);
for(MaintenanceStandardDetail maintenanceStandardDetail:maintenanceStandardDetailList){
DailyMaintenanceOrderDetail dailyMaintenanceOrderDetail = new DailyMaintenanceOrderDetail();
@@ -407,9 +409,14 @@
}
return Result.error("鏂囦欢瀵煎叆澶辫触锛�");
}
-
+ @GetMapping("/getStandards")
+ public Result<?> getStandards(@RequestParam(name="ids",required=true) String ids,
+ @RequestParam(name="maintenanceType",required=true) String maintenanceType
+ ){
+ List<String> equipmentIds = Arrays.asList(ids.split(","));
+ return Result.OK(equipmentMaintenancePlanService.getStandards(equipmentIds,maintenanceType));
+ }
/*--------------------------------瀛愯〃澶勭悊-淇濆吇璁″垝鏄庣粏-end----------------------------------------------*/
-
--
Gitblit v1.9.3