From 547bb4e03faa38579871de19d738ff17a072d398 Mon Sep 17 00:00:00 2001
From: xudawei <xudawei@axzo.cn>
Date: Fri, 21 Feb 2025 11:30:39 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20(REQ-3300)=20=E5=8D=95=E7=8B=AC?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=99=84=E4=BB=B6=E5=8A=A0=E4=B8=8A=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97-=E5=85=A5=E5=8F=82=E5=8A=A0=E4=B8=8AworkspaceId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ChangeRecordRelationServiceImpl.java | 34 +++++++++++++------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java
index 0456e0b6..fdb16260 100644
--- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java
+++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java
@@ -30,6 +30,7 @@ import cn.axzo.nanopart.visa.server.rpc.WorkflowGateway;
 import cn.axzo.nanopart.visa.server.service.ChangeRecordLogService;
 import cn.axzo.nanopart.visa.server.service.ChangeRecordRelationService;
 import cn.axzo.nanopart.visa.server.service.ChangeRecordService;
+import cn.axzo.workflow.common.model.dto.UploadFieldDTO;
 import cn.axzo.workflow.common.model.request.form.instance.FormVariablesUpdateDTO;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -356,22 +357,33 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl<ChangeRecordRel
             formUpdateDto.setFormVariables(Maps.of(FORM_FIELD_ATTACH, req.getAttach()));
             workflowGateway.updateInstanceFormData(formUpdateDto);
         }
-        if (CollectionUtils.isNotEmpty(req.getAttach())) {
-            List<String> uploadAttachFileNameList = req.getAttach().stream().map(item -> item.getFileName()).collect(Collectors.toList());
+        //单独上传附件-追加操作日志
+        this.addLogWhenAttachAppend(req.getAttach(), req.getVisaId(), req.getOperatorPersonId(), req.getOperatorOuId(), req.getWorkspaceId());
+    }
+
+    /**
+     * 单独上传附件-追加操作日志
+     * @param attach 上传附件信息
+     * @param visaId 变更签证Id
+     * @param personId 人员Id
+     * @param ouId 单位id
+     * @param workspaceId 项目Id
+     */
+    private void addLogWhenAttachAppend(List<UploadFieldDTO> attach, Long visaId, Long personId, Long ouId, Long workspaceId) {
+        if (CollectionUtils.isNotEmpty(attach)) {
+            List<String> uploadAttachFileNameList = attach.stream().map(item -> item.getFileName()).collect(Collectors.toList());
             if (CollectionUtils.isNotEmpty(uploadAttachFileNameList)
-                    && Objects.nonNull(req.getOperatorPersonId())
-                    && Objects.nonNull(req.getOperatorOuId())
-                    && Objects.nonNull(req.getWorkspaceId())) {
-                changeRecordLogService.batchAddLog(req.getVisaId(), VisaLogTypeEnum.UPLOAD_FILE
-                        , VisaLogParam.builder().personId(req.getOperatorPersonId())
-                                .ouId(req.getOperatorOuId())
-                                .workspaceId(req.getWorkspaceId())
+                    && Objects.nonNull(personId)
+                    && Objects.nonNull(ouId)
+                    && Objects.nonNull(workspaceId)) {
+                changeRecordLogService.batchAddLog(visaId, VisaLogTypeEnum.UPLOAD_FILE
+                        , VisaLogParam.builder().personId(personId)
+                                .ouId(ouId)
+                                .workspaceId(workspaceId)
                                 .uploadAttach(uploadAttachFileNameList).build());
             }
 
         }
-
-
     }
 
     @Override