Commit Graph
343 Commits
Author SHA1 Message Date
ye1023 733b19ad91 yxk-20260519-党委会添加抄告单编号、是否为三重一大决策两个字段 2026-05-19 16:14:18 +08:00
ye1023 1568110e66 yxk-20260519-YHJY004-党委会增加协办部门字段
发起流程的时候,合并主办部门和协办部门字段,去重后合并为被督办部门供用户确认
2026-05-19 11:02:28 +08:00
ye1023 a5d4965f9c yxk-20260518-待办列表增加截至时间计算逻辑,逾期和即将到期的任务分别提醒 2026-05-18 15:33:40 +08:00
ye1023 05e0aafb48 Merge remote-tracking branch 'origin/master' 2026-05-18 09:48:25 +08:00
ye1023 f681b7e5c3 yxk-20260518-待办列表接口返回增加deadline字段,从流程变量获取数据 2026-05-18 09:47:42 +08:00
new_new_newandGitee 4c1c4ec50c !22 wsm-xispeak-收集后反馈流程
Merge pull request !22 from new_new_new/feature/20260515
2026-05-15 08:42:51 +00:00
wsm 5a629c9088 wsm-xispeak-收集后反馈流程
删除关联流程
2026-05-15 16:39:11 +08:00
new_new_newandGitee e2e3b913d8 !21 wsm-修改xispeak督办计划流程
Merge pull request !21 from new_new_new/feature/wsm-xispeak-second-process
2026-05-13 13:10:39 +00:00
wsm c8e65171a3 wsm-修改xispeak督办计划流程 2026-05-13 21:05:01 +08:00
new_new_newandGitee 9d8bb8c676 !20 wsm-修改xispeak督办计划流程
Merge pull request !20 from new_new_new/feature/xispeak-first-process
2026-05-12 07:35:46 +00:00
wsm d26a081e99 wsm-修改xispeak督办计划流程 2026-05-12 15:34:52 +08:00
ye1023 dded0d7b74 yxk-20260509-党委会反馈表添加流程实例id字段,为了取分不同督办流程的反馈意见 2026-05-09 15:44:12 +08:00
ye1023 553c6acaf4 yxk-20260508-党委会表单字典添加:年份、密级、完成状态、紧急程度 2026-05-08 10:19:17 +08:00
ye1023 499c40ff44 yxk-20260508-修复党委会主子表新增的时候del_flag字段没有默认设置为0的bug 2026-05-08 09:27:01 +08:00
new_new_newandGitee 0f36e71ca3 !19 wsm-添加适配会签任务内再次会签的变量获取方法
Merge pull request !19 from new_new_new/feature/different-level-get-veriable
2026-05-07 02:38:25 +00:00
new_new_newandGitee 82281a5467 Merge branch 'master' of gitee.com:sz_30/supervison-java into feature/different-level-get-veriable
Signed-off-by: new_new_new <8454518+new-twice@user.noreply.gitee.com>
2026-05-07 02:38:09 +00:00
wsm 9153beee61 wsm-添加适配会签任务内再次会签的变量获取方法 2026-05-07 10:36:05 +08:00
ye1023 a3b31ea710 yxk-20260506-自定义监听class:
SaveCurrentTaskAssigneeLocalListener保存当前节点办理人到子流程的局部变量中去
2026-05-06 16:55:36 +08:00
ye1023 03a4f52907 Merge remote-tracking branch 'origin/master' 2026-05-06 16:52:57 +08:00
ye1023 33fb624f06 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/extbpm/listener/task/SaveCurrentTaskAssigneeLocalListener.java
2026-05-06 16:50:30 +08:00
new_new_newandGitee d53bdebe5a !18 加载配置文件
Merge pull request !18 from new_new_new/feature/20260506-xispeak
2026-05-06 08:50:12 +00:00
wsm c8143fad64 加载配置文件 2026-05-06 16:49:36 +08:00
new_new_newandGitee cedc98ee4b !17 修改监听器,对于子流程内的会签向上两级寻找执行实例id
Merge pull request !17 from new_new_new/feature/20260506-xispeak
2026-05-06 08:39:37 +00:00
wsm 89ecd64788 修改监听器,对于子流程内的会签向上两级寻找执行实例id 2026-05-06 16:39:01 +08:00
ye1023 3bfcac3d19 yxk-20260506-自定义监听class:
SaveCurrentTaskAssigneeLocalListener保存当前节点办理人到子流程的局部变量中去
2026-05-06 15:13:21 +08:00
new_new_newandGitee aae6a3739f !16 在依赖裁决中明确flow模块的版本号
Merge pull request !16 from new_new_new/feature/20260506-branch
2026-05-06 01:14:32 +00:00
ye1023 1b4a8b6b55 yxk-20260506-自定义监听class:
SaveCurrentTaskAssigneeLocalListener保存当前节点办理人到子流程的局部变量中去
2026-05-06 09:14:05 +08:00
ye1023 2c50c98549 Merge remote-tracking branch 'origin/master' 2026-05-06 09:13:35 +08:00
wsm d70b54fbb6 在依赖裁决中明确flow模块的版本号 2026-05-06 09:05:29 +08:00
new_new_newandGitee 1764cddbfe !15 修改test
Merge pull request !15 from new_new_new/feature/20260506-branch
2026-05-06 00:57:12 +00:00
wsm 4cb68be1e4 修改test 2026-05-06 08:51:02 +08:00
wsm 280708e4ca 督办增加sdw审批字段 2026-05-06 08:50:19 +08:00
wsm 123c95a9f3 localapi增加接口 2026-05-06 08:48:41 +08:00
wsm 09b6c7da12 startpom文件增加流程模块启动 2026-05-06 08:39:42 +08:00
wsm edc15cafa7 user查询适配 2026-05-06 08:37:42 +08:00
wsm 2deaf52ddf 新加监听器以及流程表达式函数 2026-05-06 08:33:56 +08:00
wsm 97d61af6c2 xiSpeak-flow模块 2026-05-06 08:32:25 +08:00
wsm 46cae986fe xiSpeak反馈表后端代码 2026-05-06 08:31:13 +08:00
ye1023 99f33801e9 yxk-20260506-自定义流程表达式:
1、saveCurrentTaskAssigneeLocal保存当前节点办理人到子流程的局部变量中去
2、getSonProcessVariableString获取子流程变量,返回类型是String
2026-05-03 12:08:48 +08:00
ye1023 876af1c706 yxk-20260506-自定义流程表达式:
setProcessVariable可以写入主流程变量/子流程局部变量
增加了 taskId、executionId、local 字段
传 local: true 且有 taskId 时,通过 taskId 查当前 executionId
调用 runtimeService.setVariableLocal(executionId, 'subApproveUser', value)
不传 local/taskId/executionId 时,保持原来的 setVariable(processInstanceId, ...) 行为
2026-05-03 11:38:24 +08:00
ye1023 f7b6518038 yxk-20260506-自定义流程表达式:
setProcessVariable可以写入主流程变量/子流程局部变量
增加了 taskId、executionId、local 字段
传 local: true 且有 taskId 时,通过 taskId 查当前 executionId
调用 runtimeService.setVariableLocal(executionId, 'subApproveUser', value)
不传 local/taskId/executionId 时,保持原来的 setVariable(processInstanceId, ...) 行为
2026-05-03 11:37:24 +08:00
ye1023 1737dffef2 yxk-20260506-流程表达式:
1、getUsersListByDeptAndRole根据部门和角色id获取人员list
2、getSonProcessVariable根据子流程的变量名称,获取子流程的局部变量
2026-05-03 11:33:30 +08:00
陈志浩andGitee 0d825e50d9 !14 czh-20260501-增加密级相关内容
Merge pull request !14 from 陈志浩/feature/tasklist
2026-04-30 18:40:06 +00:00
zhihao d5b30e2f08 czh-20260501-增加密级相关内容 2026-05-01 02:35:48 +08:00
zhihao 78314bdaab czh-20260430-修复任务管理相关bug 2026-04-30 22:44:29 +08:00
ye1023 042c18baa2 yxk-20260430-增加setProcessVariable接口,设置流程变量 2026-04-30 11:15:52 +08:00
zhihao fc59ddf803 czh-20260430-实现任务管理后端功能 2026-04-30 09:23:24 +08:00
ye1023 f1ad6afaa3 yxk-20260429-增加/saveBpmForm接口,保存业务数据的同时更新流程的json_data 2026-04-29 19:52:05 +08:00
ye1023 f42b673fb1 yxk-20260429-增加/saveBpmForm接口,保存业务数据的同时更新流程的json_data 2026-04-29 17:42:26 +08:00
ye1023 8c2f048b02 yxk-20260428-增加/bgpartymatter/bgPartymatter/queryById接口 2026-04-28 14:24:36 +08:00