From b2772fdcf0c26fac4fc8d1852fd24cf0f5af0f6d Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期二, 24 十月 2023 19:11:26 +0800
Subject: [PATCH] 故障报修
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
index 5b9e3e7..4b5836c 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
@@ -612,19 +612,25 @@
@RequestMapping(value = "/saveFinal", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> saveFinal(@RequestBody CalibrationOrder calibrationOrder) {
calibrationOrder.setCalibrationTime(new Date());
+ calibrationOrder.setStatus("5");
if(StringUtils.isNotBlank(calibrationOrder.getEquipmentId())){
String equipmentId = calibrationOrder.getEquipmentId();
Equipment equipment = equipmentService.getById(equipmentId);
if(ObjectUtils.isNotNull(equipment)){
LocalDate currentDate = LocalDate.now();
+ // 娣诲姞缁存姢鍛ㄦ湡鐨勬棩鏈�
+ String checkPeriod = equipment.getCheckPeriod();
+ if(StringUtils.isNotBlank(checkPeriod)){
+ LocalDate dateAfter30Days = currentDate.plusDays(Integer.parseInt(checkPeriod));
+ Date result = Date.from(dateAfter30Days.atStartOfDay(ZoneId.systemDefault()).toInstant());
+ equipment.setTechnologyStatus(calibrationOrder.getCalibrationOrderUda6());
+ equipment.setTechnologyStatusQualificationTime(new Date());
+ equipment.setNextTechnologyStatusQualificationTime(result);
+ }else {
+ return Result.error("璇ヨ澶囧皻鏈淮鎶ゆ瀹氬懆鏈燂紝璇峰厛缁存姢妫�瀹氬懆鏈�");
+ }
- // 娣诲姞30澶�
- LocalDate dateAfter30Days = currentDate.plusDays(Integer.parseInt(equipment.getCheckPeriod()));
// 杞崲涓簀ava.util.Date
- Date result = Date.from(dateAfter30Days.atStartOfDay(ZoneId.systemDefault()).toInstant());
- equipment.setTechnologyStatus(calibrationOrder.getCalibrationOrderUda6());
- equipment.setTechnologyStatusQualificationTime(new Date());
- equipment.setNextTechnologyStatusQualificationTime(result);
equipmentService.updateById(equipment);
}
--
Gitblit v1.9.3