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

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-07-01 11:37:55 +08:00
parent ea62505f8d 410ac4c964
commit aea576a204
2 changed files with 6 additions and 1 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/controller/HistoryController.java
View File

@ -99,7 +99,8 @@ public class HistoryController {
@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 = "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) {

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

@ -185,6 +185,10 @@ public class ActHistoryService {
query.processInstanceBusinessKey((String) params.get("businessKey"));
}
if (StringUtils.isNotEmpty((String) params.get("processDefinitionKey"))) { // 流程定义key
query.processDefinitionKey((String) params.get("processDefinitionKey"));
}
if (StringUtils.isNotEmpty((String) params.get("processDefinitionId"))) {
query.processDefinitionId((String) params.get("processDefinitionId"));
}