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

...

This commit is contained in:
wangliwen 2022-04-22 18:07:43 +08:00
parent 5f2317e6fa
commit 4d21104623
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java
View File

@ -8,6 +8,8 @@ import io.renren.modules.activiti.dto.ProcessActivityDTO;
import io.renren.modules.activiti.dto.ProcessInstanceDTO; import io.renren.modules.activiti.dto.ProcessInstanceDTO;
import io.renren.modules.activiti.service.ActHistoryService; import io.renren.modules.activiti.service.ActHistoryService;
import io.renren.modules.activiti.service.ActivitiService; import io.renren.modules.activiti.service.ActivitiService;
import io.renren.modules.processForm.dto.TAbilityApplicationDTO;
import io.renren.modules.processForm.service.TAbilityApplicationService;
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;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
@ -42,6 +44,9 @@ public class HistoryController {
@Autowired @Autowired
private SysUserService sysUserService; private SysUserService sysUserService;
@Autowired
private TAbilityApplicationService abilityApplicationService;
@GetMapping("getInstImage") @GetMapping("getInstImage")
@ApiOperation(value = "获取流程活动图", produces = "application/octet-stream") @ApiOperation(value = "获取流程活动图", produces = "application/octet-stream")
@ApiImplicitParam(name = "processInstanceId", value = "流程实例ID", paramType = "query", dataType = "String") @ApiImplicitParam(name = "processInstanceId", value = "流程实例ID", paramType = "query", dataType = "String")
@ -113,6 +118,11 @@ public class HistoryController {
SysUserDTO userDTO = sysUserService.get(Long.valueOf(activityDTO.getAssignee())); SysUserDTO userDTO = sysUserService.get(Long.valueOf(activityDTO.getAssignee()));
activityDTO.setAssigneeName(userDTO != null ? userDTO.getRealName() : ""); activityDTO.setAssigneeName(userDTO != null ? userDTO.getRealName() : "");
} }
TAbilityApplicationDTO abilityApplicationDTO =
abilityApplicationService.get(Long.valueOf(activityDTO.getBusinessKey()));
if (abilityApplicationDTO != null) {
activityDTO.setResourceName(abilityApplicationDTO.getSystem());
}
} }
return new Result().ok(page); return new Result().ok(page);
} }

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

@ -47,4 +47,7 @@ public class ProcessActivityDTO {
@ApiModelProperty(value = "受理人姓名") @ApiModelProperty(value = "受理人姓名")
private String assigneeName; private String assigneeName;
@ApiModelProperty(value = "申请资源名称")
private String resourceName;
} }