From 63c9ec27a1f717cff8b36ad7db23d56e41dfae8f Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 22 七月 2025 20:01:56 +0800
Subject: [PATCH] art: 技术状态鉴定申请-Bug修改

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderChangeServiceImpl.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderChangeServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderChangeServiceImpl.java
index 76de47e..f43d12d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderChangeServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderChangeServiceImpl.java
@@ -197,6 +197,7 @@
         }
         entity.setApplyReason(request.getApplyReason());
         entity.setDeferredEvaluationDate(request.getDeferredEvaluationDate());
+        entity.setRemark(request.getRemark());
         this.getBaseMapper().updateById(entity);
         return true;
     }
@@ -233,7 +234,7 @@
         //鏇存柊瀹炰綋
         this.getBaseMapper().updateById(entity);
         //鍚姩娴佺▼
-        flowCommonService.initActBusiness("宸ュ崟鍙�: " + entity.getChangeOrderNum() + ";璁惧缂栧彿: " + equipment.getEquipmentCode() + ";瀹夎浣嶇疆" + equipment.getInstallationPosition(),
+        flowCommonService.initActBusiness("宸ュ崟鍙�: " + entity.getChangeOrderNum() + ";璁惧缂栧彿: " + equipment.getEquipmentCode(),
                 entity.getId(), "IEamTechnicalStatusEvaluationOrderChangeService", "evaluation_order_change_process", null);
         Map<String, Object> variables = new HashMap<>();
         variables.put("dataId", entity.getId());
@@ -390,6 +391,7 @@
                 entity.setDepartManagerSignatureTime(new Date());
                 entity.setDepartManagerSignatureResult(request.getDepartManagerSignatureResult());
                 entity.setDepartManagerComment(request.getDepartManagerComment());
+                values.put("departLeaderConfirmFlag", request.getEquipmentManagerSignatureResult());
                 if(BusinessCodeConst.APPROVED.equals(request.getDepartManagerSignatureResult())) {
                     //閫氳繃
                     entity.setChangeStatus(TechnicalStatusEvaluationOrderChangeStatusEnum.PRODUCTION_SUPPORT_SIGNING.name());

--
Gitblit v1.9.3