FT/foton-wkflow-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,077 Commits 2 Branches 0 Tags
79ce56d7b0fc89feb877a345efbafeea27136de1
Commit Graph
1077 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
wxyclub 891748e42e Merge branch 'dev_2024325_BZSQ' into dev_2024325_LCZGF_39 2024-04-02 17:41:46 +08:00
wxyclub a2ab82d3b0 BUG: 企标制修订流程datas表的getOne换为list，避免出现多条报错 2024-04-02 14:58:42 +08:00
wxyclub 75afa55e2c BUG: 代主服务发送OA消息修改 2024-03-31 13:56:18 +08:00
高嵩 e5f4a3771f Merge branch 'dev_2024325_LCZGF_39' into 'dev_2024325_BZSQ' 
Dev 2024325 lczgf 39

See merge request laws-foton-slrs/foton-wkflow-rest!81
 2024-03-29 04:26:59 +00:00
wangzhijiang 361d0eee2f 征求意见流程图修改。 2024-03-27 15:55:15 +08:00
wangzhijiang f796fe9cef 征求意见流程图修改。 2024-03-27 18:02:53 +08:00
wangzhijiang 2902b27e56 企标制修订-技术标准流程-流程图、流程历史改造。 2024-03-26 10:55:41 +08:00
wangzhijiang 271628bbdd 企标制修订-技术标准流程-流程图、流程历史改造。 2024-03-25 21:34:46 +08:00
高嵩 bdb6af1168 Merge branch 'dev_20240123_LCZG' into 'dev_2024325_LCZGF_39' 
Dev 20240123 lczg

See merge request laws-foton-slrs/foton-wkflow-rest!80
 2024-03-25 02:03:05 +00:00
高嵩 d9455c1152 Merge branch 'fix_20240123_UAT' into 'master' 
fix: 企标制修订起草人选择多个时出错的问题

See merge request laws-foton-slrs/foton-wkflow-rest!79
 2024-02-26 09:53:48 +00:00
wxyclub 3534c46ba6 fix: 企标制修订起草人选择多个时出错的问题 2024-02-26 17:30:07 +08:00
wxyclub d89aea7559 fix: 重点认证标准/政策合规性项目审查流程的修改，流程中的操作修改标准跟踪清单中的流程状态 2024-02-05 17:01:28 +08:00
wxyclub 4f9824103a fix: 重点认证标准/政策合规性项目审查流程的修改 管理员后的节点驳回后到管理员节点 2024-02-05 16:56:22 +08:00
wangzhijiang e22e7c731d 企标制修订-技术标准流程-流程图、流程历史 2024-02-05 14:11:12 +08:00
wangzhijiang 6027b0d691 企标制修订-技术标准流程-流程图、流程历史改造。 2024-02-04 17:57:23 +08:00
wxyclub c164653767 fix: 政策征求意见的修改 管理员后的节点驳回后到管理员节点 2024-02-04 17:26:47 +08:00
wangzhijiang edc94e3709 企标制修订-技术标准流程-流程图、流程历史改造。 2024-02-02 18:00:20 +08:00
wangzhijiang 1636746bb6 标准征求意见流程-转办 2024-01-31 11:51:22 +08:00
wangzhijiang 703ddd4a19 标准征求意见流程-流程图、流程历史对接 2024-01-30 10:24:51 +08:00
wxyclub 5025679ead fix: 政策征求意见流程名称显示为《流程中选择的政策名称》- 征求意见 2024-01-29 15:04:10 +08:00
wxyclub 9f72feb910 fix: 政策征求意见流程名称显示为《流程中选择的政策名称》- 征求意见 2024-01-29 14:54:06 +08:00
wangzhijiang 5e97b14f62 标准征求意见流程-流程图、流程历史对接 2024-01-29 14:19:53 +08:00
wxyclub b62ad5c7b6 fix: 根据流程实例ID查询流程编号 2024-01-26 18:02:44 +08:00
高嵩 8e16da05a5 Merge branch 'fix_20240123_UAT' into 'master' 
fix: 修改发送OA的BIZTRANSACTIONID值为SPRS+时间戳

See merge request laws-foton-slrs/foton-wkflow-rest!78
 2024-01-26 09:58:25 +00:00
wangzhijiang dab9d57c13 标准征求意见流程-流程图、流程历史改造。 2024-01-26 17:57:36 +08:00
wxyclub b6af89cd8e Revert "fix: 修改发送OA的BIZTRANSACTIONID值为SPRS+时间戳" 
This reverts commit 4484a9abdb.
 2024-01-26 10:06:23 +08:00
wxyclub 7b942f99cb fix: 修改发送OA的BIZTRANSACTIONID值为SPRS+时间戳 2024-01-26 09:57:05 +08:00
wxyclub 4484a9abdb fix: 修改发送OA的BIZTRANSACTIONID值为SPRS+时间戳 2024-01-26 09:56:18 +08:00
wangzhijiang 70d45f56bf 标准征求意见流程-流程图、流程历史改造。 2024-01-25 18:01:36 +08:00
高嵩 538ccf2b22 Merge branch 'fix_foton_20231213' into 'master' 
fix: 监控流程查看，添加用户ID显示

See merge request laws-foton-slrs/foton-wkflow-rest!77
 2024-01-19 09:44:05 +00:00
高嵩 0ec83e4b0d Merge branch 'dev_20231229_CPBZ' into 'master' 
Dev 20231229 cpbz

See merge request laws-foton-slrs/foton-wkflow-rest!76
 2024-01-18 10:04:32 +00:00
wxyclub 6850c7f18c fix: 监控流程查看，添加用户ID显示 2024-01-16 11:50:17 +08:00
wxyclub 10d4f00e04 fix: 企标制修订产品标准发送到OA的链接跳转 2024-01-15 16:48:54 +08:00
高嵩 e7ec18abe4 Merge branch 'fix_foton_20231213' into 'master' 
fix: 计划管控取消流程代办为消除问题修改

See merge request laws-foton-slrs/foton-wkflow-rest!75
 2024-01-02 10:08:14 +00:00