FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,135 Commits 1 Branch 0 Tags
2700d732ae0ccb2f39c015ecdcb139937b6b0fd2
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
gaojiabao 939601071b Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 2023-04-12 09:49:40 +08:00
gaojiabao 4e6d7c2d5f 问答中心 我的回答 返回taskID 2023-04-12 09:49:10 +08:00
gaojiabao dbe728db6f Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 2023-04-11 17:21:19 +08:00
gaojiabao 53608b5b35 跳转 标准号 异常 2023-04-11 16:45:42 +08:00
gaojiabao 897502b4b0 问答中心显示权限 2023-04-11 15:57:29 +08:00
gaojiabao 3030bc9d68 问答中心 跳转回填提问和回答问题 2023-04-11 13:18:55 +08:00
gaojiabao 54e0ac3ce6 问答中心 跳转回填提问和回答问题 2023-04-11 13:09:58 +08:00
gaojiabao 96812f00f1 Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 2023-04-11 12:51:47 +08:00
gaojiabao 2b468f9149 问答中心 跳转回填提问和回答问题 2023-04-11 12:50:56 +08:00
gaojiabao 06e9c0a3e7 问答中心 跳转回填提问和回答问题 2023-04-11 10:47:53 +08:00
gaojiabao d0113275ac Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 2023-04-10 20:46:47 +08:00
gaojiabao 2b209fc4c8 单拆分个 2023-04-10 15:29:15 +08:00
gaojiabao f06df78def 单个拆分 2023-04-10 14:32:01 +08:00
gaojiabao 58fb851aaa 文件名称 2023-04-10 14:06:05 +08:00
gaojiabao 4e8bba5acb 文件回填 2023-04-10 13:53:59 +08:00
gaojiabao 27aba2ad1f 查询原文件 2023-04-09 20:40:35 +08:00
gaojiabao 346a68ce06 批量流程 2023-04-09 18:21:05 +08:00
gaojiabao 8b72aec7bc Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 
# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java
#	adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java
 2023-04-09 18:04:05 +08:00
