wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

1.编目更新 

2.后台管理-工作台-部门待办新增用户名称
This commit is contained in:
dinggang 2022-07-19 10:58:30 +08:00
parent de822a40ae
commit b23afc8029
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
renren-admin/src/main/java/io/renren/modules/activiti/dto/TaskDTO.java
View File

@ -26,6 +26,9 @@ public class TaskDTO {
@ApiModelProperty(value = "用户ID") @ApiModelProperty(value = "用户ID")
private String userId; private String userId;
@ApiModelProperty(value = "用户名称")
private String userName;
@ApiModelProperty(value = "任务参数") @ApiModelProperty(value = "任务参数")
private Map<String, Object> params; private Map<String, Object> params;

1
renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java
View File

@ -189,6 +189,7 @@ public class ActTaskService extends BaseServiceImpl {
for (Task task : list) { for (Task task : list) {
TaskDTO dto = new TaskDTO(); TaskDTO dto = new TaskDTO();
this.convertTaskInfo(task, dto); this.convertTaskInfo(task, dto);
dto.setUserName(sysUserService.selectById(dto.getUserId()).getRealName());
Map<String, Object> processVariable = new LinkedHashMap<>(); Map<String, Object> processVariable = new LinkedHashMap<>();
if (dto.getBusinessKey().startsWith("{") || dto.getBusinessKey().startsWith("[")) { // 为json内容 (特殊处理批量) if (dto.getBusinessKey().startsWith("{") || dto.getBusinessKey().startsWith("[")) { // 为json内容 (特殊处理批量)

20
renren-admin/src/main/resources/db/R__init_tb_data_catagory.sql
View File

@ -2,7 +2,7 @@
-- 替换前建议备份 -- 替换前建议备份
-- 注意更新时间 -- 注意更新时间
/* /*
Date: 18/07/2022 17:52:09 Date: 19/07/2022 10:55:51
*/ */
SET NAMES utf8mb4; SET NAMES utf8mb4;
@ -203,7 +203,7 @@ INSERT INTO `tb_data_category` VALUES (1531192521073946626, '测试3', '组件
INSERT INTO `tb_data_category` VALUES (1531208527270404097, '基本信息', '组件服务', '1514138753379680257', 'false', '', 'false', 'false', '', 3, 0, 1513433709613187073, '2022-05-30 17:38:56', 1513433709613187073, '2022-05-30 17:38:56', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1531208527270404097, '基本信息', '组件服务', '1514138753379680257', 'false', '', 'false', 'false', '', 3, 0, 1513433709613187073, '2022-05-30 17:38:56', 1513433709613187073, '2022-05-30 17:38:56', NULL, NULL, NULL, NULL, NULL);
INSERT INTO `tb_data_category` VALUES (1531208650478084098, '应用领域', '组件服务', '1531208527270404097', 'true', 'select', 'true', 'true', '1513712507692818433', 1, 0, 1513433709613187073, '2022-05-30 17:39:25', 1513433709613187073, '2022-05-30 17:39:25', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1531208650478084098, '应用领域', '组件服务', '1531208527270404097', 'true', 'select', 'true', 'true', '1513712507692818433', 1, 0, 1513433709613187073, '2022-05-30 17:39:25', 1513433709613187073, '2022-05-30 17:39:25', NULL, NULL, NULL, NULL, NULL);
INSERT INTO `tb_data_category` VALUES (1531208806741073921, '组件价格', '组件服务', '1531208527270404097', 'true', 'input', 'false', 'false', '', 7, 0, 1513433709613187073, '2022-05-30 17:40:03', 1513433709613187073, '2022-05-30 17:40:03', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1531208806741073921, '组件价格', '组件服务', '1531208527270404097', 'true', 'input', 'false', 'false', '', 7, 0, 1513433709613187073, '2022-05-30 17:40:03', 1513433709613187073, '2022-05-30 17:40:03', NULL, NULL, NULL, NULL, NULL);
INSERT INTO `tb_data_category` VALUES (1531208887611449346, '技术领域', '组件服务', '1531208527270404097', 'true', 'select', 'true', 'true', '1513714403530809346', 2, 0, 1513433709613187073, '2022-05-30 17:40:22', 1513433709613187073, '2022-05-30 17:40:22', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1531208887611449346, '技术领域', '组件服务', '1531208527270404097', 'true', 'select', 'false', 'true', '1513714403530809346', 2, 0, 1513433709613187073, '2022-05-30 17:40:22', 1513433709613187073, '2022-05-30 17:40:22', NULL, NULL, NULL, NULL, NULL);
INSERT INTO `tb_data_category` VALUES (1531209024668721153, '关联应用', '组件服务', '1531208527270404097', 'true', 'input', 'false', 'false', '', 4, 0, 1513433709613187073, '2022-05-30 17:40:55', 1513433709613187073, '2022-05-30 17:40:55', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1531209024668721153, '关联应用', '组件服务', '1531208527270404097', 'true', 'input', 'false', 'false', '', 4, 0, 1513433709613187073, '2022-05-30 17:40:55', 1513433709613187073, '2022-05-30 17:40:55', NULL, NULL, NULL, NULL, NULL);
INSERT INTO `tb_data_category` VALUES (1531209214872018946, '是否收费', '组件服务', '1514138753379680257', 'true', 'input', 'false', 'false', '', 4, 1, 1513433709613187073, '2022-05-30 17:41:40', 1513433709613187073, '2022-05-30 17:42:18', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1531209214872018946, '是否收费', '组件服务', '1514138753379680257', 'true', 'input', 'false', 'false', '', 4, 1, 1513433709613187073, '2022-05-30 17:41:40', 1513433709613187073, '2022-05-30 17:42:18', NULL, NULL, NULL, NULL, NULL);
INSERT INTO `tb_data_category` VALUES (1531209433567223809, '是否收费', '组件服务', '1531208527270404097', 'true', 'select', 'false', 'true', '1529028127496343554', 6, 0, 1513433709613187073, '2022-05-30 17:42:32', 1513433709613187073, '2022-05-30 17:42:32', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1531209433567223809, '是否收费', '组件服务', '1531208527270404097', 'true', 'select', 'false', 'true', '1529028127496343554', 6, 0, 1513433709613187073, '2022-05-30 17:42:32', 1513433709613187073, '2022-05-30 17:42:32', NULL, NULL, NULL, NULL, NULL);
@ -525,7 +525,7 @@ INSERT INTO `tb_data_category` VALUES (1541958011009875969, '数据范围', '组
INSERT INTO `tb_data_category` VALUES (1541958848058736642, '样式服务地址', '组件服务一', '1539529687759314945', 'true', 'input', 'false', 'false', '', 4, 0, 1524924140178481154, '2022-06-29 09:36:52', 1524924140178481154, '2022-06-29 09:36:52', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1541958848058736642, '样式服务地址', '组件服务一', '1539529687759314945', 'true', 'input', 'false', 'false', '', 4, 0, 1524924140178481154, '2022-06-29 09:36:52', 1524924140178481154, '2022-06-29 09:36:52', NULL, NULL, NULL, NULL, NULL);
INSERT INTO `tb_data_category` VALUES (1542755260526624769, '能力类型', '组件服务一', '1534718048405012481', 'true', 'AbilityType', 'false', 'false', '', 1, 0, 1524924140178481154, '2022-07-01 14:21:32', 1524924140178481154, '2022-07-01 14:21:32', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1542755260526624769, '能力类型', '组件服务一', '1534718048405012481', 'true', 'AbilityType', 'false', 'false', '', 1, 0, 1524924140178481154, '2022-07-01 14:21:32', 1524924140178481154, '2022-07-01 14:21:32', NULL, NULL, NULL, NULL, NULL);
INSERT INTO `tb_data_category` VALUES (1542755491007823873, '组件类型', '组件服务一', '1534718048405012481', 'true', 'ComponentType', 'false', 'false', '', 2, 0, 1524924140178481154, '2022-07-01 14:22:27', 1524924140178481154, '2022-07-01 14:22:27', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1542755491007823873, '组件类型', '组件服务一', '1534718048405012481', 'true', 'ComponentType', 'false', 'false', '', 2, 0, 1524924140178481154, '2022-07-01 14:22:27', 1524924140178481154, '2022-07-01 14:22:27', NULL, NULL, NULL, NULL, NULL);
INSERT INTO `tb_data_category` VALUES (1542759999255478274, '来源应用', '组件服务一', '1534718048405012481', 'true', 'AssociatedApplication', 'false', 'false', '', 17, 0, 1524924140178481154, '2022-07-01 14:40:22', 1524924140178481154, '2022-07-01 14:40:22', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1542759999255478274, '来源应用', '组件服务一', '1534718048405012481', 'true', 'AssociatedApplication', 'false', 'false', '', 19, 0, 1524924140178481154, '2022-07-01 14:40:22', 1524924140178481154, '2022-07-01 14:40:22', NULL, NULL, NULL, NULL, NULL);
INSERT INTO `tb_data_category` VALUES (1542768397682466818, '服务商', '组件服务一', '1534718048405012481', 'true', 'input', 'false', 'false', '', 13, 0, 1524924140178481154, '2022-07-01 15:13:44', 1524924140178481154, '2022-07-01 15:13:44', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1542768397682466818, '服务商', '组件服务一', '1534718048405012481', 'true', 'input', 'false', 'false', '', 13, 0, 1524924140178481154, '2022-07-01 15:13:44', 1524924140178481154, '2022-07-01 15:13:44', NULL, NULL, NULL, NULL, NULL);
INSERT INTO `tb_data_category` VALUES (1542768571779637250, '服务商联系人', '组件服务一', '1534718048405012481', 'true', 'input', 'false', 'false', '', 14, 0, 1524924140178481154, '2022-07-01 15:14:25', 1524924140178481154, '2022-07-01 15:14:25', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1542768571779637250, '服务商联系人', '组件服务一', '1534718048405012481', 'true', 'input', 'false', 'false', '', 14, 0, 1524924140178481154, '2022-07-01 15:14:25', 1524924140178481154, '2022-07-01 15:14:25', NULL, NULL, NULL, NULL, NULL);
INSERT INTO `tb_data_category` VALUES (1542768616788713473, '服务商联系电话', '组件服务一', '1534718048405012481', 'true', 'input', 'false', 'false', '', 15, 0, 1524924140178481154, '2022-07-01 15:14:36', 1524924140178481154, '2022-07-01 15:14:36', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1542768616788713473, '服务商联系电话', '组件服务一', '1534718048405012481', 'true', 'input', 'false', 'false', '', 15, 0, 1524924140178481154, '2022-07-01 15:14:36', 1524924140178481154, '2022-07-01 15:14:36', NULL, NULL, NULL, NULL, NULL);
@ -549,11 +549,11 @@ INSERT INTO `tb_data_category` VALUES (1545235376376795137, '搜大夫', '测试
INSERT INTO `tb_data_category` VALUES (1545235470660554753, '士大夫顺德府搜大夫', '测试', '1545235376376795137', 'true', 'input', 'false', 'false', '', 1, 0, 1513437369940344833, '2022-07-08 10:37:00', 1513437369940344833, '2022-07-08 10:37:00', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1545235470660554753, '士大夫顺德府搜大夫', '测试', '1545235376376795137', 'true', 'input', 'false', 'false', '', 1, 0, 1513437369940344833, '2022-07-08 10:37:00', 1513437369940344833, '2022-07-08 10:37:00', NULL, NULL, NULL, NULL, NULL);
INSERT INTO `tb_data_category` VALUES (1545339007692316673, '归属部门', '组件服务一', '1534718048405012481', 'true', 'input', 'false', 'false', '', 16, 1, 1513433709613187073, '2022-07-08 17:28:25', 1513433709613187073, '2022-07-08 17:31:05', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1545339007692316673, '归属部门', '组件服务一', '1534718048405012481', 'true', 'input', 'false', 'false', '', 16, 1, 1513433709613187073, '2022-07-08 17:28:25', 1513433709613187073, '2022-07-08 17:31:05', NULL, NULL, NULL, NULL, NULL);
INSERT INTO `tb_data_category` VALUES (1545339879419682817, '归属部门', '组件服务一', '1534718048405012481', 'true', 'select', 'false', 'false', '', 16, 0, 1513433709613187073, '2022-07-08 17:31:53', 1513433709613187073, '2022-07-08 17:31:53', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1545339879419682817, '归属部门', '组件服务一', '1534718048405012481', 'true', 'select', 'false', 'false', '', 16, 0, 1513433709613187073, '2022-07-08 17:31:53', 1513433709613187073, '2022-07-08 17:31:53', NULL, NULL, NULL, NULL, NULL);
INSERT INTO `tb_data_category` VALUES (1545340422556884994, '归属部门', '组件服务一', '1538705458625228801', 'true', 'select', 'false', 'false', '', 13, 0, 1513433709613187073, '2022-07-08 17:34:02', 1513433709613187073, '2022-07-08 17:34:02', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1545340422556884994, '归属部门', '组件服务一', '1538705458625228801', 'true', 'select', 'false', 'false', '', 7, 0, 1513433709613187073, '2022-07-08 17:34:02', 1513433709613187073, '2022-07-08 17:34:02', NULL, NULL, NULL, NULL, NULL);
INSERT INTO `tb_data_category` VALUES (1545340751889440770, '归属部门', '组件服务一', '1538797032767987714', 'true', 'select', 'false', 'false', '', 13, 0, 1513433709613187073, '2022-07-08 17:35:21', 1513433709613187073, '2022-07-08 17:35:21', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1545340751889440770, '归属部门', '组件服务一', '1538797032767987714', 'true', 'select', 'false', 'false', '', 7, 0, 1513433709613187073, '2022-07-08 17:35:21', 1513433709613187073, '2022-07-08 17:35:21', NULL, NULL, NULL, NULL, NULL);
INSERT INTO `tb_data_category` VALUES (1545340965677309953, '归属部门', '组件服务一', '1539536463208636417', 'true', 'select', 'false', 'false', '', 13, 0, 1513433709613187073, '2022-07-08 17:36:12', 1513433709613187073, '2022-07-08 17:36:12', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1545340965677309953, '归属部门', '组件服务一', '1539536463208636417', 'true', 'select', 'false', 'false', '', 8, 0, 1513433709613187073, '2022-07-08 17:36:12', 1513433709613187073, '2022-07-08 17:36:12', NULL, NULL, NULL, NULL, NULL);
INSERT INTO `tb_data_category` VALUES (1545341011684630530, '算法', '应用资源一', '1534472049895854081', 'true', 'input', 'false', 'false', '', 7, 1, 1513437369940344833, '2022-07-08 17:36:23', 1513437369940344833, '2022-07-08 17:37:30', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1545341011684630530, '算法', '应用资源一', '1534472049895854081', 'true', 'input', 'false', 'false', '', 7, 1, 1513437369940344833, '2022-07-08 17:36:23', 1513437369940344833, '2022-07-08 17:37:30', NULL, NULL, NULL, NULL, NULL);
INSERT INTO `tb_data_category` VALUES (1545341306271571969, '归属部门', '应用资源一', '1534472573403713538', 'true', 'select', 'false', 'false', '', 13, 0, 1513433709613187073, '2022-07-08 17:37:33', 1513433709613187073, '2022-07-08 17:37:33', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1545341306271571969, '归属部门', '应用资源一', '1534472573403713538', 'true', 'select', 'false', 'false', '', 7, 0, 1513433709613187073, '2022-07-08 17:37:33', 1513433709613187073, '2022-07-08 17:37:33', NULL, NULL, NULL, NULL, NULL);
INSERT INTO `tb_data_category` VALUES (1545341347040206850, '的方式发送', NULL, NULL, 'false', NULL, 'false', 'false', '', 8, 1, 1513437369940344833, '2022-07-08 17:37:43', 1513437369940344833, '2022-07-12 16:16:07', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1545341347040206850, '的方式发送', NULL, NULL, 'false', NULL, 'false', 'false', '', 8, 1, 1513437369940344833, '2022-07-08 17:37:43', 1513437369940344833, '2022-07-12 16:16:07', NULL, NULL, NULL, NULL, NULL);
INSERT INTO `tb_data_category` VALUES (1545341379457982465, '是人工投入', '的方式发送', '1545341347040206850', 'true', 'input', 'false', 'false', '', 4, 1, 1513437369940344833, '2022-07-08 17:37:51', 1513437369940344833, '2022-07-08 18:29:33', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1545341379457982465, '是人工投入', '的方式发送', '1545341347040206850', 'true', 'input', 'false', 'false', '', 4, 1, 1513437369940344833, '2022-07-08 17:37:51', 1513437369940344833, '2022-07-08 18:29:33', NULL, NULL, NULL, NULL, NULL);
INSERT INTO `tb_data_category` VALUES (1545341541542666242, '威风威风', '的方式发送', '1545341347040206850', 'true', 'input', 'false', 'false', '', 2, 1, 1513437369940344833, '2022-07-08 17:38:29', 1513437369940344833, '2022-07-08 18:29:52', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1545341541542666242, '威风威风', '的方式发送', '1545341347040206850', 'true', 'input', 'false', 'false', '', 2, 1, 1513437369940344833, '2022-07-08 17:38:29', 1513437369940344833, '2022-07-08 18:29:52', NULL, NULL, NULL, NULL, NULL);
@ -572,7 +572,9 @@ INSERT INTO `tb_data_category` VALUES (1547516746428690434, 'SDK安装包', '组
INSERT INTO `tb_data_category` VALUES (1548959424080502786, '试用账号', '应用资源一', '1534475425119453185', 'true', 'input', 'false', 'false', '', 4, 0, 1513437369940344833, '2022-07-18 17:14:40', 1513437369940344833, '2022-07-18 17:14:40', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1548959424080502786, '试用账号', '应用资源一', '1534475425119453185', 'true', 'input', 'false', 'false', '', 4, 0, 1513437369940344833, '2022-07-18 17:14:40', 1513437369940344833, '2022-07-18 17:14:40', NULL, NULL, NULL, NULL, NULL);
INSERT INTO `tb_data_category` VALUES (1548959472050757634, '试用密码', '应用资源一', '1534475425119453185', 'true', 'input', 'false', 'false', '', 5, 0, 1513437369940344833, '2022-07-18 17:14:51', 1513437369940344833, '2022-07-18 17:14:51', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1548959472050757634, '试用密码', '应用资源一', '1534475425119453185', 'true', 'input', 'false', 'false', '', 5, 0, 1513437369940344833, '2022-07-18 17:14:51', 1513437369940344833, '2022-07-18 17:14:51', NULL, NULL, NULL, NULL, NULL);
INSERT INTO `tb_data_category` VALUES (1548960050394947586, '共享条件', '应用资源一', '1534472573403713538', 'true', 'select', 'false', 'true', '1531193872826822657', 14, 0, 1513437369940344833, '2022-07-18 17:17:09', 1513437369940344833, '2022-07-18 17:17:09', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1548960050394947586, '共享条件', '应用资源一', '1534472573403713538', 'true', 'select', 'false', 'true', '1531193872826822657', 14, 0, 1513437369940344833, '2022-07-18 17:17:09', 1513437369940344833, '2022-07-18 17:17:09', NULL, NULL, NULL, NULL, NULL);
INSERT INTO `tb_data_category` VALUES (1548962537742970881, '部门联系人', '组件服务一', '1534718048405012481', 'true', 'input', 'false', 'false', '', 15, 0, 1513437369940344833, '2022-07-18 17:27:02', 1513437369940344833, '2022-07-18 17:27:02', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1548962537742970881, '部门联系人', '组件服务一', '1534718048405012481', 'true', 'input', 'false', 'false', '', 17, 0, 1513437369940344833, '2022-07-18 17:27:02', 1513437369940344833, '2022-07-18 17:27:02', NULL, NULL, NULL, NULL, NULL);
INSERT INTO `tb_data_category` VALUES (1548962613546627073, '部门联系人电话', '组件服务一', '1534718048405012481', 'true', 'input', 'false', 'false', '', 16, 0, 1513437369940344833, '2022-07-18 17:27:20', 1513437369940344833, '2022-07-18 17:27:20', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1548962613546627073, '部门联系人电话', '组件服务一', '1534718048405012481', 'true', 'input', 'false', 'false', '', 18, 0, 1513437369940344833, '2022-07-18 17:27:20', 1513437369940344833, '2022-07-18 17:27:20', NULL, NULL, NULL, NULL, NULL);
INSERT INTO `tb_data_category` VALUES (1548980404643405825, '使用方式', '组件服务', '1531208527270404097', 'true', 'input', 'true', 'true', '1513714027213660162', 8, 1, 1524924140178481154, '2022-07-18 18:38:02', 1524924140178481154, '2022-07-18 18:43:36', NULL, NULL, NULL, NULL, NULL);
SET FOREIGN_KEY_CHECKS = 1; SET FOREIGN_KEY_CHECKS = 1;