FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,001 Commits 1 Branch 0 Tags
1e23919f4601bcb51e3aae6c61611c7e48f14b35
Commit Graph
3001 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
zhangjun a08b8cdc41 标准预警查看 2022-09-26 13:38:35 +08:00
zhangjun 1b36e1b6a1 查询分解单适用车型 2022-09-26 13:31:34 +08:00
zhangjun 3c5d366595 项目清单确认流程，点击添加标准，添加查询条件“适用认证” 2022-09-26 10:48:53 +08:00
zhangjun 76145920ee 制修订流程-产品标准，修订，流程结束之后，企标库没有新增 2022-09-26 10:24:42 +08:00
zhangjun 9cd13bb880 制修订流程跑完入库报错了，流程没问题 2022-09-23 15:28:28 +08:00
zhangjun 25766202f4 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-09-22 20:36:16 +08:00
zhangjun 26905d00fb 项目确认添加适用认证 2022-09-22 20:36:00 +08:00
zyd 45e2d9766f Merge branch 'develop_master' into FOTON 2022-09-22 00:44:57 +08:00
zyd 1de8e48996 fix: 更新带水印下载代码逻辑 2022-09-22 00:44:10 +08:00
zyd 89f6240481 fix:优化机构查询用户速度慢的问题 2022-09-21 22:59:52 +08:00
zhangyanduan 2cf172938d Merge branch 'develop_master' into FOTON 2022-09-21 17:09:46 +08:00
zhangyanduan ca3f48c207 add: 增加过滤忽略白名单 syncModelDto 2022-09-21 17:08:43 +08:00
zhangyanduan 1d83907924 add: 添加模块单元数据接收推送接口 2022-09-21 17:06:26 +08:00
zhangjun 707b03aec2 Merge remote-tracking branch 'origin/develop_master' into FOTON 2022-09-21 00:51:04 +08:00
zhangjun 13c8fb50b0 查询接口 2022-09-21 00:50:32 +08:00
zyd 0f3e60feb8 fix: 修复关联表查询速度慢的问题 2022-09-21 00:26:09 +08:00
zhangjun 8a7673cd38 Merge remote-tracking branch 'origin/develop_master' into FOTON 2022-09-20 23:00:57 +08:00
zhangjun 3bd92a4fa2 优化机构 2022-09-20 22:55:54 +08:00
zyd 386bcac55c Merge branch 'develop_master' into FOTON 2022-09-19 07:40:12 +08:00
zhangjun 7f3e07000c Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-09-16 10:27:19 +08:00
zhangjun f4b3391a53 标准合规评估流程，项目分发节点，添加项目页面，项目经理没带出来 2022-09-16 10:27:08 +08:00
zyd f47962e26c fix: 修复权限查询逻辑，并且提交最新的权限表数据字段内容 2022-09-16 00:20:44 +08:00
zhangjun 1c7e92baf0 es查询大写 2022-09-15 15:54:21 +08:00
zhangjun 499d4702ee 定时任务：预警 2022-09-14 18:12:28 +08:00
zhangjun 317881c646 编辑时清空代替，被代替未删除对应标准 2022-09-14 16:28:15 +08:00
zhangjun d05fbf64e7 ES大小写问题 2022-09-14 14:45:06 +08:00
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