From 95721904f53ac9d54ad3622f9430d78e9eec8a23 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期四, 19 十月 2023 09:53:16 +0800
Subject: [PATCH] 小修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 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..8fa42c6 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,6 +612,7 @@
@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);
@@ -619,12 +620,18 @@
LocalDate currentDate = LocalDate.now();
// 娣诲姞30澶�
- LocalDate dateAfter30Days = currentDate.plusDays(Integer.parseInt(equipment.getCheckPeriod()));
+ 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("璇ヨ澶囧皻鏈淮鎶ゆ瀹氬懆鏈燂紝璇峰厛缁存姢妫�瀹氬懆鏈�");
+ }
+
// 杞崲涓簀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