wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,084 Commits 6 Branches 12 Tags 25 MiB
Commit Graph

2014 Commits

Author SHA1 Message Date
huangweixiong 109a2a1f79 待办推送格式修改 2022-10-18 17:34:59 +08:00
wangliwen 4245d1c782 Merge branch 'dev' 2022-10-18 17:22:45 +08:00
wangliwen 14a9aa33ae Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-10-18 17:22:34 +08:00
wangliwen d7f8bf7656 Merge branch 'dev' 2022-10-18 17:21:41 +08:00
lizhicheng 317a0d21aa CIM智能算法改开发组件 2022-10-18 17:07:46 +08:00
huangweixiong b326c8e24b Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform:
  数据异常导出失败
  npe
  导出表头宽度自适应
  调整导出文件名
  ...
  能力统计 导出
  CIM组件统计改为开发组件
  selectDeptDetailTypeCountList 增加导出接口
  npe
  会议室重复统计
  ...
  npe
  ...
  能力使用部门排序
  屮
  ...
  ...
  HIQDUCS-100 的处理
  设备申请新增设备详情字段
  统计报表状态修改
 2022-10-18 16:41:18 +08:00
huangweixiong 482e3fd51c 修改能力申请的发送通知 2022-10-18 16:40:39 +08:00
wangliwen 488ed3ec33 Merge branch 'dev' 2022-10-18 15:43:30 +08:00
wangliwen f2a1b152a8 数据异常导出失败 2022-10-18 15:43:22 +08:00
wangliwen 03a0b43941 Merge branch 'dev' 2022-10-18 15:21:59 +08:00
wangliwen a4047352c1 npe 2022-10-18 15:21:50 +08:00
wangliwen 1d16cca31b Merge branch 'dev' 2022-10-18 14:38:49 +08:00
wangliwen f1d3fea424 导出表头宽度自适应 2022-10-18 14:38:41 +08:00
wangliwen 847f1490b8 Merge branch 'dev' 2022-10-18 13:44:04 +08:00
wangliwen 094d27fddf 调整导出文件名 2022-10-18 13:43:54 +08:00
wangliwen 7499cbf4a0 Merge branch 'dev' 2022-10-18 11:31:38 +08:00
wangliwen fa94eb77f3 ... 2022-10-18 11:31:31 +08:00
wangliwen c9c256ff87 Merge branch 'dev' 2022-10-18 11:18:36 +08:00
wangliwen 17cd5900f8 Merge remote-tracking branch '备份/dev' into dev 2022-10-18 11:18:24 +08:00
wangliwen 020a32519a 能力统计 导出 2022-10-18 11:18:11 +08:00
lizhicheng 7c4b941031 CIM组件统计改为开发组件 2022-10-18 10:00:46 +08:00
wangliwen 41d382c71a Merge branch 'dev' 2022-10-18 09:58:18 +08:00
wangliwen c02702e70e selectDeptDetailTypeCountList 增加导出接口 2022-10-18 09:58:06 +08:00
wangliwen 6004a99da7 Merge branch 'dev' 2022-10-18 09:05:05 +08:00
lizhicheng 9961970fb1 npe 2022-10-17 17:56:53 +08:00
wangliwen 3e54f99052 Merge branch 'dev' 2022-10-17 16:54:43 +08:00
wangliwen 5b85df5010 会议室重复统计 2022-10-17 16:54:25 +08:00
wangliwen 02893504fc Merge branch 'dev' 2022-10-17 16:29:03 +08:00
wangliwen a2231e4d11 ... 2022-10-17 16:28:54 +08:00
wangliwen 6701c763a8 Merge branch 'dev' 2022-10-17 16:18:20 +08:00
wangliwen 834fbb9d8c npe 2022-10-17 16:18:10 +08:00
wangliwen 1b9f87b6ff Merge branch 'dev' 2022-10-17 16:07:29 +08:00
wangliwen c63bff7ef8 ... 2022-10-17 16:07:22 +08:00
wangliwen b263804884 Merge branch 'dev' 2022-10-17 16:04:21 +08:00
wangliwen abc082624d 能力使用部门排序 2022-10-17 16:03:32 +08:00
wangliwen cb3e72fd48 Merge branch 'dev' 2022-10-17 14:15:31 +08:00
wangliwen b25309c134 屮 2022-10-17 14:15:23 +08:00
wangliwen 23fcf66cd5 Merge branch 'dev' 2022-10-17 14:07:17 +08:00
wangliwen f1c2cbc28e ... 2022-10-17 14:07:07 +08:00
wangliwen 67de630ca0 Merge branch 'dev' 2022-10-17 13:57:35 +08:00
wangliwen ad54ba9ac1 ... 2022-10-17 13:56:19 +08:00
wangliwen 8f6b530a0d Merge branch 'dev' 2022-10-17 13:12:47 +08:00
wangliwen dd08d7b139 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-10-17 13:12:34 +08:00
wangliwen f8241322ef Merge branch 'dev' 2022-10-17 13:11:40 +08:00
wangliwen 0d44e8c81c Merge remote-tracking branch '备份/dev' into dev 
# Conflicts:
#	renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
 2022-10-17 13:11:30 +08:00
