YunaiV
|
6208c1dc4c
|
【同步】jdk21 和 jdk8 的代码
|
2024-10-04 17:22:15 +08:00 |
|
YunaiV
|
eaa22e7a56
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmModelController.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModeImportReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelSaveReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelUpdateReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmTaskController.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateDeptLeaderStrategy.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateDeptMemberStrategy.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateGroupStrategy.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidatePostStrategy.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateRoleStrategy.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateStartUserSelectStrategy.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateUserStrategy.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/listener/BpmTaskEventListener.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelService.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/message/BpmMessageService.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmActivityServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceService.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskService.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/permission/core/aop/CrmPermissionAspect.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java
# yudao-server/pom.xml
|
2024-10-04 17:16:23 +08:00 |
|
YunaiV
|
f299bf8a36
|
【代码优化】工作流：删除用不到的方法
|
2024-10-04 17:11:25 +08:00 |
|
YunaiV
|
f1872b70ee
|
【功能修复】工作流：新的 bpm 详情，bpmn 设计器也返回 node 信息
|
2024-10-04 17:05:51 +08:00 |
|
YunaiV
|
4687dfbb97
|
【功能修复】工作流：新建的流程，部分数据的 NPE 问题
|
2024-10-04 11:47:39 +08:00 |
|
YunaiV
|
ad0d9d10c8
|
【功能新增】工作流：BpmTaskCandidateAssignEmptyStrategy 读取流程管理员
|
2024-10-04 11:14:02 +08:00 |
|
YunaiV
|
742c2967de
|
【功能新增】工作流：流程发起时，校验是否有发起流程的权限
|
2024-10-03 20:44:46 +08:00 |
|
YunaiV
|
9cc8e0d37f
|
【功能新增】工作流：流程模型修改时，校验是否为流程的管理员
|
2024-10-03 20:16:32 +08:00 |
|
YunaiV
|
90ced26b01
|
【功能优化】工作流：流程模型的定义，增加谁可以发起、谁可以管理的字段 CRUD
|
2024-10-03 20:05:31 +08:00 |
|
YunaiV
|
9334edc9ea
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/bpm
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
|
2024-10-03 11:28:22 +08:00 |
|
YunaiV
|
61549f13c0
|
【代码评审】工作流：审批详情新接口的 review
|
2024-10-03 11:10:14 +08:00 |
jason
|
abea0edf23
|
【功能修改】 流程抄送查询返回 activityId 字段
|
2024-10-02 09:53:28 +08:00 |
|
jason
|
62e75a0bfe
|
【问题修复】 获取审批详情。修复结束节点的状态问题
|
2024-10-01 23:40:08 +08:00 |
|
YunaiV
|
2ca4f1fb9b
|
【功能调整】全局：默认 /app-api/* 需要登录，和 /admin-api/* 保持一致，降低大家理解成本
|
2024-10-01 11:45:00 +08:00 |
|
YunaiV
|
2299a326b5
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/discount/DiscountActivityApiImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/reward/RewardActivityApiImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/coupon/vo/template/CouponTemplateBaseVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/discount/DiscountActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/discount/vo/DiscountActivityRespVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/discount/vo/DiscountActivityUpdateReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/activity/AppActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainActivityService.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainActivityServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityService.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponTemplateServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/discount/DiscountActivityService.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/discount/DiscountActivityServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/reward/RewardActivityService.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/reward/RewardActivityServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillActivityService.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/TradePriceService.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/TradePriceServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDiscountActivityPriceCalculator.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeMemberLevelPriceCalculator.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeRewardActivityPriceCalculator.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/demo/PayDemoOrderServiceImpl.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java
|
2024-10-01 11:29:32 +08:00 |
|
YunaiV
|
e8e1f14c7c
|
【功能修改】工作流：流程实例列表，使用 processDefinitionKey 检索
|
2024-09-30 19:45:33 +08:00 |
|
jason
|
e85385d123
|
【代码审计】 code review 注释修改
|
2024-09-27 12:37:09 +08:00 |
|
jason
|
d42c63e8fd
|
【功能修改】任务的候选人的策略, 增加移除被禁用的用户接口
|
2024-09-26 23:45:04 +08:00 |
|
jason
|
7f6d214ea9
|
仿钉钉流程设计 - 获取审批记录修改, 依次审批节点添加未审批人候选人
|
2024-09-26 17:53:22 +08:00 |
|
jason
|
31df372ab5
|
仿钉钉流程设计 - 获取审批记录修改列表，合并正在运行的会签和或签任务
|
2024-09-26 13:36:28 +08:00 |
|
jason
|
b6c78ad04f
|
仿钉钉流程设计 - 获取表单字段权限接口修改
|
2024-09-25 22:27:32 +08:00 |
|
jason
|
1ae726f312
|
仿钉钉流程设计- 获取审批详情接口修改，增加流程未开始情况
|
2024-09-23 10:38:59 +08:00 |
|
jason
|
ac2ae25a87
|
仿钉钉流程设计- 冲突解决
|
2024-09-21 11:12:54 +08:00 |
|
jason
|
5a1c3bdef5
|
仿钉钉流程设计- 条件节点 review 修改
|
2024-09-21 11:07:22 +08:00 |
|
YunaiV
|
6cc577eaaa
|
【代码评审】BPM：获取审批任务的记录列表
|
2024-09-21 10:31:43 +08:00 |
|
jason
|
25d4c4105a
|
仿钉钉流程设计- 审批记录预测条件节点的执行
|
2024-09-19 09:53:00 +08:00 |
|
jason
|
105c02c109
|
仿钉钉流程设计- 代码评审修改
|
2024-09-18 23:26:42 +08:00 |
|
YunaiV
|
d100093be1
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderQueryServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
|
2024-09-17 17:26:01 +08:00 |
|
YunaiV
|
bb359c5f40
|
合并 master 代码到 bpm 开发分支
|
2024-09-17 15:35:05 +08:00 |
|
YunaiV
|
4e8e491035
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/bpm
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmModelConvert.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmParallelMultiInstanceBehavior.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmSequentialMultiInstanceBehavior.java
|
2024-09-17 15:34:30 +08:00 |
|
YunaiV
|
a6e5b2880b
|
【功能优化】工作流：会签、或签分配人的时候，如果已经分配过，则不重复计算
|
2024-09-17 15:28:53 +08:00 |
|
YunaiV
|
98e62211c6
|
【代码评审】BPM：获取审批任务的记录列表
|
2024-09-17 11:06:38 +08:00 |
|
jason
|
da398dfefc
|
仿钉钉流程设计- 获取审批记录第二版
|
2024-09-15 19:40:29 +08:00 |
|
jason
|
b28d917d56
|
仿钉钉流程设计- 代码评审修改
|
2024-09-08 17:20:28 +08:00 |
|
YunaiV
|
d02e1e1d6b
|
【代码评审】BPM：获取审批任务的记录列表
|
2024-09-08 11:29:28 +08:00 |
|
YunaiV
|
8024d0af3f
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/config/YudaoApiLogAutoConfiguration.java
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/YudaoWebAutoConfiguration.java
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java
# yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/logger/ApiAccessLogApi.java
# yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/logger/ApiErrorLogApi.java
# yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/combination/CombinationRecordApi.java
# yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/CouponApi.java
# yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/dto/CouponValidReqDTO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/combination/CombinationRecordApiImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/CouponApiImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/CombinationActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/reward/RewardActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/reward/vo/RewardActivityBaseVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/activity/AppActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/AppCouponController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/vo/coupon/AppCouponMatchReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/vo/coupon/AppCouponRespVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/reward/RewardActivityServiceImplTest.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApiImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/aftersale/AppAfterSaleController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateService.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeCouponOrderHandler.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeCouponPriceCalculator.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDeliveryPriceCalculator.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeRewardActivityPriceCalculator.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletServiceImpl.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApi.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApiImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/TencentSmsClient.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelServiceImpl.java
|
2024-09-07 20:45:32 +08:00 |
|
YunaiV
|
4d15396e36
|
【代码评审】工作流：获得审批的进展
|
2024-09-05 09:15:34 +08:00 |
|
YunaiV
|
0ce0c3f3d2
|
【功能修复】工作流：bpmnBytes 在非 UTF-8 环境下，可能存在乱码的问题
|
2024-09-02 13:15:10 +08:00 |
|
jason
|
f03e26bc86
|
仿钉钉流程设计- 增加流程进度接口第一版 (用于查询审批记录）
|
2024-09-01 23:12:04 +08:00 |
|
YunaiV
|
ea75cf8502
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-08-31 13:31:11 +08:00 |
|
YunaiV
|
56ae4503a6
|
【代码优化】SYSTEM：操作日志，增加异步记录
|
2024-08-31 13:28:30 +08:00 |
|
YunaiV
|
ff6bee964b
|
【功能新增】工作流：BPM Model 增加 type 标记是 BPMN 设计器，还是 SIMPLE 钉钉设计器
|
2024-08-26 18:38:32 +08:00 |
|
YunaiV
|
c26862f3e4
|
【功能简化】工作流：移除“导入”流程的功能，原生 bpmn 设计器，已经提供导入
|
2024-08-26 13:07:42 +08:00 |
|
YunaiV
|
77d518b9c8
|
【代码优化】工作流：表单权限
|
2024-08-26 12:52:11 +08:00 |
|
jason
|
6b0520d779
|
仿钉钉流程设计- 流程抄送增加流程活动 Id 字段
|
2024-08-25 23:06:08 +08:00 |
|
YunaiV
|
dd0bba4752
|
【代码优化】工作流：表单权限
|
2024-08-25 19:19:01 +08:00 |
|
jason
|
6217d5acb1
|
Merge remote-tracking branch 'origin/feature/bpm' into feature/bpm
|
2024-08-24 22:57:39 +08:00 |
|
jason
|
da690a2b1c
|
仿钉钉流程设计- 新增获取流程表单字段权限接口,需要分离开
|
2024-08-24 22:57:23 +08:00 |
|
YunaiV
|
56664ca0a0
|
【代码评审】工作流：驳回到发起人时，不自动通过
|
2024-08-24 15:26:16 +08:00 |
|
YunaiV
|
70386263e4
|
【功能修复】工作流：自动审批通过时，不能使用 TransactionSynchronizationManager 的 afterCommit 的情况
|
2024-08-24 14:42:09 +08:00 |
|
YunaiV
|
764a242d07
|
【代码优化】BPM：增加一个默认的发起人节点
|
2024-08-21 22:16:19 +08:00 |
|
jason
|
8b93a71f56
|
Merge remote-tracking branch 'origin/feature/bpm' into feature/bpm
|
2024-08-21 21:02:16 +08:00 |
|
jason
|
5679b4ef95
|
仿钉钉流程设计- 新增发起人节点
|
2024-08-21 20:55:54 +08:00 |
|
YunaiV
|
14c8b591d3
|
【代码评审】工作流：抄送的实现逻辑
|
2024-08-17 22:57:44 +08:00 |
|
jason
|
3a433e8226
|
仿钉钉流程设计- 连续多级部门负责人review 修改
|
2024-08-17 22:46:10 +08:00 |
|
YunaiV
|
b98421dfc6
|
【代码评审】工作流：抄送的实现逻辑
|
2024-08-17 21:20:10 +08:00 |
|
YunaiV
|
040a1bcfad
|
【代码评审】工作流：连续多级部门负责人的实现
|
2024-08-17 20:30:51 +08:00 |
|
jason
|
e7815dd762
|
仿钉钉流程设计- 连续多级部门负责人
|
2024-08-17 19:54:57 +08:00 |
|
jason
|
a22976ba97
|
Merge remote-tracking branch 'origin/feature/bpm' into feature/bpm
|
2024-08-17 19:51:58 +08:00 |
|
jason
|
20c97d1441
|
仿钉钉流程设计- 连续多级部门负责人, 支持选多个部门
|
2024-08-17 18:45:23 +08:00 |
|
YunaiV
|
17c7fa44c1
|
【功能新增】工作流：审批类型，区分人工审批、自动通过、自动拒绝
|
2024-08-17 18:21:30 +08:00 |
|
YunaiV
|
0d738fa397
|
【功能新增】工作流：支持审批人为空时，根据配置进行自动通过、自动拒绝、指定人审批的效果
|
2024-08-17 16:24:25 +08:00 |
|
jason
|
d4306846f9
|
Merge remote-tracking branch 'origin/feature/bpm' into feature/bpm
|
2024-08-17 12:19:39 +08:00 |
|
YunaiV
|
58a2e3d5d4
|
【代码重构】将审批超时的 action 统一换成 handlerType，保持一致
|
2024-08-17 12:09:29 +08:00 |
|
jason
|
bc46c67a99
|
Merge remote-tracking branch 'origin/feature/bpm' into feature/bpm
|
2024-08-17 12:05:23 +08:00 |
|
jason
|
620a0d8c2c
|
仿钉钉流程设计- 新增连续多级部门负责人审批策略
|
2024-08-17 12:04:53 +08:00 |
|
YunaiV
|
40db4cf7b7
|
【功能新增】审批节点的审批人与发起人相同时，具体实现处理。
|
2024-08-17 11:33:41 +08:00 |
|
YunaiV
|
71e42cb0a1
|
【功能新增】审批节点的审批人与发起人相同时，对应的处理类型的配置
|
2024-08-17 10:19:20 +08:00 |
|
YunaiV
|
fe3ca8deba
|
【代码优化】BPM：审批超时提醒的实现
|
2024-08-16 23:28:59 +08:00 |
|
YunaiV
|
ae7dbd3c53
|
Merge remote-tracking branch 'origin/feature/bpm' into feature/bpm
|
2024-08-12 09:03:55 +08:00 |
|
YunaiV
|
36a77251af
|
【代码优化】工作流：BpmTaskService、BpmProcessInstanceService 区分读方法、写、event 方法的区域，提升可阅读性
|
2024-08-12 09:03:49 +08:00 |
|
jason
|
6c69eeba09
|
仿钉钉流程设计- code review 部分修改
|
2024-08-11 22:07:11 +08:00 |
|
YunaiV
|
32804d3e0b
|
【功能重构】工作流：重构流程不通过、取消的处理逻辑，完全转向 flowable 的 moveActivityIdsToSingleActivityId API
|
2024-08-11 19:01:56 +08:00 |
|
YunaiV
|
521cc3deb4
|
【代码优化】工作流：task 审批不通过时，针对加签的处理
|
2024-08-11 13:00:01 +08:00 |
|
YunaiV
|
5bafc0ce57
|
【代码评审】工作流：快搭部分的 code review
|
2024-08-11 00:09:39 +08:00 |
|
YunaiV
|
923b967766
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/bpm
|
2024-08-10 19:31:06 +08:00 |
|
YunaiV
|
7c54204716
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm
|
2024-07-28 20:44:58 +08:00 |
|
YunaiV
|
668870d052
|
【同步】BOOT 和 CLOUD 的功能
|
2024-07-27 15:41:23 +08:00 |
|
YunaiV
|
87126d8385
|
【功能修复】CRM：回款管理导出报错的问题
|
2024-07-26 22:37:35 +08:00 |
|
YunaiV
|
257acba31e
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/interceptor/ApiAccessLogInterceptor.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserService.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/security/config/SecurityConfiguration.java
|
2024-07-24 18:46:33 +08:00 |
|
YunaiV
|
2a4882e8d6
|
【代码修复】BPM：BpmProcessInstanceStatusEnum 的 array 返回错误，导致 page 筛选校验报错
|
2024-07-23 13:53:16 +08:00 |
|
YunaiV
|
a210210b20
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/wallet/PayWalletController.java
|
2024-07-21 11:15:04 +08:00 |
|
YunaiV
|
e3bec2fa3b
|
【缺陷修复】BPM：流程重新发起时，禁用业务表单的情况，避免报错
|
2024-07-20 22:14:34 +08:00 |
|
YunaiV
|
3e3407eb99
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/file/FileConfigDO.java
# yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/dal/dataobject/message/MpMessageDO.java
|
2024-07-13 22:43:33 +08:00 |
|
YunaiV
|
2b39b434fa
|
【依赖】mybatis-plus from 3.5.5 to 3.5.7
|
2024-07-13 22:42:54 +08:00 |
|
jason
|
58e250c4eb
|
仿钉钉流程设计- 操作按钮权限设置
|
2024-07-13 14:34:07 +08:00 |
|
YunaiV
|
5d3bb791fd
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceTest.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java
|
2024-07-07 09:14:36 +08:00 |
|
jason
|
053e03d068
|
仿钉钉流程设计- 表单字段权限设置
|
2024-06-27 09:21:22 +08:00 |
|
YunaiV
|
5519fdcd4c
|
【代码评审】BPM：review 快搭相关实现
|
2024-06-23 11:28:08 +08:00 |
|
YunaiV
|
7786233ae8
|
【修复】BPM：多租户使用同一个流程标识 key 时查询报错
|
2024-06-22 14:26:50 +08:00 |
|
jason
|
234df7bda1
|
仿钉钉流程设计- 抄送节点结构调整
|
2024-06-21 10:01:13 +08:00 |
|
jason
|
9e41576dc4
|
仿钉钉流程设计- 模型节点结构调整
|
2024-06-19 23:51:54 +08:00 |
|
jason
|
4d49952c52
|
仿钉钉流程设计- 加签拒绝处理
|
2024-06-19 17:06:48 +08:00 |
|
jason
|
633a7c50ae
|
仿钉钉流程设计- 简化审批拒绝流程, code review 修改
|
2024-06-18 00:04:10 +08:00 |
|
YunaiV
|
41b9ab2ba5
|
【代码评审】BPM：review 快搭的实现
|
2024-06-17 18:45:54 +08:00 |
|
jason
|
8585e05772
|
仿钉钉流程设计- 会签按比例通过bug 修复
|
2024-06-14 21:53:57 +08:00 |
|
jason
|
d7e1b87b1b
|
仿钉钉流程设计- 简化多人审批方式
|
2024-06-14 11:05:32 +08:00 |
|
jason
|
7423f9ddad
|
仿钉钉流程设计- 任务拒绝，跳转到 EndEvent 结束流程
|
2024-06-13 23:07:32 +08:00 |
|
YunaiV
|
b0fe72d735
|
【代码评审】BPM：会签逻辑的实现
|
2024-06-12 20:23:16 +08:00 |
|
jason
|
479d664a63
|
仿钉钉流程设计- code review 修改
|
2024-06-08 11:03:06 +08:00 |
|
jason
|
5c2fcdce15
|
仿钉钉流程设计- 会签按通过比率
|
2024-06-08 08:20:20 +08:00 |
|
jason
|
12108e7365
|
仿钉钉流程设计- 基于服务任务实现会签下的拒绝需要全员
|
2024-06-07 22:07:47 +08:00 |
|
jason
|
0db7796c62
|
仿钉钉流程设计- code review 修改
|
2024-06-07 13:09:41 +08:00 |
|
YunaiV
|
dff1ff90a7
|
【代码评审】BPM：review 快搭的实现
|
2024-06-06 20:17:53 +08:00 |
|
jason
|
1ec94e5bbc
|
仿钉钉流程设计- 新增会签时通过只需一人，拒绝需要所有人的处理
|
2024-06-06 09:51:02 +08:00 |
|
YunaiV
|
c87bea5a72
|
【代码评审】BPM：review simple 字段、seq 连线
|
2024-06-03 12:50:07 +08:00 |
|
jason
|
d9a2849cce
|
仿钉钉流程设计- code review 修改。新增并行分支节点
|
2024-06-02 18:11:10 +08:00 |
|
jason
|
8a3b6c3eb9
|
仿钉钉流程设计- code review 修改
|
2024-05-31 08:57:08 +08:00 |
|
jason
|
65a09182e7
|
仿钉钉流程设计- code review 构建节点连线修改
|
2024-05-29 09:48:28 +08:00 |
|
YunaiV
|
d9ca52a478
|
【代码评审】BPM：review simple 字段、seq 连线
|
2024-05-28 20:04:21 +08:00 |
|
jason
|
4bd399cd32
|
仿钉钉流程设计- code review 修改
|
2024-05-28 08:46:58 +08:00 |
|
jason
|
8f31e745dd
|
仿钉钉流程设计- code review 修改
|
2024-05-28 00:19:28 +08:00 |
|
YunaiV
|
4d176c8494
|
Merge remote-tracking branch 'origin/feature/bpm' into feature/bpm
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/SimpleModelUtils.java
|
2024-05-27 21:20:07 +08:00 |
|
YunaiV
|
1ae06b89e4
|
【代码评审】BPM：review simple 表单的转化
|
2024-05-27 21:18:59 +08:00 |
|
jason
|
5b97d565cd
|
仿钉钉流程设计- code review 修改
|
2024-05-27 21:15:08 +08:00 |
|
YunaiV
|
95bbf749a1
|
【代码评审】BPM：review 快搭的实现
|
2024-05-27 13:23:13 +08:00 |
|
jason
|
007639d61a
|
仿钉钉流程设计- 简化审批节点拒绝处理
|
2024-05-27 09:28:04 +08:00 |
|
jason
|
d2750f08ce
|
仿钉钉流程设计- 审批节点添加拒绝处理方式
|
2024-05-26 10:57:23 +08:00 |
|
jason
|
d34fef67da
|
仿钉钉流程设计- 审批节点超时处理
|
2024-05-23 22:34:56 +08:00 |
|
jason
|
afad8ac619
|
仿钉钉流程设计- 增加发起人自己候选人策略
|
2024-05-20 21:20:26 +08:00 |
|
YunaiV
|
b65ccd769f
|
【同步】BPM：合并 master-jdk17 代码
|
2024-05-19 11:18:30 +08:00 |
|
YunaiV
|
51917c7413
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/bpm
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmSimpleModelNodeType.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/simple/BpmSimpleModelNodeVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/enums/BpmnModelConstants.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/BpmnModelUtils.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelService.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmSimpleModelServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceCopyServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmSimpleNodeService.java
|
2024-05-19 11:00:55 +08:00 |
|
jason
|
f85ca1f88f
|
仿钉钉流程设计- 条件节点新增条件规则
|
2024-05-13 14:27:01 +08:00 |
|
jason
|
f9c7795efb
|
仿钉钉流程设计- 抄送任务增加表单字段权限扩展元素
|
2024-05-08 20:56:39 +08:00 |
|
YunaiV
|
cec5c287f9
|
【同步】JDK17 和 JDK8 的代码
|
2024-05-04 09:42:16 +08:00 |
|
YunaiV
|
9f63e1e294
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/vo/portrait/CrmStatisticsPortraitReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsPerformanceServiceImpl.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImpl.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/job/JobServiceImpl.java
# yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/service/JmReportTokenServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java
|
2024-05-04 09:39:07 +08:00 |
|
YunaiV
|
b6d0176186
|
【代码评审】BPM：review 仿钉钉流程设计 - 调整排他网关和条件节点
|
2024-05-03 19:56:12 +08:00 |
|
YunaiV
|
ab00986a1d
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17
|
2024-05-01 08:37:56 +08:00 |
|
jason
|
4958aaea81
|
仿钉钉流程设计- 调整排他网关和条件节点
|
2024-04-30 00:07:58 +08:00 |
|
YunaiV
|
1bd96eb13e
|
【代码评审】BPM：review 快搭的实现
|
2024-04-28 19:53:21 +08:00 |
|
jason
|
e4fbc11dc4
|
仿钉钉流程设计- 前端重构调整, 新增多人审批方式
|
2024-04-27 09:30:14 +08:00 |
|
YunaiV
|
5380e21001
|
【修复】bpm：流程提交时，variables 为 null 会导致 NPE 问题
|
2024-04-24 12:40:03 +08:00 |
|
YunaiV
|
5d58037d05
|
优化：将 hutool-all 6.0 版本替换成 hutool-extra，减少依赖
|
2024-04-22 19:01:25 +08:00 |
|
jason
|
cb5cfd31f0
|
仿钉钉流程设计- code review 修改
|
2024-04-18 20:47:02 +08:00 |
|
YunaiV
|
5d390d2d65
|
bpm：code review 快搭实现
|
2024-04-18 12:38:38 +08:00 |
|
jason
|
1e30e4851a
|
仿钉钉流程设计- 流程表单字段权限测试
|
2024-04-14 10:07:55 +08:00 |
|
芋道源码
|
48aef10d2d
|
回退 'Pull Request !937 : feat: 客户成交周期分析(按区域、按产品)'
|
2024-04-12 11:13:11 +00:00 |
|
jason
|
9456d461f9
|
仿钉钉流程设计- code review 修改。扩展属性保存在 extensionElement 尝试
|
2024-04-11 21:02:38 +08:00 |
|
YunaiV
|
cc9b2e86b6
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java
|
2024-04-10 20:58:35 +08:00 |
|
YunaiV
|
2e03dcba69
|
移除 resilience4j 组件
|
2024-04-10 20:57:44 +08:00 |
|
YunaiV
|
1e97ca282b
|
Merge remote-tracking branch 'origin/feature/bpm' into feature/bpm
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmSimpleModelNodeType.java
|
2024-04-08 22:47:53 +08:00 |
|
YunaiV
|
95dbf4f8aa
|
bpm：code review 钉钉流程设计器
|
2024-04-08 22:46:58 +08:00 |
dhb52
|
286e24ad6c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2024-04-08 22:33:39 +08:00 |
|
jason
|
98998cff6f
|
仿钉钉流程设计-包容网关的实现
|
2024-04-07 22:20:46 +08:00 |
|
jason
|
df936deeca
|
仿钉钉流程设计-并行网关的实现
|
2024-04-07 15:37:25 +08:00 |
|
jason
|
32809c3edb
|
仿钉钉流程设计-仿钉钉快搭模型 JSON数据的保存
|
2024-04-05 22:49:34 +08:00 |
|
jason
|
d9758636b1
|
仿钉钉流程设计-抄送节点实现
|
2024-04-05 12:59:37 +08:00 |
|
YunaiV
|
01cfa60a64
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/aop/OperateLogAspect.java
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo01/Demo01ContactController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo02/Demo02CategoryController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo03/Demo03StudentController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/JobController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/JobLogController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryExpressController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/order/PayOrderController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/refund/PayRefundController.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApi.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/OperateLogCreateReqDTO.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/OperateLogV2CreateReqDTO.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/dict/DictDataController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictTypeController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/ErrorCodeController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/LoginLogController.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/sensitiveword/SensitiveWordController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsLogController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/logger/OperateLogServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/logger/OperateLogServiceImplTest.java
|
2024-04-04 02:14:02 +08:00 |
|
YunaiV
|
20583417a4
|
【重构】V2 操作日志转正，基于注解的可使用变量、可以自定义函数的通用操作日志组件
|
2024-04-04 01:49:49 +08:00 |
|
jason
|
d88718071d
|
仿钉钉流程设计-排他网关实现
|
2024-04-02 20:50:49 +08:00 |