From cb7eb6fa3477e624f7112a2eac632783b96bf4b4 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期一, 15 一月 2024 16:19:35 +0800
Subject: [PATCH] 点检标准 多sheet页导入
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 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 0fdd3ad..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;
@@ -69,6 +70,14 @@
@Autowired
private ISysBaseAPI sysBaseApi;
+
+ @Autowired
+ private IDailyMaintenanceOrderDetailService maintenanceOrderDetailService;
+
+ @Autowired
+ private IMaintenanceStandardDetailService maintenanceStandardDetailService;
+
+
/*---------------------------------涓昏〃澶勭悊-begin-------------------------------------*/
@@ -222,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());
@@ -234,7 +243,17 @@
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();
+ dailyMaintenanceOrderDetail.setDailyMaintenanceOrderId(dailyMaintenanceOrder.getId());
+ dailyMaintenanceOrderDetail.setMaintenanceStandardDetailId(maintenanceStandardDetail.getId());
+ dailyMaintenanceOrderDetail.setMaintenanceStandardId(maintenanceStandard.getId());
+ dailyMaintenanceOrderDetail.setMaintenanceProjectId(maintenanceStandardDetail.getMaintenanceProjectId());
+ dailyMaintenanceOrderDetail.setDelFlag(0);
+ maintenanceOrderDetailService.save(dailyMaintenanceOrderDetail);
+ }
}
equipmentMaintenancePlanService.updateById(equipmentMaintenancePlan);
String msg = "鍗曟嵁鍙蜂负銆�"+equipmentMaintenancePlan.getNum()+"銆戠殑淇濆吇璁″垝宸茬敓鎴愪繚鍏诲伐鍗�";
@@ -390,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