gaojiabao 463052ab89 企标计划批量走流程 2023-04-09 17:58:36 +08:00
gaojiabao 960fb4c422 提供前端 2023-04-07 18:46:05 +08:00
gaojiabao a7dafb3cf8 Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 2023-04-06 03:44:49 +08:00
gaojiabao d5d1884d38 问答中心 msg 没有值 2023-04-06 03:44:12 +08:00
gaojiabao a14d158480 Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 2023-04-05 23:43:00 +08:00
gaojiabao 8d6a79801c 导入拆分结果 2023-04-05 23:42:40 +08:00
gaojiabao 01635ca7c7 定时任务 2023-04-05 22:14:41 +08:00
gaojiabao 7c747782ca Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 2023-04-05 15:08:27 +08:00
gaojiabao a34f14d52f 名称优化 2023-04-05 15:08:04 +08:00
gaojiabao c9708f03f5 在线编辑文件的路径 2023-04-04 23:33:19 +08:00
gaojiabao 524b880cf3 Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 2023-04-04 22:59:53 +08:00
gaojiabao 659358908e 标准拆分 分页文本状态 nulL 2023-04-04 22:59:07 +08:00
gaojiabao 602db8cac3 Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 2023-04-04 21:32:13 +08:00
gaojiabao c4535f9b12 导入拆分结果 2023-04-04 21:31:15 +08:00
gaojiabao c8c55a839b 通过id查询接口 2023-04-04 17:44:55 +08:00
gaojiabao 50b7f6632e Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 2023-04-04 15:37:11 +08:00
gaojiabao 7aa1c4a80c 标准详情的问答返回所有问题和回答 2023-04-04 15:36:56 +08:00
gaojiabao c038fae038 企业编号 最大值 加1 以及新增时，企标名称可以重复（编号和名称重复也是新增一条，不做覆盖） 2023-04-04 11:44:31 +08:00
gaojiabao 9415f29898 Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 2023-04-04 10:37:15 +08:00
gaojiabao 5cd7e4310b 企业编号 最大值 加1 2023-04-04 10:25:33 +08:00
gaojiabao 47af72dcf3 拆分导入 2023-04-03 21:13:27 +08:00
gaojiabao 4f71a4c971 Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 2023-04-03 21:11:50 +08:00
gaojiabao d3c152f5b4 拆分导入 2023-04-03 21:11:11 +08:00
gaojiabao c52c720884 问答中心回答 2023-04-03 13:36:50 +08:00
gaojiabao 6d6edd5d43 问答中心回答 2023-04-03 11:19:04 +08:00
gaojiabao f6731e85bd Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 2023-03-31 15:40:45 +08:00
gaojiabao 733c7c14f5 问答中心回答 2023-03-31 15:40:28 +08:00
gaojiabao f47c1273da 首页 接收任务 按钮 点击则隐藏 2023-03-30 19:43:13 +08:00
gaojiabao ca11f4ea51 拆分表格角标 2023-03-30 19:12:06 +08:00
gaojiabao 0c9f2fb867 Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 2023-03-30 19:07:30 +08:00
gaojiabao 4a18c684fa 拆分表格角标修正 2023-03-30 19:07:03 +08:00
gaojiabao bfea9a313d Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 2023-03-27 18:13:43 +08:00
gaojiabao 484d2879e4 人员表修改 2023-03-27 11:31:58 +08:00
gaojiabao 72b7568c2e OA三天后撤销 2023-03-26 12:59:43 +08:00
gaojiabao 02a4b8a6d7 OA三天后撤销 2023-03-26 10:16:30 +08:00
gaojiabao 04c780243c 企业标准产品标准附件重复问题 2023-03-24 17:54:41 +08:00
gaojiabao dcc3eb755b Merge remote-tracking branch 'origin/dev_chaifen_20230322' into dev_chaifen_20230322 2023-03-23 13:54:34 +08:00
gaojiabao b4410694f1 OA强制删除 2023-03-23 13:54:18 +08:00
gaojiabao 2732f5c505 英译文件修改和无法处理数据进行返回（公众号和文件id） 2023-03-22 18:07:19 +08:00
gaojiabao 4d9b3c22ca 英译文件修改和无法处理数据进行返回（公众号和文件id） 2023-03-22 16:12:25 +08:00
gaojiabao 19d7befd82 Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 2023-03-22 13:50:15 +08:00
gaojiabao 23659c18a7 企标制修订计划管控 （接收任务） 2023-03-22 13:49:55 +08:00
gaojiabao 734342e0ad 变更表结构字段 2023-03-21 17:11:18 +08:00
gaojiabao b4946c9ecc 校验优化 2023-03-20 16:27:55 +08:00
gaojiabao 994e4acbbb 校验优化 2023-03-20 16:10:40 +08:00
gaojiabao 98f2c05f32 校验优化 2023-03-20 15:59:02 +08:00
gaojiabao 17c526d396 Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 2023-03-20 09:20:23 +08:00
gaojiabao 59e8462d23 校验 2023-03-20 09:19:21 +08:00
gaojiabao aa4451f0aa 校验 2023-03-17 18:03:27 +08:00
gaojiabao b94f153b98 老系统重复文件查询 2023-03-16 09:11:44 +08:00
gaojiabao 0e28163281 Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 2023-03-16 09:02:57 +08:00
gaojiabao 5f466027b1 译文原文问题 2023-03-16 09:02:32 +08:00
gaojiabao d481985603 译文原文问题（校验） 2023-03-14 17:18:28 +08:00
gaojiabao 52134d926d 译文原文问题（更正老系统文件名称获取字段） 2023-03-14 14:17:45 +08:00
gaojiabao cf570dbe6c 译文原文问题（返回文件有名称重复,代码优化） 2023-03-14 11:34:20 +08:00
gaojiabao f398caa0eb 译文原文问题（返回文件有名称重复,代码优化） 2023-03-13 18:06:40 +08:00
gaojiabao 690373af7d 译文原文问题（返回文件有名称重复,代码优化） 2023-03-13 17:03:08 +08:00
gaojiabao 859326d2a3 译文原文问题（返回文件有名称重复,代码优化） 2023-03-13 15:07:20 +08:00
gaojiabao 4872a5a24a 译文原文问题（返回文件有名称重复,数据优化） 2023-03-13 14:49:40 +08:00
gaojiabao 99eb785b9d 译文原文问题（返回文件有名称重复） 2023-03-13 10:52:18 +08:00
gaojiabao e13d97769d 清空注释代码 2023-03-10 17:25:04 +08:00
gaojiabao 8165d52946 英译 问题 + 老系统附件重复问题 2023-03-10 17:21:28 +08:00
gaojiabao acc164f16d 英译 2023-03-10 10:31:28 +08:00
gaojiabao 70171a5e79 文件下载 + 流程的历史版本问 2023-03-09 14:19:25 +08:00
gaojiabao 59e89c9c98 文件挂靠 接口 2023-03-07 10:09:53 +08:00
gaojiabao faa7fdd02e Merge branch 'dev_20230216' of E:\futianxiangmu\foton-slrs-system-rest with conflicts. 2023-03-02 17:21:02 +08:00
gaojiabao 413ef5b82e Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 2023-03-02 17:18:18 +08:00
gaojiabao 4d31e44da2 Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 2023-02-28 14:59:04 +08:00
gaojiabao 3adaeddbf1 归档 2023-02-28 10:44:12 +08:00
gaojiabao 1d00e1c8c3 测试 提交 2023-02-22 16:09:40 +08:00
gaojiabao 6ac734d65f 问答流程 2023-02-20 16:42:49 +08:00
gaojiabao e2ed54e90e 判断企业名称+编号是否是唯一的 2023-02-17 13:53:59 +08:00
gaojiabao 3ffeefcfc8 判断企业名称+编号是否是唯一的 2023-02-17 11:18:35 +08:00
gaojiabao 3fca3eed63 判断企业名称+编号是否是唯一的 2023-02-17 10:54:25 +08:00
gaojiabao 719c98739b 个人中心 我的收藏 倒叙排序 和三天以内收藏的数据加（new） 2023-02-17 10:50:49 +08:00
gaojiabao 15cb65ffdb 国内标准 海外标准 企业标准 判断名称+编号为唯一标识接口 2023-02-17 10:46:01 +08:00
gaojiabao 9123902866 法规清单 导出补充子弹 2023-02-14 14:06:30 +08:00
gaojiabao 5d4a787a4b 个人中心 我的收藏 日期排序 2023-02-13 13:41:32 +08:00
gaojiabao 76feeb358a 拆分流程导出表格问题 2023-02-13 11:36:01 +08:00
gaojiabao 9e80e6f93e 拆分流程图片展示以及导出出片超链接格式 2023-02-10 12:05:17 +08:00
gaojiabao ce1200dd11 拆分流程图片展示以及导出出片超链接格式（测试） 2023-02-10 11:56:37 +08:00
gaojiabao 1067dfc51e 拆分流程图片展示以及导出出片超链接格式（测试） 2023-02-10 11:47:17 +08:00