 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 |
|
dinggang
|
912275a01f
|
Merge remote-tracking branch 'origin/master'
|
2022-05-10 11:15:01 +08:00 |
|
wangliwen
|
104d3b5129
|
...
|
2022-05-10 10:15:46 +08:00 |
|
wangliwen
|
dedb813021
|
资源的状态加入枚举
|
2022-05-10 09:57:18 +08:00 |
|
huangweixiong
|
917bd4521e
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/processForm/entity/TAbilityApplicationEntity.java
# renren-admin/src/main/java/io/renren/modules/processForm/listener/CorrectionListener.java
|
2022-05-09 15:34:49 +08:00 |
|
huangweixiong
|
4815e9f3f5
|
【统一单点】修改登录逻辑
|
2022-05-09 15:31:24 +08:00 |
|
huangweixiong
|
fd0a070abc
|
【能力上架申请】添加api网关集成
|
2022-05-09 15:30:52 +08:00 |
|
dinggang
|
856b62fdc4
|
Merge remote-tracking branch 'origin/master'
|
2022-05-07 11:48:53 +08:00 |
|
wangliwen
|
3d9e860a46
|
资源所有者审核通过后 资源申请审核状态变化
|
2022-05-07 10:18:39 +08:00 |
|
wangliwen
|
3fe2162412
|
...
|
2022-05-06 20:33:48 +08:00 |
|
wangliwen
|
4a94caddd3
|
...
|
2022-05-06 20:32:36 +08:00 |
|
dinggang
|
e9e2354a16
|
Merge remote-tracking branch 'origin/master'
|
2022-05-06 17:05:56 +08:00 |
|
wangliwen
|
497a9b6d43
|
...
|
2022-05-06 17:03:05 +08:00 |
|
wangliwen
|
25baa8b775
|
忽略把当前项目的输出jar包并使用
|
2022-05-06 17:00:37 +08:00 |
|
wangliwen
|
048861c2c6
|
运行脚本
|
2022-05-06 16:49:14 +08:00 |
|
dinggang
|
2b65f9f9d8
|
新增工作动态
|
2022-05-06 16:49:09 +08:00 |
|
wangliwen
|
d957021bd2
|
使用assembly 分离依赖与配置文件
|
2022-05-06 16:35:03 +08:00 |
|
wangliwen
|
41e0508179
|
对评论内容也做模糊查询
|
2022-05-06 11:15:23 +08:00 |
|
wangliwen
|
5071dfed4a
|
npe
|
2022-05-06 11:09:17 +08:00 |
|
wangliwen
|
953f4b628d
|
...
|
2022-05-06 11:04:14 +08:00 |
|
wangliwen
|
ac5aecf518
|
需求主题模糊查询与需求评论模糊查询
|
2022-05-06 10:59:27 +08:00 |
|
wangliwen
|
4566c0303b
|
...
|
2022-05-06 10:06:36 +08:00 |
|
wangliwen
|
01d4ff1157
|
我的评论（需求评论）
|
2022-05-06 09:50:04 +08:00 |
|
wangliwen
|
d9da76cea0
|
...
|
2022-05-05 14:22:14 +08:00 |
|
wangliwen
|
b04d8c86c9
|
...
|
2022-05-05 14:06:27 +08:00 |
|
wangliwen
|
3b0ecebdfb
|
附件的补充
|
2022-05-05 13:54:07 +08:00 |
|
wangliwen
|
8c33300983
|
日志保存时间调整
|
2022-05-05 11:54:43 +08:00 |
|
wangliwen
|
22415f8a43
|
能力申请 增加附件
|
2022-05-05 11:28:52 +08:00 |
|
wangliwen
|
45c87076c5
|
能力上架申请 增加附件
|
2022-05-05 10:56:35 +08:00 |
|
wangliwen
|
ca33bb0576
|
能力资源上架 审批历史增加字段显示
|
2022-05-05 10:35:02 +08:00 |
|
wangliwen
|
4785caa2f5
|
结束整个流程end事件监听
|
2022-05-05 10:05:58 +08:00 |
|
wangliwen
|
113d7b482a
|
加日志
|
2022-05-05 10:04:50 +08:00 |
|
wangliwen
|
94c46eadb2
|
...
|
2022-05-05 09:54:35 +08:00 |
|
wangliwen
|
8b4966349e
|
del_flag 的过滤
|
2022-05-05 09:12:17 +08:00 |
|
wangliwen
|
c994be67d2
|
...
|
2022-04-29 17:57:49 +08:00 |
|
wangliwen
|
604ddc049e
|
npe
|
2022-04-29 16:47:34 +08:00 |
|
wangliwen
|
a64b56dd14
|
审批监听结束事件end事件
|
2022-04-29 15:45:40 +08:00 |
|
dinggang
|
ed92e3568f
|
查询我的发布
|
2022-04-29 15:06:18 +08:00 |
|
wangliwen
|
dec5ac235f
|
能力资源上架 通过后
|
2022-04-29 12:00:17 +08:00 |
|
dinggang
|
828d6baae4
|
查询我的发布
|
2022-04-29 11:24:29 +08:00 |
|
wangliwen
|
f4090ec01c
|
npe
|
2022-04-28 21:37:47 +08:00 |
|
wangliwen
|
7da01b64ad
|
Merge remote-tracking branch 'origin/master'
|
2022-04-28 21:35:38 +08:00 |
|
wangliwen
|
11e2ca64d3
|
...
|
2022-04-28 21:34:56 +08:00 |
|
dinggang
|
65f0f31276
|
bug修复
|
2022-04-28 20:19:09 +08:00 |
|
wangliwen
|
ed4bb8d71f
|
Merge remote-tracking branch 'origin/master'
|
2022-04-28 11:36:25 +08:00 |
|
huangweixiong
|
27afac32a7
|
【能力上架申请】审批通过后网关注册成功只更新groupid字段
|
2022-04-28 11:24:51 +08:00 |
|
huangweixiong
|
84cc1b43f2
|
能力申请保存当前用户
|
2022-04-28 11:18:45 +08:00 |
|
wangliwen
|
7f7c4d2b15
|
一点优化
|
2022-04-28 09:18:24 +08:00 |
|
wangliwen
|
940fc384aa
|
ie 的支持
|
2022-04-27 20:29:51 +08:00 |
|
wangliwen
|
85931f3e0e
|
npe
|
2022-04-27 20:29:34 +08:00 |
|
wangliwen
|
c7c5f52b1e
|
Merge remote-tracking branch 'origin/master'
|
2022-04-27 19:09:57 +08:00 |
|
wangliwen
|
bb26b9ba61
|
补充字段信息
|
2022-04-27 19:09:41 +08:00 |
|
dinggang
|
b5ba97c55f
|
门户首页及二级搜索页面排序实现
|
2022-04-27 19:01:04 +08:00 |
|
wangliwen
|
2e45b8f47b
|
Merge remote-tracking branch 'origin/master'
|
2022-04-27 18:44:08 +08:00 |
|
wangliwen
|
afbab8b012
|
...
|
2022-04-27 18:43:54 +08:00 |
|
dinggang
|
39602c3fbe
|
门户首页及二级搜索页面排序实现
|
2022-04-27 18:05:47 +08:00 |
|
wangliwen
|
f7eff75ad7
|
Merge remote-tracking branch 'origin/master'
|
2022-04-27 16:53:12 +08:00 |
|
wangliwen
|
80cb1b7570
|
...
|
2022-04-27 16:52:59 +08:00 |
|
dinggang
|
a519811d4c
|
门户首页及二级搜索页面排序实现
|
2022-04-27 16:50:16 +08:00 |
|
huangweixiong
|
4638a6ad94
|
上架审批结束推送api网关
|
2022-04-27 16:32:58 +08:00 |
|
wangliwen
|
a09436b162
|
...
|
2022-04-27 14:08:54 +08:00 |
|
wangliwen
|
989f1586b4
|
终极审批人（啥都查不到）更换为崔腾
|
2022-04-27 11:28:30 +08:00 |
|
wangliwen
|
3d97d7a2be
|
未填资源所属部门时，指定提交人部门审核人审核
|
2022-04-27 11:06:38 +08:00 |
|
wangliwen
|
fec96155a0
|
sql 生成异常
|
2022-04-27 10:47:04 +08:00 |
|
dinggang
|
63a0c20343
|
开发指南文件上传修改
|
2022-04-26 20:37:19 +08:00 |
|
wangliwen
|
66e50fd582
|
一些权限限制的去除
|
2022-04-26 19:48:10 +08:00 |
|
wangliwen
|
444b96b312
|
...
|
2022-04-26 19:33:24 +08:00 |
|
wangliwen
|
d533df53c0
|
...
|
2022-04-26 17:52:18 +08:00 |
|
wangliwen
|
e0c38aca8e
|
排查日志
|
2022-04-26 17:16:13 +08:00 |
|
wangliwen
|
ca018b7855
|
反序列化
|
2022-04-26 16:53:08 +08:00 |
|
wangliwen
|
9e8401ea8e
|
...
|
2022-04-26 16:32:26 +08:00 |
|
wangliwen
|
aff4b37d5c
|
...
|
2022-04-26 15:13:26 +08:00 |
|
wangliwen
|
77faae8e73
|
Merge remote-tracking branch 'origin/master'
|
2022-04-26 15:11:10 +08:00 |
|
wangliwen
|
8532b21999
|
...
|
2022-04-26 15:10:58 +08:00 |
|
dinggang
|
98c5978c7a
|
开发指南文件上传修改
|
2022-04-26 15:09:51 +08:00 |
|
wangliwen
|
299d0cc19b
|
。。。
|
2022-04-26 15:04:27 +08:00 |
|
dinggang
|
816ec82d45
|
能力表修改
|
2022-04-26 11:51:08 +08:00 |
|
dinggang
|
e525007c0c
|
开发指南修改
|
2022-04-26 11:41:15 +08:00 |
|
wangliwen
|
e5cea2d03b
|
Gson报错Invalid time zone indicator 的处理
|
2022-04-26 11:35:39 +08:00 |
|
wangliwen
|
eb72e3fb74
|
提供需求创建者分页查询
|
2022-04-26 11:06:33 +08:00 |
|
dinggang
|
3e3183c511
|
编目新增一级分类创建保存开发指南文件的文件夹
|
2022-04-26 10:47:18 +08:00 |
|
wangliwen
|
d1d2e5ed65
|
...
|
2022-04-26 10:13:49 +08:00 |
|
wangliwen
|
406826f14e
|
Merge remote-tracking branch 'origin/master'
|
2022-04-26 09:53:35 +08:00 |
|
wangliwen
|
0ae65d020d
|
加入需求评论
|
2022-04-26 09:53:13 +08:00 |
|
dinggang
|
4eade083b9
|
编目新增一级分类创建保存开发指南文件的文件夹
|
2022-04-26 09:52:39 +08:00 |
|
wangliwen
|
19f628ee58
|
...
|
2022-04-26 09:26:21 +08:00 |
|
wangliwen
|
258dcbb57a
|
npe
|
2022-04-26 09:01:33 +08:00 |
|
DingGang
|
88150d1c63
|
Merge remote-tracking branch 'origin/master'
|
2022-04-25 22:26:33 +08:00 |
|
DingGang
|
416b27074a
|
开发指南文件获取，保存
|
2022-04-25 22:21:56 +08:00 |
|
wangliwen
|
a551408bc7
|
Merge remote-tracking branch 'origin/master'
|
2022-04-25 19:59:56 +08:00 |
|
wangliwen
|
9312095dfa
|
....
|
2022-04-25 19:59:40 +08:00 |
|
dinggang
|
94cf76e322
|
能力表字段修改，开发指南文件相关功能
|
2022-04-25 17:53:08 +08:00 |
|
wangliwen
|
2ff2137b81
|
...
|
2022-04-25 17:31:53 +08:00 |
|
wangliwen
|
6768f8567f
|
...
|
2022-04-25 17:25:15 +08:00 |
|
wangliwen
|
01728a8cfb
|
需求申请监听器
|
2022-04-25 17:05:48 +08:00 |
|
wangliwen
|
2756ed523b
|
...
|
2022-04-25 15:51:59 +08:00 |
|
wangliwen
|
f4a756ec19
|
Merge remote-tracking branch 'origin/master'
|
2022-04-25 14:19:09 +08:00 |
|
wangliwen
|
8d44b59fe5
|
..
|
2022-04-25 14:19:02 +08:00 |
|
dinggang
|
b5dd0c91f8
|
门户首页查询最新能力，最热能力实现修改，编目字段表新增字段，能力资源表字段修改
|
2022-04-25 14:08:34 +08:00 |
|
wangliwen
|
60685c8878
|
资源录入区分前端与管理后台录入
|
2022-04-25 12:39:10 +08:00 |
|
wangliwen
|
cd0aca28c8
|
...
|
2022-04-25 09:58:12 +08:00 |
|
wangliwen
|
453dc0a6d6
|
能力上架 所有部门审批人 动态设置
|
2022-04-24 17:57:24 +08:00 |
|
wangliwen
|
f059f2b76a
|
资源上架 申请功能
|
2022-04-24 17:19:07 +08:00 |
|
wangliwen
|
4c23160773
|
Merge remote-tracking branch 'origin/master'
|
2022-04-24 16:32:45 +08:00 |
|
wangliwen
|
bb13945d43
|
资源上架 流程初始化
|
2022-04-24 16:32:32 +08:00 |
|
dinggang
|
8dab238003
|
门户首页各种条件查询能力，新增我的收藏和评分功能
|
2022-04-24 16:30:15 +08:00 |
|
wangliwen
|
0d1036c3d7
|
...
|
2022-04-24 11:57:59 +08:00 |
|
wangliwen
|
4fb3b092cf
|
npe
|
2022-04-24 11:27:04 +08:00 |
|
wangliwen
|
21e45f919b
|
加点字段
|
2022-04-24 10:37:37 +08:00 |
|
wangliwen
|
f57681856c
|
能力申请 使用配置文件进行配置
|
2022-04-24 09:45:43 +08:00 |
|
wangliwen
|
368e33b0d5
|
Merge remote-tracking branch 'origin/master'
|
2022-04-24 08:43:05 +08:00 |
|
wangliwen
|
997e2a7fa2
|
加上自动通过的意见
|
2022-04-24 08:42:32 +08:00 |
|
DingGang
|
c28ec496f1
|
门户查询最新及最热能力
|
2022-04-23 18:51:52 +08:00 |
|
dinggang
|
d70cb67c06
|
Merge remote-tracking branch 'origin/master'
|
2022-04-22 18:21:45 +08:00 |
|
dinggang
|
b123adda7a
|
前台跳转登录后台管理系统权限
|
2022-04-22 18:20:24 +08:00 |
|
wangliwen
|
4d21104623
|
...
|
2022-04-22 18:07:43 +08:00 |
|
wangliwen
|
5f2317e6fa
|
我的代办加上 申请时的表单信息
|
2022-04-22 17:29:25 +08:00 |
|
wangliwen
|
d7735a4fdf
|
二级审批为大数据时，直接审核通过
|
2022-04-22 17:04:34 +08:00 |
|
wangliwen
|
3decf28405
|
流程各节点加上审批人姓名
|
2022-04-22 16:15:17 +08:00 |
|
wangliwen
|
9c39989591
|
...
|
2022-04-22 14:31:31 +08:00 |
|
wangliwen
|
292b800a6a
|
清晰点的部门审批流程节点日志
|
2022-04-22 14:29:11 +08:00 |
|
dinggang
|
93ffea6021
|
修复查询用户时未添加岗位筛选条件时查询数据不对
|
2022-04-22 11:37:05 +08:00 |
|
dinggang
|
53a4af2bb8
|
加申购车参数校验
|
2022-04-22 10:10:58 +08:00 |
|
wangliwen
|
dcb415763e
|
配置文件
|
2022-04-21 20:51:45 +08:00 |
|
wangliwen
|
a1c2bc2c89
|
...
|
2022-04-21 20:31:26 +08:00 |
|
wangliwen
|
b0b7d752ae
|
npe
|
2022-04-21 20:18:12 +08:00 |
|
wangliwen
|
36220f9e70
|
npe
|
2022-04-21 20:05:54 +08:00 |