FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,172 Commits 1 Branch 0 Tags
8b401b88326f9cc0fbc05294264b2b1e098ad21f
Commit Graph
97 Commits
Author SHA1 Message Date
super_liu 8b401b8832 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!222
 2021-11-07 16:49:22 +08:00
zhaokaiyao@91isoft.com 3f32907acf 过内外标准发布日期排序 2021-11-07 13:47:03 +08:00
super_liu 8b12a63925 feat: There is no way the, 2021-11-06 23:17:29 +08:00
super_liu 3171ce4622 feat: There is no way the, #50742 2021-11-05 10:51:36 +08:00
super_liu 3cd3266899 Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!214
 2021-11-01 18:03:47 +08:00
super_liu cab90f06ee feat: There is no way the,Laws 2021-11-01 17:59:24 +08:00
yuezhihang d42d9f34f4 标准详情分页查询 ；老版本新接口 2021-11-01 17:23:09 +08:00
yuezhihang 0d18758178 项目评估流程标准维度-查询数据来源修复 2021-10-27 13:47:29 +08:00
yuezhihang 9ec34d5125 Merge remote-tracking branch 'origin/develop_master' into develop_master 
# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
 2021-10-27 13:39:58 +08:00
yuezhihang d02b73e2dd 标准库查询 和 流程发起界面查询 做了一个标志位的区分 目的是为了提高标准库的查询速度 2021-10-27 13:39:07 +08:00
super_liu c2e7b589d2 feat: There is no way the 2021-10-27 13:35:51 +08:00
super_liu 1918e0da78 feat: There is no way the, TO optimize the query 2021-10-22 17:03:29 +08:00
super_liu 9eff2340a2 feat: There is no way the, TO optimize the query 2021-10-22 15:50:07 +08:00
zhaokaiyao@91isoft.com d09cdb1d42 通过id绑定责任工程师和责任部门名称 2021-10-20 11:24:49 +08:00
zhaokaiyao@91isoft.com 9b5bf72fad 文件后缀大写 2021-10-17 14:26:44 +08:00
Mr.Z aa5e7004dc Merge remote-tracking branch 'origin/develop_master' into develop_1 
# Conflicts:
#	adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
 2021-09-28 10:52:29 +08:00
zhaokaiyao@91isoft.com ce7812e704 把 standtextStatusShow改为了standTextStatusShow 2021-09-27 13:54:14 +08:00
zhaokaiyao@91isoft.com d9d5aeb284 标准导出 2021-09-27 10:18:26 +08:00
yanyizhou c7e3c97339 国内外标准--如果清单下挂着标准A，在标准库里删除标准A的话，加个验证 不让删这个标准 2021-09-23 15:17:41 +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