Commit Graph
1045 Commits
Author SHA1 Message Date
高嵩 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
wangzhijiang e22e7c731d 企标制修订-技术标准流程-流程图、流程历史 2024-02-05 14:11:12 +08:00
wangzhijiang 6027b0d691 企标制修订-技术标准流程-流程图、流程历史改造。 2024-02-04 17:57:23 +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
wangzhijiang 5e97b14f62 标准征求意见流程-流程图、流程历史对接 2024-01-29 14:19:53 +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 7b942f99cb fix: 修改发送OA的BIZTRANSACTIONID值为SPRS+时间戳 2024-01-26 09:57:05 +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
wxyclub 5e54e8769d fix: 计划管控取消流程代办为消除问题修改 2024-01-02 18:04:12 +08:00
高嵩 18e3d9385b Merge branch 'fix_foton_20231213' into 'master'
fix: 计划管控取消流程代办未消除问题修改

See merge request laws-foton-slrs/foton-wkflow-rest!74
2024-01-02 09:58:36 +00:00
wxyclub d0f0b8c6ab fix: 企标制修订产品标准流程修改 2024-01-02 17:05:31 +08:00
wxyclub acd36ae6c3 fix: 计划管控取消流程代办未消除问题修改 2024-01-02 14:40:03 +08:00
wxyclub 3d8e6129c5 fix: 企标制修订产品标准流程表单修改,流程意见处理 2024-01-02 14:26:17 +08:00
wxyclub 603b5c19ba fix: 企标制修订产品标准流程表单修改,流程意见处理 2024-01-02 08:58:54 +08:00
wxyclub 13a79a5be9 fix: 企标制修订产品标准流程表单修改 2023-12-29 14:42:27 +08:00
高嵩 2b89ad5e73 Merge branch 'fix_foton_20231213' into 'master'
fix: 已发流程报错问题修改

See merge request laws-foton-slrs/foton-wkflow-rest!73
2023-12-18 02:32:11 +00:00
wxyclub 88344efad2 fix: 已发流程报错问题修改 2023-12-18 09:59:22 +08:00
高嵩 76c0c8fd3b Merge branch 'dev_20231201_feizhi' into 'master'
Dev 20231201 feizhi

See merge request laws-foton-slrs/foton-wkflow-rest!72
2023-12-15 09:17:00 +00:00
wxyclub 4b42ab6800 fix: 政策课题入会参会驳回后删除OA代办 2023-12-15 16:01:19 +08:00
wxyclub 43f9b40b52 fix: 流程详情页文件上传时间倒序改为主服务排序 2023-12-15 10:06:34 +08:00
wxyclub 9c332a4d1b bug: 流程详情页文件改成上传时间倒序 2023-12-14 15:04:03 +08:00
高嵩 4443dd534a Merge branch 'dev_20231201_feizhi' into 'master'
bug: 计划管控延期流程走完后流程取消未取消修改

See merge request laws-foton-slrs/foton-wkflow-rest!71
2023-12-13 10:36:31 +00:00
wxyclub 72dc3aac25 bug: 计划管控延期流程走完后流程取消未取消修改 2023-12-13 18:20:22 +08:00
高嵩 c9561fde3b Merge branch 'dev_20231201_feizhi' into 'master'
fix: 废止节点抄送链接修改

See merge request laws-foton-slrs/foton-wkflow-rest!70
2023-12-13 04:12:26 +00:00
wxyclub 0cb3bca685 fix: 废止节点抄送链接修改 2023-12-13 10:54:01 +08:00
高嵩 bef61f0af5 Merge branch 'dev_20231201_feizhi' into 'master'
Dev 20231201 feizhi

See merge request laws-foton-slrs/foton-wkflow-rest!69
2023-12-13 02:35:01 +00:00
wxyclub a457ae110a fix: 完成任务接口添加task为空的情况处理 2023-12-12 18:06:56 +08:00
wxyclub cc7ad3d6c0 fix: 修改企标废止流程抄送链接 2023-12-12 09:40:33 +08:00
wxyclub e3a6eeba7e fix: 更名后流程类别错误问题 2023-12-09 17:56:10 +08:00
wxyclub 97a2aa05b0 fix: 更名后流程类别错误问题 2023-12-09 17:03:31 +08:00
wxyclub be76631e84 fix: 监控流程-企标制修订-汇总流程评分仅显示最新的分数 2023-12-06 17:35:32 +08:00
wxyclub f73ac8faea add: 企标废止流程批准节点添加抄送功能 2023-12-05 14:32:56 +08:00
wxyclub ea995edd58 Merge branch 'dev_20230829_change' into dev_20231201_feizhi
# Conflicts:
#	src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java
2023-12-01 18:20:00 +08:00
lixuetao c0df85601e 工作流优化sql 2023-12-01 14:00:17 +08:00
wxyclub 7cb7ede855 bug: 计划管控合并流程空指针修改 2023-11-28 17:58:27 +08:00
wxyclub 27e773f646 bug: 计划管控取消流程空指针修改 2023-11-24 15:17:51 +08:00
wxyclub dce23673a5 bug: 计划管控取消流程空指针修改 2023-11-23 10:28:38 +08:00
wxyclub 1115e7196b bug: 产品标准修改时发布节点顺序号丢失 2023-11-20 17:08:18 +08:00
wxyclub fceff66f48 bug: 修改计划管控更名bug 2023-11-20 08:59:55 +08:00
lixuetao 63891c0b33 配置文件处理,添加druid配置 2023-11-16 16:59:34 +08:00