FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,290 Commits 1 Branch 0 Tags
d5c3ea25a7c36ffdca4c978d21d29fd533b878ee
Commit Graph
86 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
zhangjun 3f1e3f71aa 重置索引 2022-10-13 09:28:38 +08:00
zhangjun d0e7a5f96f Merge remote-tracking branch 'origin/develop_master' into FOTON 2022-10-13 09:03:12 +08:00
zhangjun 8f74bbfbd9 删除索引信息 2022-10-12 12:09:05 +08:00
zhangjun 5f6fa80e16 搜索中心同步删除 2022-10-11 15:00:41 +08:00
zhangjun 376cc3bab9 搜索中心同步删除 2022-10-11 14:59:52 +08:00
zhangjun b174191045 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-10-08 17:42:21 +08:00
zhangjun 3f5515b77b sql 不想删了，暂时保留，这个是前端bug，只需去掉control层代码即可 2022-10-08 17:42:01 +08:00
zhangjun 3d924b4cfb Merge remote-tracking branch 'origin/FOTON' into FOTON 2022-10-08 09:02:21 +08:00
zhangjun 4017583752 搜索中心日志 2022-10-08 09:01:14 +08:00
zhangjun d4e592e21f 添加定时任务 ip 字段 2022-09-30 17:39:46 +08:00
zhangjun 03ab40bbe1 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-09-30 17:34:05 +08:00
zhangjun 42274fb6b0 修改搜索中心添加并查询资源类型、能源类型 2022-09-29 20:58:04 +08:00
zhangjun 326c3f1cc9 修改搜索中心添加并查询资源类型、能源类型 2022-09-29 17:00:42 +08:00
zhangjun 761727e63c 修改搜索中心添加并查询资源类型、能源类型 2022-09-29 16:56:13 +08:00
zhangjun d105dce3a5 标准预警模块导出excel缺少条款内容 2022-09-29 15:00:09 +08:00
zhangjun 97f12bdef1 代替标准号超链接打不开 2022-09-29 14:40:03 +08:00
zhangjun bc0d3a878a 修改搜索中心添加并查询资源类型、能源类型 2022-09-29 14:14:03 +08:00
zhangjun fd855adfc3 修改搜索中心添加并查询资源类型、能源类型 2022-09-29 14:13:32 +08:00
zhangjun 6bc2bfadb0 修改搜索中心重构后出现问题 2022-09-29 13:14:35 +08:00
zhangjun 06ebf1d3fc 修改搜索中心重构后出现问题 2022-09-29 13:09:41 +08:00
zhangjun 78376b2598 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-09-28 15:39:15 +08:00
zhangjun 107a58b857 修改删除企标树结构，但是这块逻辑不明白，暂时不修改，防止引起更多问题 2022-09-28 15:38:55 +08:00
zhangjun 80c7602e11 模块结构单元变型号 2022-09-28 10:04:35 +08:00
zhangjun 950c78575b 自动启动项目 2022-09-27 16:16:22 +08:00
zhangjun 1e60718574 启动项目 2022-09-27 15:53:27 +08:00
zhangjun a26274ac9c 适用车辆显示问题 2022-09-27 14:54:31 +08:00
zhangjun 556166090c 预警删除之前的信息 2022-09-27 14:27:33 +08:00
zhangjun 11eee9ec03 查看分解单报错 2022-09-27 10:59:57 +08:00
zhangjun fd887d10fd 修改搜索中心排序问题 2022-09-26 17:39:33 +08:00
zhangjun a460bdb05b Merge remote-tracking branch 'origin/develop_master' into FOTON 2022-09-26 17:38:41 +08:00
zhangjun c68e00e466 修改搜索中心排序问题 2022-09-26 17:37:12 +08:00
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 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
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
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
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
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
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
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
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
zhangjun aa13451ac6 56708 2022-08-23 10:14:05 +08:00
张君 5291f3cf69 Merge remote-tracking branch 'origin/develop_3' into develop_3 2022-01-19 10:20:08 +08:00
张君 87b843c398 es字段 2022-01-19 10:19:16 +08:00
张君 54ef64c852 注释 2022-01-18 17:09:03 +08:00