feat: (REQ-3300) 单独上传附件加上日志-入参加上workspaceId
This commit is contained in:
parent
eb003ab0ab
commit
547bb4e03f
@ -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.ChangeRecordLogService;
|
||||||
import cn.axzo.nanopart.visa.server.service.ChangeRecordRelationService;
|
import cn.axzo.nanopart.visa.server.service.ChangeRecordRelationService;
|
||||||
import cn.axzo.nanopart.visa.server.service.ChangeRecordService;
|
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 cn.axzo.workflow.common.model.request.form.instance.FormVariablesUpdateDTO;
|
||||||
import com.alibaba.fastjson.JSON;
|
import com.alibaba.fastjson.JSON;
|
||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
@ -356,22 +357,33 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl<ChangeRecordRel
|
|||||||
formUpdateDto.setFormVariables(Maps.of(FORM_FIELD_ATTACH, req.getAttach()));
|
formUpdateDto.setFormVariables(Maps.of(FORM_FIELD_ATTACH, req.getAttach()));
|
||||||
workflowGateway.updateInstanceFormData(formUpdateDto);
|
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)
|
if (CollectionUtils.isNotEmpty(uploadAttachFileNameList)
|
||||||
&& Objects.nonNull(req.getOperatorPersonId())
|
&& Objects.nonNull(personId)
|
||||||
&& Objects.nonNull(req.getOperatorOuId())
|
&& Objects.nonNull(ouId)
|
||||||
&& Objects.nonNull(req.getWorkspaceId())) {
|
&& Objects.nonNull(workspaceId)) {
|
||||||
changeRecordLogService.batchAddLog(req.getVisaId(), VisaLogTypeEnum.UPLOAD_FILE
|
changeRecordLogService.batchAddLog(visaId, VisaLogTypeEnum.UPLOAD_FILE
|
||||||
, VisaLogParam.builder().personId(req.getOperatorPersonId())
|
, VisaLogParam.builder().personId(personId)
|
||||||
.ouId(req.getOperatorOuId())
|
.ouId(ouId)
|
||||||
.workspaceId(req.getWorkspaceId())
|
.workspaceId(workspaceId)
|
||||||
.uploadAttach(uploadAttachFileNameList).build());
|
.uploadAttach(uploadAttachFileNameList).build());
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user