wangliwen
|
632ed9a6e3
|
屮
|
2022-05-30 15:26:57 +08:00 |
|
wangliwen
|
abacd77904
|
出现重放 加以解决
|
2022-05-30 15:16:49 +08:00 |
|
wangliwen
|
80a0dbb73b
|
消息发送者 显示异常
|
2022-05-30 14:44:25 +08:00 |
|
wangliwen
|
aa27a8ad5a
|
...
|
2022-05-30 14:22:40 +08:00 |
|
wangliwen
|
b5498b1a80
|
消息通知发起人
|
2022-05-30 14:05:07 +08:00 |
|
wangliwen
|
d714038dfb
|
调整注解位置
|
2022-05-30 11:32:01 +08:00 |
|
wangliwen
|
ca3c963981
|
...
|
2022-05-30 11:15:40 +08:00 |
|
wangliwen
|
4e0e39da8d
|
审批节点分配审批人时事件注解
|
2022-05-30 11:11:02 +08:00 |
|
JunheZhang
|
9eeab30dcf
|
告警信息查询信息按时间倒序展示
|
2022-05-27 14:08:43 +08:00 |
|
wangliwen
|
03db648aee
|
...
|
2022-05-27 14:01:24 +08:00 |
|
wangliwen
|
61db8a5f7d
|
...
|
2022-05-27 11:11:53 +08:00 |
|
wangliwen
|
698576ad9a
|
我的申请模糊查询
|
2022-05-27 10:43:32 +08:00 |
|
wangliwen
|
7f7fadbafc
|
Merge remote-tracking branch 'origin/zhangjunhe'
|
2022-05-26 19:43:56 +08:00 |
|
wangliwen
|
1b67c7865a
|
屮
|
2022-05-26 19:38:54 +08:00 |
|
wangliwen
|
7ba6af7f05
|
分页的处理
|
2022-05-26 19:26:44 +08:00 |
|
wangliwen
|
ecd78da476
|
...
|
2022-05-26 19:18:13 +08:00 |
|
wangliwen
|
68ea4d03a0
|
试一试
|
2022-05-26 19:17:24 +08:00 |
|
wangliwen
|
c49d8ed1ba
|
...
|
2022-05-26 19:10:43 +08:00 |
|
JunheZhang
|
d4b544e1b9
|
增加了任务列表查询，告警信息查询
|
2022-05-26 18:59:34 +08:00 |
|
wangliwen
|
7429fb7a31
|
我的申请模糊查询bug？
|
2022-05-26 18:43:00 +08:00 |
|
wangliwen
|
6d11d96360
|
免批资源的判断
|
2022-05-26 16:17:54 +08:00 |
 dinggang
|
dabf8dca50
|
能力统计-资源图谱
|
2022-05-26 11:02:57 +08:00 |
|
dinggang
|
90dbf582a4
|
能力统计-资源图谱
|
2022-05-26 10:32:42 +08:00 |
|
wangliwen
|
0b9632fc71
|
...
|
2022-05-25 14:51:49 +08:00 |
|
wangliwen
|
9ff764fd9d
|
...
|
2022-05-25 13:49:37 +08:00 |
|
dinggang
|
3444868612
|
能力统计-资源图谱
|
2022-05-25 11:13:25 +08:00 |
|
wangliwen
|
2a6e4959b3
|
排序优化
|
2022-05-25 10:04:42 +08:00 |
|
wangliwen
|
db8319022e
|
申请应用领域分词
|
2022-05-25 09:53:41 +08:00 |
|
wangliwen
|
05ad116e04
|
资源提供方应用领域分词
|
2022-05-25 09:44:09 +08:00 |
|
wangliwen
|
08bde6f597
|
Merge remote-tracking branch 'origin/master'
|
2022-05-25 08:59:33 +08:00 |
|
wangliwen
|
61ec67c9a1
|
topN按数目逆序
|
2022-05-25 08:56:53 +08:00 |
|
dinggang
|
6e5c80e48f
|
能力统计-资源图谱
|
2022-05-24 21:08:43 +08:00 |
|
dinggang
|
b1e9fd607e
|
能力统计-资源图谱
|
2022-05-24 19:49:37 +08:00 |
|
wangliwen
|
9129b115ff
|
..
|
2022-05-24 18:43:08 +08:00 |
|
wangliwen
|
86b7ecc0e5
|
过滤掉其他
|
2022-05-24 18:39:19 +08:00 |
|
wangliwen
|
bcf940114c
|
部门名
|
2022-05-24 18:14:52 +08:00 |
|
wangliwen
|
381c32fd30
|
Merge branch 'wangliwen'
|
2022-05-24 18:02:24 +08:00 |
|
wangliwen
|
d9026207e1
|
能力共享方-应用领域接口；能力申请方-应用领域；
|
2022-05-24 18:01:31 +08:00 |
 huangweixiong
