From 09aa0d2eebbdf7d0a584323babc02c4608ab852a Mon Sep 17 00:00:00 2001 From: “linengliang” <vanSuperEnergy@163.com> Date: 星期二, 05 九月 2023 18:10:10 +0800 Subject: [PATCH] 设备台账维护子表 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceCycleController.java | 6 +++++- 1 files changed, 5 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..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 @@ -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