FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
939 Commits 1 Branch 0 Tags
3eb2ddce1ef13500b48e7bddff4a40576f89f215
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
yuezhihang bcf47c93e1 查人组件 2021-09-15 16:34:47 +08:00
yuezhihang f6933d2cc3 程序异常解决 2021-09-09 19:15:07 +08:00
yuezhihang d4dc194a79 清单 流程回退 2021-09-09 16:11:09 +08:00
yuezhihang bbbf101055 征求意见排序！！ 2021-09-09 15:31:48 +08:00
yuezhihang 721f13febc 数据同步 2021-09-09 10:04:42 +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
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
yuezhihang 81a65fcf36 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-09-07 09:22:34 +08:00
yuezhihang 02f54162d1 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-09-06 18:30:08 +08:00
yuezhihang fa2417d51e Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-09-06 18:29:54 +08:00
yuezhihang 299c91d03e Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-09-06 09:12:50 +08:00
yuezhihang 92207379fc Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-09-04 16:43:36 +08:00
yuezhihang b5414c7bf1 老数据 读取 2021-09-04 16:43:27 +08:00
yuezhihang 8ce701cc82 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-09-03 09:24:42 +08:00
yuezhihang ae1c70b140 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-09-02 17:31:44 +08:00
yuezhihang 5c246ba9b4 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-09-02 16:44:15 +08:00
yuezhihang 5fdf3fa9ae Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-09-02 16:30:12 +08:00
yuezhihang 0e4d7b6a32 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-09-02 09:36:04 +08:00
yuezhihang 4277e819f2 因排序导致无法去重 2021-08-31 16:12:29 +08:00
yuezhihang 1ef143e71f 标准查询 标准号/标准姓名 ！！！ 2021-08-31 10:49:04 +08:00
yuezhihang fdd7fe18c0 清单查询失效问题 2021-08-31 10:29:29 +08:00
yuezhihang 7ad71e5e6a Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-30 17:50:50 +08:00
yuezhihang 900437039d 项目清单确认流程 2021-08-30 17:50:45 +08:00
yuezhihang 46978c9fdb Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-27 17:44:02 +08:00
yuezhihang 75888c8fa0 首页 结束时间正序 2021-08-27 17:43:56 +08:00
yuezhihang 73588cac91 需求 解读流程 最细条目 2021-08-27 15:30:24 +08:00
yuezhihang 9b9ebabe6b 公开征求意见 2021-08-27 15:30:24 +08:00
yuezhihang 653fd06d50 配置 2021-08-27 15:30:24 +08:00
yuezhihang 59f77d802c 首页征求意见倒序 2021-08-27 15:30:24 +08:00
yuezhihang 7ff86124b7 首页 征求意见倒序排序 2021-08-27 15:30:24 +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
yuezhihang 638a988a9d Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-08-27 09:23:22 +08:00
yuezhihang 6aeb9b91ac 公开征求意见 2021-08-26 14:25:12 +08:00
yuezhihang 7b940f7c91 配置 2021-08-26 13:56:12 +08:00
yuezhihang 6c94bcb070 首页征求意见倒序 2021-08-26 13:55:21 +08:00
yuezhihang 120ee599b7 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-26 13:54:35 +08:00
yuezhihang 19ed562068 首页 征求意见倒序排序 2021-08-26 13:54:24 +08:00
yuezhihang ca84264193 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-26 09:42:57 +08:00
yuezhihang 65a7e634d4 分界单进入之前先删除 2021-08-24 17:14:20 +08:00
yuezhihang 78dbd37f03 Merge remote-tracking branch 'origin/develop_1' into develop_master 
# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
 2021-08-24 15:34:27 +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
