From a1f67e8727f7af3b3b472446616ab6c591caaebc Mon Sep 17 00:00:00 2001
From: houjie <714924425@qq.com>
Date: 星期一, 04 九月 2023 13:09:04 +0800
Subject: [PATCH] 备件库存
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceCycleController.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 5da4254..d8e8e12 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
@@ -128,7 +128,7 @@
*/
@PostMapping(value = "/addNew")
public Result<String> addNew(@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.setName(String.valueOf(maintenanceCycle.getCycle()).concat(cycleUnit));
maintenanceCycleService.save(maintenanceCycle);
return Result.OK("娣诲姞鎴愬姛锛�");
@@ -344,12 +344,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 +388,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