From 1b7f266af71b91254a22295f1bafc6a905e0b41f Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期六, 05 七月 2025 18:02:18 +0800
Subject: [PATCH] 保养规范修改流程处理
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java | 48 ++++++++++++++++++++++++------------------------
1 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java
index 48d0bef..317a494 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java
@@ -32,6 +32,7 @@
import org.jeecg.modules.eam.request.EamMaintenanceStandardRequest;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.service.IEamMaintenanceStandardService;
+import org.jeecg.modules.eam.vo.EamMaintenanceStandardVo;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.entity.ImportParams;
@@ -65,6 +66,28 @@
private ISysBusinessCodeRuleService businessCodeRuleService;
@Autowired
private IEamEquipmentService eamEquipmentService;
+
+ /**
+ * 娴佺▼鍚姩,淇濆瓨瀵瑰簲鐨勬暟鎹�
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "淇濆吇鏍囧噯-娴佺▼鍚姩淇濆瓨瀵瑰簲鐨勬暟鎹�", notes = "淇濆吇鏍囧噯-娴佺▼鍚姩淇濆瓨瀵瑰簲鐨勬暟鎹�")
+ @GetMapping(value = "/saveEamMaintenanceStandardProcess")
+ public Result<?> saveEamMaintenanceStandardProcess(String id){
+ return eamMaintenanceStandardService.saveEamMaintenanceStandardProcess(id);
+ }
+
+ /**
+ * 娴佺▼瀹℃牳
+ * @param eamMaintenanceStandardVo
+ * @return
+ */
+ @ApiOperation(value = "淇濆吇鏍囧噯-娴佺▼瀹℃牳", notes = "淇濆吇鏍囧噯-娴佺▼瀹℃牳")
+ @PostMapping(value = "/audit")
+ public Result<?> auditEamMaintenanceStandard(@RequestBody EamMaintenanceStandardVo eamMaintenanceStandardVo){
+ return eamMaintenanceStandardService.auditEamMaintenanceStandard(eamMaintenanceStandardVo);
+ }
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -143,7 +166,7 @@
*/
@AutoLog(value = "淇濆吇鏍囧噯-鍗囩増")
@ApiOperation(value = "淇濆吇鏍囧噯-鍗囩増", notes = "淇濆吇鏍囧噯-鍗囩増")
- @RequestMapping(value = "/upgrade", method = {RequestMethod.PUT, RequestMethod.POST})
+ @PutMapping(value = "/upgrade")
public Result<?> upgrade(@RequestBody EamMaintenanceStandardRequest standardRequest) {
if (standardRequest == null) {
return Result.error("娣诲姞鐨勫璞′笉鑳戒负绌猴紒");
@@ -541,29 +564,6 @@
//鏂囦欢缂栫爜
Cell fileCode = row.getCell(13);
request.setFileCode(fileCode.getStringCellValue());
-
- Map<String, PictureData> pictures;
- if (isXSSFWorkbook) {
- pictures = PoiPublicUtil.getSheetPictrues07((XSSFSheet) book.getSheetAt(0), (XSSFWorkbook) book);
- } else {
- pictures = PoiPublicUtil.getSheetPictrues03((HSSFSheet) book.getSheetAt(0), (HSSFWorkbook) book);
- }
-
- if (CollectionUtil.isNotEmpty(pictures)) {
- //鍙細瀛樺湪涓�寮犲浘鐗�
- PictureData pictureData = pictures.get(pictures.keySet().iterator().next());
- byte[] data = pictureData.getData();
- String fileName = request.getEquipmentCode() + "[" + request.getFileCode() + "]" + "." + pictureData.suggestFileExtension();
- FileUploadResult fileUploadResult = FileUtil.uploadFile(data, fileName);
- if(fileUploadResult != null) {
- List<FileUploadResult> fileList = request.getFileList();
- if(fileList == null) {
- fileList = new ArrayList<FileUploadResult>();
- }
- fileList.add(fileUploadResult);
- request.setFileList(fileList);
- }
- }
} catch (Exception e) {
log.error("璇诲彇Excel淇℃伅澶辫触锛歿}", e.getMessage(), e);
}
--
Gitblit v1.9.3