From 9b015b51b72ba050b4c38a6ba79eb45b7065e67d Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 25 七月 2024 10:11:52 +0800
Subject: [PATCH] 调整sql
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceCycleController.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceCycleController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceCycleController.java
index 3934591..ce7a756 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceCycleController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceCycleController.java
@@ -20,7 +20,9 @@
import org.jeecg.modules.eam.entity.InspectionCycle;
import org.jeecg.modules.eam.entity.MaintenanceCycle;
import org.jeecg.modules.eam.service.IMaintenanceCycleService;
+import org.jeecg.modules.eam.service.IdentityService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -62,6 +64,10 @@
@Autowired
private ISysBaseAPI sysBaseApi;
+
+ @Autowired
+ @Lazy
+ private IdentityService sysIdentityService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -130,6 +136,8 @@
public Result<String> addNew(@RequestBody MaintenanceCycle maintenanceCycle) {
String cycleUnit = sysBaseApi.queryDictTextByKey("maintenance_cycle_unit", String.valueOf(maintenanceCycle.getCycleUnit()));
maintenanceCycle.setName(String.valueOf(maintenanceCycle.getCycle()).concat(cycleUnit));
+ String num = sysIdentityService.getNumByTypeAndLength("MaintenanceCycle", 4);
+ maintenanceCycle.setCode(num);
maintenanceCycleService.save(maintenanceCycle);
return Result.OK("娣诲姞鎴愬姛锛�");
}
@@ -344,12 +352,14 @@
*/
@PostMapping(value = "/revise")
public Result<String> revise(@RequestBody MaintenanceCycle maintenanceCycle) {
- String cycleUnit = sysBaseApi.queryDictTextByKey("cycle_unit", String.valueOf(maintenanceCycle.getCycleUnit()));
+ String cycleUnit = sysBaseApi.queryDictTextByKey("maintenance_cycle_unit", String.valueOf(maintenanceCycle.getCycleUnit()));
maintenanceCycle.setId("");
maintenanceCycle.setName(String.valueOf(maintenanceCycle.getCycle()).concat(cycleUnit));
maintenanceCycle.setCreateTime(new Date());
maintenanceCycle.setUpdateBy(null);
maintenanceCycle.setUpdateTime(null);
+ maintenanceCycle.setLoseEfficacyTime(null);
+ maintenanceCycle.setTakeEffectTime(null);
boolean b = maintenanceCycleService.save(maintenanceCycle);
if(b){
return Result.OK("鐗堟湰鍗囩骇鎴愬姛锛�");
@@ -386,8 +396,10 @@
.orderByDesc(MaintenanceCycle::getVersion).list();
for (MaintenanceCycle cycle : maintenanceCycles) {
cycle.setVersionStatus("3");
+ cycle.setLoseEfficacyTime(new Date());
maintenanceCycleService.updateById(cycle);
}
+ maintenanceCycle.setTakeEffectTime(new Date());
boolean b = maintenanceCycleService.updateById(maintenanceCycle);
if (b){
return Result.OK("鐢熸晥鎴愬姛!");
--
Gitblit v1.9.3