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; } 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..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; @@ -197,7 +198,8 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl existsAttach = findByCondition(VisaRelationDto.builder() @@ -355,20 +357,33 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl uploadAttachFileNameList = req.getAttach().stream().map(item -> item.getFileName()).collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(uploadAttachFileNameList)) { - changeRecordLogService.batchAddLog(req.getVisaId(), VisaLogTypeEnum.UPLOAD_FILE - , VisaLogParam.builder().personId(req.getOperatorPersonId()) - .ouId(req.getOperatorOuId()) - .workspaceId(req.getOperatorWorkspaceId()) + //单独上传附件-追加操作日志 + 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(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