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

流程记录返回申请单号

This commit is contained in:
wangliwen 2022-07-14 11:08:31 +08:00
parent a001fd5963
commit 136e4453ce
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,4 +88,7 @@ public class ProcessInstanceDTO {
private Integer demandCommentFlag; private Integer demandCommentFlag;
@ApiModelProperty(value = "评论情况") @ApiModelProperty(value = "评论情况")
private String demandCommentFlagTip; private String demandCommentFlagTip;
@ApiModelProperty(value = "申请单号")
private String applyNumber;
} }

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

@ -289,12 +289,14 @@ public class ActHistoryService {
stringBuffer.deleteCharAt(stringBuffer.length() - 1); stringBuffer.deleteCharAt(stringBuffer.length() - 1);
dto.setName(stringBuffer.toString()); dto.setName(stringBuffer.toString());
dto.setResourceId(null); dto.setResourceId(null);
dto.setApplyNumber(abilityApplicationDTO.get(0).getApplyNumber());
} }
} 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(abilityApplicationDTO1.getResourceId()); dto.setResourceId(abilityApplicationDTO1.getResourceId());
dto.setApplyNumber(abilityApplicationDTO1.getApplyNumber());
} else { } else {
TResourceMountApplyDTO resourceMountApplyDTO = tResourceMountApplyService.get(Long.valueOf(dto.getBusinessKey())); TResourceMountApplyDTO resourceMountApplyDTO = tResourceMountApplyService.get(Long.valueOf(dto.getBusinessKey()));
if (resourceMountApplyDTO != null && resourceMountApplyDTO.getResourceDTO() != null if (resourceMountApplyDTO != null && resourceMountApplyDTO.getResourceDTO() != null
@ -306,6 +308,7 @@ public class ActHistoryService {
if (resourceDTO != null) { if (resourceDTO != null) {
dto.setName(resourceDTO.getName()); dto.setName(resourceDTO.getName());
dto.setResourceId(resourceDTO.getId().toString()); dto.setResourceId(resourceDTO.getId().toString());
dto.setApplyNumber(resourceMountApplyDTO.getApplyNumber());
} }
} }
} else { } else {
@ -313,6 +316,7 @@ public class ActHistoryService {
if (resourceDTO != null) { if (resourceDTO != null) {
dto.setName(resourceDTO.getName()); dto.setName(resourceDTO.getName());
dto.setResourceId(resourceDTO.getId().toString()); dto.setResourceId(resourceDTO.getId().toString());
dto.setApplyNumber(resourceDTO.getApplyNumber());
} else { } else {
TDemandCommentDTO tDemandCommentDTO = tDemandCommentService.get(Long.valueOf(dto.getBusinessKey())); TDemandCommentDTO tDemandCommentDTO = tDemandCommentService.get(Long.valueOf(dto.getBusinessKey()));
if (tDemandCommentDTO != null) { if (tDemandCommentDTO != null) {
@ -323,6 +327,7 @@ public class ActHistoryService {
if (tDemandCommentEntityDelFlag.isPresent()) { if (tDemandCommentEntityDelFlag.isPresent()) {
dto.setDemandCommentFlagTip(tDemandCommentEntityDelFlag.get().getTip()); dto.setDemandCommentFlagTip(tDemandCommentEntityDelFlag.get().getTip());
} }
dto.setApplyNumber(tDemandCommentDTO.getApplyNumber());
} else { } else {
TDemandDataDTO tDemandDataDTO = tDemandDataService.get(Long.valueOf(dto.getBusinessKey())); TDemandDataDTO tDemandDataDTO = tDemandDataService.get(Long.valueOf(dto.getBusinessKey()));
if (tDemandDataDTO != null) { if (tDemandDataDTO != null) {
@ -333,6 +338,7 @@ public class ActHistoryService {
if (tDemandCommentEntityDelFlag.isPresent()) { if (tDemandCommentEntityDelFlag.isPresent()) {
dto.setDemandFlagTip(tDemandCommentEntityDelFlag.get().getTip()); dto.setDemandFlagTip(tDemandCommentEntityDelFlag.get().getTip());
} }
dto.setApplyNumber(tDemandDataDTO.getApplyNumber());
} }
} }
} }