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

能力资源上架 审批历史增加字段显示

This commit is contained in:
wangliwen 2022-05-05 10:35:02 +08:00
parent 4785caa2f5
commit ca33bb0576
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,8 @@ import io.renren.modules.activiti.dto.ProcessInstanceDTO;
import io.renren.modules.activiti.dto.TaskDTO; import io.renren.modules.activiti.dto.TaskDTO;
import io.renren.modules.processForm.dto.TAbilityApplicationDTO; import io.renren.modules.processForm.dto.TAbilityApplicationDTO;
import io.renren.modules.processForm.service.TAbilityApplicationService; import io.renren.modules.processForm.service.TAbilityApplicationService;
import io.renren.modules.resourceMountApply.dto.TResourceMountApplyDTO;
import io.renren.modules.resourceMountApply.service.TResourceMountApplyService;
import io.renren.modules.security.user.SecurityUser; import io.renren.modules.security.user.SecurityUser;
import io.renren.modules.sys.dto.SysUserDTO; import io.renren.modules.sys.dto.SysUserDTO;
import io.renren.modules.sys.service.SysUserService; import io.renren.modules.sys.service.SysUserService;
@ -65,6 +67,9 @@ public class ActHistoryService {
@Autowired @Autowired
protected TaskService taskService; protected TaskService taskService;
@Autowired
private TResourceMountApplyService tResourceMountApplyService;
@Autowired @Autowired
private SysUserService sysUserService; private SysUserService sysUserService;
@ -257,6 +262,12 @@ public class ActHistoryService {
if (abilityApplicationDTO1 != null) { if (abilityApplicationDTO1 != null) {
dto.setName(abilityApplicationDTO1.getSystem()); dto.setName(abilityApplicationDTO1.getSystem());
dto.setResourceId(abilityApplicationDTO.getResourceId()); dto.setResourceId(abilityApplicationDTO.getResourceId());
} else {
TResourceMountApplyDTO resourceMountApplyDTO = tResourceMountApplyService.get(Long.valueOf(dto.getBusinessKey()));
if (resourceMountApplyDTO != null) {
dto.setName(resourceMountApplyDTO.getResourceDTO().getName());
dto.setResourceId(resourceMountApplyDTO.getResourceDTO().getId().toString());
}
} }
} }
if (dto.isEnded()) { // 已结束 if (dto.isEnded()) { // 已结束