1111 Commits
Author SHA1 Message Date
王晓勇 b09feb504a Merge branch 'fix_foton_20240619' into 'master'
fix: 计划管控节点重新起草后数据存储修改

See merge request laws-foton-slrs/foton-wkflow-rest!97
2024-07-26 01:22:59 +00:00
wxyclub 9660d901f9 fix: 计划管控节点重新起草后数据存储修改 2024-07-04 16:19:45 +08:00
王晓勇 862a4df2aa Merge branch 'fix_foton_20240619' into 'master'
Fix foton 20240619

See merge request laws-foton-slrs/foton-wkflow-rest!96
2024-07-01 09:56:15 +00:00
wxyclub 3348d32527 fix: 重点认证标准/政策合规性项目审查流程BUG修改 2024-07-01 14:20:31 +08:00
wxyclub 0929339284 fix: 重点认证标准/政策合规性项目审查流程BUG修改 2024-07-01 13:34:34 +08:00
wxyclub 508e966fad fix: 政策征求意见流程BUG修改 2024-07-01 11:01:11 +08:00
王晓勇 0091fd24dd Merge branch 'fix_foton_20240619' into 'master'
Fix foton 20240619

See merge request laws-foton-slrs/foton-wkflow-rest!95
2024-06-19 10:06:08 +00:00
wxyclub 4e782dcd17 Merge branch 'fix_foton_20240430' into fix_foton_20240619 2024-06-19 15:10:59 +08:00
wxyclub d4e066996e fix: 流程状态变更 2024-06-17 09:32:14 +08:00
王晓勇 7c40fc6b1d Merge branch 'fix_foton_20240430' into 'master'
fix: 标准解读流程流程名称出现null的情况处理

See merge request laws-foton-slrs/foton-wkflow-rest!93
2024-06-06 10:40:20 +00:00
wxyclub 78e91de609 fix: 标准解读流程流程名称出现null的情况处理 2024-06-06 18:39:35 +08:00
王晓勇 85f697894b Merge branch 'test_20240409_for39' into 'master'
Test 20240409 for39

See merge request laws-foton-slrs/foton-wkflow-rest!92
2024-05-22 09:59:41 +00:00
王晓勇 52cc59ace7 Merge branch 'fix_foton_20240430' into 'master'
fix: 添加发送待办接口

See merge request laws-foton-slrs/foton-wkflow-rest!91
2024-05-21 09:46:59 +00:00
wxyclub 8e2f49f12f fix: 添加发送待办接口 2024-05-21 17:45:00 +08:00
王晓勇 ebfe05cdfc Merge branch 'fix_foton_20240430' into 'master'
Fix foton 20240430

See merge request laws-foton-slrs/foton-wkflow-rest!90
2024-05-09 09:47:34 +00:00
wxyclub 5352591652 fix: 流程历史显示错误问题修改 2024-05-09 17:45:13 +08:00
wxyclub 68d164938c fix: 流程历史显示错误问题修改 2024-05-09 11:24:57 +08:00
wxyclub 46022076c1 Merge remote-tracking branch 'origin/DEV_20240422_LCLS' into test_20240409_for39 2024-04-29 10:05:44 +08:00
wxyclub b6d4405e9c Merge branch 'dev_20240425_DRSP' into test_20240409_for39 2024-04-29 09:52:26 +08:00
wxyclub 41d337d2b3 Merge branch 'fix_foton_20240408' into test_20240409_for39 2024-04-29 09:51:59 +08:00
wxyclub c2456486e4 fix: 外部署名推荐批准流程回执不显示修改 2024-04-28 17:28:04 +08:00
wxyclub 942c19c271 fix: 标准化协会入会流程流程回执不显示修改 2024-04-28 17:25:26 +08:00
wxyclub 66ab2fd86f fix: 流程回执不显示修改 2024-04-28 16:56:04 +08:00
wxyclub c205381d52 fix: 加入标准化协会信息备案流程流程回执不显示修改 2024-04-28 15:33:48 +08:00
wxyclub 3608c1e5e2 fix: 外部署名推荐审批流程修改 2024-04-28 11:26:36 +08:00
wxyclub 090beef0b1 fix: 企标制修订-技术标准批准节点改为多人处理节点 2024-04-26 14:22:29 +08:00
wangzhijiang bf14cab433 流程历史按子流程归堆、查询流程历史权限。 2024-04-26 10:49:15 +08:00
高嵩 adfb662fcf Merge branch 'fix_foton_20240408' into 'master'
fix: 改派任务时出错的响应修改