wangliwen ce11e658ff HIQDUCS-100 的处理 2022-10-17 13:09:46 +08:00
huangweixiong 234732dea0 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform: (64 commits)
  发起人主动终止时 补充意见
  环境不一致，sql修改
  草泥马
  ..
  去掉
  ..
  1.系统运行初始化数据调整 2.修复后台能力统计能力申请明细会议室申请状态错误bug
  调整
  。。。
  屮
  。。。
  。。。
  屮尼玛
  ...
  后台能力统计明细增加会议室申请
  。。。
  apply_amount 增加会客厅数量
  ...
  sql文件命名冲突
  1.修改前后台能力申请统计逻辑，加入会议室申请统计 2.赋能场景增加字段
  ...

# Conflicts:
#	renren-admin/src/main/java/io/renren/modules/gateway/controller/MonitorControllerV2.java
 2022-10-15 00:26:07 +08:00
huangweixiong 6a50857c2e 升级shiro，阿里云暂时没有最新包 2022-10-15 00:22:13 +08:00
huangweixiong 79b86cb96c 亚威组织导出接口 2022-10-15 00:21:28 +08:00
lizhicheng 85d1e9eddf 设备申请新增设备详情字段 2022-10-14 17:23:53 +08:00
lizhicheng 64e53c3535 统计报表状态修改 2022-10-14 14:57:46 +08:00
wangliwen a1fbce7737 Merge branch 'dev' 2022-10-14 11:26:58 +08:00
wangliwen b1376f4646 发起人主动终止时 补充意见 2022-10-14 11:25:58 +08:00
wangliwen 27b34d26c2 Merge branch 'dev' 2022-10-14 11:15:04 +08:00
dinggang 74523031c8 环境不一致，sql修改 2022-10-13 23:43:55 +08:00
wangliwen 4fdfb45b1c Merge branch 'dev' 2022-10-13 23:08:11 +08:00
wangliwen e920447f39 Merge remote-tracking branch 'origin/dev' into dev 2022-10-13 23:08:01 +08:00
wangliwen 2ca1096ecc 草泥马 2022-10-13 23:07:37 +08:00
dinggang 227db45035 .. 2022-10-13 23:04:15 +08:00
wangliwen 14768c994a Merge branch 'dev' 2022-10-13 22:57:09 +08:00
wangliwen 7ca30e38c2 去掉 2022-10-13 22:56:49 +08:00
wangliwen 339dd090fc Merge branch 'dev' 2022-10-13 22:03:14 +08:00
dinggang de5d3738d7 .. 2022-10-13 22:02:20 +08:00
wangliwen 096470457e Merge branch 'dev' 2022-10-13 21:50:11 +08:00
dinggang 88bbff3b8f 1.系统运行初始化数据调整 
2.修复后台能力统计能力申请明细会议室申请状态错误bug
 2022-10-13 21:47:31 +08:00
