FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
960 Commits 1 Branch 0 Tags
d9d5aeb284119d5338295fa2c45fa5de75661821
Commit Graph
79 Commits
Author SHA1 Message Date
zhaokaiyao@91isoft.com d9d5aeb284 标准导出 2021-09-27 10:18:26 +08:00
zhaokaiyao@91isoft.com ccf7d32945 首页标准发布 只查询文本状态为即将实施的数据 2021-09-16 19:27:36 +08:00
zhaokaiyao@91isoft.com d6331ab155 标准详情,已被分解的的文本才有分解单按钮 2021-09-15 18:01:06 +08:00
super_liu e85d3daecb feat: There is no way the #47611 2021-09-06 17:42:34 +08:00
zhaokaiyao@91isoft.com 19c52a212b 解决企标高级搜索,putTime,issuTime,textStatusBuss失效的问题 2021-09-04 10:09:40 +08:00
yanyizhou 3070ec5e59 合并代码冲突 2021-08-27 15:30:23 +08:00
super_liu a971d3bcf7 feat: There is no way the 2021-08-24 13:40:45 +08:00
super_liu 6084f51bae feat: There is no way the 2021-08-24 09:57:11 +08:00
super_liu a242b9ac56 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the Buss and Convert

See merge request !120
 2021-08-20 10:12:39 +00:00
super_liu fe89ba9c60 feat: There is no way the Buss and Convert 2021-08-20 18:12:08 +08:00
zhaokaiyao@91isoft.com 6c6d99f088 写了点注释 2021-08-19 16:42:10 +08:00
super_liu bc1a9e8241 feat: There is no way the 2021-08-19 10:38:21 +08:00
super_liu 0aba76276f feat: There is no way the 2021-08-19 10:26:31 +08:00
zhaokaiyao@91isoft.com 01d0da14e8 Merge remote-tracking branch 'origin/develop_3' into develop_3 
# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
#	adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
 2021-08-18 16:42:28 +08:00
super_liu 150e2c96d2 feat: There is no way the User Menu auth 2021-08-18 16:30:58 +08:00
super_liu 5767a26a6a Merge remote-tracking branch 'origin/develop_3' into develop_3 2021-08-18 13:57:48 +08:00
super_liu 8e0e632c35 feat: There is no way the 2021-08-18 13:46:11 +08:00
super_liu f7231deef7 feat: There is no way the 2021-08-17 17:36:44 +08:00
zhaokaiyao@91isoft.com e6908fb48c 标准分解单 分页 2021-08-17 14:09:06 +08:00
zhaokaiyao@91isoft.com 1acf15280e Merge remote-tracking branch 'origin/develop_3' into develop_3 2021-08-16 16:13:17 +08:00
zhaokaiyao@91isoft.com 32626f3ae1 过内外标准高级搜索 2021-08-16 16:13:04 +08:00
super_liu a5ae69996d feat: There is no way the Search Add Stand ES 2021-08-16 13:56:49 +08:00
super_liu 8b74f8bb24 Merge remote-tracking branch 'origin/develop_3' into develop_3 2021-08-13 15:44:41 +08:00
super_liu fbf1d49065 feat: There is no way the 2021-08-13 15:43:49 +08:00
zhaokaiyao@91isoft.com 0142c3fe85 国内外标准排序 2021-08-13 13:48:42 +08:00
super_liu 8ccbd447be feat:There is no way the 2021-08-10 14:55:53 +08:00
super_liu 9c32571868 feat:There is no way the 2021-08-09 17:31:32 +08:00
super_liu d46dbd5229 feat: 搜索中心 es 入库 国内外标准修改 2021-08-03 15:39:12 +08:00
super_liu 4e398027eb feat: 国内外标准 编辑入es库 问题修改 2021-08-02 17:44:16 +08:00
super_liu de95dc63ae Merge remote-tracking branch 'origin/develop_3' into develop_3 
# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
 2021-07-30 16:54:36 +08:00
zhaokaiyao@91isoft.com d71c4a81e1 Revert "修复了收藏后重新编辑数据,收藏的数据没有更新问题" 
This reverts commit 3154533fb8.

# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
 2021-07-30 16:25:23 +08:00
yuezhihang 589b31aa4d 注掉部分超哥代码 使程序先跑起来 2021-07-30 09:32:24 +08:00
super_liu 00894cbeef Merge branch 'develop_master' into develop_3 
# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
 2021-07-30 00:54:34 +08:00
super_liu d7f3fc9f95 feat: 国内外标准 反向标准显示逻辑 2021-07-30 00:48:48 +08:00
super_liu 31a14da9db Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request !68
 2021-07-28 08:16:16 +00:00
super_liu 0b069efd95 feat: 国内外标准 多文档 操作 及 删除 国家属性字段 2021-07-28 16:14:52 +08:00
2510220824 935a47d1f1 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-07-28 15:36:42 +08:00
2510220824 de8f5631c0 add:升级es到7.6.2 2021-07-28 15:35:45 +08:00
super_liu f0fd398fee feat: 1 2021-07-27 18:25:36 +08:00
zhaokaiyao@91isoft.com 5bb3959002 Merge remote-tracking branch 'origin/develop_3' into develop_3 2021-07-27 10:43:17 +08:00
super_liu 387a97a46c feat: 树查询国内外标准 2021-07-27 09:50:47 +08:00
zhaokaiyao@91isoft.com f4c7b2ba68 Merge remote-tracking branch 'origin/develop_3' into develop_3 
# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
 2021-07-26 20:12:12 +08:00
super_liu 5a8cad6e09 feat: 国内外标准库 2021-07-26 18:30:54 +08:00
zhaokaiyao@91isoft.com 6c4ad93812 Merge remote-tracking branch 'origin/develop_3' into develop_3 2021-07-26 10:10:24 +08:00
super_liu 2ba81296da feat: 标准库MQ 2021-07-26 09:51:12 +08:00
zhaokaiyao@91isoft.com 3154533fb8 修复了收藏后重新编辑数据,收藏的数据没有更新问题 
优化逻辑,取消收藏时(逻辑删除),再次收藏此数据,由之前的添加一条新收藏的数据更改为更新原来数据的逻辑删除字段值
 2021-07-25 16:51:59 +08:00
super_liu 7db2b79b63 feat: 首页标准发布 2021-07-19 16:29:52 +08:00
super_liu 63181803aa feat: 标准库 2021-07-18 17:10:35 +08:00
super_liu de97f459fd feat: 标准入库流程 带入 逻辑 2021-07-15 17:14:54 +08:00
super_liu 9930cbae9b feat: 添加企业标准库 接口服务 2021-07-13 14:25:06 +08:00