diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java b/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java index 7d55d9ed..3ee6dc20 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java @@ -100,7 +100,7 @@ public class WorkCenterController { return Result.OK(sentList); } - @ApiOperation(value = "查询全部流程") + @ApiOperation(value = "监控流程") @GetMapping("/getAllList") public Result getAllList(ProcessAll processAll, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessAllMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessAllMapper.xml index e9b4390b..fb722407 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessAllMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessAllMapper.xml @@ -26,20 +26,19 @@ p.project_id, p.project_name, p.prc_name_en, - group_concat(par.user_id) as handleUserId, - par.node_id + group_concat(par.user_id) as handleUserId from ( select pa.*, max(par.create_time) as receivedTaskTime, - max(par.end_time) as completedTaskTime, - par.node_id + max(par.end_time) as completedTaskTime from process_all pa left join process_approval_record par on pa.process_instance_id = par.process_instance_id ${ew.customSqlSegment} + group by pa.id ) p - left join process_approval_record par on p.process_instance_id = par.process_instance_id - WHERE par.finish_flag = 0 - or par.id is null + LEFT JOIN ( + SELECT user_id,process_instance_id from process_approval_record WHERE finish_flag = 1 + ) par ON p.process_instance_id = par.process_instance_id group by p.process_instance_id @@ -50,9 +49,11 @@ from process_all pa left join process_approval_record par on pa.process_instance_id = par.process_instance_id ${ew.customSqlSegment} + group by pa.id ) p - left join process_approval_record par on p.process_instance_id = par.process_instance_id - WHERE par.finish_flag = 0 or par.id is null + LEFT JOIN ( + SELECT user_id,process_instance_id from process_approval_record WHERE finish_flag = 1 + ) par ON p.process_instance_id = par.process_instance_id group by p.process_instance_id @@ -63,9 +64,11 @@ from process_all pa left join process_approval_record par on pa.process_instance_id = par.process_instance_id ${ew.customSqlSegment} + group by pa.id ) p - left join process_approval_record par on p.process_instance_id = par.process_instance_id - WHERE par.finish_flag = 0 or par.id is null + LEFT JOIN ( + SELECT user_id,process_instance_id from process_approval_record WHERE finish_flag = 1 + ) par ON p.process_instance_id = par.process_instance_id group by p.process_instance_id \ No newline at end of file