wangliwen 2b599faa4a Merge branch 'dev' 2022-10-13 21:32:12 +08:00
wangliwen f3cb2206cb 调整 2022-10-13 21:32:01 +08:00
wangliwen 719484fad7 Merge branch 'dev' 2022-10-13 20:58:20 +08:00
wangliwen 1373ab7088 。。。 2022-10-13 20:58:11 +08:00
wangliwen 88e00d54d8 Merge branch 'dev' 2022-10-13 20:43:00 +08:00
wangliwen 0e3e460164 屮 2022-10-13 20:42:53 +08:00
wangliwen 2928c04e85 Merge branch 'dev' 2022-10-13 20:34:56 +08:00
wangliwen c348b6d9eb 。。。 2022-10-13 20:34:49 +08:00
wangliwen 2673802567 Merge branch 'dev' 2022-10-13 20:26:02 +08:00
wangliwen 127a4f7a56 。。。 2022-10-13 20:25:40 +08:00
wangliwen dd957414d8 Merge branch 'dev' 2022-10-13 20:21:54 +08:00
wangliwen fa138f5b57 屮尼玛 2022-10-13 20:21:46 +08:00
wangliwen 0b9505136f Merge branch 'dev' 2022-10-13 19:49:45 +08:00
wangliwen d67abf81a1 ... 2022-10-13 19:49:34 +08:00
wangliwen 65112dc728 Merge branch 'dev' 2022-10-13 17:52:03 +08:00
dinggang 785276c635 Merge remote-tracking branch 'origin/dev' into dev 2022-10-13 17:50:47 +08:00
dinggang 98a0715bf5 后台能力统计明细增加会议室申请 2022-10-13 17:50:17 +08:00
wangliwen e0cd927455 Merge branch 'dev' 2022-10-13 17:49:13 +08:00
wangliwen e98febf4c6 。。。 2022-10-13 17:49:06 +08:00
wangliwen 639e885225 Merge branch 'dev' 2022-10-13 17:37:36 +08:00
wangliwen cd6c670a18 apply_amount 增加会客厅数量 2022-10-13 17:37:25 +08:00
wangliwen 244f5ed2e4 Merge branch 'dev' 2022-10-13 17:06:38 +08:00
dinggang c14fe24878 ... 2022-10-13 17:04:58 +08:00
wangliwen 156756bac2 Merge branch 'dev' 2022-10-13 16:52:22 +08:00
dinggang 433d353d4f sql文件命名冲突 2022-10-13 16:51:45 +08:00
wangliwen 208829c4f8 Merge branch 'dev' 2022-10-13 16:45:37 +08:00
dinggang c583280b35 1.修改前后台能力申请统计逻辑，加入会议室申请统计 
2.赋能场景增加字段
 2022-10-13 16:44:46 +08:00
wangliwen e7dc109193 Merge branch 'dev' 2022-10-13 14:50:34 +08:00
wangliwen b45316d33b 屮 2022-10-13 14:50:23 +08:00
wangliwen eb543c2695 Merge branch 'dev' 2022-10-13 12:50:03 +08:00
wangliwen a6733814ae 。。。 2022-10-13 12:49:54 +08:00
wangliwen f8b0b44cb2 Merge branch 'dev' 2022-10-13 11:57:11 +08:00
wangliwen b4cc23f323 屮 2022-10-13 11:57:03 +08:00
wangliwen eaa8dc4482 Merge branch 'dev' 2022-10-13 11:49:29 +08:00
dinggang 1b87f215f9 Merge remote-tracking branch 'origin/dev' into dev 2022-10-13 11:48:18 +08:00
dinggang 9113da88bb 后台管理-能力统计新增会议室申请统计 2022-10-13 11:47:42 +08:00
wangliwen e40428d48e Merge branch 'dev' 2022-10-13 11:46:42 +08:00
wangliwen 9fdda47fcc Merge remote-tracking branch 'origin/dev' into dev 2022-10-13 11:46:31 +08:00
wangliwen 8e4eac8030 tb_fuse_resource 字段调整 2022-10-13 11:46:24 +08:00
dinggang 2467da9106 字段名修改 2022-10-13 11:32:29 +08:00
dinggang 4f37523519 1.融合服务新增各种资源数量字段 2022-10-13 11:02:37 +08:00
wangliwen 3ecbda2a60 Merge branch 'dev' 2022-10-13 10:44:31 +08:00
wangliwen 1e8d781ba5 selectResourceListByType 接口数量调整 2022-10-13 10:43:36 +08:00
wangliwen 6cc646b959 Merge branch 'dev' 2022-10-13 10:17:56 +08:00
wangliwen 35b53fa901 文案调整 2022-10-13 10:17:44 +08:00
wangliwen 09998753b2 Merge remote-tracking branch 'origin/dev' 2022-10-13 09:39:47 +08:00
dinggang 02398a3641 1.同步sys_menu菜单 
2.实现访客模式功能
 2022-10-13 09:37:24 +08:00
