From 8b825a12d64065dd9d8054e5247e374f6cec5390 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期三, 06 九月 2023 18:03:30 +0800
Subject: [PATCH] 设备台账字段增加查询条件增加
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java
index 403e04f..1c26d74 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java
@@ -11,8 +11,11 @@
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.eam.entity.*;
-import org.jeecg.modules.eam.service.*;
+import org.jeecg.modules.eam.entity.DailyInspectionStandard;
+import org.jeecg.modules.eam.entity.DailyInspectionStandardDetail;
+import org.jeecg.modules.eam.service.IDailyInspectionStandardDetailService;
+import org.jeecg.modules.eam.service.IDailyInspectionStandardService;
+import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -22,6 +25,7 @@
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -259,6 +263,7 @@
@Transactional(rollbackFor = { Exception.class })
public Result<String> revise(@RequestBody DailyInspectionStandard dailyInspectionStandard) {
dailyInspectionStandard.setId("");
+ dailyInspectionStandard.setCreateTime(new Date());
dailyInspectionStandardService.save(dailyInspectionStandard);
List<DailyInspectionStandardDetail> dailyInspectionStandardDetaillist = dailyInspectionStandard.getDailyInspectionStandardDetaillist();
DailyInspectionStandardDetail isd = null;
@@ -306,8 +311,10 @@
.eq(DailyInspectionStandard::getVersionStatus, "2").list();
for (DailyInspectionStandard standard : dailyInspectionStandards) {
standard.setVersionStatus("3");
+ standard.setLoseEfficacyTime(new Date());
dailyInspectionStandardService.updateById(standard);
}
+ dailyInspectionStandard.setTakeEffectTime(new Date());
boolean b = dailyInspectionStandardService.updateById(dailyInspectionStandard);
if (b){
return Result.OK("缂栬緫鎴愬姛!");
--
Gitblit v1.9.3