YunaiV
|
b11231c499
|
Merge remote-tracking branch 'origin/master'
|
2024-03-24 10:44:08 +08:00 |
|
YunaiV
|
c6e5cfccc9
|
Merge branch 'feature/bpm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/candidate/vo/BpmTaskCandidateRuleVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmFormController.java
# 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/BpmProcessDefinitionController.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmTaskAssignRuleController.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmUserGroupController.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormBaseVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormCreateReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormRespVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormUpdateReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupSaveReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupUpdateReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelBaseVO.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/definition/vo/process/BpmProcessDefinitionRespVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleBaseVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleCreateReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleUpdateReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOALeaveController.java
# 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/oa/vo/BpmOALeaveCreateReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeaveRespVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceCopyController.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/controller/admin/task/vo/instance/BpmProcessInstanceCopyCreateReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskAddSignReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskApproveReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskDelegateReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/script/impl/BpmTaskAssignStartUserScript.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/handler/MultiInstanceHandler.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/listener/BpmProcessInstanceEventListener.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/web/config/BpmWebConfiguration.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/web/core/FlowableWebFilter.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/candidate/BpmCandidateSourceInfo.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/candidate/BpmCandidateSourceInfoProcessorChain.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/candidate/sourceInfoProcessor/BpmCandidateAdminUserApiSourceInfoProcessor.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/candidate/sourceInfoProcessor/BpmCandidateDeptApiSourceInfoProcessor.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/candidate/sourceInfoProcessor/BpmCandidatePostApiSourceInfoProcessor.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/candidate/sourceInfoProcessor/BpmCandidateRoleApiSourceInfoProcessor.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/candidate/sourceInfoProcessor/BpmCandidateScriptApiSourceInfoProcessor.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/candidate/sourceInfoProcessor/BpmCandidateUserGroupApiSourceInfoProcessor.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmFormService.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmFormServiceImpl.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/BpmProcessDefinitionService.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/definition/BpmTaskAssignRuleService.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmTaskAssignRuleServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmUserGroupService.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmUserGroupServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/dto/BpmProcessDefinitionCreateReqDTO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOALeaveServiceImpl.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-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/cc/BpmProcessInstanceCopyServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/test/java/cn/iocoder/yudao/module/bpm/service/candidate/BpmCandidateSourceInfoProcessorChainTest.java
# yudao-module-bpm/yudao-module-bpm-biz/src/test/java/cn/iocoder/yudao/module/bpm/service/definition/BpmTaskAssignRuleServiceImplTest.java
|
2024-03-24 10:16:24 +08:00 |
|
YunaiV
|
5c5bd0e5da
|
BPM：流程模型的 icon 维护
|
2024-03-24 10:08:51 +08:00 |
|
YunaiV
|
727faac8d8
|
BPM：增加流程表达式的管理
|
2024-03-23 21:11:53 +08:00 |
|
YunaiV
|
6d44bf0d7a
|
BPM：增加任务监听器、执行监听器的管理
|
2024-03-23 19:23:11 +08:00 |
|
YunaiV
|
889b9406b8
|
BPM：增加任务监听器、执行监听器的管理
|
2024-03-23 15:58:45 +08:00 |
|
YunaiV
|
528a321f0a
|
BPM：增加「发起人自选」的任务审批人的分配策略
|
2024-03-23 00:54:26 +08:00 |
|
YunaiV
|
acea73c991
|
BPM：新增【流程任务】菜单，用于全部流程实例的查询
|
2024-03-22 09:06:52 +08:00 |
|
YunaiV
|
ba4b3701bf
|
BPM：新增【流程实例】菜单，用于全部流程实例的查询
|
2024-03-22 08:26:19 +08:00 |
|
YunaiV
|
b21eac6ca6
|
优化 findAndThen 方法，支持 key 为 null 的过滤
|
2024-03-21 08:53:16 +08:00 |
|
YunaiV
|
e5444c5d47
|
BPM：优化 convert 的逻辑
|
2024-03-20 21:32:01 +08:00 |
|
YunaiV
|
c104191821
|
BPM：增强 model 流程模型部署时，各种参数校验
|
2024-03-20 18:51:36 +08:00 |
|
YunaiV
|
559bab571a
|
BPM：移除 flowable starter 模块，融合到 bpm 模块中
|
2024-03-20 13:14:53 +08:00 |
|
YunaiV
|
29a0fbfc43
|
BPM：支持多表单，每个流程任务都可以绑定流程表单
|
2024-03-20 12:50:51 +08:00 |
|
YunaiV
|
ed83b912e4
|
BPM：新增流程分类表，替代现有的 bpm_category 数据字典
|
2024-03-19 19:49:45 +08:00 |
|
YunaiV
|
d5e28d4c57
|
BPM：简化 userGroup 的实现
|
2024-03-19 12:13:49 +08:00 |
|
YunaiV
|
8c32eb24ec
|
BPM：优化 task 加减签的实现
|
2024-03-19 01:31:37 +08:00 |
|
YunaiV
|
0a7f94dd5f
|
BPM：完善 task 在通过、不通过、取消等情况下的 reason 和 comment 逻辑
|
2024-03-18 22:43:58 +08:00 |
|
YunaiV
|
bc4427aca5
|
BPM：完善 task 转派的实现
|
2024-03-18 20:44:44 +08:00 |
|
YunaiV
|
b2b2b497b1
|
BPM：完善 task 委托的实现
|
2024-03-18 19:24:07 +08:00 |
|
YunaiV
|
c4688d887c
|
BPM：增加 task 的审批建议
|
2024-03-18 18:41:04 +08:00 |
|
YunaiV
|
ba502fc528
|
BPM：调整抄送逻辑的实现，改成审批通过、不通过时，可选择抄送
|
2024-03-17 22:14:36 +08:00 |
|
YunaiV
|
3fce482716
|
BPM：简化 task 接口的 VO，做一些合并。虽然字段上有冗余，但是读代码难度降低
|
2024-03-17 17:24:40 +08:00 |
|
YunaiV
|
d40fa0f929
|
BPM：流程任务的 status 状态实现，使用 Flowable 的 variables 存储，移除 bpm_task_ext 表
|
2024-03-17 10:10:42 +08:00 |
|
YunaiV
|
7967a2a195
|
BPM：流程实例的 status 状态实现，使用 Flowable 的 variables 存储，移除 bpm_process_instance_ext 表
|
2024-03-16 16:43:53 +08:00 |
|
YunaiV
|
a1defeb48a
|
BPM：新增顺序会签、或签的能力
|
2024-03-15 21:08:43 +08:00 |
|
YunaiV
|
f5f73adcbb
|
BPM：重构流程分配人的实现，通过 BpmTaskCandidateStrategy 策略模式
|
2024-03-15 00:19:09 +08:00 |
|
YunaiV
|
797fddfb3d
|
BPM：新增 flowable expression 表达式，替代现有 BpmTaskAssignScript，更加灵活
|
2024-03-14 12:54:16 +08:00 |
|
YunaiV
|
cdbcd4d673
|
BPM：重构审批人的分配规则实现，移除 bpm_task_assign_rule 表，存储在 bpmn 的 userTask 中
|
2024-03-13 21:18:07 +08:00 |
|
芋道源码
|
504e364fd0
|
!906 回退 'Pull Request !905 : CRM员工业绩统计PR v1.0'（需要在 develop 分支开发）
Merge pull request !906 from 芋道源码/revert-merge-905-master
|
2024-03-09 09:39:59 +00:00 |
|
芋道源码
|
fd191b5c3d
|
回退 'Pull Request !905 : CRM员工业绩统计PR v1.0'
|
2024-03-09 09:39:31 +00:00 |
|
芋道源码
|
46c8cee6b0
|
!905 CRM员工业绩统计PR v1.0
Merge pull request !905 from scholarli/master
|
2024-03-09 09:39:18 +00:00 |
|
芋道源码
|
d4e39dfc40
|
!904 feat: MapUtils.findAndThen，key 为 null 时, 不处理
Merge pull request !904 from dhb52/N/A
|
2024-03-09 03:10:16 +00:00 |
|
scholar
|
e86059ed80
|
CRM员工业绩统计PR v1.0
|
2024-03-08 10:11:47 +08:00 |
|
dhb52
|
f4b1e9ca4a
|
feat: MapUtils.findAndThen，key 为 null 时, 不处理
Signed-off-by: dhb52 <dhb52@126.com>
|
2024-03-05 15:13:53 +00:00 |
|
YunaiV
|
e091b077a8
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-03-01 20:01:38 +08:00 |
|
YunaiV
|
dda0909843
|
🎉 2.0.1 版本发布！
|
2024-03-01 20:01:16 +08:00 |
|
YunaiV
|
d3f3584132
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-03-01 19:40:52 +08:00 |
|
YunaiV
|
835bbe7e42
|
🎉 2.0.1 版本发布！
|
2024-03-01 19:40:37 +08:00 |
|
YunaiV
|
7ef7228f65
|
MALL：增加返回 vipPrice 减免金额
|
2024-03-01 19:21:03 +08:00 |
|
YunaiV
|
6b06bf8a3d
|
bugfix MALL：已过期的优惠劵，还显示可以使用
|
2024-03-01 13:55:37 +08:00 |
|
YunaiV
|
f1ff656282
|
bugfix：运行失败的单测
bugfix：PayOrderExtensionMapper 的 selectListByStatusAndCreateTimeGe 查询时间范围不对的问题
|
2024-03-01 12:35:00 +08:00 |
|
YunaiV
|
831cf33e95
|
Merge branch 'master-jdk21' 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/TradeOrderUpdateServiceImpl.java
# yudao-module-pay/yudao-module-pay-biz/src/test/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceTest.java
|
2024-03-01 12:26:40 +08:00 |
|
YunaiV
|
da6e01f6b5
|
bugfix：运行失败的单测
bugfix：PayOrderExtensionMapper 的 selectListByStatusAndCreateTimeGe 查询时间范围不对的问题
|
2024-03-01 12:26:05 +08:00 |
|
YunaiV
|
bbdedd08f1
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/redis/RedisController.java
|
2024-03-01 09:39:55 +08:00 |
|
YunaiV
|
d8bfed5c87
|
fix: 获取redis命令统计指令有误
|
2024-03-01 09:39:27 +08:00 |
|
YunaiV
|
8a93a4d988
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
|
2024-03-01 09:32:25 +08:00 |
|
芋道源码
|
a4c7946830
|
!887 fix: 获取redis命令统计指令有误
Merge pull request !887 from dhb52/N/A
|
2024-03-01 01:32:08 +00:00 |
|
芋道源码
|
9b7f71c203
|
!896 fix:跟进记录分页不显示商机
Merge pull request !896 from 李占宏/develop
|
2024-03-01 01:30:49 +00:00 |
|
zhanhong
|
814acb83ae
|
fix:跟进记录分页不显示商机
|
2024-03-01 09:28:06 +08:00 |
|