wangliwen 05b57f3340 Merge branch 'dev' 2022-10-12 19:04:19 +08:00
wangliwen 7c763efbd6 ...增加资源所属部门名称 2022-10-12 19:04:09 +08:00
wangliwen 6623fe87fd Merge branch 'dev' 2022-10-12 18:52:05 +08:00
wangliwen e6191ab72e 资源申请量去掉 基础设施数量 2022-10-12 18:51:19 +08:00
wangliwen 1362c2dcd3 Merge branch 'dev' 2022-10-12 17:11:35 +08:00
wangliwen 357971f23b 菜单增加 site 站点标识 字段 2022-10-12 17:11:04 +08:00
wangliwen 997edea1cd Merge branch 'dev' 2022-10-12 16:20:42 +08:00
wangliwen da4fab24bc ... 2022-10-12 16:20:32 +08:00
wangliwen 5c9a8a83d8 Merge remote-tracking branch '备份/dev' into dev 2022-10-12 16:18:57 +08:00
wangliwen 57c0e17208 Merge branch 'dev' 2022-10-12 16:16:37 +08:00
wangliwen 48cccebdfd 通知文案调整 2022-10-12 16:15:51 +08:00
lizhicheng 6e22e9929f 申请历史修改时长单位 2022-10-12 16:08:58 +08:00
wangliwen 500b68d429 Merge branch 'dev' 2022-10-12 15:57:33 +08:00
wangliwen 0c1a606dd4 增加我的待办各类型的待办数量 2022-10-12 15:57:18 +08:00
wangliwen 1a60f96ad8 Merge branch 'dev' 2022-10-12 15:15:36 +08:00
wangliwen b19598a4cb Merge remote-tracking branch '备份/dev' into dev 2022-10-12 15:15:28 +08:00
wangliwen 6e80f7cdaf 重复申请发送通知 2022-10-12 15:15:21 +08:00
lizhicheng 57af11a4a0 基础设施去掉感知资源分类 2022-10-12 11:19:00 +08:00
wangliwen d947510ebe Merge branch 'dev' 2022-10-12 09:57:05 +08:00
wangliwen 6612b514c8 模型文案调整 2022-10-12 09:56:54 +08:00
wangliwen 388b8f67a0 Merge branch 'dev' 2022-10-12 09:42:28 +08:00
wangliwen 5bff2763a9 审批详情——市级区市管理员——改为市级管理员 HIQDUCS-17 2022-10-12 09:42:18 +08:00
wangliwen 5fb69dc48c Merge branch 'dev' 2022-10-11 19:59:21 +08:00
wangliwen 6857ccb90e npe 2022-10-11 19:59:14 +08:00
wangliwen 8cb99adfc4 Merge branch 'dev' 2022-10-11 19:48:14 +08:00
wangliwen bc4a0f6635 。。。 2022-10-11 19:48:06 +08:00
wangliwen 1634cb4aad Merge branch 'dev' 2022-10-11 19:36:14 +08:00
wangliwen 2c40cace07 审批详情返回分配人的所属部门 2022-10-11 19:36:06 +08:00
wangliwen 55e85e86f0 Merge branch 'dev' 2022-10-11 17:45:19 +08:00
lizhicheng 50fed6862d 消息通知跳转完善 2022-10-11 16:19:47 +08:00
lizhicheng 894c5c0251 报表统计bug、会议室消息跳转 2022-10-11 11:49:22 +08:00
wangliwen 7ab1ce6c77 Merge remote-tracking branch 'origin/dev' 2022-10-10 14:13:06 +08:00
dinggang e217f56ca9 修改能力统计页申请次数统计不一致问题 2022-10-10 14:08:26 +08:00
wangliwen 21ac7f2991 Merge branch 'dev' 2022-10-10 13:53:45 +08:00
zhangzhikang d62484ba62 会议室预约审批人角色改为会议室审核人,增加根据roleid查询所有userId的方法，会议室改为发送角色下的所有人 2022-10-10 10:50:52 +08:00
wangliwen 2538479e36 Merge branch 'dev' 2022-10-10 10:16:36 +08:00
zhangzhikang 7169d9ee73 会议室预约审批人角色改为会议室审核人 2022-10-10 10:12:17 +08:00
wangliwen 53725af1b2 Merge branch 'dev' 2022-10-10 09:50:47 +08:00
wangliwen f72463d3bf 部门审批人为发起人时 默认通过 2022-10-10 09:50:28 +08:00
wangliwen 1190beb8fe Merge branch 'dev' 2022-10-09 18:09:24 +08:00
lizhicheng bb9d5847bf 完善：西海岸申购车 2022-10-09 17:20:03 +08:00
wangliwen 06b3086ae3 Merge branch 'dev' 
# Conflicts:
#	renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java
 2022-10-09 10:45:40 +08:00
