From a70c4bfde4a52a598a270901e41b8c253dd0bb89 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 04 七月 2025 21:02:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java | 27 ++++++++-------------------
1 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
index 8cf5866..24de739 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
@@ -166,17 +166,6 @@
});
eamInspectionOrderDetailService.saveBatch(eamInspectionOrderRequest.getTableDetailList());
}
- //澶勭悊闄勪欢
- if (CollectionUtil.isNotEmpty(eamInspectionOrderRequest.getFileList())) {
- FileUploadResult fileUploadResult = eamInspectionOrderRequest.getFileList().get(0);
- ObjectMapper mapper = new ObjectMapper();
- try {
- String referenceFile = mapper.writeValueAsString(fileUploadResult);
- eamInspectionOrder.setImageFiles(referenceFile);
- } catch (JsonProcessingException e) {
- log.error("JSON杞崲澶辫触锛�" + e.getMessage(), e);
- }
- }
if (StrUtil.isNotBlank(eamInspectionOrderRequest.getOperator())) {
triggerProcess(eamInspectionOrder);
}
@@ -392,17 +381,17 @@
Map<String, Object> values = new HashMap<>();
if (InspectionStatus.UNDER_INSPECTION.name().equals(order.getInspectionStatus()) && user.getUsername().equals(order.getOperator())) {
// 鐐规浜虹偣妫�缁撴潫
- String manager = Optional.ofNullable(iEamEquipmentService.getById(order.getEquipmentId()))
- .map(EamEquipment::getEquipmentManager)
- .orElse(null);
- if (manager == null) {
- throw new IllegalArgumentException("璁惧绠＄悊鍛樻湭閰嶇疆");
- }
- List<String> usernameList = Collections.singletonList(manager);
+// String manager = Optional.ofNullable(iEamEquipmentService.getById(order.getEquipmentId()))
+// .map(EamEquipment::getEquipmentManager)
+// .orElse(null);
+// if (manager == null) {
+// throw new IllegalArgumentException("璁惧绠＄悊鍛樻湭閰嶇疆");
+// }
+// List<String> usernameList = Collections.singletonList(manager);
values.put("dataId", order.getId());
values.put("organization", "鐐规浜虹偣妫�缁撴潫");
values.put("comment", "鐐规浜虹偣妫�缁撴潫");
- values.put("NextAssignee", usernameList);
+// values.put("NextAssignee", usernameList);
request.setComment("鐐规浜虹偣妫�缁撴潫");
} else {
// 鐝粍闀跨‘璁�
--
Gitblit v1.9.3