From ad3eefc453b68736da41ac6b0e0fb0eeb1336203 Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 26 Oct 2020 11:56:04 +0800 Subject: [PATCH] =?UTF-8?q?lz=5Fflow=5Fapproval=5Frole=E4=BF=AE=E6=94=B9ro?= =?UTF-8?q?leId=E4=B8=BAString?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/flow/entity/FlowApprovalRole.java | 6 ++--- .../flow/model/FlowApprovalRoleDto.java | 6 ++--- .../modules/flow/req/FlowApprovalRoleReq.java | 6 ++--- .../controller/FlowStartController.java | 25 +++++++++++++++---- 4 files changed, 29 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/lz/modules/flow/entity/FlowApprovalRole.java b/src/main/java/com/lz/modules/flow/entity/FlowApprovalRole.java index 60b2af53..db0eb52d 100644 --- a/src/main/java/com/lz/modules/flow/entity/FlowApprovalRole.java +++ b/src/main/java/com/lz/modules/flow/entity/FlowApprovalRole.java @@ -37,7 +37,7 @@ public class FlowApprovalRole implements java.io.Serializable { private Integer type; //审批人角色id @ApiModelProperty(value = "审批人角色id", name = "roleId") - private Long roleId; + private String roleId; //流程表id @ApiModelProperty(value = "流程表id", name = "flowId") private Long flowId; @@ -142,14 +142,14 @@ public class FlowApprovalRole implements java.io.Serializable { * 审批人角色id * @return */ - public Long getRoleId() { + public String getRoleId() { return roleId; } /** * 审批人角色id * @param roleId */ - public void setRoleId(Long roleId) { + public void setRoleId(String roleId) { this.roleId = roleId; } diff --git a/src/main/java/com/lz/modules/flow/model/FlowApprovalRoleDto.java b/src/main/java/com/lz/modules/flow/model/FlowApprovalRoleDto.java index f6b66496..85a882ed 100644 --- a/src/main/java/com/lz/modules/flow/model/FlowApprovalRoleDto.java +++ b/src/main/java/com/lz/modules/flow/model/FlowApprovalRoleDto.java @@ -23,7 +23,7 @@ public class FlowApprovalRoleDto { private Integer type; //审批人角色id @ApiModelProperty(value = "审批人角色id", name = "roleId") - private Long roleId; + private String roleId; //流程表id @ApiModelProperty(value = "流程表id", name = "flowId") private Long flowId; @@ -80,14 +80,14 @@ public class FlowApprovalRoleDto { * 审批人角色id * @return */ - public Long getRoleId() { + public String getRoleId() { return roleId; } /** * 审批人角色id * @param roleId */ - public void setRoleId(Long roleId) { + public void setRoleId(String roleId) { this.roleId = roleId; } diff --git a/src/main/java/com/lz/modules/flow/req/FlowApprovalRoleReq.java b/src/main/java/com/lz/modules/flow/req/FlowApprovalRoleReq.java index a938d59c..2a6951ed 100644 --- a/src/main/java/com/lz/modules/flow/req/FlowApprovalRoleReq.java +++ b/src/main/java/com/lz/modules/flow/req/FlowApprovalRoleReq.java @@ -46,7 +46,7 @@ public class FlowApprovalRoleReq implements java.io.Serializable { private Integer type; //审批人角色id @ApiModelProperty(value = "审批人角色id", name = "roleId") - private Long roleId; + private String roleId; //流程表id @ApiModelProperty(value = "流程表id", name = "flowId") private Long flowId; @@ -148,14 +148,14 @@ public class FlowApprovalRoleReq implements java.io.Serializable { * 审批人角色id * @return */ - public Long getRoleId() { + public String getRoleId() { return roleId; } /** * 审批人角色id * @param roleId */ - public void setRoleId(Long roleId) { + public void setRoleId(String roleId) { this.roleId = roleId; } diff --git a/src/main/java/com/lz/modules/performance/controller/FlowStartController.java b/src/main/java/com/lz/modules/performance/controller/FlowStartController.java index 3dee17b9..ada649f3 100644 --- a/src/main/java/com/lz/modules/performance/controller/FlowStartController.java +++ b/src/main/java/com/lz/modules/performance/controller/FlowStartController.java @@ -133,7 +133,6 @@ public class FlowStartController { Map chartNameMaps = new HashedMap();//流程节点与流程名称对应map，下面多次循环，减少数据库查找 Map> staffManages = new HashedMap();//部门(id+几级)和部门几级管理对应关系，减少数据库查找 //下面开始初始化流程 - String[] gids = flowStart.getGroupIds().split(","); List ids = Arrays.stream(flowStart.getGroupIds().split(",")).map(new Function() { @Override public Long apply(String s) { @@ -259,7 +258,7 @@ public class FlowStartController { String[] optIds = flowChartDetailRecord.getOptIds().split(","); for (String id:optIds ) { - String[] roleIds = flowChartDetailRecord.getRoleIds().split(","); + /*String[] roleIds = flowChartDetailRecord.getRoleIds().split(","); for (String roleId:roleIds ) { FlowApprovalRole flowApprovalRole = new FlowApprovalRole(); @@ -270,11 +269,27 @@ public class FlowStartController { flowApprovalRole.setType(flowChartDetailRecord.getOptType()); flowApprovalRoles.add(flowApprovalRole); flowApprovalRole.setStepIndex(stepIndex); - } + }*/ + FlowApprovalRole flowApprovalRole = new FlowApprovalRole(); + flowApprovalRole.setFlowId(flow.getId()); + flowApprovalRole.setApprovalId(Long.parseLong(id)); + flowApprovalRole.setStepType(flowChartDetailRecord.getStepType()); + flowApprovalRole.setRoleId(flowChartDetailRecord.getRoleIds()); + flowApprovalRole.setType(flowChartDetailRecord.getOptType()); + flowApprovalRoles.add(flowApprovalRole); + flowApprovalRole.setStepIndex(stepIndex); } stepIndex++; }else{ - String[] roleIds = flowChartDetailRecord.getRoleIds().split(","); + FlowApprovalRole flowApprovalRole = new FlowApprovalRole(); + flowApprovalRole.setFlowId(flow.getId()); + flowApprovalRole.setApprovalId(Long.parseLong(flowChartDetailRecord.getRoleIds())); + flowApprovalRole.setStepType(flowChartDetailRecord.getStepType()); + flowApprovalRole.setRoleId(flowChartDetailRecord.getRoleIds()); + flowApprovalRole.setType(flowChartDetailRecord.getOptType()); + flowApprovalRoles.add(flowApprovalRole); + flowApprovalRole.setStepIndex(stepIndex); + /*String[] roleIds = flowChartDetailRecord.getRoleIds().split(","); for (String roleId:roleIds ) { FlowApprovalRole flowApprovalRole = new FlowApprovalRole(); @@ -286,7 +301,7 @@ public class FlowStartController { flowApprovalRole.setStepIndex(stepIndex); - } + }*/ stepIndex++; }