Commit Graph

537 Commits

Author SHA1 Message Date
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
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
wangliwen 6e5d988f16 打包安装包时 排除prod配置环境 2022-05-09 10:47:03 +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 efb58708e6 pom 调整 2022-05-05 16:43:58 +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 5e80283fde ... 2022-04-28 13:22:11 +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
wangliwen 80648e1f59 入参的调整 2022-04-21 18:55:45 +08:00
wangliwen 424140dd0f Merge remote-tracking branch 'origin/master' 2022-04-21 18:00:53 +08:00
wangliwen 8a594d2180 增加大数据动态审批人 2022-04-21 18:00:32 +08:00
dinggang 5932ba8f8e 加申购车参数校验 2022-04-21 17:05:19 +08:00
dinggang 3deac71914 文件保存位置配置 2022-04-21 15:28:10 +08:00
wangliwen b4bbdd1194 亚微 jar 2022-04-21 15:16:26 +08:00
dinggang eeb9627347 开发指南测试 2022-04-21 14:16:31 +08:00
dinggang 80260a9fa0 开发指南测试 2022-04-21 10:29:35 +08:00
wangliwen 22133a83da fix npe 2022-04-21 08:45:16 +08:00
wangliwen f070be4ed8 ... 2022-04-20 20:23:04 +08:00
dinggang d51c1e701f 申购车功能,门户相关接口 2022-04-20 19:05:35 +08:00
dinggang 42c64253f8 申购车功能,门户相关接口 2022-04-20 17:34:34 +08:00
dinggang c1cfa1781e 申购车功能,门户相关接口 2022-04-20 17:31:48 +08:00
wangliwen db9a819aba getMyProcessInstancePage接口字段的补充 2022-04-20 16:51:15 +08:00
wangliwen cc1778e40b 根据申请填写的部门动态分配流程审批人 2022-04-20 15:05:19 +08:00
wangliwen 004537b865 加点日志文件的写入 2022-04-20 14:51:39 +08:00
wangliwen d2439cd096 ... 2022-04-20 10:50:43 +08:00
huangweixiong 57477cba83 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:
  ...
  ...
  批量进行能力申请接口(一个接口搞定)
  本地存储资源上传与访问
  编目管理接口,资源管理接口修改
  编目管理接口,资源管理接口修改
2022-04-19 10:07:37 +08:00
wangliwen 8ce7a18999 ... 2022-04-19 10:04:47 +08:00
wangliwen 1e2a8a64cb ... 2022-04-18 17:12:14 +08:00
wangliwen e0e3450a86 批量进行能力申请接口(一个接口搞定) 2022-04-18 17:12:06 +08:00
wangliwen e1c935a254 本地存储资源上传与访问 2022-04-18 13:59:25 +08:00
dinggang 5f2bd3aeab 编目管理接口,资源管理接口修改 2022-04-15 11:49:50 +08:00
dinggang c7e119ab1f 编目管理接口,资源管理接口修改 2022-04-14 23:51:01 +08:00
huangweixiong 388267109a 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:
  删除人人开源注释,新增编目管理接口,资源管理接口
2022-04-14 19:30:08 +08:00
huangweixiong ab6ee44ac9 流程钩子 2022-04-14 19:29:38 +08:00
dinggang 42b318b471 删除人人开源注释,新增编目管理接口,资源管理接口 2022-04-14 13:58:19 +08:00
huangweixiong 7e0481b0ee ignore init 2022-04-14 10:35:02 +08:00
weixiong_huang ed53a011b2 能力申请表单及流程接口 2022-04-14 10:10:40 +08:00
weixiong_huang fd4fc9016b Initial commit 2022-04-11 15:03:55 +08:00