From a90ae030ad64da0e44f48f4b1bb044753c1acff2 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 23 四月 2025 09:40:56 +0800
Subject: [PATCH] 报修编辑
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamReportRepairService.java | 8 ++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java | 20 ++++++++++++++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportRepairController.java | 5 ++++-
3 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportRepairController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportRepairController.java
index f8e2af8..96a9bdb 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportRepairController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportRepairController.java
@@ -97,7 +97,10 @@
@ApiOperation(value = "鏁呴殰鎶ヤ慨-缂栬緫", notes = "鏁呴殰鎶ヤ慨-缂栬緫")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<?> edit(@RequestBody EamReportRepair eamReportRepair) {
- eamReportRepairService.updateById(eamReportRepair);
+ boolean b = eamReportRepairService.edit(eamReportRepair);
+ if(!b) {
+ return Result.error("缂栬緫澶辫触锛�");
+ }
return Result.OK("缂栬緫鎴愬姛!");
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamReportRepairService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamReportRepairService.java
index 5c303dc..059a9f6 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamReportRepairService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamReportRepairService.java
@@ -46,4 +46,12 @@
* @return
*/
EamReportRepair add(EamReportRepair eamReportRepair);
+
+ /**
+ * 缂栬緫
+ * @param eamReportRepair
+ * @return
+ */
+ boolean edit(EamReportRepair eamReportRepair);
+
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java
index 91045ef..b6f808a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java
@@ -139,4 +139,24 @@
eamEquipmentExtendService.updateEquipmentRepairStatus(eamReportRepair.getEquipmentId(), EquipmentRepairStatus.WAIT_REPAIR.name());
return eamReportRepair;
}
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean edit(EamReportRepair eamReportRepair) {
+ // 闄勪欢澶勭悊
+ if (eamReportRepair.getImageFilesResult() != null) {
+ List<FileUploadResult> imageFilesResult = eamReportRepair.getImageFilesResult();
+ ObjectMapper mapper = new ObjectMapper();
+ try {
+ String referenceFile = mapper.writeValueAsString(imageFilesResult);
+ eamReportRepair.setImageFiles(referenceFile);
+ } catch (JsonProcessingException e) {
+ return false;
+ }
+ } else {
+ eamReportRepair.setImageFiles(null);
+ }
+ this.baseMapper.updateById(eamReportRepair);
+ return true;
+ }
}
--
Gitblit v1.9.3