See merge request laws-foton-slrs/foton-wkflow-rest!89
2024-04-25 01:55:48 +00:00
wxyclub 4c52247cc9 fix: 改派任务时出错的响应修改 2024-04-24 17:33:48 +08:00
王晓勇 6855940bee Merge branch 'fix_foton_20240408' into 'master'
Fix foton 20240408

See merge request laws-foton-slrs/foton-wkflow-rest!88
2024-04-22 09:47:26 +00:00
wxyclub b307e99919 fix: OA发送失败的补发,添加等待时间 2024-04-22 17:46:26 +08:00
wxyclub 581610e750 fix: OA发送失败的补发 2024-04-22 17:11:53 +08:00
wxyclub 979a7eeb13 fix: 修复OA消息发送方式 2024-04-22 15:24:46 +08:00
wxyclub be7bc047fc fix: 发送OA消息的请求添加超时时间为2分钟,发送失败后的延迟时间设为10分钟 2024-04-19 17:48:04 +08:00
wxyclub 79ce56d7b0 Merge branch 'fix_foton_20240408'
# Conflicts:
#	src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java
2024-04-19 17:47:17 +08:00
wxyclub 00187403d3 fix: 发送OA消息的请求添加超时时间为2分钟,发送失败后的延迟时间设为10分钟 2024-04-19 17:39:05 +08:00
wxyclub 4dcf5237d4 fix: 企标废止流程批准后的变更修改 2024-04-19 17:21:08 +08:00
wxyclub 60be779dc8 Merge branch 'dev_2024325_LCZGF_39'
# Conflicts:
#	src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java
2024-04-15 11:45:49 +08:00
王晓勇 42dd72bae2 Merge branch 'fix_foton_20240408' into 'master'
fix: 企标废止流程批准后修改标准状态方式

See merge request laws-foton-slrs/foton-wkflow-rest!85
2024-04-12 08:21:52 +00:00
wxyclub 04b7a6122c bug: 政策征求意见流程会签节点人员抓取修改 2024-04-12 16:01:57 +08:00
wxyclub e4b6779e44 fix: 对政策征求意见添加曾删改接口 2024-04-12 09:45:03 +08:00
wxyclub f4d97a1ddb fix: 对政策征求意见添加曾删改接口 2024-04-11 17:44:45 +08:00
wxyclub 4d7300233d fix: 对政策征求意见添加曾删改接口 2024-04-11 15:59:35 +08:00
wxyclub f81f5ed3a4 fix: 企标废止流程批准后修改标准状态方式 2024-04-11 09:08:40 +08:00
高嵩 1e8d858c85 Merge branch 'fix_foton_20240408' into 'master'
Fix foton 20240408

See merge request laws-foton-slrs/foton-wkflow-rest!84
2024-04-10 10:05:17 +00:00
wxyclub 12d3dc3f71 fix: 把getOne换成list 2024-04-10 18:02:53 +08:00
wxyclub 771ad389fa fix: 企标废止流程批准后修改标准状态方式 2024-04-10 17:58:50 +08:00
高嵩 bb56ec4723 Merge branch 'dev_20240123_ZHENGCE' into 'dev_2024325_LCZGF_39'
Revert "fix: 修改发送OA的BIZTRANSACTIONID值为SPRS+时间戳"

See merge request laws-foton-slrs/foton-wkflow-rest!83
2024-04-08 06:55:46 +00:00
高嵩 93a6ed894c Merge branch 'dev_2024325_LCZGF_39' into 'master'
Dev 2024325 lczgf 39

See merge request laws-foton-slrs/foton-wkflow-rest!82
2024-04-08 06:54:00 +00:00
wxyclub 0d19beba42 BUG: 修改企标制修订的发送OA连接的新旧数据判断 2024-04-03 14:53:18 +08:00