From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceCycleController.java | 12 +++++++++++-
1 files changed, 11 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 f03cd50..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("鐗堟湰鍗囩骇鎴愬姛锛�");
--
Gitblit v1.9.3