Commit Graph

Select branches

Hide Pull Requests

dev_20231201_feizhi

Mono Color

• 07303047fa 工作组 yuezhihang 2022-07-05 09:21:45 +08:00
• 348b4b0be5 Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2022-07-04 13:29:44 +08:00
• f8761dda1b 其他清单-编辑 程序异常（走过更新发布流程 yuezhihang 2022-07-04 13:29:35 +08:00
• 98d049af2f Merge branch 'develop_migration' into 'develop_master' super_liu 2022-07-03 18:04:18 +08:00
• 8b70a4c80d feat: There is no way the, #55969 #55973 企标顺序号相关逻辑 396572590@qq.com 2022-07-03 18:02:57 +08:00
• 58fa98fe3a Merge branch 'develop_migration' into 'develop_master' super_liu 2022-07-02 22:41:27 +08:00
• 4131965f6e feat: There is no way the, 企标顺序号关联逻辑 396572590@qq.com 2022-07-02 22:34:04 +08:00
• 36d7838206 Merge branch 'develop_migration' into 'develop_master' super_liu 2022-07-01 14:47:57 +08:00
• 83b806c932 feat: There is no way the, bug #56143 企标相关-- 选择人员后带入的起草责任单位支持三级查询 396572590@qq.com 2022-07-01 14:38:34 +08:00
• af8425f268 改名字 yuezhihang 2022-06-30 11:09:16 +08:00
• f76c667a4f Merge branch 'develop_master' into FOTON 396572590@qq.com 2022-06-30 11:08:25 +08:00
• 992a715988 Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2022-06-30 10:45:33 +08:00
• d1c3e424d7 附件改名逻辑 yuezhihang 2022-06-30 10:45:23 +08:00
• f03c06e020 Merge branch 'develop_migration' into 'develop_master' super_liu 2022-06-30 09:54:18 +08:00
• 19b4863d18 Merge branch 'develop_master' into develop_migration 396572590@qq.com 2022-06-30 09:31:51 +08:00
• 4d0a56be74 feat: There is no way the, 改改改 从企标计划开始 改到 企标标准入库及企标库 改至计划已确认关联之多 改为测 396572590@qq.com 2022-06-29 15:37:25 +08:00
• 20d23a427e feat: There is no way the, 改改改 从企标计划开始 改到 企标标准入库及企标库 改至计划已确认关联之多 改为测 396572590@qq.com 2022-06-29 15:31:50 +08:00
• 67b877e5d5 Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2022-06-29 13:41:29 +08:00
• 189763f5a2 附件名称修改 yuezhihang 2022-06-29 13:41:22 +08:00
• accfc06de8 Merge branch 'develop_master' into FOTON 396572590@qq.com 2022-06-29 11:57:28 +08:00
• 902e595ad0 fix: AWC系统对接去掉VPPSName对接查询 zhangyanduan 2022-06-29 11:50:30 +08:00
• 177804eb67 idm 新增处理人员部门逻辑 yuezhihang 2022-06-29 10:05:04 +08:00
• a8e7a28de5 Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2022-06-29 08:53:42 +08:00
• e42500f3c4 feat: There is no way the, 改改改 从企标计划开始 改到 企标标准入库及企标库 改至计划已确认关联之多…… 待改完 396572590@qq.com 2022-06-28 18:14:53 +08:00
• 4380b2af06 Merge branch 'develop_migration' into 'develop_master' super_liu 2022-06-28 18:04:39 +08:00
• dd0676c577 feat: There is no way the, UPDNONEXISTENT_nameEn (只支持文本查询接口,维护ES 英文字段不存在的数据) 396572590@qq.com 2022-06-28 18:04:17 +08:00
• aa3bdac315 feat: There is no way the, 改改改 从企标计划开始 改到 企标标准入库及企标库 改至计划已确认关联之多…… 待改完 396572590@qq.com 2022-06-28 17:55:40 +08:00
• 6199f40128 sonar yuezhihang 2022-06-28 17:04:07 +08:00
• 3ec5d054f2 Merge branch 'develop_migration' into 'develop_master' super_liu 2022-06-28 14:35:51 +08:00
• bd487d08ad feat: There is no way the, UPDNONEXISTENT_nameEn (只支持文本查询接口,维护ES 英文字段不存在的数据) 396572590@qq.com 2022-06-28 14:35:06 +08:00
• 467d19e5b2 Merge branch 'develop_master' into FOTON 396572590@qq.com 2022-06-28 11:49:22 +08:00
• d9b478ea63 Merge branch 'develop_migration' into 'develop_master' super_liu 2022-06-28 11:48:12 +08:00
• 0ea7f77dba feat: There is no way the, 企标编辑优化 396572590@qq.com 2022-06-28 11:47:03 +08:00
• e45d166a90 Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2022-06-27 17:24:43 +08:00
• b5555110e0 标注评估结果分页查询加上 来自分解单的字段 yuezhihang 2022-06-27 17:24:34 +08:00
• 3213e37979 Merge branch 'develop_master' into FOTON 396572590@qq.com 2022-06-27 17:21:01 +08:00
• fb0c1bbc61 Merge branch 'develop_migration' into 'develop_master' super_liu 2022-06-27 17:19:53 +08:00
• fa2235a993 feat: There is no way the, #55761 8986的模糊查询，系统查询不到 396572590@qq.com 2022-06-27 16:07:00 +08:00
• 06dcff99af Merge branch 'develop_master' of http://gitlab.91isoft.com:90/LiuChao/foton-slrs-system-rest into develop_master zhangyanduan 2022-06-27 14:57:22 +08:00
• 7584a3cc51 fix: 修复当登录的TOKEN认证失败后，抛出的异常中无法被识别到导致前端无法捕获此类异常数据导致无法正确返回页面 zhangyanduan 2022-06-27 14:57:07 +08:00
• cd3729ace3 机构管理 bug + 上传文件改名接口 yuezhihang 2022-06-27 14:25:48 +08:00
• 19db42504f 预警 yuezhihang 2022-06-27 11:32:12 +08:00
• 8b2eb6b84a 标准预警推送 新增20s沉睡 避免 频繁死锁 yuezhihang 2022-06-27 10:55:52 +08:00
• b867799859 Merge branch 'develop_migration' into 'develop_master' super_liu 2022-06-24 18:30:21 +08:00
• ae0bb036d4 feat: There is no way the, BUG #56065 396572590@qq.com 2022-06-24 18:25:11 +08:00
• 996d2b4cfb Merge branch 'develop_migration' into 'develop_master' super_liu 2022-06-24 13:50:47 +08:00
• 8d51647019 feat: There is no way the, bug #55972 复审流程自动发起自动发起草稿 396572590@qq.com 2022-06-24 13:49:53 +08:00
• 340615ad26 Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2022-06-24 10:04:30 +08:00
• 4177a19406 机构管理 yuezhihang 2022-06-24 10:04:18 +08:00
• 7884aaf319 feat: There is no way the, 自动发起企标复审 自动存入草稿 396572590@qq.com 2022-06-23 18:09:26 +08:00
• 611db02e6e Merge branch 'develop_master' of http://gitlab.91isoft.com:90/LiuChao/foton-slrs-system-rest into develop_master zhangyanduan 2022-06-23 15:27:01 +08:00
• e3a5fa808f fix: 修复定时预警代码BUG zhangyanduan 2022-06-23 15:26:51 +08:00
• 07dcb20360 Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2022-06-23 15:02:53 +08:00
• c6a229f0e4 征求意见 查询部门问题 yuezhihang 2022-06-23 15:02:47 +08:00
• ad35a94f5f Merge branch 'develop_migration' into 'develop_master' super_liu 2022-06-23 15:01:28 +08:00
• 7429d47622 feat: There is no way the, bug #55693 396572590@qq.com 2022-06-23 14:56:47 +08:00
• 6ca4b8420b Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2022-06-23 14:35:57 +08:00
• 03b4ba0d1e 国内 清单bug修复 yuezhihang 2022-06-23 14:35:46 +08:00
• 29f6374474 fix: 改造标准预警模块定时执行的逻辑 zhangyanduan 2022-06-23 14:27:53 +08:00
• e1a3fd6239 Merge branch 'develop_master' into FOTON 396572590@qq.com 2022-06-23 11:10:11 +08:00
• 8fb63876c9 Merge branch 'develop_migration' into 'develop_master' super_liu 2022-06-23 11:08:48 +08:00
• 1772b09067 feat: There is no way the, ES 文本索引字段逻辑区分 396572590@qq.com 2022-06-23 11:06:40 +08:00
• 6cd06641ca Merge branch 'develop_migration' into 'develop_master' super_liu 2022-06-22 18:13:53 +08:00
• 5d8dcb23eb feat: There is no way the, bug #55745 #55786 #55815 396572590@qq.com 2022-06-22 18:11:11 +08:00
• 5ea9ca4fea 公开征求意见 + 征求意见流程部门问题 处理 yuezhihang 2022-06-22 16:43:29 +08:00
• d53d7d9d85 feat: There is no way the, bug #55745 #55786 396572590@qq.com 2022-06-22 16:02:55 +08:00
• 9d9db343de 问答查询 排序 yuezhihang 2022-06-22 14:49:24 +08:00
• 7a822f921f 问答查询 标准号字段 查询修复 yuezhihang 2022-06-22 09:24:24 +08:00
• 65a2c44593 Merge branch 'develop_master' into FOTON 396572590@qq.com 2022-06-21 17:13:19 +08:00
• f808150027 我的回答 第二列 排序 yuezhihang 2022-06-21 16:33:15 +08:00
• 427a51daa9 bug 55827 yuezhihang 2022-06-21 14:58:03 +08:00
• 4ddea28670 问答查询 标准号字段 查询修复 yuezhihang 2022-06-21 14:03:27 +08:00
• 2a837925ab 数据字典 查询接口 给标准类别强行换顺序 会导致bug产生 yuezhihang 2022-06-21 13:56:48 +08:00
• e2ee532dc1 Merge branch 'develop_master' into FOTON 396572590@qq.com 2022-06-21 11:48:09 +08:00
• 2e239defed Merge branch 'develop_migration' into 'develop_master' super_liu 2022-06-20 18:12:05 +08:00
• 9f84c0facf feat: There is no way the, bug #55865 396572590@qq.com 2022-06-20 18:11:32 +08:00
• ad965b5d7d 问答查询 yuezhihang 2022-06-20 17:21:42 +08:00
• 41d5a6408c Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2022-06-20 17:11:09 +08:00
• 0d001e1fc0 Merge branch 'develop_migration' into 'develop_master' super_liu 2022-06-20 16:36:03 +08:00
• 478503d94d feat: There is no way the, #55663 396572590@qq.com 2022-06-20 16:31:53 +08:00
• c007ba6185 55882 yuezhihang 2022-06-20 16:28:00 +08:00
• 9d7ac6ecf0 55657 yuezhihang 2022-06-20 16:09:13 +08:00
• c82ccd27d8 bug 55837 修复 yuezhihang 2022-06-20 15:48:28 +08:00
• f3eee80a6c 问答查询 标准号字段 查询修复 yuezhihang 2022-06-20 15:19:15 +08:00
• 7b89fdab71 pom依赖修改 yuezhihang 2022-06-20 14:50:10 +08:00
• a1510b361c bug 55833 修复 yuezhihang 2022-06-20 14:47:03 +08:00
• 3ac3be0683 Merge branch 'develop_master' into FOTON 396572590@qq.com 2022-06-20 10:46:05 +08:00
• fac0916be6 update: 对接集成AWC系统接口总返回的数据列表中增加文档类型字段 zyd 2022-06-19 20:07:31 +08:00
• df4dc3e351 Merge branch 'develop_master' into FOTON 396572590@qq.com 2022-06-17 17:15:09 +08:00
• 9f52d69c13 Merge branch 'develop_migration' into 'develop_master' super_liu 2022-06-17 16:51:47 +08:00
• 5c1234d076 feat: There is no way the, 新需求 添加查询ES详情接口 文本分词高亮显示全部内容 396572590@qq.com 2022-06-17 16:49:00 +08:00
• 7a037a96bf Merge branch 'develop_migration' into 'develop_master' super_liu 2022-06-17 16:39:05 +08:00
• 843ee0e371 feat: There is no way the, x super_liu 2022-06-17 16:31:59 +08:00
• 1db5730948 Merge branch 'develop_migration' into 'develop_master' super_liu 2022-06-17 16:26:48 +08:00
• fdfb696dd9 feat: There is no way the, 个别字段数据不规整 没法排序 super_liu 2022-06-17 16:24:57 +08:00
• c5ca4be11f Merge branch 'develop_migration' into 'develop_master' super_liu 2022-06-17 15:55:44 +08:00
• 7f36f4899e feat: There is no way the, 新需求 调整ES 检索规则 更新 es 操作文档 super_liu 2022-06-17 15:54:46 +08:00
• 56c2d1991f Merge branch 'develop_migration' into 'develop_master' super_liu 2022-06-17 15:50:54 +08:00
• 113587333f feat: There is no way the, 新需求 添加查询ES详情接口 文本分词高亮显示全部内容 super_liu 2022-06-17 15:49:17 +08:00
• d6e309f9cc Merge branch 'develop_migration' into 'develop_master' super_liu 2022-06-17 15:36:20 +08:00