From ed48aa9f30a87c528f071d06bf6b59d7d15428e9 Mon Sep 17 00:00:00 2001 From: qushaowei <qushaowei@163.com> Date: 星期一, 26 五月 2025 16:12:55 +0800 Subject: [PATCH] 点检报表后端 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionCycleController.java | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 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 1e7c08a..7f69705 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 @@ -25,7 +25,9 @@ import org.jeecg.modules.eam.service.IInspectionCycleService; import org.jeecg.modules.eam.service.IInspectionProjectService; +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.*; @@ -59,6 +61,12 @@ @Autowired private InspectionCycleMapper inspectionCycleMapper; + + @Autowired + @Lazy + private IdentityService sysIdentityService; + + // // // @Autowired @@ -129,7 +137,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(); +// String num = "DJ" + DateUtils.date2Str(DateUtils.yyyyMMdd.get()) + inspectionCycleMapper.getInspectionCycleNum(); + String num = sysIdentityService.getNumByTypeAndLength("InspectionCycle", 4); inspectionCycle.setCode(num); inspectionCycleService.save(inspectionCycle); return Result.OK("娣诲姞鎴愬姛锛�"); @@ -348,6 +357,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("鐗堟湰鍗囩骇鎴愬姛锛�"); @@ -382,8 +393,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