FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,553 Commits 1 Branch 0 Tags
4c65fb97d42e30c1f3135d5ecbcc2f8bd30c2c0c
Commit Graph
61 Commits
Author SHA1 Message Date
zhaokaiyao@91isoft.com 4c65fb97d4 根据标准id查询存在分解单的文本类型 2021-12-28 19:41:37 +08:00
yanyizhou dd8d2e2151 分解单编辑功能 2021-12-22 17:59:07 +08:00
yuezhihang 3880e0c68f 标准维度选数据出现全空数据的问题 2021-12-21 11:05:26 +08:00
zhaokaiyao@91isoft.com 22faad46db 分解单默认正序排序 2021-12-10 13:45:07 +08:00
zhaokaiyao@91isoft.com fd9bf0f130 查看分解单 实施日期多个 2021-12-09 14:27:29 +08:00
zhaokaiyao@91isoft.com 0cabb928d7 查看分解单 实施日期多个 2021-12-09 14:26:50 +08:00
yuezhihang 2bbdb32e8f 项目维度查询分解单数据错误bug 2021-12-08 17:23:06 +08:00
yuezhihang 455fc2ba0e 12.1bug修复 2021-12-01 17:59:17 +08:00
yuezhihang 4c31f54a5e 11.26 项目维度 查询标准数据接口修改1 2021-11-26 16:41:50 +08:00
yuezhihang 0d18758178 项目评估流程标准维度-查询数据来源修复 2021-10-27 13:47:29 +08:00
yuezhihang d02b73e2dd 标准库查询 和 流程发起界面查询 做了一个标志位的区分 目的是为了提高标准库的查询速度 2021-10-27 13:39:07 +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
yuezhihang 87337c1374 查询人 接口 2021-09-27 19:47:15 +08:00
Mr.Z 0630c99b0b 添加条款内容传给前端 2021-09-27 16:33:59 +08:00
Mr.Z 2b9b039a48 拉取master 2021-09-22 16:52:13 +08:00
zhaokaiyao@91isoft.com d4a293cbef 标准详情->分解单->排序split_pid函数 2021-09-22 16:26:02 +08:00
zhaokaiyao@91isoft.com e7e3848108 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-09-16 20:04:09 +08:00
zhaokaiyao@91isoft.com 3eb2ddce1e 分解单默认升序排序 2021-09-16 16:47:03 +08:00
yuezhihang 6e88f37c28 项目评估流程排序问题 2021-09-16 15:00:14 +08:00
zhaokaiyao@91isoft.com 180b755bec 分解单排序 2021-09-15 17:07:37 +08:00
Mr.Z 84190c9ddc 项目合规评估流程-项目 入到标准合规评估结果 里面 产品线、项目编号、项目名称没传值~~ 2021-09-07 16:55:28 +08:00
zhaokaiyao@91isoft.com 913fc6e8f5 国内外标准详情 分解单日期格式和条款名称模糊查询 2021-08-29 19:17:41 +08:00
Mr.Z 349fa7e499 标准拆分的批量删除与编辑~~ 2021-08-27 15:30:24 +08:00
yuezhihang 65a7e634d4 分界单进入之前先删除 2021-08-24 17:14:20 +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
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
zhaokaiyao@91isoft.com e6908fb48c 标准分解单 分页 2021-08-17 14:09:06 +08:00
yuezhihang 99d5706184 解读入库 2021-08-16 14:57:34 +08:00
super_liu ecb5d3a67e Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request !109
 2021-08-13 08:43:49 +00:00
super_liu fbf1d49065 feat: There is no way the 2021-08-13 15:43:49 +08:00
yuezhihang cdf9e16f1d Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-12 09:06:22 +08:00
zhaokaiyao@91isoft.com 2107728ce8 最新 2021-08-11 14:42:09 +08:00
zhaokaiyao@91isoft.com 530a6febf6 查看分解单字段修改 2021-08-11 13:36:50 +08:00
yanyizhou 3f66b95e94 拆分 2021-08-10 19:19:29 +08:00
yuezhihang fb860e347d 解读入库 2021-08-10 17:57:03 +08:00
yuezhihang e52f316a59 标准总数返回 
！！！！！
 2021-08-10 14:49:44 +08:00
yuezhihang ca80dd9feb Merge remote-tracking branch 'origin/develop_master' into develop_master 
# Conflicts:
#	adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
 2021-08-09 17:55:11 +08:00
yuezhihang 3dd392b411 过滤数据！！！ 2021-08-09 17:52:01 +08:00
2510220824 4302fed66f Merge remote-tracking branch 'origin/develop_3' into develop_3 
# Conflicts:
#	adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
 2021-08-09 17:10:30 +08:00
zhaokaiyao@91isoft.com b0eeb87bd1 标准详情->标准分解单查询 2021-08-08 22:40:37 +08:00
yuezhihang 82b72b191d 解读入库 2021-08-05 14:51:45 +08:00
yuezhihang a2bd01dd5e 标准解读流程入库+ 合并分支 2021-08-05 09:05:30 +08:00
zzy 0540325f35 update：修改标准查询 2021-07-27 17:04:30 +08:00
zzy c3c69e87ef update：清单增加字段 2021-07-27 09:20:27 +08:00
zzy 3cafbfbb6f Merge remote-tracking branch 'origin/develop_master' into develop_1 
# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java
#	adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml
 2021-07-22 16:25:23 +08:00
zzy 91c4dea4db update:清单导出，增加编辑，修复bug 2021-07-22 16:10:53 +08:00
yuezhihang 310cdf9473 Merge remote-tracking branch 'origin/develop_1' into develop_master 
# Conflicts:
#	adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml
 2021-07-21 14:07:53 +08:00
yuezhihang 7d890e7fcd 评估流程 2021-07-21 10:52:22 +08:00
zzy 8ce15424ac update:修复清单bug 2021-07-20 13:36:55 +08:00