FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,896 Commits 1 Branch 0 Tags
4a4c91cad8c49710784f1c310b4223927a8e4b77
Commit Graph
165 Commits
Author SHA1 Message Date
李雅玮 23d50e06d1 Merge branch 'FOTON' into 'develop_master' 
# Conflicts:
#   adc-da-main/src/main/resources/application.properties
 2022-12-07 16:38:07 +08:00
gaojiabao e715c57b7e 更名流程-将更名流程走完后，企标计划的名称并没有修改 BUG 2022-12-05 15:15:08 +08:00
gaojiabao c0839a370b 更名流程-将更名流程走完后，企标计划的名称并没有修改 BUG 2022-12-05 12:00:28 +08:00
CD e7faa9ad2a Merge branch 'develop_master' into FOTON 2022-12-01 20:39:03 +08:00
CD e06e37f203 Merge remote-tracking branch 'origin/develop_master_new' into develop_master_new 2022-11-25 17:51:07 +08:00
CD 94fef5e08f bug273、bug274 2022-11-25 17:50:42 +08:00
liyawei 1372f306ea 生产环境配置文件恢复 2022-11-24 17:42:22 +08:00
liyawei 50ded28c72 开发环境配置文件更新 2022-11-24 14:48:32 +08:00
liyawei f805415536 174-接受任务回显 2022-11-22 15:07:48 +08:00
liyawei 4cd34c749b 174-OA待办修改 2022-11-21 17:39:02 +08:00
CD 82e9333ef6 222、223 bug 2022-11-08 14:30:48 +08:00
CD 53b2adbf50 log修改 2022-11-02 13:34:21 +08:00
liyawei 1037f112ee Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-10-25 12:43:59 +08:00
liyawei c2c50b4352 操作日志-部门显示修改 2022-10-25 12:43:20 +08:00
zyd 5a01009cf8 Merge branch 'develop_master' of http://gitlab.91isoft.com:90/LiuChao/foton-slrs-system-rest into develop_master 2022-10-24 22:31:08 +08:00
liyawei 9e60b22671 修改企标复审入库流程：非修订时才修改文本状态 2022-10-24 20:19:09 +08:00
liyawei b20d14a562 修改企标复审入库流程：修订时才生成企标计划 2022-10-24 17:48:05 +08:00
zyd 991c299c10 fix: 修复BUG 2022-10-24 16:10:01 +08:00
CD 73945de1cf 适用车型为空会出现bug 2022-10-20 21:27:01 +08:00
CD fe37063ba4 日志 2022-10-20 14:13:27 +08:00
liyawei 0ebdd2f435 解决: 企标制修订立项计划流程，程结束之后，查看计划库归档，立项单填写的内容没有归档 2022-10-14 15:08:17 +08:00
liyawei bb8021122e 企标制修订-技术标准流程,起草单位高级经理审核节点，导出意见 2022-10-13 14:57:51 +08:00
liyawei 61e8851ebf 企标制修订-技术标准流程,起草单位高级经理审核节点，导出意见 2022-10-13 13:51:54 +08:00
zhangjun afdc003aa2 先跑项目评估流程，假如归档A标准，再跑标准评估流程，假如归档B标准，查看项目清单，对应项目下的A标准被替换了 2022-09-08 18:49:10 +08:00
zhangjun d63ec599cc 项目评估流程完结之后，项目库归档有问题，符合，不涉及没有归档，合规评估模块归档没问题 2022-09-08 16:55:25 +08:00
zhangjun 04f10c6df9 修改定时任务 2022-09-02 10:20:49 +08:00
super_liu 4d72c4f90c Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!558
 2022-07-19 18:08:03 +08:00
396572590@qq.com 53ccc5a913 feat: There is no way the, 标准入库 国内及海外标准法规 
FBGYWBD
                                 发布稿(译文) 入库添加字段
 2022-07-19 17:31:28 +08:00
zyd e5d7a67307 fix: 入库接口地址清理非本项目内的代码逻辑 2022-07-19 11:11:45 +08:00
396572590@qq.com 1effa2bbf7 feat: There is no way the, 工作流文件下载 2022-07-16 00:30:56 +08:00
396572590@qq.com fa9284fe8b feat: There is no way the, 工作流文件下载 2022-07-16 00:23:20 +08:00
396572590@qq.com 1c7ead8867 feat: There is no way the, 工作流文件下载 2022-07-15 22:23:09 +08:00
396572590@qq.com 8b70a4c80d feat: There is no way the, #55969 #55973 企标顺序号相关逻辑 2022-07-03 18:02:57 +08:00
396572590@qq.com 19b4863d18 Merge branch 'develop_master' into develop_migration 2022-06-30 09:31:51 +08:00
396572590@qq.com 20d23a427e feat: There is no way the, 改改改 从企标计划开始 改到 企标标准入库及企标库 改至计划已确认关联之多 改为测 2022-06-29 15:31:50 +08:00
super_liu 4380b2af06 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the,  改改改 从企标计划开始 改到 企标标准入库及企标库 改至计划已确认关联之多…… 待改完

See merge request LiuChao/foton-slrs-system-rest!543
 2022-06-28 18:04:39 +08:00
396572590@qq.com aa3bdac315 feat: There is no way the, 改改改 从企标计划开始 改到 企标标准入库及企标库 改至计划已确认关联之多…… 待改完 2022-06-28 17:55:40 +08:00
zhangyanduan 29f6374474 fix: 改造标准预警模块定时执行的逻辑 2022-06-23 14:27:53 +08:00
zyd 43a31db7ca fix:定时任务增加管控注记 2022-06-08 11:34:44 +08:00
yuezhihang e222598ce3 全局搜索 2022-05-05 15:30:43 +08:00
super_liu 30f6b276df feat: There is no way the, 政策入库 新增 多选日期 2022-04-08 17:39:24 +08:00
super_liu 31774254b6 feat: There is no way the, 政策库修改1 2022-04-02 16:59:25 +08:00
super_liu 86bc0fe525 feat: There is no way the, 2022-04-01 14:18:00 +08:00
super_liu dda0aeae41 feat: There is no way the, 企标复审入库 修改 通用更新企标接口 2022-03-29 10:28:28 +08:00
super_liu 9c3cf24422 feat: There is no way the, bug #52092 2022-03-25 17:07:46 +08:00
super_liu ae26e35d3f Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the, 企标审批完入库后，入库人应为流程发起人

See merge request LiuChao/foton-slrs-system-rest!410
 2022-03-03 16:08:21 +08:00
super_liu 13b603b526 feat: There is no way the, 企标审批完入库后，入库人应为流程发起人 2022-03-03 15:58:09 +08:00
yuezhihang 7262b6974b Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-02-24 17:55:28 +08:00
yuezhihang af11a626df bug修复 2022-02-24 17:55:22 +08:00
super_liu 183ba86528 feat: There is no way the, tree async 2022-02-22 17:18:18 +08:00