From d2cd1865e77dd873166543df2f2f27f183e66860 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期五, 20 十月 2023 13:56:50 +0800
Subject: [PATCH] 小修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java | 3 +--
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java | 12 ++++++------
2 files changed, 7 insertions(+), 8 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 8fa42c6..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
@@ -618,8 +618,7 @@
Equipment equipment = equipmentService.getById(equipmentId);
if(ObjectUtils.isNotNull(equipment)){
LocalDate currentDate = LocalDate.now();
-
- // 娣诲姞30澶�
+ // 娣诲姞缁存姢鍛ㄦ湡鐨勬棩鏈�
String checkPeriod = equipment.getCheckPeriod();
if(StringUtils.isNotBlank(checkPeriod)){
LocalDate dateAfter30Days = currentDate.plusDays(Integer.parseInt(checkPeriod));
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
index 7b51b55..6a9c170 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
@@ -321,14 +321,14 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private java.util.Date technologyStatusExpirationTime;
- @Excel(name = "鏈鎶�鏈姸鎬侀壌瀹氭椂闂�", width = 20, format = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鏈鎶�鏈姸鎬侀壌瀹氭椂闂�", width = 20, format = "yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private java.util.Date technologyStatusQualificationTime;
- @Excel(name = "涓嬫鎶�鏈姸鎬侀壌瀹氭椂闂�", width = 20, format = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "涓嬫鎶�鏈姸鎬侀壌瀹氭椂闂�", width = 20, format = "yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private java.util.Date nextTechnologyStatusQualificationTime;
@Excel(name = "鏈浜屼繚鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
--
Gitblit v1.9.3