Commit Graph

1207 Commits

Author SHA1 Message Date
49269aa1d5 feat(REQ-4196) - 调整发送 MQ 时,关联的应用 2025-05-26 14:55:11 +08:00
b50333b902 feat(REQ-4196) - 调整一些日志打印级别 2025-05-22 10:29:26 +08:00
1bea2bd80b feat(REQ-4196) - TestController 添加 es 操作功能入口 2025-05-20 19:48:13 +08:00
60e995ba4d feat(REQ-4196) - 调整金额组件字段命名 2025-05-20 13:43:44 +08:00
18779c21da feat(REQ-4196) - 调整金额组件字段命名 2025-05-20 11:43:34 +08:00
c41bc147ce feat(REQ-4196) - 调整金额组件值处理逻辑 2025-05-16 17:38:22 +08:00
2eda02cb3a feat(REQ-4196) - 优化文档签署和变量替换逻辑 2025-05-16 15:39:27 +08:00
0bfadc5775 feat(REQ-4196) - 确保一个实例只会产生一条 sign 记录 2025-05-16 13:40:09 +08:00
5f31ab7f16 feat(REQ-4196) - 调整 selector 的公共逻辑 2025-05-16 10:14:40 +08:00
857eeb10f1 feat(REQ-4196) - 添加通讯录组件,变量替换逻辑 2025-05-15 14:42:57 +08:00
50cbe7dc8f feat(REQ-4196) - 调整环境配置 2025-05-14 20:32:37 +08:00
7189537827 feat(REQ-4196) - 调整 wps 文档替换的变量前后缀标识 2025-05-14 16:39:56 +08:00
539befad96 feat(REQ-4196) - 变量模型调整,增加中文描述 2025-05-14 15:49:50 +08:00
c783af2a51 feat(REQ-4196) - 变量模型调整,增加中文描述 2025-05-14 15:19:36 +08:00
244832e5a2 feat(REQ-4196) - 增加发起人节点发送待办和完成待办 2025-05-14 11:12:30 +08:00
5c9f16e622 feat(REQ-4196) - 增加发起人节点发送待办和完成待办 2025-05-14 10:12:31 +08:00
ac41e6c232 feat(REQ-4196) - 添加模型扩展属性 2025-05-13 18:36:48 +08:00
0a5ea5de68 feat(REQ-4196) - 默认按钮接口响应模型调整 2025-05-13 15:55:56 +08:00
2d41c6c308 feat(REQ-3982) - fix compiler 2025-05-07 14:17:55 +08:00
6f5ef4adf8 Merge branch 'feature/REQ-3982'
# Conflicts:
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomGetProcessInstanceVariablesCmd.java
#	workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessModelController.java
#	workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/manage/PrintAdminController.java
2025-05-07 14:08:31 +08:00
8c6cd3e75e Merge remote-tracking branch 'origin/master'
# Conflicts:
#	pom.xml
2025-05-07 13:54:36 +08:00
chenwenjian
abfca75039 Merge branch 'master' into feature/update_xxljob 2025-04-30 14:48:27 +08:00
85d74784b2 feat(REQ-3769) - 优化查询模型打印模板配置 2025-04-25 12:41:29 +08:00
501b90b84e feat(REQ-3769) - 解决发起的 node 列表异常 2025-04-25 11:45:30 +08:00
a13ed8c709 feat(REQ-3982) - 增加部分接口内部是否报错异常的控制 2025-04-23 16:59:36 +08:00
c253c226ec feat(REQ-3982) - 增加部分接口内部是否报错异常的控制 2025-04-23 15:51:40 +08:00
93683c94b8 feat(REQ-3769) - 调整签署业务的流程实例创建后,复制初始模版的时机 2025-04-23 15:18:23 +08:00
4ddf90dd64 feat(REQ-3769) - 调整签署业务的流程实例创建后,复制初始模版的时机 2025-04-23 14:45:37 +08:00
d503a133a9 feat(REQ-3982) - 结合 Cursor 调整代码 2025-04-23 14:11:15 +08:00
3f2a97bab9 feat(REQ-3769) - 模板变量替换逻辑 2025-04-22 12:34:55 +08:00
340bce520d feat(REQ-3769) - 增加代运营模板被关闭后的兼容逻辑 2025-04-21 16:47:29 +08:00
77064641f3 feat(REQ-3769) - 调整重置文档功能 2025-04-21 16:04:11 +08:00
e90e926b09 feat(REQ-3769) - 调整签署业务的条件判断逻辑 2025-04-21 11:30:00 +08:00
8713355e50 feat(REQ-3982) - 打印模板配置系统字段,增加审批结束时间 2025-04-19 17:58:31 +08:00
ff8fd32a92 feat(REQ-3982) - 打印模板配置系统字段,增加审批结束时间 2025-04-19 14:19:53 +08:00
22afb53323 feat(REQ-3982) - 增加获取打印模板的能力 2025-04-19 10:34:25 +08:00
d624b5dd2f feat(REQ-3769) - 调整获取代运营的文档逻辑 2025-04-18 13:22:16 +08:00
e51eaf4a47 feat(REQ-3769) - 调整获取代运营的文档逻辑 2025-04-18 13:03:33 +08:00
e1981cf941 feat(REQ-3769) - 文档模板克隆逻辑调整 2025-04-18 12:44:19 +08:00
38404e3920 feat(REQ-3769) - 文档模板克隆逻辑调整 2025-04-18 12:19:03 +08:00
d562859e05 feat(REQ-3769) - 文档模板克隆逻辑调整 2025-04-18 11:03:30 +08:00
13176736bd feat(REQ-3769) - 文档模板克隆逻辑调整 2025-04-18 10:40:29 +08:00
8b06ac4666 feat(REQ-3769) - 文档模板克隆逻辑调整 2025-04-18 09:58:49 +08:00
wangli
2a8ba8c03f feat(REQ-3769) - 新增 API 2025-04-18 00:43:57 +08:00
wangli
7f7ce19ee7 feat(REQ-3769) - 新增 API 2025-04-18 00:39:24 +08:00
wangli
c86a6e9d77 feat(REQ-3769) - 新增 API 2025-04-18 00:16:25 +08:00
wangli
dcafaeb145 feat(REQ-3769) - 调整 WPSUtil 工具类 2025-04-17 23:11:58 +08:00
wangli
70e008b6a9 feat(REQ-3769) - 调整 WPSUtil 工具类 2025-04-17 21:55:57 +08:00
08fdb28a9c feat(REQ-3769) - 解决一些兼容问题 2025-04-17 19:36:24 +08:00
0040b6e233 feat(REQ-3769) - 解决一些兼容问题 2025-04-17 19:33:00 +08:00
4677aa7bf2 feat(REQ-3769) - 解决一些兼容问题 2025-04-17 09:59:12 +08:00
8a4ceb0bb5 feat(REQ-3769) - 调整获取文档 2025-04-16 23:09:50 +08:00
070723e8ee feat(REQ-3769) - 调整获取文档 2025-04-16 22:51:28 +08:00
321bb43136 feat(REQ-3769) - 调整获取文档 2025-04-16 20:26:05 +08:00
3248dcd36a feat(REQ-3769) - 增加文档列表根据 ID 返回的接口 2025-04-16 18:23:02 +08:00
d81795dd68 feat(REQ-3769) - 防御性 command 处理,防止实例结束后查询会报错 2025-04-16 11:07:52 +08:00
48da2ba0b8 feat(REQ-3769) - 调整 Controller 方法的注释 2025-04-16 10:21:59 +08:00
6cf881daaa Merge branch 'master' into feature/REQ-3769 2025-04-15 19:28:55 +08:00
a207dcedbe feat(REQ-3769) - 移除流程内部发送签署业务待办的逻辑,迁移至 nanopart SignBizPendingEventListener 2025-04-15 15:29:12 +08:00
494fab37d9 hotfix - 修复撤回接口的参数校验逻辑 2025-04-14 17:34:04 +08:00
afce31ab11 feat(REQ-3769) - 调整DocContent表内容字段写入逻辑 2025-04-14 14:46:26 +08:00
9b8d213fcb feat(REQ-3769) - 测试返回 HiPrint 配置内容 2025-04-14 11:44:13 +08:00
wangli
a49ca3b915 feat(REQ-3769) - 优化返回 wps 文档附件 2025-04-12 00:30:19 +08:00
wangli
d0cdf31662 feat(REQ-3769) - 优化返回 wps 文档附件 2025-04-12 00:28:27 +08:00
1d40dca871 feat(REQ-3769) - 测试流程审批过程中,替换文件变量 2025-04-11 19:19:41 +08:00
yangqicheng
5f34a74b88 REQ-3758 修复查询数据问题 2025-04-11 18:44:09 +08:00
8beb80f9ab feat(REQ-3769) - 测试流程审批过程中,替换文件变量 2025-04-11 17:27:56 +08:00
4688cf7d58 feat(REQ-3769) - 调整模型更新的逻辑 2025-04-11 11:03:04 +08:00
fae0991123 feat(REQ-3769) - 新增代运营停启用时,发送变更事件的逻辑 2025-04-10 18:29:55 +08:00
yangqicheng
b0b2344593 REQ-3769 调整签署完成,发送业务待办逻辑 2025-04-10 17:09:17 +08:00
f8dc1d9d3b feat(REQ-3769) - 优化创建流程后,替换 wps 文档变量的逻辑 2025-04-10 15:10:34 +08:00
d37a5f625d feat(REQ-3769) - 测试创建签署业务流程,修复逻辑异常 2025-04-10 14:54:20 +08:00
d160fbdf55 feat(REQ-3769) - 调整发送SpringEvent的是事务控制 2025-04-10 10:26:49 +08:00
40a446858e feat(REQ-3769) - 调整每个节点结束和创建过程中的文件内容变量替换 2025-04-09 20:48:36 +08:00
513c7f18c3 feat(REQ-3769) - 提炼 wps 文件变量替换接口作为工具类 2025-04-09 20:47:45 +08:00
d8ffd45fa9 feat(REQ-3769) - 完善流程创建过程中的变量替换 2025-04-09 20:21:20 +08:00
7d8342710c feat(REQ-3769) - 处理流程创建后,和完成后的关联启用的文档模板变量替换逻辑 2025-04-09 18:12:56 +08:00
67d48f5dad feat(REQ-3769) - 增加关联的文档必选设置 2025-04-09 18:09:52 +08:00
2655fa708f feat(REQ-3769) - 调整审批人在签批业务下,文档的阅读状态设置 2025-04-09 18:09:06 +08:00
b94c94e284 feat(REQ-3769) - 原打印接口获取变量,移除业务中的参数变量 2025-04-09 18:06:34 +08:00
yangqicheng
169980b39d REQ-3769 流程结束,发送签署业务待办 2025-04-09 16:06:31 +08:00
2f04baf37a feat(REQ-3769) - 新增审批人对关联文档的阅读状态记录 2025-04-08 16:29:21 +08:00
yangqicheng
8296f0cc2d REQ-3769 处理报错问题 2025-04-08 11:21:28 +08:00
3d24d3ff0a feat(REQ-3769) - 调整审批过程中,节点生成文档的逻辑 2025-04-08 10:14:09 +08:00
b8b89332b6 feat(REQ-3769) - 增加 HiPrint 文档内容获取接口 2025-04-08 09:45:15 +08:00
61a79065d9 feat(REQ-3769) - 自测模型关联文档动作发送事件内容 2025-04-07 20:53:10 +08:00
43068f0f30 feat(REQ-3769) - 增加模型文档变更事件发送 2025-04-07 20:09:39 +08:00
516e074ad8 feat(REQ-3769) - 增加模型文档变更事件发送 2025-04-07 19:59:28 +08:00
5b4e6f3c00 feat(REQ-3769) - 文档停启用设置 2025-04-07 16:40:01 +08:00
8048e7974d feat(REQ-3769) - 文档停启用设置 2025-04-07 16:26:25 +08:00
a8856c0841 feat(REQ-3769) - 暂存 2025-04-07 10:14:01 +08:00
8a9161869c feat(REQ-3769) - 签署业务中, 增加流程实例的几个生命周期操作文档逻辑 2025-04-03 18:11:21 +08:00
dc3d7a0641 feat(REQ-3769) - 签署业务中,每个节点结束后,都进行一次文档变量替换,并更新实例签署文档数据 2025-04-03 18:09:46 +08:00
ff0d0b6cdd feat(REQ-3769) - 增加签署业务下,审批待办中,获取最新的渲染文档 2025-04-03 18:06:29 +08:00
c03074bb3e feat(REQ-3769) - 审批过程中添加文档记录信息 2025-04-03 13:40:03 +08:00
yangqicheng
3f56894930 REQ-3769 调整注释 2025-04-02 20:14:53 +08:00
4cfa6ca561 feat(REQ-3769) - 签署业务审批完成后,自动进行归档,并对签署人员发送业务待办 2025-04-02 17:23:05 +08:00
d4e56e6c15 feat(REQ-3769) - 增加模型编辑中,添加关联时可被使用的变量列表 2025-04-02 17:22:07 +08:00
5edafa1ed0 feat(REQ-3769) - 增加签署业务下,发起流程时,传入签署人和本次关联的文档 2025-04-02 17:20:29 +08:00
208cb997f1 feat(REQ-3769) - 添加签署业务流程实例完成后,发送业务待办 2025-04-02 15:49:53 +08:00
943de84f8f feat(REQ-3769) - 添加签署业务流程实例信息记录 2025-04-02 11:09:58 +08:00
242cb4e8d0 feat(REQ-3769) - 添加发送业务待办的逻辑分支定义 2025-04-01 18:48:53 +08:00
yangqicheng
6fb6e6f710 REQ-3769 审批模版文档复制-step2 2025-04-01 17:18:42 +08:00
b837b406ce Merge remote-tracking branch 'origin/feature/REQ-3769' into feature/REQ-3769 2025-04-01 17:06:54 +08:00
624fa7560f feat(REQ-3769) - 发起人自选功能,增加二级规则限制逻辑分支定义 2025-04-01 17:06:44 +08:00
yangqicheng
a9cddf121c REQ-3769 审批模版文档复制-step1 2025-04-01 16:22:40 +08:00
yangqicheng
1f54de4686 REQ-3769 调整分组/变量保存逻辑 2025-04-01 14:01:07 +08:00
f3049d20c2 feat(REQ-3769) - 增加模板关联文档克隆、文档列表查询等功能 2025-04-01 13:48:28 +08:00
03cabaf1be Merge remote-tracking branch 'origin/feature/REQ-3769' into feature/REQ-3769 2025-03-31 17:24:49 +08:00
592722af44 feat(REQ-3769) - 增加模板关联文档相关排序动作 2025-03-31 17:24:40 +08:00
yangqicheng
aadb93ef64 REQ-3769 新增模版分组/变量相关处理逻辑 2025-03-31 17:20:17 +08:00
e5382d33a3 feat(REQ-3769) - 添加关联文档的操作的实现逻辑 2025-03-31 14:37:33 +08:00
f9d090dec6 feat(REQ-3769) - 添加关联文档的操作的实现逻辑 2025-03-28 18:55:44 +08:00
9e67b346c9 feat(REQ-3824) - 调整签署确认节点的配置,与解析 2025-03-26 20:25:03 +08:00
ccd3ef7203 feat(REQ-3769) - 调整发起时加载模板节点列表的逻辑,增加返回模板原始配置 2025-03-26 10:37:43 +08:00
1fbb8b6231 feat(REQ-3769) - 模板协议内容增加签署配置,以及反解析 bpmn 中的该配置 2025-03-25 18:09:13 +08:00
ddbdb0d509 feat(xxljob) - 升级 xxl-job 2025-03-20 10:42:46 +08:00
2dd06d9563 Merge branch 'feature/REQ-3824' 2025-03-14 15:16:11 +08:00
79150dedf7 Merge remote-tracking branch 'origin/master' into feature/REQ-3581 2025-03-14 15:15:22 +08:00
2e33b3aba8 feat(REQ-3824) - 业务节点长时间卡住告警 2025-03-14 11:36:43 +08:00
ac4088b28d feat(REQ-3824) - 添加业务节点卡住的告警功能 2025-03-12 16:30:07 +08:00
yangqicheng
ee224bd159 Merge branch 'refs/heads/feature/REQ-3626'
# Conflicts:
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessTaskServiceImpl.java
2025-03-10 15:45:37 +08:00
5913962191 feat(REQ-3581) - 调整参数 2025-03-04 18:29:27 +08:00
23820d47ac feat(REQ-3581) - 调整参数 2025-03-04 18:24:48 +08:00
b4d438a71b feat(REQ-3581) - 增加一个超管的撤回,取消验证租户 ID 2025-03-03 11:19:46 +08:00
48ef611717 feat(REQ-3581) - 增加一个超管的撤回,取消验证租户 ID 2025-03-03 10:49:05 +08:00
cb4e9e5821 feat(REQ-3340) - 调整API的请求方式 2025-02-24 19:30:23 +08:00
f534d301d4 feat(REQ-3340) - 调整查询是否有打印模板的逻辑 2025-02-24 19:10:18 +08:00
a713264145 feat(REQ-3340) - 调整查询是否有打印模板的逻辑 2025-02-24 17:56:25 +08:00
bd5f578a71 feat(REQ-3340) - 调整查询是否有打印模板的逻辑 2025-02-24 16:57:47 +08:00
f2347a3dc4 feat(REQ-3340) - 优化表单数据更新的 API 说明 2025-02-24 13:55:01 +08:00
yangqicheng
8f41522a01 REQ-3626 修复报错问题 2025-02-23 23:05:42 +08:00
yangqicheng
0c77f34dfb REQ-3626 增加回退至指定节点通用能力 2025-02-23 23:02:28 +08:00
wangli
22edab6bf6 feat(REQ-3383) - 合并代码,解决冲突 2025-02-22 18:14:35 +08:00
wangli
e4a85dffd4 Merge branch 'master' into feature/REQ-3340
# Conflicts:
#	workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/bpmn/ProcessInstanceApi.java
#	workflow-engine-common/src/main/java/cn/axzo/workflow/common/constant/BpmnConstants.java
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomApproveTaskWithFormCmd.java
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCancelProcessInstanceCmd.java
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/event/MessagePushEventBuilder.java
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/BpmnProcessInstanceService.java
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessInstanceServiceImpl.java
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessTaskServiceImpl.java
#	workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessInstanceController.java
2025-02-22 18:04:57 +08:00
wangli
9961058c59 feat(REQ-3383) - 消息的模型增加节点电子签开关 2025-02-22 17:51:58 +08:00
1109b185bf feat(REQ-3340) - 优化重置打印模板相关参数 2025-02-20 15:51:43 +08:00
yangqicheng
50512ec8dd Merge remote-tracking branch 'refs/remotes/origin/hotfix/hotfix-transfer-admin-change' into feature/REQ-3502 2025-02-20 13:37:49 +08:00
yangqicheng
8b30f63cd3 Merge remote-tracking branch 'refs/remotes/origin/master' into feature/REQ-3502 2025-02-20 13:36:40 +08:00
6e63aa50bd feat(REQ-3340) - 添加打印模板日志 2025-02-20 10:41:18 +08:00
fc8b1f3358 feat(REQ-3340) - 优化打印变量查询的逻辑 2025-02-19 20:06:03 +08:00
e1c1ec215f feat(REQ-3340) - 优化任务 reject 时,由于实现内部采用了虚拟任务,所以需跳过该任务的完成事件,它不应该广播出去 2025-02-19 18:09:49 +08:00
af44769263 feat(REQ-3340) - 优化审批同意时,如果未包含表单数据,则主动切换普通的同意 2025-02-19 17:29:26 +08:00
a6f64724e3 feat(REQ-3340) - 优化审批日志中的人的模型 2025-02-19 16:12:09 +08:00
wangli
4119aa9249 feat(REQ-3383) - 优化打印变量的处理逻辑 2025-02-15 12:51:07 +08:00
c6e775e365 feat(REQ-3340) - 调整获取打印模板的逻辑 2025-02-13 15:00:35 +08:00
fe95eb783a feat(REQ-3340) - 调整打印变量值的处理逻辑 2025-02-13 14:37:49 +08:00
df85c19673 feat(REQ-3340) - 调整打印变量的日期相关格式 2025-02-13 11:17:58 +08:00
475759a9cc feat(REQ-3340) - 调整打印字段模型定义 2025-02-11 16:42:02 +08:00
c4c03b7a6e feat(REQ-3340) - 调整打印字段响应的属性值 2025-02-11 15:32:48 +08:00