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/SpecialtyInspectionStandardController.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/SpecialtyInspectionStandardController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/SpecialtyInspectionStandardController.java
index 75e8f21..85da3c9 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/SpecialtyInspectionStandardController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/SpecialtyInspectionStandardController.java
@@ -13,8 +13,12 @@
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.eam.entity.SpecialtyInspectionStandard;
import org.jeecg.modules.eam.entity.SpecialtyInspectionStandardDetail;
-import org.jeecg.modules.eam.service.*;
+import org.jeecg.modules.eam.service.IEamEquipmentService;
+import org.jeecg.modules.eam.service.ISpecialtyInspectionStandardDetailService;
+import org.jeecg.modules.eam.service.ISpecialtyInspectionStandardService;
+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.*;
import org.springframework.web.servlet.ModelAndView;
@@ -45,6 +49,10 @@
@Autowired
private ISpecialtyInspectionStandardDetailService specialtyInspectionStandardDetailService;
+
+ @Autowired
+ @Lazy
+ private IdentityService identityService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -295,4 +303,24 @@
}
}
+ /**
+ * 涓撲笟鐐规鏍囧噯澶嶅埗
+ * cj 2023-8-31
+ */
+ @RequestMapping("/getCopy")
+ public Result<?> getCopy(@RequestBody SpecialtyInspectionStandard specialtyInspectionStandard) {
+ specialtyInspectionStandard.setId(null);
+ specialtyInspectionStandard.setVersion("1.0");
+ specialtyInspectionStandard.setVersionStatus("1");
+ specialtyInspectionStandard.setNum(identityService.getNumByTypeAndLength("SpecialtyInspectionStandard",4));
+ specialtyInspectionStandardService.save(specialtyInspectionStandard);
+ List<SpecialtyInspectionStandardDetail> specialtyInspectionStandardDetailList = specialtyInspectionStandard.getSpecialtyInspectionStandardDetaillist();
+ for(SpecialtyInspectionStandardDetail specialtyInspectionStandardDetail : specialtyInspectionStandardDetailList){
+ specialtyInspectionStandardDetail.setId(null);
+ specialtyInspectionStandardDetail.setSpecialtyInspectionStandardId(specialtyInspectionStandard.getId());
+ }
+ specialtyInspectionStandardDetailService.saveBatch(specialtyInspectionStandardDetailList);
+ return Result.ok("澶嶅埗鎴愬姛锛岃鍘绘湭鐢熸晥鐘舵�佷腑鏌ョ湅锛�");
+ }
+
}
--
Gitblit v1.9.3