Commit Graph
364 Commits
Author SHA1 Message Date
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
yuezhihang f8cdb28f09 解读流程加名称提示 2021-12-15 17:06:28 +08:00
yuezhihang d852cfef62 标准化活动-入会参会流程-全不涉及情况下的处理 2021-12-15 15:43:03 +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 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
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
yuezhihang 494ba638a1 解读流程 和 企标制修订流程 修复 2021-12-09 16:57:45 +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
yuezhihang f748f10f44 解读结束节点 2021-12-08 10:49:20 +08:00
Superman_Main d579a5e20e Merge remote-tracking branch 'origin/develop' into develop 2021-12-08 09:02:05 +08:00
Superman_Main 13a825ab5f feat: There is no way the,buss 2021-12-08 09:01:32 +08:00
yuezhihang a8d3f5e5ab 企标复审流程 和 企标废止流程 加上废止->状态下的联动 2021-12-07 17:34:42 +08:00
yuezhihang 2ced1d27a3 12.7bug修复 草稿改批量删除 流程汇总异常恢复 2021-12-07 15:17:06 +08:00
yuezhihang 50e7d7ab60 日期相差八个小时 2021-12-06 16:14:58 +08:00
yuezhihang 52a2689c20 流程bug修复 2021-12-06 15:17:57 +08:00
liao ea1913a877 Merge remote-tracking branch 'origin/Three' into Three
# Conflicts:
#	src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java
#	src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java
2021-12-06 10:53:05 +08:00
yuezhihang a2083fa80c 项目清单汇总 2021-12-05 20:56:08 +08:00
yuezhihang 0f78d8a78b 草稿删除接口 2021-12-05 15:52:43 +08:00
yuezhihang 1ba0157052 企标制修订计划! 2021-12-05 15:08:05 +08:00
yuezhihang ea5ae3a5a3 企标制修订计划流程!入库 2021-12-05 14:26:12 +08:00
liao ac92d728cd 2021-12-05 10:02:43 +08:00
Superman_Main afa39bc706 feat: There is no way the 2021-12-03 14:27:12 +08:00
Superman_Main bd22414d5c Merge remote-tracking branch 'origin/develop' into develop 2021-12-03 14:15:59 +08:00
Superman_Main c1a816c148 feat: There is no way the 2021-12-03 14:15:36 +08:00
yuezhihang bef70eb7a0 项目清单确认流程 2021-12-02 21:03:49 +08:00
yuezhihang 4156adc6d1 项目流程 2021-12-02 15:38:57 +08:00
yuezhihang 2b9b2fa68f 标准维度 2021-12-02 13:45:36 +08:00
yuezhihang 4471941a51 项目确认流程部分代码 以及标准维度驳回 2021-12-02 13:32:30 +08:00
yuezhihang ae67a56dbb 新流程 以及项目维度驳回 2021-12-02 11:18:14 +08:00
yuezhihang 7cc898aec6 项目评估流程 2021-12-02 10:26:18 +08:00