From d8f5af1e20d4eca7b4ce5b5b1110802a5270363d Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 18 七月 2025 10:24:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 c91a37c..bf7458c 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
@@ -533,7 +533,7 @@
} else {
eamInspectionOrder.setEquipmentId(equipment.getId());
}
- flowCommonService.initActBusiness("宸ュ崟鍙�: " + eamInspectionOrder.getOrderNum() + ";璁惧缂栧彿: " + equipment.getEquipmentCode() + (equipment.getInstallationPosition() == null ? "" : ";瀹夎浣嶇疆: " + equipment.getInstallationPosition()),
+ flowCommonService.initActBusiness("宸ュ崟鍙�: " + eamInspectionOrder.getOrderNum() + ";璁惧缂栧彿: " + equipment.getEquipmentCode(),
eamInspectionOrder.getId(), "IEamInspectionOrderService", "eam_inspection", null);
Map<String, Object> variables = new HashMap<>();
variables.put("dataId", eamInspectionOrder.getId());
@@ -754,13 +754,14 @@
values.put("organization", request.getConfirmComment());
values.put("comment", request.getConfirmComment());
values.put("confirmation", request.getConfirmDealType());
- request.setComment(request.getConfirmComment());
+ request.setComment("缁翠慨宸ョ‘璁ょ粨鏉�");
if ("2".equals(request.getConfirmDealType())) {
// 缁翠慨宸ラ┏鍥�
List<String> usernames = new ArrayList<>();
usernames.add(order.getOperator());
order.setInspectionStatus(InspectionStatus.UNDER_INSPECTION.name());
values.put("NextAssignee", usernames);
+ request.setComment("缁翠慨宸ラ┏鍥炵粨鏉�");
}
}
request.setValues(values);
--
Gitblit v1.9.3