diff --git a/ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml b/ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml index 7a0a29e8..bb596f12 100644 --- a/ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml @@ -31,6 +31,8 @@ and fa.procDefName like concat('%', #{procDefName}, '%') and fa.businessKey = #{businessKey} + and fa.startDeptName like concat('%', #{startDeptName}, '%') + and fa.startUserName like concat('%', #{startUserName}, '%') and fa.businessKeyName like concat('%', #{businessKeyName}, '%') and fa.category = #{category} and fa.createTime between #{params.beginDate} and #{params.endDate} diff --git a/ruoyi-ui/src/views/flowable/task/myProcess/index.vue b/ruoyi-ui/src/views/flowable/task/myProcess/index.vue index 2b3d952e..e3344ee9 100644 --- a/ruoyi-ui/src/views/flowable/task/myProcess/index.vue +++ b/ruoyi-ui/src/views/flowable/task/myProcess/index.vue @@ -69,7 +69,7 @@ v-hasPermi="['system:deployment:add']" >新增流程 - + @@ -331,7 +331,7 @@ export default { }, /** 统计 */ queryCount(params){ - queryCount(this.queryParams).then(response => { + queryCount(params).then(response => { this.tabs.await = "进行中("+response.data.await+")"; this.tabs.finished = "已完成("+response.data.finished+")"; this.tabs.all = "全部申请("+(parseInt(response.data.await)+parseInt(response.data.finished))+")"; diff --git a/ruoyi-ui/src/views/flowable/task/project/index.vue b/ruoyi-ui/src/views/flowable/task/project/index.vue new file mode 100644 index 00000000..e4f43ae1 --- /dev/null +++ b/ruoyi-ui/src/views/flowable/task/project/index.vue @@ -0,0 +1,289 @@ + + + +