From 33ceaa13a6c7c7be1b6d5c90ca05ca3e4bef0e11 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 31 八月 2023 10:15:23 +0800
Subject: [PATCH] 增加生效失效时间
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionCycleController.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionCycleController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionCycleController.java
index 47c27ad..04cda53 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionCycleController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionCycleController.java
@@ -21,6 +21,7 @@
import org.jeecg.common.util.DateUtils;
import org.jeecg.modules.eam.entity.*;
+import org.jeecg.modules.eam.mapper.InspectionCycleMapper;
import org.jeecg.modules.eam.service.IInspectionCycleService;
import org.jeecg.modules.eam.service.IInspectionProjectService;
@@ -55,6 +56,9 @@
@Autowired
private ISysBaseAPI sysBaseApi;
+
+ @Autowired
+ private InspectionCycleMapper inspectionCycleMapper;
//
//
// @Autowired
@@ -125,6 +129,8 @@
public Result<String> addNew(@RequestBody InspectionCycle inspectionCycle) {
String cycleUnit = sysBaseApi.queryDictTextByKey("cycle_unit", String.valueOf(inspectionCycle.getCycleUnit()));
inspectionCycle.setName(String.valueOf(inspectionCycle.getCycle()).concat(cycleUnit));
+ String num = "DJ" + DateUtils.date2Str(DateUtils.yyyyMMdd.get()) + inspectionCycleMapper.getInspectionCycleNum();
+ inspectionCycle.setCode(num);
inspectionCycleService.save(inspectionCycle);
return Result.OK("娣诲姞鎴愬姛锛�");
}
@@ -376,8 +382,10 @@
List<InspectionCycle> list = inspectionCycleService.lambdaQuery().eq(InspectionCycle::getCode, inspectionCycle.getCode()).eq(InspectionCycle::getVersionStatus, "2").list();
for (InspectionCycle cycle : list) {
cycle.setVersionStatus("3");
+ cycle.setLoseEfficacyTime(new Date());
inspectionCycleService.updateById(cycle);
}
+ inspectionCycle.setTakeEffectTime(new Date());
boolean b = inspectionCycleService.updateById(inspectionCycle);
if (b){
return Result.OK("缂栬緫鎴愬姛!");
--
Gitblit v1.9.3