Commit Graph

94 Commits

Author SHA1 Message Date
YunaiV
802ac89b73 ⬇️ 保持 JDK8 + Spring Boot 2.7.18 持续维护 2023-12-08 22:17:52 +08:00
YunaiV
98697ee075 ⬆️ 2023-12-07 20:48:11 +08:00
YunaiV
81f1800f40 优化对 dameng 工作流的适配 2023-11-26 19:19:31 +08:00
YunaiV
7f75f0abfc bpm:code review 指定审批人 2023-11-19 18:28:00 +08:00
kehaiyou
ca184026cf feat: 创建流程实例时,提前指派审批人 2023-11-05 14:21:37 +08:00
YunaiV
af788e36ce bpm:code review 2023-10-24 08:47:46 +08:00
YunaiV
3bb3e4caf6 code review:工作流的加减签 2023-10-21 21:04:20 +08:00
kehaiyou
6dfef29834 feat: 控制查找子任务次数和清除递归代码 2023-10-21 18:31:30 +08:00
kehaiyou
aca65a66b5 feat: 【工作流】--加减签review修改 2023-10-21 18:16:21 +08:00
zhijiantianya@gmail.com
c629fd2208 code review:工作流逻辑 2023-10-17 18:49:35 +08:00
youkehai
bc781d9473 fix: 【工作流】按 review 修改代码 2023-10-10 10:46:16 +08:00
zhijiantianya@gmail.com
6388950ab2 code review:【工作流】—— 加签的实现 2023-10-09 20:57:23 +08:00
youkehai
5d6faa8023 fix: 【工作流】-加减签父任务处理逻辑完善 2023-10-09 16:40:31 +08:00
kehaiyou
10af05066c feat: 【工作流】--任务列表只返回顶级任务,拼装成父子关系并返回 2023-10-08 22:35:02 +08:00
kehaiyou
d7ae944438 feat: 【工作流】--减签逻辑优化 2023-09-30 15:35:14 +08:00
kehaiyou
cd678e997a feat: 【工作流】--减签和加签共用处理父任务逻辑 2023-09-30 14:56:16 +08:00
kehaiyou
80d532b0f1 feat: 【工作流】--减签 2023-09-29 15:51:00 +08:00
kehaiyou
7d497ce09b feat: 【工作流】--加签 2023-09-29 14:57:28 +08:00
YunaiV
f088fdff84 code review:委托逻辑 2023-09-25 13:59:44 +08:00
youkehai
3972fbd1d9 fix: 根据review结果修改 2023-09-25 11:30:44 +08:00
youkehai
1553900193 fix: 解决冲突 2023-09-25 09:22:11 +08:00
youkehai
d6e736bd56 Merge branch 'master' into feature/bpm-delegate
# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
2023-09-25 09:15:59 +08:00
YunaiV
83a133b344 bpm:优化 BpmnModelUtils 2023-09-24 23:06:04 +08:00
YunaiV
ffdaf3a859 bpm:简化流程驳回的逻辑实现,提升可读性 2023-09-24 22:19:36 +08:00
YunaiV
0b649fd3e1 bpm:简化获得可回退节点的实现 2023-09-24 16:08:50 +08:00
kehaiyou
4efa93b03b feat: 【工作流】--委派 2023-09-24 15:43:35 +08:00
kehaiyou
921f99d39d fix: 方法,变量名词,注释规范 2023-09-24 13:13:55 +08:00
kehaiyou
b13f71424b feat: 工作流-》流程实例的任务节点回退 2023-09-23 14:47:34 +08:00
shizhong
81c12b1852 解决MapStruct的时区问题 2023-08-23 12:21:49 +08:00
shizhong
eb4434ecbc 解决MapStruct的时区问题 2023-08-23 12:11:47 +08:00
wcz
a6ffb5d650 BaseMapperX.java少了几个方法,TradeCartMapper.java方法调整,BpmProcessInstanceServiceImpl.java多了 2023-07-28 19:33:23 +08:00
YunaiV
c33186569d 优化 mp 账号的刷新机制,使用 Job 轮询,替换 MQ 广播 2023-07-27 20:25:15 +08:00
YunaiV
5d6308e4bb 对齐 boot 与 cloud 的代码 2023-07-27 13:59:29 +08:00
YunaiV
859cf74a6c 对齐 boot 与 cloud 的代码 2023-07-27 13:00:52 +08:00
YunaiV
461c789492 清理 bpm 用不到的实体、与 convert 方法 2023-07-26 20:53:10 +08:00
YunaiV
8e51de5349 修复“删除流程模型方法 有注释写错” 2023-07-25 20:33:41 +08:00
xingyu
0b3640a522 fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED 2023-05-08 10:06:17 +08:00
YunaiV
75c74590e5 修复工作流创建流程时,流程名可能不存在的问题 2023-04-09 10:21:29 +08:00
SuperHao
4592b79deb
bugfix: 转换HistoricTaskInstance.createTime -> BpmTaskRespVO.createTime
Signed-off-by: SuperHao <jacky.jihao@gmail.com>
2023-03-01 02:17:20 +00:00
YunaiV
d16d20fc22 修复 BpmTaskAssignRuleServiceImplTest 单测报错的问题 2023-02-08 00:13:34 +08:00
YunaiV
de7d26129c Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/vue3-bpm
# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeaveBaseVO.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskTodoPageReqVO.java
2023-02-04 20:58:09 +08:00
YunaiV
c3eb9022b8 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/springdoc
# Conflicts:
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java
#	yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/clean.sql
#	yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/create_tables.sql
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/RoleController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsChannelController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
#	yudao-server/pom.xml
2023-02-04 10:21:45 +08:00
YunaiV
3d3c88dd4f 完善 AdminUserServiceImpl 单元测试 2023-02-03 22:10:05 +08:00
YunaiV
96e8fa4216 完善 RoleServiceImpl 单元测试 2023-02-02 09:13:14 +08:00
YunaiV
0537421655 完善 DictDataServiceImpl 单元测试 2023-02-01 07:34:57 +08:00
YunaiV
bef06ef940 完善 PostServiceImpl 单元测试 2023-02-01 00:42:38 +08:00
YunaiV
1011de3278 完善 DeptServiceImpl 单元测试 2023-02-01 00:07:34 +08:00
YunaiV
98bf423569 bpm:增加待办任务 2023-01-22 09:21:22 +08:00
YunaiV
3e4d388e70 bpm:增加 OA 请假的创建 2023-01-21 21:30:17 +08:00
YunaiV
fe6adf693b bpm:完成流程表单 2023-01-20 13:40:00 +08:00