Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into pay_extension

 Conflicts:

	sql/ruoyi-vue-pro.sql

	yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/enums/SysDictTypeConstants.java

	yudao-admin-server/src/main/resources/application-local.yaml

	yudao-admin-server/src/main/resources/application.yaml

	yudao-admin-server/src/test/resources/sql/clean.sql

	yudao-admin-server/src/test/resources/sql/create_tables.sql

	yudao-admin-ui/src/utils/dict.js

yudao-admin-ui/src/api/bpm/activity.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+export function getActivityList(query) {
+  return request({
+    url: '/bpm/activity/list',
+    method: 'get',
+    params: query
+  })
+}

yudao-admin-ui/src/api/bpm/definition.js

@@ -0,0 +1,24 @@
+import request from '@/utils/request'
+
+export function getProcessDefinitionPage(query) {
+  return request({
+    url: '/bpm/process-definition/page',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getProcessDefinitionList(query) {
+  return request({
+    url: '/bpm/process-definition/list',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getProcessDefinitionBpmnXML(id) {
+  return request({
+    url: '/bpm/process-definition/get-bpmn-xml?id=' + id,
+    method: 'get'
+  })
+}

yudao-admin-ui/src/api/bpm/form.js

@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 创建工作流的表单定义
+export function createForm(data) {
+  return request({
+    url: '/bpm/form/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新工作流的表单定义
+export function updateForm(data) {
+  return request({
+    url: '/bpm/form/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除工作流的表单定义
+export function deleteForm(id) {
+  return request({
+    url: '/bpm/form/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得工作流的表单定义
+export function getForm(id) {
+  return request({
+    url: '/bpm/form/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得工作流的表单定义分页
+export function getFormPage(query) {
+  return request({
+    url: '/bpm/form/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得动态表单的精简列表
+export function getSimpleForms() {
+  return request({
+    url: '/bpm/form/list-all-simple',
+    method: 'get'
+  })
+}

yudao-admin-ui/src/api/bpm/leave.js

@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+// 创建请假申请
+export function createLeave(data) {
+  return request({
+    url: '/bpm/oa/leave/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 获得请假申请
+export function getLeave(id) {
+  return request({
+    url: '/bpm/oa/leave/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得请假申请分页
+export function getLeavePage(query) {
+  return request({
+    url: '/bpm/oa/leave/page',
+    method: 'get',
+    params: query
+  })
+}

yudao-admin-ui/src/api/bpm/model.js

@@ -0,0 +1,58 @@
+import request from '@/utils/request'
+
+export function getModelPage(query) {
+  return request({
+    url: '/bpm/model/page',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getModel(id) {
+  return request({
+    url: '/bpm/model/get?id=' + id,
+    method: 'get'
+  })
+}
+
+export function updateModel(data) {
+  return request({
+    url: '/bpm/model/update',
+    method: 'PUT',
+    data: data
+  })
+}
+
+// 任务状态修改
+export function updateModelState(id, state) {
+  return request({
+    url: '/bpm/model/update-state',
+    method: 'put',
+    data: {
+      id,
+      state
+    }
+  })
+}
+
+export function createModel(data) {
+  return request({
+    url: '/bpm/model/create',
+    method: 'POST',
+    data: data
+  })
+}
+
+export function deleteModel(id) {
+  return request({
+    url: '/bpm/model/delete?id=' + id,
+    method: 'DELETE'
+  })
+}
+
+export function deployModel(id) {
+  return request({
+    url: '/bpm/model/deploy?id=' + id,
+    method: 'POST'
+  })
+}

yudao-admin-ui/src/api/bpm/processInstance.js

@@ -0,0 +1,35 @@
+import request from '@/utils/request'
+
+export function getMyProcessInstancePage(query) {
+  return request({
+    url: '/bpm/process-instance/my-page',
+    method: 'get',
+    params: query
+  })
+}
+
+export function createProcessInstance(data) {
+  return request({
+    url: '/bpm/process-instance/create',
+    method: 'POST',
+    data: data
+  })
+}
+
+export function cancelProcessInstance(id, reason) {
+  return request({
+    url: '/bpm/process-instance/cancel',
+    method: 'DELETE',
+    data: {
+      id,
+      reason
+    }
+  })
+}
+
+export function getProcessInstance(id) {
+  return request({
+    url: '/bpm/process-instance/get?id=' + id,
+    method: 'get',
+  })
+}

yudao-admin-ui/src/api/bpm/task.js

@@ -0,0 +1,56 @@
+import request from '@/utils/request'
+
+export function getTodoTaskPage(query) {
+  return request({
+    url: '/bpm/task/todo-page',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getDoneTaskPage(query) {
+  return request({
+    url: '/bpm/task/done-page',
+    method: 'get',
+    params: query
+  })
+}
+
+export function completeTask(data) {
+  return request({
+    url: '/bpm/task/complete',
+    method: 'PUT',
+    data: data
+  })
+}
+
+export function approveTask(data) {
+  return request({
+    url: '/bpm/task/approve',
+    method: 'PUT',
+    data: data
+  })
+}
+
+export function rejectTask(data) {
+  return request({
+    url: '/bpm/task/reject',
+    method: 'PUT',
+    data: data
+  })
+}
+
+export function updateTaskAssignee(data) {
+  return request({
+    url: '/bpm/task/update-assignee',
+    method: 'PUT',
+    data: data
+  })
+}
+
+export function getTaskListByProcessInstanceId(processInstanceId) {
+  return request({
+    url: '/bpm/task/list-by-process-instance-id?processInstanceId=' + processInstanceId,
+    method: 'get',
+  })
+}

yudao-admin-ui/src/api/bpm/taskAssignRule.js

@@ -0,0 +1,25 @@
+import request from '@/utils/request'
+
+export function getTaskAssignRuleList(query) {
+  return request({
+    url: '/bpm/task-assign-rule/list',
+    method: 'get',
+    params: query
+  })
+}
+
+export function createTaskAssignRule(data) {
+  return request({
+    url: '/bpm/task-assign-rule/create',
+    method: 'post',
+    data: data
+  })
+}
+
+export function updateTaskAssignRule(data) {
+  return request({
+    url: '/bpm/task-assign-rule/update',
+    method: 'put',
+    data: data
+  })
+}

yudao-admin-ui/src/api/bpm/userGroup.js

@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 创建用户组
+export function createUserGroup(data) {
+  return request({
+    url: '/bpm/user-group/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新用户组
+export function updateUserGroup(data) {
+  return request({
+    url: '/bpm/user-group/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除用户组
+export function deleteUserGroup(id) {
+  return request({
+    url: '/bpm/user-group/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得用户组
+export function getUserGroup(id) {
+  return request({
+    url: '/bpm/user-group/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得用户组分页
+export function getUserGroupPage(query) {
+  return request({
+    url: '/bpm/user-group/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获取用户组精简信息列表
+export function listSimpleUserGroups() {
+  return request({
+    url: '/bpm/user-group/list-all-simple',
+    method: 'get'
+  })
+}

yudao-admin-ui/src/api/infra/job.js

@@ -65,7 +65,6 @@ export function updateJobStatus(jobId, status) {
   })
 }
 
-
 // 定时任务立即执行一次
 export function runJob(jobId) {
   return request({

yudao-admin-ui/src/api/oa/flow.js

@@ -1,9 +0,0 @@
-import request from '@/utils/request'
-
-
-export function getStartForm(processKey) {
-  return request({
-    url: '/workflow/process/definition/getStartForm?processKey='+processKey,
-    method: 'get'
-  })
-}

yudao-admin-ui/src/api/oa/leave.js

@@ -1,62 +0,0 @@
-import request from '@/utils/request'
-
-// 创建请假申请
-export function createLeave(data) {
-  return request({
-    url: '/oa/leave/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新请假申请
-export function updateLeave(data) {
-  return request({
-    url: '/oa/leave/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除请假申请
-export function deleteLeave(id) {
-  return request({
-    url: '/oa/leave/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得请假申请
-export function getLeave(id) {
-  return request({
-    url: '/oa/leave/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 获得请假申请分页
-export function getLeavePage(query) {
-  return request({
-    url: '/oa/leave/page',
-    method: 'get',
-    params: query
-  })
-}
-
-export function createFormKeyLeave(data) {
-  return request({
-    url: '/oa/leave/form-key/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 导出请假申请 Excel
-export function exportLeaveExcel(query) {
-  return request({
-    url: '/oa/leave/export-excel',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}

yudao-admin-ui/src/api/oa/todo.js

@@ -1,83 +0,0 @@
-import request from '@/utils/request'
-
-// 创建请假申请
-export function createLeave(data) {
-  return request({
-    url: '/oa/leave/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新请假申请
-export function updateLeave(data) {
-  return request({
-    url: '/oa/leave/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除请假申请
-export function deleteLeave(id) {
-  return request({
-    url: '/oa/leave/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得请假申请
-export function getLeave(id) {
-  return request({
-    url: '/oa/leave/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 获得待办任务分页
-export function getTodoTaskPage(query) {
-  return request({
-    url: '/workflow/task/todo/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 签收任务
-export function claimTask(id) {
-  return request({
-    url: '/workflow/task/claim?id=' + id,
-    method: 'get'
-  })
-}
-
-export function completeTask(data) {
-  return request({
-    url: '/workflow/task/complete',
-    method: 'post',
-    data: data
-  })
-}
-
-export function taskSteps(data) {
-  return request({
-    url: '/workflow/task/task-steps',
-    method: 'post',
-    data: data
-  })
-}
-
-export function getTaskFormKey(data) {
-  return request({
-    url: '/workflow/task/formKey',
-    method: 'post',
-    data: data
-  })
-}
-
-export function processHistorySteps(id) {
-  return request({
-    url: '/workflow/task/process/history-steps?id='+id,
-    method: 'get'
-  })
-}

yudao-admin-ui/src/api/system/user.js

@@ -10,6 +10,14 @@ export function listUser(query) {
   })
 }
 
+// 获取用户精简信息列表
+export function listSimpleUsers() {
+  return request({
+    url: '/system/user/list-all-simple',
+    method: 'get'
+  })
+}
+
 // 查询用户详细
 export function getUser(userId) {
   return request({