|
1ca0606cc3
|
资源统计接口转发
|
2022-05-24 16:04:57 +08:00 |
|
huangweixiong
|
042ed549f5
|
Merge branch 'master' of http://221.0.232.152:9393/ability-center/share-platform
* 'master' of http://221.0.232.152:9393/ability-center/share-platform: (82 commits)
需求接口出评论数目
...
兼容已经重复提交过下架的资源
...
资源重复下线错误提示
资源重复下架
....
被覆盖？
。。。
...
该资源已发起下架，重复发起下架时 抛出异常
...
...
统计资源访问量
...
我的待办查出流转状态
资源下架申请中状态仍然为正常
指定编译目标为jdk1.8
能力申请若为大数据负责人申请，大数据级别申请默认通过；若申请者为资源所属部门审批人，默认通过；
我的待办只出仍然在运行的任务
...
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java
|
2022-05-24 15:33:26 +08:00 |
|
huangweixiong
|
f6e52a5c59
|
资源数据转发
|
2022-05-24 15:29:25 +08:00 |
|
wangliwen
|
da1cc12fe9
|
Merge remote-tracking branch 'origin/master' into wangliwen
|
2022-05-24 09:09:41 +08:00 |
|
wangliwen
|
cea2901afa
|
需求接口出评论数目
|
2022-05-24 09:09:22 +08:00 |
|
dinggang
|
ba372c2386
|
...
|
2022-05-23 18:28:02 +08:00 |
|
wangliwen
|
59d13aadc8
|
兼容已经重复提交过下架的资源
|
2022-05-23 10:47:02 +08:00 |
|
wangliwen
|
e6093fb62a
|
...
|
2022-05-23 10:24:50 +08:00 |
|
wangliwen
|
1c7e2dcdc1
|
资源重复下线错误提示
|
2022-05-23 09:45:53 +08:00 |
|
wangliwen
|
27d692f575
|
资源重复下架
|
2022-05-20 18:35:47 +08:00 |
|
wangliwen
|
07711e2928
|
....
|
2022-05-20 18:29:59 +08:00 |
|
wangliwen
|
1091344da1
|
被覆盖？
|
2022-05-20 18:24:21 +08:00 |
|
wangliwen
|
2d40ab3eb1
|
。。。
|
2022-05-20 18:18:23 +08:00 |
|
wangliwen
|
31a6998a57
|
...
|
2022-05-20 18:12:03 +08:00 |
|
wangliwen
|
e994527810
|
该资源已发起下架，重复发起下架时 抛出异常
|
2022-05-20 18:11:14 +08:00 |
|
wangliwen
|
8cdefe07de
|
...
|
2022-05-20 18:03:16 +08:00 |
|
wangliwen
|
9801eb50f4
|
...
|
2022-05-20 12:03:19 +08:00 |
|
wangliwen
|
8aa344d8a3
|
统计资源访问量
|
2022-05-20 11:30:29 +08:00 |
|
wangliwen
|
46851b85f9
|
...
|
2022-05-20 11:05:35 +08:00 |
|
wangliwen
|
6423f22b42
|
我的待办查出流转状态
|
2022-05-20 10:53:59 +08:00 |
|
wangliwen
|
ab36bb4f77
|
资源下架申请中状态仍然为正常
|
2022-05-20 10:31:37 +08:00 |
|
wangliwen
|
7f5521484b
|
指定编译目标为jdk1.8
|
2022-05-20 10:23:52 +08:00 |
|
wangliwen
|
10173db6d1
|
能力申请若为大数据负责人申请，大数据级别申请默认通过；若申请者为资源所属部门审批人，默认通过；
|
2022-05-20 10:16:51 +08:00 |
|
wangliwen
|
0978d219df
|
Merge branch 'wangliwen'
|
2022-05-20 09:58:00 +08:00 |
|
wangliwen
|
83434616ce
|
我的待办只出仍然在运行的任务
|
2022-05-20 09:57:46 +08:00 |
|
dinggang
|
093d51efab
|
...
|
2022-05-19 17:22:53 +08:00 |
|
dinggang
|
e7a36f02b9
|
...
|
2022-05-19 15:11:41 +08:00 |
|
dinggang
|
19bbf0f606
|
二级搜索左侧根据部门搜索，统计浏览统计接口
|
2022-05-19 15:07:23 +08:00 |
|
dinggang
|
767968d01f
|
...
|
2022-05-18 18:06:47 +08:00 |
|
wangliwen
|
c2d82d8ddc
|
需求审批通过
|
2022-05-18 17:19:14 +08:00 |
|
wangliwen
|
a68dd97428
|
查询资源失败时的补充
|
2022-05-18 17:05:47 +08:00 |
|
wangliwen
|
27639c1832
|
fix npe
|
2022-05-18 16:39:42 +08:00 |
|
wangliwen
|
ee641f3008
|
...
|
2022-05-18 16:30:08 +08:00 |
|
wangliwen
|
248f4aecb7
|
特殊处理资源DTO在流程引擎内的值
|
2022-05-18 16:21:15 +08:00 |
|
wangliwen
|
1168f08172
|
资源下架被驳回时重新录入表单
|
2022-05-18 16:13:51 +08:00 |
|
wangliwen
|
479cf97d8d
|
驳回 对能力上架表单进行特殊处理
|
2022-05-18 15:18:11 +08:00 |
|
wangliwen
|
dc0c5bb726
|
....
|
2022-05-18 14:38:33 +08:00 |
|
wangliwen
|
a37f557870
|
...
|
2022-05-18 13:47:19 +08:00 |
|
wangliwen
|
d6540e250e
|
...
|
2022-05-18 11:29:40 +08:00 |
|
wangliwen
|
fec55086b6
|
需求驳回、拒绝时 状态
|
2022-05-18 11:23:26 +08:00 |
|
wangliwen
|
ef50bd85b3
|
驳回重新提交后各标志位重置
|
2022-05-18 10:24:44 +08:00 |
|
wangliwen
|
02fa716c48
|
前台页面驳回后，重新提交表单发起流程
|
2022-05-18 10:09:01 +08:00 |
|
dinggang
|
c073b8fe41
|
新增浏览记录，算法仓查询接口，修复能力修改bug
|
2022-05-17 18:13:13 +08:00 |
|
wangliwen
|
b49f52b121
|
资源挂载加入资源id标志
|
2022-05-17 17:39:56 +08:00 |
|
wangliwen
|
ae454b942a
|
资源录入加日志
|
2022-05-17 15:54:50 +08:00 |
|
wangliwen
|
4941922a1f
|
npe
|
2022-05-17 15:42:27 +08:00 |
|
wangliwen
|
469cc7fac7
|
npe
|
2022-05-17 15:24:57 +08:00 |
|
wangliwen
|
d07326244e
|
npe
|
2022-05-17 14:43:06 +08:00 |
|
wangliwen
|
ba93c270b0
|
提取驳回标志
|
2022-05-17 11:05:52 +08:00 |
|
wangliwen
|
494fa2c379
|
流程节点通过时，标识驳回为false
|
2022-05-17 11:01:21 +08:00 |
|
wangliwen
|
d9c3b28ec5
|
...
|
2022-05-17 10:54:23 +08:00 |
|
wangliwen
|
35bd409045
|
...
|
2022-05-17 10:49:43 +08:00 |
|
wangliwen
|
08f028e0a1
|
...
|
2022-05-17 10:40:33 +08:00 |
|
wangliwen
|
9cbba2477b
|
我发起的流程 添加 是否驳回到第一节点
|
2022-05-17 10:34:00 +08:00 |
|
wangliwen
|
3aef51ab1d
|
TODO 驳回后，重新录入流程表单?
|
2022-05-16 17:49:26 +08:00 |
|
wangliwen
|
f0f86ae32d
|
...
|
2022-05-16 17:34:00 +08:00 |
|
wangliwen
|
b6d3aff11e
|
日志级别修改
|
2022-05-16 16:51:28 +08:00 |
|
wangliwen
|
e0783aac0a
|
...
|
2022-05-16 16:47:48 +08:00 |
|
wangliwen
|
396a7b5c6b
|
加入公共录入表单（作为所有流程第一个用户任务）处理
|
2022-05-16 16:33:36 +08:00 |
|
wangliwen
|
34fd01f208
|
直接终止拒绝时，各类审批流程的处理
|
2022-05-16 15:47:24 +08:00 |
|
wangliwen
|
9d06c43739
|
...
|
2022-05-16 14:46:52 +08:00 |
|
wangliwen
|
51949f672d
|
加入审核公用dto
|
2022-05-16 14:46:40 +08:00 |
|
wangliwen
|
f1b1063044
|
。。。
|
2022-05-13 18:02:33 +08:00 |
|
wangliwen
|
80769609ea
|
...
|
2022-05-13 17:48:37 +08:00 |
|
dinggang
|
c2a9881317
|
新增演示环境，修改门户查询逻辑
|
2022-05-13 17:30:05 +08:00 |
|
dinggang
|
dda2c6c6b5
|
新增演示环境，修改门户查询逻辑
|
2022-05-13 11:17:21 +08:00 |
|
wangliwen
|
ddc5932938
|
...
|
2022-05-13 10:53:34 +08:00 |
|
wangliwen
|
4c25b8ab4b
|
发布应用到网关失败 防止流程阻塞
|
2022-05-13 10:42:25 +08:00 |
|
wangliwen
|
1cce4f9888
|
gson 时间戳问题
|
2022-05-13 10:23:20 +08:00 |
|
wangliwen
|
d34303b92f
|
fixbug #139 我的申请，免批申请的资源，查看流程时，无法展示资源部门负责人
|
2022-05-13 10:15:30 +08:00 |
|
wangliwen
|
7edd5ae2fd
|
...
|
2022-05-13 10:03:57 +08:00 |
|
wangliwen
|
10899efa6c
|
时间戳序列化问题
|
2022-05-13 09:35:49 +08:00 |
|
dinggang
|
9e155eaf73
|
门户搜索修改
|
2022-05-12 18:10:13 +08:00 |
|
wangliwen
|
77628f982b
|
统计各类资源申请数目
|
2022-05-12 15:15:22 +08:00 |
|
dinggang
|
1abc8a883e
|
门户搜索修改
|
2022-05-12 13:48:47 +08:00 |
|
wangliwen
|
a73228e07e
|
亚微打包问题
|
2022-05-12 12:38:34 +08:00 |
|
wangliwen
|
d5f249ccb6
|
...
|
2022-05-12 11:31:48 +08:00 |
|
wangliwen
|
5583c2b609
|
...
|
2022-05-12 10:55:08 +08:00 |
|
wangliwen
|
9652a63dd5
|
npe
|
2022-05-12 10:50:44 +08:00 |
|
dinggang
|
939864d0f6
|
门户搜索修改
|
2022-05-11 20:52:48 +08:00 |
|
dinggang
|
ba2cf96791
|
新增工作动态,门户搜索修改
|
2022-05-11 20:19:31 +08:00 |
|
dinggang
|
20d8ceb860
|
Merge remote-tracking branch 'origin/master'
|
2022-05-11 20:06:42 +08:00 |
|
wangliwen
|
564728efc2
|
找回
|
2022-05-11 18:18:22 +08:00 |
|
wangliwen
|
6d0aec6686
|
...
|
2022-05-11 18:13:45 +08:00 |
|
wangliwen
|
5b1c97b802
|
...
|
2022-05-11 17:25:21 +08:00 |
|
wangliwen
|
d6b9fa0677
|
统计的补充
|
2022-05-11 16:57:59 +08:00 |
|
wangliwen
|
68eeb69bc7
|
Merge remote-tracking branch 'origin/master'
|
2022-05-11 16:33:23 +08:00 |
|
wangliwen
|
fd132c749c
|
申请情况加入资源的存续情况
|
2022-05-11 16:32:59 +08:00 |
|
huangweixiong
|
56cc7cfbf4
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/processForm/listener/CorrectionListener.java
# renren-admin/src/main/java/io/renren/modules/resourceMountApply/listener/ResourceOwnerListener.java
|
2022-05-11 16:27:32 +08:00 |
|
huangweixiong
|
06085b9eea
|
【网关对接】修改申请字段以及流程调整
|
2022-05-11 16:26:06 +08:00 |
|
wangliwen
|
39b76c5c76
|
审核状态不正确的处理
|
2022-05-11 16:10:13 +08:00 |
|
wangliwen
|
7c99310df7
|
...
|
2022-05-11 16:01:46 +08:00 |
|
wangliwen
|
0014610f58
|
...
|
2022-05-11 16:00:58 +08:00 |
|
wangliwen
|
53efbf246e
|
...
|
2022-05-11 15:58:41 +08:00 |
|
wangliwen
|
105b6b536c
|
资源数目统计
|
2022-05-11 15:31:48 +08:00 |
|
wangliwen
|
cd7831e68c
|
...
|
2022-05-11 12:53:04 +08:00 |
|
wangliwen
|
b59b830beb
|
...
|
2022-05-11 11:51:57 +08:00 |
|
wangliwen
|
aeaffb269f
|
...
|
2022-05-11 11:48:30 +08:00 |
|
wangliwen
|
0f92ae06e5
|
...
|
2022-05-11 11:39:11 +08:00 |
|
wangliwen
|
a2eefd990d
|
...
|
2022-05-11 11:33:24 +08:00 |
|
wangliwen
|
c5377cb7f3
|
防止覆盖前端参数
|
2022-05-11 11:28:19 +08:00 |
|
dinggang
|
f82fdcd5f3
|
Merge remote-tracking branch 'origin/master'
|
2022-05-11 11:20:44 +08:00 |
|
wangliwen
|
87e93469e8
|
应用简略信息
|
2022-05-11 11:19:37 +08:00 |
|
wangliwen
|
8684700c19
|
...
|
2022-05-11 10:45:03 +08:00 |
|
wangliwen
|
49bf48472a
|
...
|
2022-05-11 10:22:47 +08:00 |
|
wangliwen
|
a00007992a
|
免批资源申请默认审核通过
|
2022-05-11 09:59:39 +08:00 |
|
dinggang
|
8822dbac56
|
Merge remote-tracking branch 'origin/master'
|
2022-05-11 09:49:48 +08:00 |
|
wangliwen
|
830c09feaf
|
下架通过 资源状态改变
|
2022-05-11 09:47:23 +08:00 |
|
wangliwen
|
a53b817aec
|
资源基础信息
|
2022-05-11 09:13:40 +08:00 |
|
wangliwen
|
d0ae226585
|
记录资源下架发起人姓名
|
2022-05-10 17:21:57 +08:00 |
|
wangliwen
|
dd261257b8
|
npe 管理员的部门id不存在的情况
|
2022-05-10 16:17:05 +08:00 |
|
wangliwen
|
fd645cffeb
|
资源下架流程
|
2022-05-10 15:37:56 +08:00 |