From 2ad07b7122851fcb9a68d17b79253f013079e8d1 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Fri, 21 Feb 2025 10:30:14 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat(REQ-3300)=20-=20=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=B6=E7=9A=84=E5=8D=95=E6=8D=AE=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/service/impl/ChangeRecordRelationServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 54d7eac9..6b86ef35 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 @@ -197,7 +197,8 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl Date: Fri, 21 Feb 2025 10:41:41 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat(REQ-3300)=20-=20=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=B6=E7=9A=84=E5=8D=95=E6=8D=AE=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ChangeRecordRelationServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 6b86ef35..e7610bf5 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 @@ -197,8 +197,8 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl existsAttach = findByCondition(VisaRelationDto.builder() From e96dfcc5cdeafd07b0c2554708034ba3b1e696a6 Mon Sep 17 00:00:00 2001 From: xudawei Date: Fri, 21 Feb 2025 10:47:52 +0800 Subject: [PATCH 3/5] =?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 --- .../nanopart/visa/api/request/ChangeRecordAppendAttachReq.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/ChangeRecordAppendAttachReq.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/ChangeRecordAppendAttachReq.java index 6949d3b3..3c73c04c 100644 --- a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/ChangeRecordAppendAttachReq.java +++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/ChangeRecordAppendAttachReq.java @@ -36,6 +36,6 @@ public class ChangeRecordAppendAttachReq { private Long operatorOuId; - private Long operatorWorkspaceId; + private Long workspaceId; } From eb003ab0ab3abf00ab3a8cf85db44855caf644de Mon Sep 17 00:00:00 2001 From: xudawei Date: Fri, 21 Feb 2025 11:07:07 +0800 Subject: [PATCH 4/5] =?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 --- .../service/impl/ChangeRecordRelationServiceImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 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 e7610bf5..0456e0b6 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 @@ -358,11 +358,14 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl uploadAttachFileNameList = req.getAttach().stream().map(item -> item.getFileName()).collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(uploadAttachFileNameList)) { + 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.getOperatorWorkspaceId()) + .workspaceId(req.getWorkspaceId()) .uploadAttach(uploadAttachFileNameList).build()); } From 547bb4e03faa38579871de19d738ff17a072d398 Mon Sep 17 00:00:00 2001 From: xudawei Date: Fri, 21 Feb 2025 11:30:39 +0800 Subject: [PATCH 5/5] =?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 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 attach, Long visaId, Long personId, Long ouId, Long workspaceId) { + if (CollectionUtils.isNotEmpty(attach)) { + List 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