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

Merge branch 'dev'

This commit is contained in:
wangliwen 2022-10-12 09:42:28 +08:00
parent 5fb69dc48c 5bff2763a9
commit 388b8f67a0
2 changed files with 11 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,18 +101,7 @@ public class HistoryController {
@GetMapping("getHistoryProcessInstancePage")
@ApiOperation("历史流程实例列表")
@LogOperation("查询历史流程实例列表")
@ApiImplicitParams({
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType = "int"),
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query", required = true, dataType = "int"),
@ApiImplicitParam(name = "processInstanceId", value = "实例ID", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "businessKey", value = "业务KEY", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "processDefinitionId", value = "流程定义ID", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "finishedBeginTime", value = "流程完成开始时间", paramType = "query", dataType = "Date"),
@ApiImplicitParam(name = "finishedEndTime", value = "流程完成结束时间", paramType = "query", dataType = "Date"),
@ApiImplicitParam(name = "startBeginTime", value = "流程启动开始时间", paramType = "query", dataType = "Date"),
@ApiImplicitParam(name = "startEndTime", value = "流程启动结束时间", paramType = "query", dataType = "Date"),
@ApiImplicitParam(name = "ended", value = "是否完成(true, false)", paramType = "query", dataType = "String")
})
@ApiImplicitParams({@ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType = "int"), @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query", required = true, dataType = "int"), @ApiImplicitParam(name = "processInstanceId", value = "实例ID", paramType = "query", dataType = "String"), @ApiImplicitParam(name = "businessKey", value = "业务KEY", paramType = "query", dataType = "String"), @ApiImplicitParam(name = "processDefinitionId", value = "流程定义ID", paramType = "query", dataType = "String"), @ApiImplicitParam(name = "finishedBeginTime", value = "流程完成开始时间", paramType = "query", dataType = "Date"), @ApiImplicitParam(name = "finishedEndTime", value = "流程完成结束时间", paramType = "query", dataType = "Date"), @ApiImplicitParam(name = "startBeginTime", value = "流程启动开始时间", paramType = "query", dataType = "Date"), @ApiImplicitParam(name = "startEndTime", value = "流程启动结束时间", paramType = "query", dataType = "Date"), @ApiImplicitParam(name = "ended", value = "是否完成(true, false)", paramType = "query", dataType = "String")})
// @RequiresPermissions("sys:his:all")
public Result<ProcessInstanceDTO> getHistoryProcessInstancePage(@ApiIgnore @RequestParam Map<String, Object> params) {
PageData<ProcessInstanceDTO> page = historyService.getHistoryProcessInstancePage(params);
@ -122,18 +111,7 @@ public class HistoryController {
@GetMapping("getMyProcessInstancePage")
@ApiOperation("我发起的流程")
@LogOperation("查询我发起的流程")
@ApiImplicitParams({
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType = "int"),
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query", required = true, dataType = "int"),
@ApiImplicitParam(name = "name", value = "能力名称", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "processInstanceId", value = "实例ID", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "businessKey", value = "业务KEY", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "processDefinitionId", value = "流程定义ID", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "startBeginTime", value = "流程启动开始时间", paramType = "query", dataType = "Date"),
@ApiImplicitParam(name = "startEndTime", value = "流程启动结束时间", paramType = "query", dataType = "Date"),
@ApiImplicitParam(name = "ended", value = "是否结束（true:是，false:否）", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "processDefinitionKey", value = "流程定义KEY", paramType = "query", dataType = "String")
})
@ApiImplicitParams({@ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType = "int"), @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query", required = true, dataType = "int"), @ApiImplicitParam(name = "name", value = "能力名称", paramType = "query", dataType = "String"), @ApiImplicitParam(name = "processInstanceId", value = "实例ID", paramType = "query", dataType = "String"), @ApiImplicitParam(name = "businessKey", value = "业务KEY", paramType = "query", dataType = "String"), @ApiImplicitParam(name = "processDefinitionId", value = "流程定义ID", paramType = "query", dataType = "String"), @ApiImplicitParam(name = "startBeginTime", value = "流程启动开始时间", paramType = "query", dataType = "Date"), @ApiImplicitParam(name = "startEndTime", value = "流程启动结束时间", paramType = "query", dataType = "Date"), @ApiImplicitParam(name = "ended", value = "是否结束（true:是，false:否）", paramType = "query", dataType = "String"), @ApiImplicitParam(name = "processDefinitionKey", value = "流程定义KEY", paramType = "query", dataType = "String")})
// @RequiresPermissions("sys:his:all")
public Result<ProcessInstanceDTO> getMyProcessInstancePage(@ApiIgnore @RequestParam Map<String, Object> params) {
PageData<ProcessInstanceDTO> page = historyService.getMyProcessInstancePage(params);
@ -143,18 +121,7 @@ public class HistoryController {
@GetMapping("getMyHandledInstancePage")
@ApiOperation("已办任务：根据登录账号查询用户已办任务")
@LogOperation("已办任务：根据登录账号查询用户已办任务")
@ApiImplicitParams({
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType = "int"),
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query", required = true, dataType = "int"),
@ApiImplicitParam(name = "processInstanceId", value = "实例ID", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "businessKey", value = "业务KEY", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "processDefinitionId", value = "流程定义ID", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "startBeginTime", value = "流程启动开始时间", paramType = "query", dataType = "Date"),
@ApiImplicitParam(name = "startEndTime", value = "流程启动结束时间", paramType = "query", dataType = "Date"),
@ApiImplicitParam(name = "finishedBeginTime", value = "流程完成开始时间", paramType = "query", dataType = "Date"),
@ApiImplicitParam(name = "finishedEndTime", value = "流程完成结束时间", paramType = "query", dataType = "Date"),
@ApiImplicitParam(name = "processDefinitionKey", value = "流程定义KEY", paramType = "query", dataType = "String")
})
@ApiImplicitParams({@ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType = "int"), @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query", required = true, dataType = "int"), @ApiImplicitParam(name = "processInstanceId", value = "实例ID", paramType = "query", dataType = "String"), @ApiImplicitParam(name = "businessKey", value = "业务KEY", paramType = "query", dataType = "String"), @ApiImplicitParam(name = "processDefinitionId", value = "流程定义ID", paramType = "query", dataType = "String"), @ApiImplicitParam(name = "startBeginTime", value = "流程启动开始时间", paramType = "query", dataType = "Date"), @ApiImplicitParam(name = "startEndTime", value = "流程启动结束时间", paramType = "query", dataType = "Date"), @ApiImplicitParam(name = "finishedBeginTime", value = "流程完成开始时间", paramType = "query", dataType = "Date"), @ApiImplicitParam(name = "finishedEndTime", value = "流程完成结束时间", paramType = "query", dataType = "Date"), @ApiImplicitParam(name = "processDefinitionKey", value = "流程定义KEY", paramType = "query", dataType = "String")})
// @RequiresPermissions("sys:his:all")
public Result<ProcessActivityDTO> getMyHandledInstancePage(@ApiIgnore @RequestParam Map<String, Object> params) {
if (params.containsKey("processDefinitionKey") && StringUtils.isNotEmpty(params.get("processDefinitionKey").toString())) {
@ -177,10 +144,7 @@ public class HistoryController {
@GetMapping("getDeptHandledInstancePage")
@ApiOperation("已办任务：根据登录账号查询其所在部门的已办任务")
@LogOperation("已办任务：根据登录账号查询其所在部门的已办任务")
@ApiImplicitParams({
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType = "int"),
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query", required = true, dataType = "int")
})
@ApiImplicitParams({@ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType = "int"), @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query", required = true, dataType = "int")})
public Result<Page<ProcessActivityDTO>> getDeptHandledInstancePage(@ApiIgnore @RequestParam Map<String, Object> params) {
Page<ProcessActivityDTO> page = activitiService.getDeptProcessInstancePage(params);
setExtraProcessProperties(Optional.ofNullable(page.getRecords()).orElse(new ArrayList<>()));
@ -190,9 +154,7 @@ public class HistoryController {
@GetMapping("getTaskHandleDetailInfo")
@ApiOperation("获取流程处理详情")
@LogOperation("获取流程处理详情")
@ApiImplicitParams({
@ApiImplicitParam(name = "processInstanceId", value = "实例ID", paramType = "query", dataType = "String")
})
@ApiImplicitParams({@ApiImplicitParam(name = "processInstanceId", value = "实例ID", paramType = "query", dataType = "String")})
// @RequiresPermissions("sys:his:all")
public Result<HistoryDetailDTO> getTaskHandleDetailInfo(String processInstanceId) {
List<HistoryDetailDTO> list = activitiService.getTaskHandleDetailInfo(processInstanceId);
@ -244,8 +206,7 @@ public class HistoryController {
SysUserDTO userDTO = sysUserService.get(Long.valueOf(activityDTO.getAssignee()));
activityDTO.setAssigneeName(userDTO != null ? userDTO.getRealName() : "");
}
List<TAbilityApplicationDTO> abilityApplicationDTOS =
abilityApplicationService.getByInstanceId(activityDTO.getProcessInstanceId());
List<TAbilityApplicationDTO> abilityApplicationDTOS = abilityApplicationService.getByInstanceId(activityDTO.getProcessInstanceId());
TResourceMountApplyDTO tResourceMountApplyDTO = null;
TDemandDataDTO tDemandDataDTO = null;
ResourceDTO resourceDTO = null;

5
renren-admin/src/main/resources/db/V6.2__update_model.sql Normal file
View File

File diff suppressed because one or more lines are too long