Commit Graph
804 Commits
Author SHA1 Message Date
陈栋 13c5f56e9f 合并分支 'dev_foton_CD' 到 'FOTON'
bug293 时间间隔修改

查看合并请求 laws-foton-slrs/foton-wkflow-rest!10
2023-01-05 16:05:11 +08:00
CD a1ae597899 bug293 时间间隔修改 2023-01-05 11:02:52 +08:00
陈栋 b2bdc19bdc 合并分支 'dev_foton_DBQ' 到 'FOTON'
/decodeDetail接口中进行数据去重4

查看合并请求 laws-foton-slrs/foton-wkflow-rest!9
2023-01-04 16:58:56 +08:00
陈栋 a439243df2 合并分支 'dev_foton_CD' 到 'FOTON'
bug293中定时任务加上注解

查看合并请求 laws-foton-slrs/foton-wkflow-rest!8
2023-01-04 16:58:37 +08:00
CD 4f40329a92 bug293中定时任务加上注解 2023-01-04 15:37:01 +08:00
dingbingqing 8e6e561569 /decodeDetail接口中进行数据去重4 2022-12-29 16:59:21 +08:00
陈栋 b5f031c30c 合并分支 'dev_foton_DBQ' 到 'FOTON'
Dev foton dbq

查看合并请求 laws-foton-slrs/foton-wkflow-rest!7
2022-12-29 16:45:05 +08:00
dingbingqing c2da218ad2 /decodeDetail接口中进行数据去重3 2022-12-29 15:13:16 +08:00
cuijiaming bb39e2c541 Merge remote-tracking branch 'origin/dev_foton_DBQ' into dev_foton_DBQ
# Conflicts:
#	src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java
2022-12-29 15:08:10 +08:00
cuijiaming 3cf81d3a49 /decodeDetail接口中数据的去重 2022-12-29 15:05:16 +08:00
dingbingqing bc117884b5 /decodeDetail接口中进行数据去重 2022-12-29 11:21:53 +08:00
dingbingqing 00733272f7 /decodeDetail接口中进行数据升序排序
标准解读流程的汇总详情
2022-12-29 10:41:50 +08:00
陈栋 365b4c7b6f 合并分支 'dev_foton_DBQ' 到 'FOTON'
Dev foton dbq

查看合并请求 laws-foton-slrs/foton-wkflow-rest!6
2022-12-27 16:43:25 +08:00
cuijiaming 36ad137476 解读流程汇总接口补充 2022-12-27 09:15:50 +08:00
dingbingqing 9ad2d42bfa 新增/decodeDetail接口
标准解读流程的汇总详情
2022-12-23 09:11:33 +08:00
dingbingqing 83aa045316 修改/get_gather_by_instance接口bug
当驳回时,将无法进行汇总
2022-12-15 17:45:16 +08:00
dingbingqing 128ef8d69c 修改/queryTaskIndex接口查询功能2 2022-12-15 14:56:19 +08:00
dingbingqing 334bd6ddb3 修改/queryTaskIndex接口查询功能 2022-12-15 09:56:55 +08:00
dingbingqing a9b95d4d5d /queryTaskIndex查询bug修改 2022-12-14 15:09:05 +08:00
cuijiaming bc0584fb59 新增汇总指定任务接口/queryTaskIndex 2022-12-14 11:56:26 +08:00
dingbingqing a3cbb25e49 /get_gather_by_instance
返回汇总数组下标
2022-12-13 17:52:34 +08:00
dingbingqing befae7ba9b /get_gather_by_instance
功能判断bug修改
2022-12-13 17:21:10 +08:00
dingbingqing 447b2cabb7 新增方法 /get_gather_by_instance
已办流程中的汇总功能
中的是否可汇总的功能判断
2022-12-13 16:47:46 +08:00
dingbingqing 0ff903895c 新增方法 /get_gather_by_instance
已办流程中的汇总功能
中的是否可汇总的功能判断
2022-12-13 14:18:43 +08:00
dingbingqing 0f322ea42a 新增方法 /get_list_by_instance
已办流程中的汇总功能
2022-12-13 09:32:14 +08:00
陈栋 0edf54cda8 合并分支 'fix_foton' 到 'FOTON'
Fix foton

查看合并请求 laws-foton-slrs/foton-wkflow-rest!5
2022-12-09 16:50:02 +08:00
陈栋 9e3c5c6b2b 合并分支 'develop' 到 'fix_foton'
Develop

查看合并请求 laws-foton-slrs/foton-wkflow-rest!3
2022-12-09 16:47:25 +08:00
CD f66e5a398e Merge remote-tracking branch 'remotes/origin/dev_foton_CD' into develop 2022-12-09 09:26:41 +08:00
CD e96a328dcf 流程图表达式空指针bug 2022-12-08 18:11:48 +08:00
高嵩 7ebf9fb9bf Merge remote-tracking branch 'origin/develop' into FOTON 2022-12-08 17:03:17 +08:00
CD 3d161be3f1 Merge branch 'develop_new' into develop 2022-12-08 14:53:28 +08:00
CD 04cd1eb911 bug287 2022-12-08 11:35:26 +08:00
李雅玮 baa8037349 合并分支 'develop' 到 'FOTON'
Develop

查看合并请求 laws-foton-slrs/foton-wkflow-rest!2
2022-12-07 16:52:02 +08:00
李雅玮 171602314c 合并分支 'develop_new' 到 'develop'
Develop new

查看合并请求 laws-foton-slrs/foton-wkflow-rest!1
2022-12-07 16:51:19 +08:00
CD ccc90fe550 bug284 2022-12-06 16:53:00 +08:00
CD 59a6433bfe bug62867 2022-12-05 14:00:15 +08:00
CD cbb2cbdc2a Merge branch 'develop' into FOTON 2022-12-01 20:36:20 +08:00
CD 764b2d9d56 Merge branch 'develop_new' into develop 2022-12-01 20:34:08 +08:00
CD 5499bfe724 监控流程未执行的节点为黑色 2022-12-01 15:40:37 +08:00
liyawei e7c2be1ff1 Merge branch 'develop' into FOTON 2022-11-27 19:20:12 +08:00
liyawei 99d2ac4de3 174-撤回流程修改 2022-11-27 19:18:34 +08:00
CD 406c01ad8c 去掉多余的 2022-11-25 17:53:18 +08:00
CD 013169d1e8 Merge remote-tracking branch 'origin/develop_new' into develop_new 2022-11-25 17:48:51 +08:00
CD d0b4ada9f4 bug273、bug274 2022-11-25 17:48:25 +08:00
liyawei 9f60b8f02c 生产环境配置文件恢复 2022-11-24 17:47:07 +08:00
liyawei 851de3d100 Merge branch 'develop' into FOTON
# Conflicts:
#	src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java
2022-11-24 17:44:40 +08:00
liyawei 84bcdda92d 开发环境配置文件更新 2022-11-24 14:47:19 +08:00
liyawei 1a21c1576f 174-撤回流程修改 2022-11-23 16:32:21 +08:00
CD 5e5f146ce2 bug 2022-11-23 16:29:26 +08:00
liyawei 78ef6ac4c0 Merge branch 'develop' into FOTON 2022-11-22 22:20:33 +08:00