 yuezhihang
|
0babd2b56f
|
统一修改了一下分页
|
2021-12-14 16:07:51 +08:00 |
|
|
yuezhihang
|
6db9220082
|
手机端查询人员数据
|
2021-12-13 17:49:33 +08:00 |
|
|
yuezhihang
|
301ba42d65
|
手机端查人接口 以及 部分涉及到开耀的接口 加了备注 我先改了一下 等开耀回来看一下
|
2021-12-13 16:17:25 +08:00 |
|
|
yuezhihang
|
c87d843055
|
征求意见流程新---！！！！
|
2021-12-13 14:15:44 +08:00 |
|
|
yuezhihang
|
1a88f21eb0
|
未符合项整改回显
|
2021-12-12 10:52:29 +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 |
|
|
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 |
|
|
super_liu
|
867f147edb
|
Merge branch 'origin/Three' into 'develop_master'
Origin/three
See merge request LiuChao/foton-slrs-system-rest!274
|
2021-12-08 15:51:11 +08:00 |
|
|
Superman_Main
|
d9f7c7ea8b
|
Merge branch 'develop_master' into origin/Three
|
2021-12-08 15:49:59 +08:00 |
|
|
yuezhihang
|
c53b405891
|
技术评估结果排序--》猜测需要添加字段区分国内海外 ！！！ 后续看需求是否添加
|
2021-12-08 14:06:21 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
a018459ad1
|
评分
|
2021-12-07 17:46:12 +08:00 |
|
|
yuezhihang
|
3da2c21cd9
|
拆分标准 复制修复 --->对应bug为无法删除
|
2021-12-07 17:33:15 +08:00 |
|
|
yuezhihang
|
01b503fda5
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-12-07 15:20:05 +08:00 |
|
|
yuezhihang
|
1edd95bccc
|
Ocr部分bug 和工作组部分bug修复
|
2021-12-07 15:19:55 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
de2e2977a9
|
评分历史 创建时间和修改时间
|
2021-12-07 09:59:02 +08:00 |
|
|
yuezhihang
|
39ffe69442
|
登录接口新增字段 上一级部门 id和名称
|
2021-12-07 09:21:14 +08:00 |
|
|
yuezhihang
|
95642b0166
|
登陆接口 新增返回字段-----部门id 和 部门名称
|
2021-12-07 09:21:14 +08:00 |
|
|
yuezhihang
|
0ce4df7252
|
未符合项整改加排序
|
2021-12-07 09:21:14 +08:00 |
|
|
yuezhihang
|
995891757d
|
补充上一版本
|
2021-12-07 09:21:14 +08:00 |
|
|
yuezhihang
|
4478fecf73
|
项目清单 新增字段符合-未符合-不展示逻辑 以及部分条件下未维护清单不显示问题
|
2021-12-07 09:21:14 +08:00 |
|
|
yuezhihang
|
0e68e431ea
|
为符合项 排序
|
2021-12-07 09:21:14 +08:00 |
|
|
yuezhihang
|
7f5fdbd321
|
删除草稿接口 api/lawss/activiti/delCG
|
2021-12-07 09:21:14 +08:00 |
|
|
yuezhihang
|
a501f87a68
|
项目清单加字段 ！ 白名单添加一个导出
|
2021-12-07 09:21:14 +08:00 |
|
|
王夏晖
|
359a384c70
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request LiuChao/foton-slrs-system-rest!270
|
2021-12-06 18:11:09 +08:00 |
|
|
zj
|
a2d002d659
|
ocr回到附件名称斜杠转换，避免造成路径读取错误
|
2021-12-06 18:06:28 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
8d211a52c2
|
评分表
|
2021-12-06 18:03:49 +08:00 |
|
|
yuezhihang
|
82aa2a1139
|
登录接口新增字段 上一级部门 id和名称
|
2021-12-06 17:05:37 +08:00 |
|
|
yuezhihang
|
58cbe73a09
|
登陆接口 新增返回字段-----部门id 和 部门名称
|
2021-12-06 15:39:10 +08:00 |
|
|
yuezhihang
|
6b3d87c890
|
未符合项整改加排序
|
2021-12-06 14:51:25 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
3e877d48fe
|
去除多选日期时分秒
|
2021-12-06 14:06:20 +08:00 |
|
|
yuezhihang
|
5df6ea6c73
|
补充上一版本
|
2021-12-06 09:47:48 +08:00 |
|