FT/foton-wkflow-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
997 Commits 2 Branches 0 Tags
dev_20230829_change
Commit Graph
997 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
super_liu e118843481 Merge remote-tracking branch 'origin/develop' into develop 2021-12-17 16:43:00 +08:00
super_liu 3847a33631 feat: There is no way the,buss add onlyOffice callback 2021-12-17 16:42:43 +08:00
yuezhihang 894b382ccc 企标制修订计划 2021-12-17 16:00:09 +08:00
王夏晖 f98fd2eb6b Merge branch 'develop' into 'FOTON' 
Develop

See merge request foton-wkflow-group/foton-wkflow-rest!70
 2021-12-17 13:58:27 +08:00
super_liu 002c8bb88f Merge remote-tracking branch 'origin/develop' into develop 2021-12-17 13:52:01 +08:00
super_liu 2720b4a534 feat: There is no way the,OA 2021-12-17 13:51:39 +08:00
王夏晖 4bac6b0da6 Merge branch 'develop' into 'FOTON' 
Develop

See merge request foton-wkflow-group/foton-wkflow-rest!69
 2021-12-17 11:27:31 +08:00
yuezhihang c5e5bafd12 Merge remote-tracking branch 'origin/develop' into develop 2021-12-17 11:17:09 +08:00
yuezhihang 42fe41307c 征求意见流程bug 2021-12-17 11:17:03 +08:00
super_liu 8bcb65318b Merge branch 'develop' into FOTON 2021-12-16 20:15:44 +08:00
super_liu 35296d7f5e Merge remote-tracking branch 'origin/develop' into develop 2021-12-16 18:13:14 +08:00
super_liu e35878cbca feat: There is no way the,buss 2021-12-16 18:12:11 +08:00
yuezhihang 83db666b01 征求意见流程部分bug修复 2021-12-16 18:06:04 +08:00
王夏晖 89039e43a8 Merge branch 'develop' into 'FOTON' 
Develop

See merge request foton-wkflow-group/foton-wkflow-rest!68
 2021-12-16 14:04:17 +08:00
yuezhihang 3b453bdf75 新流程发起接口 2021-12-16 11:04:02 +08:00
yuezhihang fa01b36d34 .部门内部汇总后审批人，分线审核人不选都可以直接提交，而且默认成了发起人 2021-12-16 09:51:57 +08:00
yuezhihang ba6560cd49 Merge remote-tracking branch 'origin/develop' into develop 2021-12-16 09:46:16 +08:00
yuezhihang e82ad2e967 征求意见流程汇总bug修复 2021-12-16 09:46:06 +08:00
super_liu b6217fb721 Merge remote-tracking branch 'origin/develop' into develop 2021-12-15 21:44:49 +08:00
super_liu 11b7631d87 feat: There is no way the,buss 2021-12-15 21:44:39 +08:00
super_liu efab4f35b0 Merge branch 'develop' into FOTON 2021-12-15 21:10:40 +08:00
yuezhihang f8cdb28f09 解读流程加名称提示 2021-12-15 17:06:28 +08:00
yuezhihang d852cfef62 标准化活动-入会参会流程-全不涉及情况下的处理 2021-12-15 15:43:03 +08:00
super_liu 6fa6ca1a75 Merge branch 'develop' into FOTON 2021-12-15 11:36:54 +08:00
yuezhihang 660faa15e3 外部署名推荐批准 ---> 修订产生多条数据 bug修复 2021-12-15 10:36:42 +08:00
yuezhihang ebed3d71fa Merge remote-tracking branch 'origin/develop' into develop 2021-12-15 10:12:46 +08:00
yuezhihang 47d4e4af7d 新的征求意见流程 发送OA待办 2021-12-15 10:12:38 +08:00
super_liu 70878668c8 feat: There is no way the 2021-12-14 21:46:24 +08:00
super_liu b26947e8a3 Merge branch 'develop' into FOTON 
# Conflicts:
#	src/main/resources/application.yml
 2021-12-14 21:45:45 +08:00
super_liu 002630a5d2 Merge remote-tracking branch 'origin/develop' into develop 2021-12-14 21:21:17 +08:00
super_liu 4a28ed8d04 feat: There is no way the,buss 2021-12-14 21:21:05 +08:00
yuezhihang 80624bf7d3 外部署名 2021-12-14 15:52:45 +08:00
yuezhihang ac1c7486e2 新征求意见流程 + 政策课题组入库部分错误代码注释掉 2021-12-14 15:44:03 +08:00
super_liu 5bf33d5374 Merge branch 'develop' into FOTON 2021-12-14 15:20:20 +08:00
yuezhihang e409320519 项目评估标准维度--》入库 2021-12-13 14:17:20 +08:00
yuezhihang 2b5e6638b0 项目评估入库bug 修复 2021-12-12 10:46:42 +08:00
yuezhihang 191a8d25dd 项目评估条款数据没入库问题 + 项目清单驳回问题 + 为符合项整改未与数据库联动问题（现在的逻辑是走完整改就等于关闭） 2021-12-10 13:49:16 +08:00
Superman_Main d50c43c8fa Merge remote-tracking branch 'origin/develop' into develop 2021-12-10 10:45:33 +08:00
Superman_Main 85bd4ea485 feat: There is no way the,buss eval 2021-12-10 10:45:16 +08:00
王夏晖 b94c0dd1cb Merge branch 'develop' into 'FOTON' 
解读流程 和 企标制修订流程 修复

See merge request foton-wkflow-group/foton-wkflow-rest!66
 2021-12-09 19:38:28 +08:00
yuezhihang 494ba638a1 解读流程 和 企标制修订流程 修复 2021-12-09 16:57:45 +08:00
Superman_Main b8c5d84cfa Merge branch 'develop' into FOTON 2021-12-08 21:23:18 +08:00
yuezhihang b5e3d6c39f 项目维度 日期bug修复 2021-12-08 17:36:53 +08:00
super_liu d6c38bc0ff Merge branch 'Three' into 'develop' 
Three

See merge request foton-wkflow-group/foton-wkflow-rest!65
 2021-12-08 15:41:46 +08:00
张超然 d86953f011 rest 2021-12-08 15:39:29 +08:00
张超然 a0fe2bb6b6 Merge remote-tracking branch 'origin/Three' into Three 2021-12-08 15:17:46 +08:00
Superman_Main 04ed85b528 Merge branch 'develop' into Three 
# Conflicts:
#	src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java
 2021-12-08 15:08:55 +08:00
Superman_Main 5b9cf2aca8 Merge remote-tracking branch 'origin/Three' into Three 2021-12-08 15:06:46 +08:00
Superman_Main 37031fb9c4 feat: There is no way the 2021-12-08 15:06:02 +08:00
yuezhihang 83e99a45cc Merge remote-tracking branch 'origin/develop' into develop 2021-12-08 10:49:28 +08:00