yuezhihang 019ca93736 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-19 16:51:11 +08:00
yuezhihang 66edfd1afc 清单 附件回显 2021-08-19 16:51:03 +08:00
yuezhihang b7589984e8 清单 流程回退 2021-08-19 10:51:37 +08:00
yuezhihang 7d18b3ff7c Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-08-19 10:41:20 +08:00
yuezhihang cdb3a9ccd4 bug修复 !!! 2021-08-19 09:25:29 +08:00
yuezhihang 508c292200 配置文件 2021-08-18 15:15:06 +08:00
yuezhihang af1ffe9313 解读入库 2021-08-18 14:44:27 +08:00
yuezhihang 39561c91d2 代码部分恢复 2021-08-18 14:38:00 +08:00
yuezhihang f353328bce Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-17 17:51:44 +08:00
yuezhihang 7303f11043 解读入库 2021-08-17 17:51:38 +08:00
yuezhihang 8028002033 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-17 16:18:45 +08:00
yuezhihang 535c4f47c4 清单！！！ 2021-08-17 16:18:38 +08:00
yuezhihang 0529b40897 试图上传 2021-08-17 09:50:23 +08:00
yuezhihang 690d86a4b8 项目查询以及代码精简 2021-08-17 09:37:46 +08:00
yuezhihang fbefe71f1c 评估结果 2021-08-16 15:43:26 +08:00
yuezhihang 86db5270e4 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-08-16 15:12:54 +08:00
yuezhihang 5bbc0e175f Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-16 14:57:44 +08:00
yuezhihang 99d5706184 解读入库 2021-08-16 14:57:34 +08:00
yuezhihang 133f55d162 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-13 18:28:34 +08:00
yuezhihang 44a24c23b1 项目维度 筛选标准 2021-08-13 18:28:28 +08:00
yuezhihang c660c36d40 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-13 16:44:17 +08:00
yuezhihang 699b1ef9c4 车型项目库查询bug 2021-08-13 16:44:09 +08:00
yuezhihang 39c08ecb81 发版配置 2021-08-13 09:15:01 +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
yuezhihang 514bf18667 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-12 14:54:01 +08:00
yuezhihang 3c27f20db3 修改分解单状态 2021-08-12 14:53:54 +08:00
yuezhihang f43ac650e0 标准合规评估流程 产品线不显示bug修复 2021-08-12 09:29:24 +08:00
yuezhihang 0326e66b54 启动bug修复 2021-08-12 09:13:06 +08:00
yuezhihang cdf9e16f1d Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-12 09:06:22 +08:00
yuezhihang 440bb7d038 标准总数返回 
！！！！！
 2021-08-11 14:23:49 +08:00
yuezhihang 8c92abab31 过滤数据！！！ 2021-08-11 14:23:49 +08:00
yuezhihang def09cd38a 标准总数返回 
！！！！！
 2021-08-11 13:39:25 +08:00
yuezhihang adb039fa98 过滤数据！！！ 2021-08-11 13:39:20 +08:00
yuezhihang fb860e347d 解读入库 2021-08-10 17:57:03 +08:00
yuezhihang 90c39fab34 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-08-10 17:44:56 +08:00
yuezhihang e52f316a59 标准总数返回 
！！！！！
 2021-08-10 14:49:44 +08:00
yuezhihang 1218c4633a 代码合并 2021-08-09 17:58:19 +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
yuezhihang 1b8884fe75 车型项目库！ 2021-08-09 11:07:26 +08:00
yuezhihang 11ef32d698 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-08-08 17:37:45 +08:00
yuezhihang 313251dbbd Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-08 17:37:33 +08:00
yuezhihang 79113cd47a Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-08-08 15:44:08 +08:00
yuezhihang 32f7678427 ky 上传文件类型限制！！！ 2021-08-08 10:41:26 +08:00
yuezhihang b618714246 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-06 14:07:29 +08:00
yuezhihang 3df07924e8 标准解读流程 over！ 2021-08-06 14:07:22 +08:00
yuezhihang 82b72b191d 解读入库 2021-08-05 14:51:45 +08:00
yuezhihang 78ec0a08c7 发版配置更新 2021-08-05 09:24:51 +08:00
yuezhihang a2bd01dd5e 标准解读流程入库+ 合并分支 2021-08-05 09:05:30 +08:00
yuezhihang 639dd56700 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-08-05 09:04:09 +08:00
yuezhihang 9a5117f8e8 标准 拆分加文本状态 Map对应的 酌情添加 2021-08-03 15:06:20 +08:00