Commit Graph
552 Commits
Author SHA1 Message Date
yuezhihang 900437039d 项目清单确认流程 2021-08-30 17:50:45 +08:00
super_liu a57693fd39 Merge branch 'develop_master' into develop_migration 2021-08-30 15:11:00 +08:00
super_liu 99c32a2d7f feat: There is no way the convert 2021-08-30 15:08:55 +08:00
zhaokaiyao@91isoft.com 2fb1faacfa 标准预警,标准文本状态自动更新 2021-08-30 09:48:35 +08:00
zhaokaiyao@91isoft.com 913fc6e8f5 国内外标准详情 分解单日期格式和条款名称模糊查询 2021-08-29 19:17:41 +08:00
zhaokaiyao@91isoft.com d66fcc1ad1 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-08-27 15:30:35 +08:00
yuezhihang 73588cac91 需求 解读流程 最细条目 2021-08-27 15:30:24 +08:00
Mr.Z 349fa7e499 标准拆分的批量删除与编辑~~ 2021-08-27 15:30:24 +08:00
yanyizhou 87f3c15a7b 不一致项 查询 加standType 2021-08-27 15:30:23 +08:00
zhaokaiyao@91isoft.com c22db5b063 定时任务-修改文本状态 2021-08-27 15:24:32 +08:00
yuezhihang 003315dde8 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-08-27 14:44:07 +08:00
yuezhihang 9185ef2b6a 需求 解读流程 最细条目 2021-08-27 14:43:47 +08:00
Mr.Z 8cf4fec559 标准预警标准编号与名称跳页~~ 2021-08-27 11:25:17 +08:00
Mr.Z 07bd24b7cf 标准拆分的批量删除与编辑~~ 2021-08-26 20:44:51 +08:00
Mr.Z 6ada02e26d Merge branch 'develop_master' into develop_1 2021-08-26 10:27:59 +08:00
zhaokaiyao@91isoft.com 6e0091f875 标准预警 2021-08-26 10:23:02 +08:00
yanyizhou dbac199130 Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-08-25 17:03:28 +08:00
yanyizhou 51055e0374 不一致项 查询 加standType 2021-08-25 17:02:59 +08:00
super_liu 590165a3c8 Merge branch 'develop_master' into develop_migration 2021-08-24 17:31:22 +08:00
super_liu 02a8b6c969 feat: There is no way the ES BUSS 2021-08-24 17:29:53 +08:00
Mr.Z 3d9952df59 Merge branch 'develop_master' into develop_1 2021-08-24 11:05:07 +08:00
Mr.Z 6e9cf7adf4 车型项目库数据传递bug修改~~ 2021-08-24 11:01:32 +08:00
super_liu 6084f51bae feat: There is no way the 2021-08-24 09:57:11 +08:00
Mr.Z d94b03b05a 车型项目库回显bug(T_T)~~~~ 2021-08-23 14:46:09 +08:00
yanyizhou 67dc9c829a Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-08-23 09:47:05 +08:00
yanyizhou 23365ffa16 标准拆分,拆分之后分解单里也有数据 2021-08-20 21:50:40 +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
yuezhihang 27e72dca2e 征求意见 数据 2021-08-20 17:49:34 +08:00
yuezhihang e4c66d74a2 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-20 15:20:54 +08:00
yuezhihang dcfedac4bf 标准征求意见流程汇总 2021-08-20 15:20:33 +08:00
super_liu 1363a5b5af Merge branch 'develop_3' into 'develop_master'
Develop 3

See merge request !119
2021-08-20 07:06:16 +00:00
zhaokaiyao@91isoft.com ebfde8bd52 定时标准预警 2021-08-20 14:33:29 +08:00
super_liu d176d93d6b feat: There is no way the Buss and Convert 2021-08-20 14:07:37 +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 5251cfdb71 Merge branch 'develop_master' into develop_3 2021-08-18 14:00:03 +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
zhaokaiyao@91isoft.com e6908fb48c 标准分解单 分页 2021-08-17 14:09:06 +08:00
super_liu ecde4434dd Merge branch 'develop_3' into 'develop_master'
Develop 3

See merge request !113
2021-08-17 02:48:55 +00:00
zhaokaiyao@91isoft.com 32626f3ae1 过内外标准高级搜索 2021-08-16 16:13:04 +08:00
yuezhihang 99d5706184 解读入库 2021-08-16 14:57:34 +08:00
yuezhihang 44a24c23b1 项目维度 筛选标准 2021-08-13 18:28:28 +08:00
yuezhihang 699b1ef9c4 车型项目库查询bug 2021-08-13 16:44:09 +08:00
yuezhihang 3327223c25 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-08-13 09:06:16 +08:00
yuezhihang 9f0ed13874 合规评估项目数据过滤 2021-08-12 18:08:29 +08:00
yuezhihang 5254f397b8 项目评估流程 2021-08-12 18:00:46 +08:00
yuezhihang 7d4dcf561a 查询总数 错误bug 2021-08-12 16:22:36 +08:00
shen_yan_pu 0ae192be2f 修改标准清单的实施日期字段 2021-08-12 10:40:17 +08:00
yuezhihang 0326e66b54 启动bug修复 2021-08-12 09:13:06 +08:00