加点字段
This commit is contained in:
parent
f57681856c
commit
21e45f919b
|
@ -39,6 +39,8 @@ public class ProcessInstanceDTO {
|
||||||
|
|
||||||
@ApiModelProperty(value = "实例名称")
|
@ApiModelProperty(value = "实例名称")
|
||||||
private String name;
|
private String name;
|
||||||
|
@ApiModelProperty(value = "资源id")
|
||||||
|
private String resourceId;
|
||||||
|
|
||||||
@ApiModelProperty(value = "描述")
|
@ApiModelProperty(value = "描述")
|
||||||
private String description;
|
private String description;
|
||||||
|
|
|
@ -251,10 +251,12 @@ public class ActHistoryService {
|
||||||
TAbilityApplicationDTO abilityApplicationDTO = tAbilityApplicationService.getByInstanceId(dto.getProcessInstanceId()); // 获取申请表单
|
TAbilityApplicationDTO abilityApplicationDTO = tAbilityApplicationService.getByInstanceId(dto.getProcessInstanceId()); // 获取申请表单
|
||||||
if (abilityApplicationDTO != null && StringUtils.isNotEmpty(abilityApplicationDTO.getSystem()) && StringUtils.isEmpty(dto.getName())) {
|
if (abilityApplicationDTO != null && StringUtils.isNotEmpty(abilityApplicationDTO.getSystem()) && StringUtils.isEmpty(dto.getName())) {
|
||||||
dto.setName(abilityApplicationDTO.getSystem());
|
dto.setName(abilityApplicationDTO.getSystem());
|
||||||
|
dto.setResourceId(abilityApplicationDTO.getResourceId());
|
||||||
} else {
|
} else {
|
||||||
TAbilityApplicationDTO abilityApplicationDTO1 = tAbilityApplicationService.getByBusinessKey(dto.getBusinessKey());
|
TAbilityApplicationDTO abilityApplicationDTO1 = tAbilityApplicationService.getByBusinessKey(dto.getBusinessKey());
|
||||||
if (abilityApplicationDTO1 != null) {
|
if (abilityApplicationDTO1 != null) {
|
||||||
dto.setName(abilityApplicationDTO1.getSystem());
|
dto.setName(abilityApplicationDTO1.getSystem());
|
||||||
|
dto.setResourceId(abilityApplicationDTO.getResourceId());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (dto.isEnded()) { // 已结束
|
if (dto.isEnded()) { // 已结束
|
||||||
|
|
Loading…
Reference in New Issue