FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,472 Commits 1 Branch 0 Tags
3bbbc90900a0d77fd3a15c9034f91b8573ba560e
Commit Graph
999 Commits
Author SHA1 Message Date
zhaokaiyao@91isoft.com 3bbbc90900 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-12-15 17:50:57 +08:00
zhaokaiyao@91isoft.com f00f5b9021 commit 2021-12-15 17:50:25 +08:00
yuezhihang 14e2b3368c 拆分和ocr查询文件出错问题 2021-12-15 16:15:29 +08:00
zhaokaiyao@91isoft.com 0fafe93d39 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-12-15 15:17:35 +08:00
zhaokaiyao@91isoft.com 5b64f69989 资料中心接口 2021-12-15 15:17:18 +08:00
yuezhihang 0a26dbfda9 工作组 2021-12-15 11:22:19 +08:00
yuezhihang 67deb52111 工作组下 关联属性删除1 2021-12-15 11:05:00 +08:00
zhaokaiyao@91isoft.com e35990d25f Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-12-15 10:41:51 +08:00
zhaokaiyao@91isoft.com bb5cd0a360 清单详情 因为实施日期报错 2021-12-15 10:41:31 +08:00
yuezhihang ebd5c94057 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-12-15 10:14:52 +08:00
yuezhihang 99f33ac218 工作组 单位不回显bug修复 2021-12-15 10:14:45 +08:00
王夏晖 0964813f89 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!282
 2021-12-15 09:16:25 +08:00
zhaokaiyao@91isoft.com 02f0fb0cd7 体系结构缺少-内存中构造树结构时没有把改节点查出 2021-12-14 20:27:49 +08:00
yuezhihang cae1605ab1 工作组修改完已经可以回显 2021-12-14 17:45:23 +08:00
zhaokaiyao@91isoft.com 5eeb60b7f3 资料中心 2021-12-14 17:09:05 +08:00
yuezhihang a8fda1bb94 标准清单查询接口!!! 2021-12-14 16:33:07 +08:00
yuezhihang 0babd2b56f 统一修改了一下分页 2021-12-14 16:07:51 +08:00
zhaokaiyao@91isoft.com 36568f8c19 重点认证新增和删除逻辑完善 2021-12-14 13:55:31 +08:00
zhaokaiyao@91isoft.com 2412b50953 预警标表头和列宽 2021-12-14 10:32:25 +08:00
yuezhihang 301ba42d65 手机端查人接口 以及 部分涉及到开耀的接口 加了备注 我先改了一下 等开耀回来看一下 2021-12-13 16:17:25 +08:00
yuezhihang 1a88f21eb0 未符合项整改回显 2021-12-12 10:52:29 +08:00
zhaokaiyao@91isoft.com 387b7485bf Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-12-10 17:16:12 +08:00
zhaokaiyao@91isoft.com 11dbe628c8 评分计算 2021-12-10 17:01:07 +08:00
zhaokaiyao@91isoft.com 8537648dde 评分历史排序 2021-12-10 16:15:39 +08:00
zhaokaiyao@91isoft.com e6aa1bf44f 评分查询 bug查询不够精确 2021-12-10 15:40:00 +08:00
zhaokaiyao@91isoft.com c783f40d41 预警excel导出 数据与表格对应 2021-12-10 15:38:41 +08:00
yuezhihang 48bc83ff4f Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-12-10 14:49:46 +08:00
yuezhihang 2623bb0954 国内清单!! 2021-12-10 14:49:41 +08:00
super_liu 91dcda3f4e Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!279
 2021-12-10 14:33:55 +08:00
yuezhihang 97261de96e Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-12-10 13:51:31 +08:00
yuezhihang 483429fb8b 未符合项目整改--》批量关闭未符合项目接口 直接修改的closeStatus 2021-12-10 13:51:26 +08:00
zhaokaiyao@91isoft.com 13b5444e24 质量评分节点 2021-12-10 13:47:42 +08:00
zhaokaiyao@91isoft.com 22faad46db 分解单默认正序排序 2021-12-10 13:45:07 +08:00
Superman_Main 3bad62d5eb Merge branch 'develop_master' into develop_migration 2021-12-10 10:43:34 +08:00
Superman_Main 3156acafd2 feat: There is no way the, buss 2021-12-10 10:42:13 +08:00
王夏晖 304bebc284 Merge branch 'develop_3' into 'develop_master' 
预警导出 和 定时任务

See merge request LiuChao/foton-slrs-system-rest!277
 2021-12-09 19:36:43 +08:00
zhaokaiyao@91isoft.com a86fe68308 预警导出 和 定时任务 2021-12-09 17:49:51 +08:00
yuezhihang 5cfa69c8e3 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-12-09 16:56:05 +08:00
yuezhihang 45dab72515 标准条件查询 2021-12-09 16:55:55 +08:00
super_liu a879fd9ff2 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!276
 2021-12-09 15:20:48 +08:00
zhaokaiyao@91isoft.com fd9bf0f130 查看分解单 实施日期多个 2021-12-09 14:27:29 +08:00
zhaokaiyao@91isoft.com 0cabb928d7 查看分解单 实施日期多个 2021-12-09 14:26:50 +08:00
zhaokaiyao@91isoft.com 276f0a9726 企标评分 2021-12-09 13:45:49 +08:00
王夏晖 751448384a Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!275
 2021-12-09 13:33:10 +08:00
yuezhihang 2f402f737d 公开征求意见导出 部门数据导出 2021-12-09 10:24:10 +08:00
zhaokaiyao@91isoft.com 6e52fb44bf Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-12-09 10:09:31 +08:00
zhaokaiyao@91isoft.com ab07fbf9ce 新增标准与修改标准 插入数据库取消时分秒 2021-12-09 10:07:20 +08:00
zhaokaiyao@91isoft.com c4eb74a211 Merge remote-tracking branch 'origin/develop_master' into develop_3 
# Conflicts:
#	adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
#	adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
 2021-12-08 17:24:48 +08:00
yuezhihang 2bbdb32e8f 项目维度查询分解单数据错误bug 2021-12-08 17:23:06 +08:00
Superman_Main d9f7c7ea8b Merge branch 'develop_master' into origin/Three 2021-12-08 15:49:59 +08:00