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/InspectionCycleController.java |   10 ++++++++++
 1 files changed, 10 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..6dc727a 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("娣诲姞鎴愬姛锛�");
     }
@@ -342,6 +348,8 @@
         inspectionCycle.setCreateTime(new Date());
         inspectionCycle.setUpdateBy(null);
         inspectionCycle.setUpdateTime(null);
+        inspectionCycle.setLoseEfficacyTime(null);
+        inspectionCycle.setTakeEffectTime(null);
         boolean b = inspectionCycleService.save(inspectionCycle);
         if(b){
             return Result.OK("鐗堟湰鍗囩骇鎴愬姛锛�");
@@ -376,8 +384,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