wangliwen 77aac95526 资源导入 2022-10-09 10:43:34 +08:00
wangliwen 286df76ec3 Merge branch 'dev' 2022-10-09 09:01:38 +08:00
wangliwen 983b01af36 全局格式化 2022-10-09 09:01:27 +08:00
wangliwen ec4a84b581 Merge branch 'dev' 2022-10-09 08:55:42 +08:00
lizhicheng 00eace9698 西海岸新增：购物车添加与一键申请 2022-10-08 19:03:01 +08:00
wangliwen 3096433c38 Merge branch 'dev' 2022-10-08 10:55:13 +08:00
wangliwen a409420df3 ... 2022-10-08 10:55:03 +08:00
wangliwen dca052dd59 Merge branch 'dev' 2022-10-08 09:28:35 +08:00
wangliwen 332a2972e4 全局格式化代码 2022-10-08 09:28:24 +08:00
DESKTOP-VA9NQUP\liwen 7396a0a595 Merge branch 'master' into docker_package 2022-10-04 22:11:22 +08:00
lizhicheng 117c79eb0d 通知消息跳转bug fix 2022-10-04 18:01:49 +08:00
lizhicheng c645e0f177 新增功能：通知消息支持跳转 2022-10-04 17:34:19 +08:00
DESKTOP-VA9NQUP\liwen d2a26c959f Merge branch 'master' into docker_package 2022-10-03 20:33:27 +08:00
lizhicheng be042a94b0 统计报表新增：审批单号 2022-10-03 16:06:42 +08:00
lizhicheng 4a5ef24d0c 融合服务场景入口、首页资源统计、已办bug 2022-10-03 11:46:20 +08:00
wangliwen 68ecd853d1 Merge branch 'master' into docker_package 2022-09-30 09:13:29 +08:00
lizhicheng 7163b83c2a 新增功能：基础设施部门最大申请限制 2022-09-29 23:01:27 +08:00
wangliwen 98f5b5519f Merge branch 'master' into docker_package 2022-09-29 17:52:06 +08:00
wangliwen ea141edbfa 全局格式化代码 2022-09-29 17:51:37 +08:00
wangliwen 0259a0a1db Merge branch 'master' into docker_package 2022-09-29 11:15:28 +08:00
wangliwen dc7821387c 屮 2022-09-29 11:15:14 +08:00
wangliwen 92138b1668 docker 镜像增加 HEALTHCHECK 2022-09-29 10:38:25 +08:00
wangliwen bdac845f47 Merge branch 'master' into docker_package 2022-09-29 09:26:11 +08:00
wangliwen 2f933627ff ... 2022-09-29 09:25:57 +08:00
wangliwen 768e24d62a Merge branch 'master' into docker_package 2022-09-28 09:39:43 +08:00
wangliwen 1af6d798ed 日志输出采用异步输出模式 2022-09-28 09:39:18 +08:00
DESKTOP-VA9NQUP\liwen ff8ed49979 Merge branch 'master' into docker_package 2022-09-28 07:54:24 +08:00
lizhicheng ae3556ac3e 西海岸v2申请流程修改 2022-09-27 18:55:44 +08:00
wangliwen 0348efcb56 Merge branch 'master' into docker_package 2022-09-27 17:27:29 +08:00
lizhicheng 1eb11c53ee 设备审批增加筛选条件 2022-09-27 16:43:20 +08:00
lizhicheng 22eea4c2f5 bug fix 2022-09-27 16:10:42 +08:00
wangliwen c5aaeca724 Merge branch 'master' into docker_package 2022-09-27 11:04:53 +08:00
lizhicheng 3c0d9ab8b3 新增：申请过期时间 2022-09-27 09:52:16 +08:00
wangliwen 1b7825b3d6 Merge branch 'master' into docker_package 2022-09-26 17:16:07 +08:00
wangliwen 57f73108ea 所有流程流转增加当前流程节点 2022-09-26 17:15:52 +08:00
wangliwen 0a17e588eb Merge branch 'master' into docker_package 2022-09-26 16:51:11 +08:00
wangliwen 3826cdae37 处理人 2022-09-26 16:50:59 +08:00
wangliwen c98509adc0 Merge branch 'master' into docker_package 2022-09-26 16:39:55 +08:00
wangliwen 128653d837 屮 2022-09-26 16:39:43 +08:00
wangliwen 16ee9172be Merge branch 'master' into docker_package 2022-09-26 16:35:54 +08:00
wangliwen 950f3f3b6e ... 2022-09-26 16:35:41 +08:00
wangliwen c67274cf51 Merge branch 'master' into docker_package 2022-09-26 16:25:53 +08:00
wangliwen 21a56a4d26 ... 2022-09-26 16:25:38 +08:00
wangliwen 736d815f68 Merge branch 'master' into docker_package 2022-09-26 16:08:19 +08:00
wangliwen 0e4c61cda1 能力申请增加当前节点信息 2022-09-26 16:07:28 +08:00
wangliwen 48c80cb357 能力申请通知调整 2022-09-26 15:39:40 +08:00