wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

加点字段

This commit is contained in:
wangliwen 2022-04-24 10:37:37 +08:00
parent f57681856c
commit 21e45f919b
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
renren-admin/src/main/java/io/renren/modules/activiti/dto/ProcessInstanceDTO.java
View File

@ -39,6 +39,8 @@ public class ProcessInstanceDTO {
@ApiModelProperty(value = "实例名称")
private String name;
@ApiModelProperty(value = "资源id")
private String resourceId;
@ApiModelProperty(value = "描述")
private String description;

2
renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java
View File

@ -251,10 +251,12 @@ public class ActHistoryService {
TAbilityApplicationDTO abilityApplicationDTO = tAbilityApplicationService.getByInstanceId(dto.getProcessInstanceId()); // 获取申请表单
if (abilityApplicationDTO != null && StringUtils.isNotEmpty(abilityApplicationDTO.getSystem()) && StringUtils.isEmpty(dto.getName())) {
dto.setName(abilityApplicationDTO.getSystem());
dto.setResourceId(abilityApplicationDTO.getResourceId());
} else {
TAbilityApplicationDTO abilityApplicationDTO1 = tAbilityApplicationService.getByBusinessKey(dto.getBusinessKey());
if (abilityApplicationDTO1 != null) {
dto.setName(abilityApplicationDTO1.getSystem());
dto.setResourceId(abilityApplicationDTO.getResourceId());
}
}
if (dto.isEnded()) { // 已结束