From a2581d63e95e5e116d0914e4715a448b6fd17e80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Tue, 12 Sep 2023 01:52:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FlowTaskServiceImpl.java | 6 +- .../mapper/flowable/FlowBusinessKeyMapper.xml | 9 +- ruoyi-ui/src/layout/index.vue | 4 + ruoyi-ui/src/store/getters.js | 3 + ruoyi-ui/src/store/index.js | 4 +- .../views/flowable/task/finished/index.vue | 2 +- .../task/myProcess/detail/detailDrawer.vue | 5 +- .../myProcess/detail/detailLeaveDrawer.vue | 5 +- .../views/flowable/task/myProcess/index.vue | 19 +- .../task/myProcess/initLeaveTaskDrawer.vue | 226 ++++++++++++++++-- .../task/myProcess/initTaskDrawer.vue | 215 +++++++++++++++-- .../src/views/flowable/task/project/index.vue | 26 ++ .../task/todo/detail/approveDrawer.vue | 3 +- .../task/todo/detail/approveLeaveDrawer.vue | 3 +- .../src/views/flowable/task/todo/index.vue | 37 ++- .../src/views/project/surProject/myIndex.vue | 30 ++- 16 files changed, 532 insertions(+), 65 deletions(-) diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java index 6f8a835a..9ce25386 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java +++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java @@ -107,7 +107,11 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask taskService.addComment(taskVo.getTaskId(), taskVo.getInstanceId(), FlowComment.DELEGATE.getType(), taskVo.getComment()); taskService.resolveTask(taskVo.getTaskId(), taskVo.getVariables()); } else { - taskService.addComment(taskVo.getTaskId(), taskVo.getInstanceId(), FlowComment.NORMAL.getType(), taskVo.getComment()); + if(task.getName().equals("提交申请")){ + taskService.addComment(taskVo.getTaskId(), taskVo.getInstanceId(), FlowComment.NORMAL.getType(), "重新提交流程申请！！"); + }else{ + taskService.addComment(taskVo.getTaskId(), taskVo.getInstanceId(), FlowComment.NORMAL.getType(), taskVo.getComment()); + } taskService.setAssignee(taskVo.getTaskId(), taskVo.getUserId()); taskService.complete(taskVo.getTaskId(), taskVo.getVariables()); } diff --git a/ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml b/ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml index bb596f12..f590f1e5 100644 --- a/ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml @@ -29,6 +29,7 @@ FROM vw_flow_all fa + and fa.taskName like concat('%', #{taskName}, '%') and fa.procDefName like concat('%', #{procDefName}, '%') and fa.businessKey = #{businessKey} and fa.startDeptName like concat('%', #{startDeptName}, '%') @@ -37,9 +38,9 @@ and fa.category = #{category} and fa.createTime between #{params.beginDate} and #{params.endDate} - and fa.businesDeptId = #{projectDeptId} + and fa.businessDeptId = #{projectDeptId} - and fa.businesDeptId = #{nowDept} + and fa.businessDeptId = #{nowDept} and fa.businessKey in (select DISTINCT projectId from sur_project_unit_info where unitId=#{nowDept} and del_flag=0) @@ -70,9 +71,9 @@ and fa.category = #{category} and fa.createTime between #{params.beginDate} and #{params.endDate} - and fa.businesDeptId = #{projectDeptId} + and fa.businessDeptId = #{projectDeptId} - and fa.businesDeptId = #{nowDept} + and fa.businessDeptId = #{nowDept} and fa.businessKey in (select DISTINCT projectId from sur_project_unit_info where unitId=#{nowDept} and del_flag=0) diff --git a/ruoyi-ui/src/layout/index.vue b/ruoyi-ui/src/layout/index.vue index dba4393d..7e73f5f2 100644 --- a/ruoyi-ui/src/layout/index.vue +++ b/ruoyi-ui/src/layout/index.vue @@ -54,6 +54,10 @@ export default { return variables; } }, + mounted() { + //查询任务tips + this.$store.dispatch('settingAwaitNum'); + }, methods: { handleClickOutside() { this.$store.dispatch('app/closeSideBar', { withoutAnimation: false }) diff --git a/ruoyi-ui/src/store/getters.js b/ruoyi-ui/src/store/getters.js index 5f45eefc..943fa617 100644 --- a/ruoyi-ui/src/store/getters.js +++ b/ruoyi-ui/src/store/getters.js @@ -1,3 +1,5 @@ +import { start } from "nprogress" + const getters = { sidebar: state => state.app.sidebar, size: state => state.app.size, @@ -17,5 +19,6 @@ const getters = { topbarRouters:state => state.permission.topbarRouters, defaultRoutes:state => state.permission.defaultRoutes, sidebarRouters:state => state.permission.sidebarRouters, + awaitTaskNum:state => state.flowtask.awaitTaskNum } export default getters diff --git a/ruoyi-ui/src/store/index.js b/ruoyi-ui/src/store/index.js index 97aaef80..36c440c4 100644 --- a/ruoyi-ui/src/store/index.js +++ b/ruoyi-ui/src/store/index.js @@ -3,6 +3,7 @@ import Vuex from 'vuex' import app from './modules/app' import dict from './modules/dict' import user from './modules/user' +import flowtask from './modules/flowtask' import tagsView from './modules/tagsView' import permission from './modules/permission' import settings from './modules/settings' @@ -17,7 +18,8 @@ const store = new Vuex.Store({ user, tagsView, permission, - settings + settings, + flowtask }, getters }) diff --git a/ruoyi-ui/src/views/flowable/task/finished/index.vue b/ruoyi-ui/src/views/flowable/task/finished/index.vue index 067d647a..7ec93258 100644 --- a/ruoyi-ui/src/views/flowable/task/finished/index.vue +++ b/ruoyi-ui/src/views/flowable/task/finished/index.vue @@ -102,7 +102,7 @@ diff --git a/ruoyi-ui/src/views/flowable/task/myProcess/detail/detailDrawer.vue b/ruoyi-ui/src/views/flowable/task/myProcess/detail/detailDrawer.vue index b4fb9b6e..af1bd0d7 100644 --- a/ruoyi-ui/src/views/flowable/task/myProcess/detail/detailDrawer.vue +++ b/ruoyi-ui/src/views/flowable/task/myProcess/detail/detailDrawer.vue @@ -180,7 +180,7 @@ export default { this.jdtitle="进行中"; this.showjd=true; }else if(options.finishTime!=null && options.assigneeId==null){ - this.jdtitle="已撤销"; + this.jdtitle="已终止"; }else{ this.jdtitle="已完成"; } @@ -356,7 +356,6 @@ export default { let flowRecordList = this.flowRecordList; for(let i=0;i :nth-child(1) { diff --git a/ruoyi-ui/src/views/flowable/task/myProcess/detail/detailLeaveDrawer.vue b/ruoyi-ui/src/views/flowable/task/myProcess/detail/detailLeaveDrawer.vue index bc3b3c0f..baf99055 100644 --- a/ruoyi-ui/src/views/flowable/task/myProcess/detail/detailLeaveDrawer.vue +++ b/ruoyi-ui/src/views/flowable/task/myProcess/detail/detailLeaveDrawer.vue @@ -210,7 +210,7 @@ this.jdtitle="进行中"; this.showjd=true; }else if(options.finishTime!=null && options.assigneeId==null){ - this.jdtitle="已撤销"; + this.jdtitle="已终止"; }else{ this.jdtitle="已完成"; } @@ -385,7 +385,6 @@ let flowRecordList = this.flowRecordList; for(let i=0;i :nth-child(1) { diff --git a/ruoyi-ui/src/views/flowable/task/myProcess/index.vue b/ruoyi-ui/src/views/flowable/task/myProcess/index.vue index e3344ee9..c86b75b6 100644 --- a/ruoyi-ui/src/views/flowable/task/myProcess/index.vue +++ b/ruoyi-ui/src/views/flowable/task/myProcess/index.vue @@ -131,6 +131,7 @@