Commit Graph

Select branches

Hide Pull Requests

dev_20231201_feizhi

Mono Color

• 5f18bf5235 Merge branch 'develop_master' into 'FOTON' 王夏晖 2022-01-21 13:48:42 +08:00
• 1d1beb5b89 Merge branch 'develop_3' into 'develop_master' 王夏晖 2022-01-21 13:41:17 +08:00
• cd8fffa2f8 查询字典类型 接口回滚 zhaokaiyao@91isoft.com 2022-01-21 13:36:28 +08:00
• 896fcf4952 Merge branch 'develop_master' into 'FOTON' 王夏晖 2022-01-21 08:14:40 +08:00
• c97e8442f4 Merge remote-tracking branch 'origin/develop_master' into develop_master 2510220824 2022-01-21 08:13:03 +08:00
• c239ad7c99 update:无岗位用户无法访问系统 2510220824 2022-01-21 08:12:15 +08:00
• 1cab47439c Merge branch 'develop_master' into FOTON super_liu 2022-01-20 20:44:29 +08:00
• 0c387355b4 Merge branch 'develop_3' into 'develop_master' super_liu 2022-01-20 20:43:52 +08:00
• eb15c06699 工作组批量删除 zhaokaiyao@91isoft.com 2022-01-20 17:19:52 +08:00
• d86f1c12cd 标准合规评估 yuezhihang 2022-01-20 16:21:09 +08:00
• 888240c86c 流程准备的接口 yuezhihang 2022-01-20 15:20:41 +08:00
• f3101d6e74 企标详情 文本状态显示textStatusBussShow zhaokaiyao@91isoft.com 2022-01-20 15:07:55 +08:00
• 4826332deb 标准合规评估 准备的接口 yuezhihang 2022-01-20 15:05:23 +08:00
• 4e61e5c077 Merge branch 'develop_master' into FOTON super_liu 2022-01-20 07:15:05 +08:00
• 42b8651544 Merge branch 'develop_3' into 'develop_master' 王夏晖 2022-01-19 19:34:32 +08:00
• ebe6cd5bf7 编辑判断不能重复时排除自身 规范了返回值 zhaokaiyao@91isoft.com 2022-01-19 19:29:40 +08:00
• 5f6394975a Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2022-01-19 18:23:17 +08:00
• a2b38c85d3 调研接口修复 yuezhihang 2022-01-19 18:23:10 +08:00
• d49893bdf1 为定时任务加上了日志 zhaokaiyao@91isoft.com 2022-01-19 17:46:23 +08:00
• cc001703f9 Merge branch 'develop_master' into FOTON super_liu 2022-01-19 17:44:37 +08:00
• d5bf93da2b Merge branch 'develop_migration' into 'develop_master' super_liu 2022-01-19 17:23:55 +08:00
• 3bd285aacd feat: There is no way the, super_liu 2022-01-19 17:17:24 +08:00
• 4821c6c34b 导出去html标签 yuezhihang 2022-01-19 16:47:43 +08:00
• 07ce4f1866 流程新需求 yuezhihang 2022-01-19 16:27:39 +08:00
• a602c5fc3f Merge branch 'develop_3' into 'develop_master' 王夏晖 2022-01-19 15:16:16 +08:00
• 0612cb210a 定时任务 VALID_FLAG='0' zhaokaiyao@91isoft.com 2022-01-19 15:14:43 +08:00
• 0a4fb00ea5 工作组,表字段与实体类 zhaokaiyao@91isoft.com 2022-01-19 15:14:07 +08:00
• cb2dde3bb2 VALID_FLAG = '0' zhaokaiyao@91isoft.com 2022-01-19 13:43:58 +08:00
• 5d53017187 Merge branch 'develop_3' into 'develop_master' 王夏晖 2022-01-19 13:34:35 +08:00
• e6d9f4a652 判断工作组名不能重复 zhaokaiyao@91isoft.com 2022-01-19 13:28:24 +08:00
• 5ded56b442 Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2022-01-19 13:15:13 +08:00
• 868d11be91 Merge remote-tracking branch 'origin/develop_3' into develop_3 zhaokaiyao@91isoft.com 2022-01-19 13:14:51 +08:00
• 50d262b610 commit zhaokaiyao@91isoft.com 2022-01-19 13:14:27 +08:00
• 5291f3cf69 Merge remote-tracking branch 'origin/develop_3' into develop_3 张君 2022-01-19 10:20:08 +08:00
• 87b843c398 es字段 张君 2022-01-19 10:19:16 +08:00
• fd13ba6253 Merge branch 'develop_master' into 'FOTON' 王夏晖 2022-01-18 23:03:26 +08:00
• 57bc0f0057 Merge branch 'develop_3' into 'develop_master' 王夏晖 2022-01-18 22:56:50 +08:00
• fac8ad54bf Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2022-01-18 22:54:20 +08:00
• 06c14bd8cd 工作组接口 zhaokaiyao@91isoft.com 2022-01-18 22:53:51 +08:00
• d18185e0b7 fix:修复VPPS查询中将其他非本节点下的数据查询出来的BUG zyd 2022-01-18 22:12:14 +08:00
• ca79108b71 日志与手动激活定时任务 zhaokaiyao@91isoft.com 2022-01-18 21:42:13 +08:00
• 54ef64c852 注释 张君 2022-01-18 17:09:03 +08:00
• 3a2ef34b80 Merge branch 'develop_migration' into 'develop_master' super_liu 2022-01-18 16:31:53 +08:00
• 2f18292492 feat: There is no way the, plan lxd super_liu 2022-01-18 16:28:20 +08:00
• 4da914c88a 新增自定义工作组模块 zhaokaiyao@91isoft.com 2022-01-18 15:39:54 +08:00
• fe9d3c6ec6 Merge branch 'develop_3' into 'develop_master' super_liu 2022-01-18 03:42:27 +08:00
• dccdd471f0 当在编辑标准的国家地区的时候,自动添加到国家地区清单中,并且把标准的是否纳入认证清单改为"是" zhaokaiyao@91isoft.com 2022-01-17 17:31:28 +08:00
• 4acc77b0d5 Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2022-01-17 17:04:27 +08:00
• e583938008 Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2022-01-17 17:02:21 +08:00
• 087f629216 清单 问题修复 yuezhihang 2022-01-17 17:00:26 +08:00
• 68d9044bf5 Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2022-01-17 16:41:09 +08:00
• 4a4b99ad1c Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2022-01-17 16:37:42 +08:00
• c2ddb5a92b 清单 新增和修改部分 对标准库的反打 yuezhihang 2022-01-17 16:37:35 +08:00
• 70be635a9a if()没有大括号 zhaokaiyao@91isoft.com 2022-01-17 15:57:42 +08:00
• 728cd5d48f Merge branch 'develop_3' into 'develop_master' 王夏晖 2022-01-17 15:54:17 +08:00
• 4a821e87b5 Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2022-01-17 15:51:00 +08:00
• 0136a396e0 高级搜索advanceVOStr日期等值查询 zhaokaiyao@91isoft.com 2022-01-17 15:49:31 +08:00
• 2abdb7e253 去除未被使用的代码 zhaokaiyao@91isoft.com 2022-01-15 17:05:11 +08:00
• 84a246ea06 修复了定时更新文本状态,由于海外标准的格式与不与国内相同,添加了新的标准号查询方法 zhaokaiyao@91isoft.com 2022-01-15 17:02:26 +08:00
• 421df00d9b 修复日志错误,修改了sar_stand_attr_detail中的sycpx和TXLB以及责任部门查询不到返回本身 zhaokaiyao@91isoft.com 2022-01-15 15:30:58 +08:00
• c8bd8fefcf 更改了日志发生错误的字段(sar_stand_attr_detail表的SEL_VAl字段),添加了对非属性字段标准性质的日志转换字典支持 zhaokaiyao@91isoft.com 2022-01-15 14:54:35 +08:00
• fa7f765195 根据 "用户id" 查询不到用户名时返回 "用户id" zhaokaiyao@91isoft.com 2022-01-14 13:57:48 +08:00
• 70d8ba058b 项目评估流程 -- 去重 yuezhihang 2022-01-14 11:31:05 +08:00
• 509905195a 回滚 yuezhihang 2022-01-14 10:59:40 +08:00
• bfa6f94452 项目评估结果去重 yuezhihang 2022-01-14 10:44:30 +08:00
• 4e362e485b Merge branch 'develop_3' into 'develop_master' super_liu 2022-01-14 06:38:06 +08:00
• 07066ea00d 条款比对信息查询 yuezhihang 2022-01-13 16:20:55 +08:00
• e60667999a 企标查询 忽略空格 zhaokaiyao@91isoft.com 2022-01-13 16:08:41 +08:00
• 6421735d7b Merge branch 'develop_3' into 'develop_master' 王夏晖 2022-01-13 11:31:19 +08:00
• 4af705e1bd 查询列表添加代替标准号 dtbzh字段 zhaokaiyao@91isoft.com 2022-01-13 10:31:40 +08:00
• 3aa9aba85c Merge branch 'develop_migration' into 'develop_master' super_liu 2022-01-13 06:18:49 +08:00
• 2659f0a783 feat: There is no way the, super_liu 2022-01-12 23:58:15 +08:00
• 97519f1813 解读合并之后数据消失bug修复 以及会后流程自动发起 恢复到每天十点 yuezhihang 2022-01-12 15:57:50 +08:00
• 7f44d04f0f Merge remote-tracking branch 'origin/develop_3' into develop_master yuezhihang 2022-01-12 11:44:48 +08:00
• 8d7466b9d7 预警 条款内容 zhaokaiyao@91isoft.com 2022-01-12 11:21:18 +08:00
• 4c13ee7c1d 日期bug修复 yuezhihang 2022-01-12 11:19:02 +08:00
• d93e9fb2ba 征求意见bug修复 yuezhihang 2022-01-12 11:00:25 +08:00
• e70b85bbd7 Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2022-01-12 10:20:42 +08:00
• fed0b3dc85 公开征求意见 导出 bug修复 yuezhihang 2022-01-12 10:20:28 +08:00
• e2bbc146ae Merge branch 'develop_3' into 'develop_master' super_liu 2022-01-11 22:55:54 +08:00
• d01ea4592d 暂停预警定时任务 zhaokaiyao@91isoft.com 2022-01-11 22:52:58 +08:00
• d4ef4e3477 预警 在产车实施日期查询 使用了两个startZCCSSRQ zhaokaiyao@91isoft.com 2022-01-11 22:33:28 +08:00
• 8a9971c046 预警 发布日期查询与回显 zhaokaiyao@91isoft.com 2022-01-11 22:27:36 +08:00
• 654e7e8127 征求意见流程自动发起日期加一天问题修复 yuezhihang 2022-01-11 15:35:59 +08:00
• e1206d7f80 Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2022-01-11 14:23:55 +08:00
• 84ca9f9524 Merge remote-tracking branch 'origin/FOTON' into develop_3 zhaokaiyao@91isoft.com 2022-01-11 14:21:01 +08:00
• b26de7b09b 会议信息修改bug修复 yuezhihang 2022-01-11 14:12:30 +08:00
• dc57f4c58f Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2022-01-11 14:05:08 +08:00
• b4d36e8888 会议信息修改bug修复 yuezhihang 2022-01-11 14:05:00 +08:00
• 7a4e96c004 Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2022-01-11 13:57:35 +08:00
• 70ee309ac2 Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2022-01-11 13:56:45 +08:00
• 5b6bb36588 Merge branch 'develop_master' into 'FOTON' 王夏晖 2022-01-11 13:40:07 +08:00
• 925ab6219e Merge branch 'develop_3' into 'develop_master' 王夏晖 2022-01-11 13:39:28 +08:00
• 914d2c3d06 测试会后流程 一小时发起一次 yuezhihang 2022-01-11 11:08:14 +08:00
• c4a40c59cb 清单中的企标查询 zhaokaiyao@91isoft.com 2022-01-11 10:51:35 +08:00
• bf0d4c2106 公开征求意见导出修改 yuezhihang 2022-01-11 10:14:35 +08:00
• 67395f75c7 Merge branch 'develop_master' into FOTON super_liu 2022-01-10 23:31:57 +08:00
• 1b2c595f50 预警导出 zhaokaiyao@91isoft.com 2022-01-10 20:48:41 +08:00
• dc5f63fdb5 公开征求意见导出 修复 yuezhihang 2022-01-10 18:25:55 +08:00
• 596528bcbf 公开征求意见模块导出上报意见功能 修复 yuezhihang 2022-01-10 18:10:09 +08:00