wangliwen
|
a2cf04b5fd
|
npe
|
2022-06-29 15:11:35 +08:00 |
|
wangliwen
|
e2a14c2ad5
|
Merge remote-tracking branch 'origin/dev'
|
2022-06-29 14:48:52 +08:00 |
 dinggang
|
7d5eaa62d7
|
...
|
2022-06-29 14:43:38 +08:00 |
 yitonglei
|
98976ae620
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-06-29 14:11:34 +08:00 |
|
yitonglei
|
58088236ab
|
1、能力统计列表及详情页CensusControllerV3的列表查询方法做了改动，部门id从登录用户获取
2、删除了SysDeptController中新增的查询部门树方法
|
2022-06-29 14:08:50 +08:00 |
|
wangliwen
|
cf4545a266
|
businessKey直接出task内部参数
|
2022-06-29 11:56:38 +08:00 |
|
wangliwen
|
eaf2e3b289
|
调整申请表单应用场景支持多选
|
2022-06-29 11:42:52 +08:00 |
|
wangliwen
|
fc4210442a
|
Merge branch 'master' into dev
|
2022-06-29 10:55:08 +08:00 |
|
dinggang
|
63cc759ac4
|
基础设施摄像头批量申请
|
2022-06-29 10:28:40 +08:00 |
|
wangliwen
|
1a07719063
|
...
|
2022-06-29 10:15:06 +08:00 |
 lizhicheng
|
d16113cd48
|
新增api：部门上架、部门上架统计
|
2022-06-29 10:11:03 +08:00 |
|
wangliwen
|
400fb77529
|
...
|
2022-06-29 09:48:24 +08:00 |
|
wangliwen
|
f953b77294
|
批量申请流程申请接口处理
|
2022-06-29 09:39:41 +08:00 |
|
wangliwen
|
8577b7f1e4
|
数据库切换回 238
|
2022-06-29 09:08:42 +08:00 |
|
wangliwen
|
f435bb8d49
|
Merge branch 'dev'
|
2022-06-28 20:13:40 +08:00 |
|
wangliwen
|
00031c475f
|
启动脚本 调大堆栈
|
2022-06-28 20:13:00 +08:00 |
|
wangliwen
|
87b74e303a
|
...
|
2022-06-28 19:31:23 +08:00 |
|
wangliwen
|
bfbcbceaac
|
...
|
2022-06-28 19:29:29 +08:00 |
|
wangliwen
|
73f3101477
|
selectWithAttrs 二级缓存
|
2022-06-28 19:18:39 +08:00 |
|
wangliwen
|
4ae2d62670
|
总体评分逆序
|
2022-06-28 19:13:38 +08:00 |
|
dinggang
|
a9b5f6f22d
|
1.基础设施摄像头列表查询修改
2.申购车根据流程ID查询申请的摄像头列表
|
2022-06-28 19:12:52 +08:00 |
|
wangliwen
|
eb362e16df
|
二级缓存缓存 按总体评价排序
|
2022-06-28 19:00:57 +08:00 |
|
wangliwen
|
a92a53b850
|
...
|
2022-06-28 18:12:55 +08:00 |
|
wangliwen
|
4fddf96687
|
Merge remote-tracking branch 'origin/dev'
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
|
2022-06-28 18:11:59 +08:00 |
|
wangliwen
|
0a8fcd3d8f
|
npe
|
2022-06-28 18:09:00 +08:00 |
|
yitonglei
|
9b3dbc53cb
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-06-28 17:48:36 +08:00 |
|
wangliwen
|
27d2757f9d
|
总体评价特殊处理，防止sql 卡顿
|
2022-06-28 17:48:29 +08:00 |
|
yitonglei
|
d27039cf07
|
1、部门发布情况增加分页能力
|
2022-06-28 17:48:26 +08:00 |
|
wangliwen
|
03f1e20a46
|
...
|
2022-06-28 17:05:21 +08:00 |
|
wangliwen
|
926bc78395
|
。。。
|
2022-06-28 16:52:57 +08:00 |
|
wangliwen
|
4a9dbdceb9
|
Merge remote-tracking branch 'origin/dev'
|
2022-06-28 16:49:13 +08:00 |
|
wangliwen
|
97b5f7c79b
|
总体评价更新
|
2022-06-28 16:48:50 +08:00 |
|
yitonglei
|
4e13cb093a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-06-28 15:52:28 +08:00 |
|
yitonglei
|
ee22d1d8fc
|
1、组件使用情况统计的查询方法--修改了基础设置列表、基础设施使用情况、知识库相关方法
|
2022-06-28 15:50:46 +08:00 |
|
HISENSE\lizhicheng2
|
fd3c2a7a4b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-06-28 15:35:45 +08:00 |
|
Unknown
|
95365f1901
|
新增api：部门待办、部门已办
|
2022-06-28 15:35:15 +08:00 |
|
wangliwen
|
f52e462e18
|
二级缓存调整
|
2022-06-28 14:00:18 +08:00 |
|
wangliwen
|
ed81a9807a
|
。。。
|
2022-06-28 13:53:29 +08:00 |
|
wangliwen
|
1d5567d493
|
。。。
|
2022-06-28 13:48:13 +08:00 |
|
wangliwen
|
d10367c4c6
|
使用冗余字段代替sql函数计算
|
2022-06-28 13:40:59 +08:00 |
|
wangliwen
|
d16d7add39
|
selectDeptList 使用全异步处理与加二级缓存
|
2022-06-28 11:49:54 +08:00 |
|
wangliwen
|
2954ede07a
|
Merge remote-tracking branch 'origin/dev'
|
2022-06-28 11:04:12 +08:00 |
|
wangliwen
|
0562a1548f
|
selectDeptList 使用并行减少io
|
2022-06-28 11:03:51 +08:00 |
|
yitonglei
|
0adb6b095c
|
1、修改组件使用情况统计的查询方法
|
2022-06-28 10:43:20 +08:00 |
|
yitonglei
|
8efd7866aa
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java
|
2022-06-28 10:40:32 +08:00 |
|
yitonglei
|
ceb9c747e2
|
1、修改组件使用情况统计的查询方法
|
2022-06-28 10:33:09 +08:00 |
|
wangliwen
|
4058089bcd
|
...
|
2022-06-28 09:33:10 +08:00 |
|
wangliwen
|
73f0607099
|
selectWithAttrs 减少sql返回字段
|
2022-06-28 09:27:35 +08:00 |
|
wangliwen
|
5176f58ac8
|
selectWithAttrs 使用流分页
|
2022-06-28 09:16:40 +08:00 |
|
wangliwen
|
99bb41556d
|
按条件出条件总数
|
2022-06-27 19:58:24 +08:00 |