FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,725 Commits 1 Branch 0 Tags
ea3dcbc04edbbe10f79b12741f6c8036e6188e97
Commit Graph
2725 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
DESKTOP-JNBCTEI\Edison ea3dcbc04e Merge branch 'develop_master' into FOTON 2022-09-08 22:09:03 +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 8b82bfac9f 修改查询除了非改项目下标准的数据 2022-09-08 13:25:17 +08:00
zhangjun 83f36cc913 还原数据 2022-09-06 15:09:14 +08:00
zhangjun 72d2d47c31 项目合规评估流程 草稿，返显数据 2022-09-06 15:03:04 +08:00
zhangjun 19acf4b842 Merge remote-tracking branch 'origin/develop_master' into FOTON 
# Conflicts:
#	adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml
 2022-09-05 21:29:08 +08:00
zhangyanduan 3f616818b8 fix: 优化对比数据的对比差异内容的显示效果 2022-09-05 16:28:49 +08:00
zhangjun 15593f2afc 项目确认清单，没有标准未传参 2022-09-05 11:14:19 +08:00
zhangjun 6f49186f7f 修改定时任务 2022-09-02 11:14:23 +08:00
zhangjun 04f10c6df9 修改定时任务 2022-09-02 10:20:49 +08:00
zhangjun 7d06865f03 修改定时任务 2022-09-02 10:17:28 +08:00
zhangjun b8f756a6fb 修改定时任务 2022-09-02 09:54:16 +08:00
zhangjun 98278f1c37 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-09-01 16:08:55 +08:00
zhangjun 5b81a7e3e2 加字段并修改技术评估查询 2022-09-01 16:08:43 +08:00
zhangyanduan 101fb1a063 fix: 修复项目清单更新流程中企标状态没有显示的BUG 2022-09-01 14:13:49 +08:00
zhangjun 8c14a17b35 导入修改 2022-09-01 10:10:40 +08:00
zhangjun 17ad8a9992 导入空模板报错 2022-08-31 14:42:42 +08:00
zhangjun bf349bb100 分页不生效 2022-08-31 13:54:05 +08:00
zhangjun a80a136046 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-08-31 12:22:21 +08:00
zhangjun 96a818628d 按照顺序查询结果 2022-08-31 12:22:10 +08:00
zyd 001a9287cf fix: 将线上版本的日志输出路径配置为当前jar包所在的路径 2022-08-31 01:27:09 +08:00
zyd d75274ce53 Merge branch 'develop_master' into FOTON 
# Conflicts:
#	adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml
 2022-08-31 01:05:37 +08:00
zyd 206c1bccf3 add:机构管理增加根据部门批量配置岗位功能 2022-08-31 00:00:35 +08:00
zyd 3db4903b0a add: 预警功能只预警最新文件类型的分解单 2022-08-30 22:56:24 +08:00
zhangjun 460892ce48 查询，改回原状 2022-08-30 18:26:25 +08:00
zhangjun b42a15ebda 按照顺序查询结果 2022-08-30 18:23:58 +08:00
zhangjun 8b25587e77 Merge remote-tracking branch 'origin/develop_master' into FOTON 
# Conflicts:
#	adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml
 2022-08-30 18:13:24 +08:00
zhangjun c4f23a11ac 按照顺序查询结果 2022-08-30 18:11:58 +08:00
zhangjun adddb5759e 按照顺序查询结果 2022-08-30 18:07:29 +08:00
zhangjun 09fd662314 查询 2022-08-30 17:29:33 +08:00
zhangjun eaec394e0a 查询 2022-08-30 17:21:48 +08:00
zhangjun 01ca5fa835 Merge remote-tracking branch 'origin/develop_master' into FOTON 2022-08-30 17:17:05 +08:00
zhangjun 145ad2ac2d 需无权限的放在前面 2022-08-30 17:15:47 +08:00
zhangjun e243dbb44f Merge remote-tracking branch 'origin/develop_master' into FOTON 2022-08-30 13:58:00 +08:00
zhangjun 3bff146fb4 还原es查询 + 修改定时任务 GB/T 没有同时更新 2022-08-29 12:13:53 +08:00
zhangjun 3d3a515710 修改无更新记录 2022-08-26 21:16:17 +08:00
zhangjun 43c8fea8b2 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-08-26 15:21:24 +08:00
zhangjun 4c7f086060 非 .keyword 无法查询出结果 2022-08-26 15:20:51 +08:00
zhangjun ae466b86d7 Merge remote-tracking branch 'origin/FOTON' into FOTON 2022-08-25 18:58:36 +08:00
zhangyanduan 0276ca92aa Merge branch 'develop_master' into FOTON 2022-08-25 18:58:06 +08:00
zhangjun a0c44be519 Merge remote-tracking branch 'origin/develop_master' into FOTON 2022-08-25 18:54:53 +08:00
zhangjun 8c25f8fb73 56708 2022-08-25 18:41:25 +08:00
zyd 075cd4768c fix:解决线上ES更新逻辑中获取文件ID时报错的BUG,目前看不到具体参数，此处增加错误输出，后续监测问题 2022-08-25 16:34:09 +08:00
zhangyanduan 84c941612b fix: 修改文件名时，文件中包含.的时候导致文件名不对的BUG 2022-08-25 16:07:39 +08:00
zhangjun 122e639e79 57017 2022-08-25 12:41:25 +08:00
zhangjun 6cd526e613 57017 2022-08-24 14:37:53 +08:00
zhangjun ca4ef75fda 56874 2022-08-23 16:37:14 +08:00
zhangjun 1687202ef5 56983 2022-08-23 14:19:32 +08:00
zhangjun 819d937d72 56694 2022-08-23 13:46:28 +08:00