Commit Graph
668 Commits
Author SHA1 Message Date
yanyizhou c7e3c97339 国内外标准--如果清单下挂着标准A,在标准库里删除标准A的话,加个验证 不让删这个标准 2021-09-23 15:17:41 +08:00
Mr.Z 8e2d3c7697 Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-09-23 14:00:35 +08:00
zhaokaiyao@91isoft.com 5d1e39fa32 分解单->关联条款 2021-09-23 01:12:51 +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 76b61d5d07 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-09-17 09:32:25 +08:00
yuezhihang 4d598a76a2 标准解读 章节1 展示 2021-09-16 20:05:48 +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 ccf7d32945 首页标准发布 只查询文本状态为即将实施的数据 2021-09-16 19:27:36 +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 d6331ab155 标准详情,已被分解的的文本才有分解单按钮 2021-09-15 18:01:06 +08:00
zhaokaiyao@91isoft.com 180b755bec 分解单排序 2021-09-15 17:07:37 +08:00
zhaokaiyao@91isoft.com 33d084527b 导入文件路径 摒弃配置 2021-09-14 15:42:35 +08:00
zhaokaiyao@91isoft.com 45da8e58d3 导入文件路径 摒弃配置设置 2021-09-14 15:11:58 +08:00
zhaokaiyao@91isoft.com aae27284b8 导入文件路径 2021-09-14 15:09:06 +08:00
zhaokaiyao@91isoft.com d133fefdab 注释 2021-09-13 16:09:32 +08:00
zhaokaiyao@91isoft.com 3f9e7205fd 使用标准表实施日期,不使用国家清单实施日期 2021-09-13 16:05:26 +08:00
zhaokaiyao@91isoft.com 200adfcc65 导入数据时,标准类别不存在时新增 2021-09-13 09:06:47 +08:00
zhaokaiyao@91isoft.com fe072412d9 属性字段初始化 2021-09-10 17:40:29 +08:00
zhaokaiyao@91isoft.com 61be8c0aaa excl批量导入标准 添加搜索中心 2021-09-10 15:59:10 +08:00
zhaokaiyao@91isoft.com ea9e2b31cc excl批量导入标准 2021-09-09 23:06:19 +08:00
zhaokaiyao@91isoft.com 77c274b724 commit 2021-09-09 22:29:34 +08:00
zhaokaiyao@91isoft.com 3c5c0e4847 详情,实施日期多个 2021-09-09 21:04:04 +08:00
zhaokaiyao@91isoft.com 6aad71715c commit 2021-09-09 19:44:48 +08:00
zhaokaiyao@91isoft.com 346f35f548 预警 再实施日期到达预警期限时,新车型和在产车实施日期不在预警期限,取消不显示 2021-09-09 19:39:01 +08:00
zhaokaiyao@91isoft.com bc4cc05f24 标准左侧数排序 2021-09-09 17:56:39 +08:00
zhaokaiyao@91isoft.com 5089cbb59d Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-09-09 17:25:45 +08:00
zhaokaiyao@91isoft.com 292d4c3823 标准号使用正则判断 2021-09-09 17:25:02 +08:00
super_liu 3bc36d45d1 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the

See merge request LiuChao/foton-slrs-system-rest!164
2021-09-09 17:22:55 +08:00
super_liu ab7e69ef39 Merge branch 'develop_3' into 'develop_master'
Develop 3

See merge request LiuChao/foton-slrs-system-rest!162
2021-09-09 17:22:22 +08:00
super_liu de8f11cadc feat: There is no way the 2021-09-09 17:18:43 +08:00
yuezhihang d4dc194a79 清单 流程回退 2021-09-09 16:11:09 +08:00
yuezhihang bbbf101055 征求意见排序!! 2021-09-09 15:31:48 +08:00
zhaokaiyao@91isoft.com 60e28c19dc Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-09-09 10:59:42 +08:00
zhaokaiyao@91isoft.com 0cdf343a09 standRegionalTimeDto 字段与数据库字段匹配 2021-09-09 10:59:26 +08:00
yuezhihang 721f13febc 数据同步 2021-09-09 10:04:42 +08:00
zhaokaiyao@91isoft.com 26f28b30b6 standRegionalTimeDto 属性大小写和数据字段匹配 2021-09-08 22:26:09 +08:00
zhaokaiyao@91isoft.com cf32ad9580 标准详情,实施日期 s.getPutTime()空指针 2021-09-08 21:07:29 +08:00
zhaokaiyao@91isoft.com 7fab612a90 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-09-08 10:18:42 +08:00
zhaokaiyao@91isoft.com 1a03cfe68f 标准文本状态.解决无法自动废止 2021-09-08 10:17:48 +08:00
yuezhihang 5d8e14befe 清单 流程回退 2021-09-08 10:09:05 +08:00
yuezhihang 4ced2398b2 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-09-08 09:16:20 +08:00
super_liu f7497d48bc feat: There is no way the #47672 2021-09-07 17:04:53 +08:00
Mr.Z 84190c9ddc 项目合规评估流程-项目 入到标准合规评估结果 里面 产品线、项目编号、项目名称没传值~~ 2021-09-07 16:55:28 +08:00
yuezhihang 7471709e1d Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-09-07 09:52:18 +08:00
yuezhihang 9729d04588 数据同步 2021-09-07 09:51:59 +08:00
Mr.Z 5d56dd4151 岗位管理新增查询功能以及分页功能~~ 2021-09-07 09:29:23 +08:00
zhaokaiyao@91isoft.com 7ede6c69af commit 2021-09-07 09:24:41 +08:00
yuezhihang 81a65fcf36 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-09-07 09:22:34 +08:00