wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lz_flow_approval_role修改roleId为String

Browse Source
This commit is contained in:
wulin 2020-10-26 11:56:04 +08:00
parent 6cea3c3e7a
commit ad3eefc453
4 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/lz/modules/flow/entity/FlowApprovalRole.java
View File

@ -37,7 +37,7 @@ public class FlowApprovalRole implements java.io.Serializable {
private Integer type; private Integer type;
//审批人角色id //审批人角色id
@ApiModelProperty(value = "审批人角色id", name = "roleId") @ApiModelProperty(value = "审批人角色id", name = "roleId")
private Long roleId; private String roleId;
//流程表id //流程表id
@ApiModelProperty(value = "流程表id", name = "flowId") @ApiModelProperty(value = "流程表id", name = "flowId")
private Long flowId; private Long flowId;
@ -142,14 +142,14 @@ public class FlowApprovalRole implements java.io.Serializable {
* 审批人角色id * 审批人角色id
* @return * @return
*/ */
public Long getRoleId() { public String getRoleId() {
return roleId; return roleId;
} }
/** /**
* 审批人角色id * 审批人角色id
* @param roleId * @param roleId
*/ */
public void setRoleId(Long roleId) { public void setRoleId(String roleId) {
this.roleId = roleId; this.roleId = roleId;
} }

6
src/main/java/com/lz/modules/flow/model/FlowApprovalRoleDto.java
View File

@ -23,7 +23,7 @@ public class FlowApprovalRoleDto {
private Integer type; private Integer type;
//审批人角色id //审批人角色id
@ApiModelProperty(value = "审批人角色id", name = "roleId") @ApiModelProperty(value = "审批人角色id", name = "roleId")
private Long roleId; private String roleId;
//流程表id //流程表id
@ApiModelProperty(value = "流程表id", name = "flowId") @ApiModelProperty(value = "流程表id", name = "flowId")
private Long flowId; private Long flowId;
@ -80,14 +80,14 @@ public class FlowApprovalRoleDto {
* 审批人角色id * 审批人角色id
* @return * @return
*/ */
public Long getRoleId() { public String getRoleId() {
return roleId; return roleId;
} }
/** /**
* 审批人角色id * 审批人角色id
* @param roleId * @param roleId
*/ */
public void setRoleId(Long roleId) { public void setRoleId(String roleId) {
this.roleId = roleId; this.roleId = roleId;
} }

6
src/main/java/com/lz/modules/flow/req/FlowApprovalRoleReq.java
View File

@ -46,7 +46,7 @@ public class FlowApprovalRoleReq implements java.io.Serializable {
private Integer type; private Integer type;
//审批人角色id //审批人角色id
@ApiModelProperty(value = "审批人角色id", name = "roleId") @ApiModelProperty(value = "审批人角色id", name = "roleId")
private Long roleId; private String roleId;
//流程表id //流程表id
@ApiModelProperty(value = "流程表id", name = "flowId") @ApiModelProperty(value = "流程表id", name = "flowId")
private Long flowId; private Long flowId;
@ -148,14 +148,14 @@ public class FlowApprovalRoleReq implements java.io.Serializable {
* 审批人角色id * 审批人角色id
* @return * @return
*/ */
public Long getRoleId() { public String getRoleId() {
return roleId; return roleId;
} }
/** /**
* 审批人角色id * 审批人角色id
* @param roleId * @param roleId
*/ */
public void setRoleId(Long roleId) { public void setRoleId(String roleId) {
this.roleId = roleId; this.roleId = roleId;
} }

25
src/main/java/com/lz/modules/performance/controller/FlowStartController.java
View File

@ -133,7 +133,6 @@ public class FlowStartController {
Map<Long, String> chartNameMaps = new HashedMap();//流程节点与流程名称对应map，下面多次循环，减少数据库查找 Map<Long, String> chartNameMaps = new HashedMap();//流程节点与流程名称对应map，下面多次循环，减少数据库查找
Map<String, List<StaffEntity>> staffManages = new HashedMap();//部门(id+几级)和部门几级管理对应关系，减少数据库查找 Map<String, List<StaffEntity>> staffManages = new HashedMap();//部门(id+几级)和部门几级管理对应关系，减少数据库查找
//下面开始初始化流程 //下面开始初始化流程
String[] gids = flowStart.getGroupIds().split(",");
List<Long> ids = Arrays.stream(flowStart.getGroupIds().split(",")).map(new Function<String, Long>() { List<Long> ids = Arrays.stream(flowStart.getGroupIds().split(",")).map(new Function<String, Long>() {
@Override @Override
public Long apply(String s) { public Long apply(String s) {
@ -259,7 +258,7 @@ public class FlowStartController {
String[] optIds = flowChartDetailRecord.getOptIds().split(","); String[] optIds = flowChartDetailRecord.getOptIds().split(",");
for (String id:optIds for (String id:optIds
) { ) {
String[] roleIds = flowChartDetailRecord.getRoleIds().split(","); /*String[] roleIds = flowChartDetailRecord.getRoleIds().split(",");
for (String roleId:roleIds for (String roleId:roleIds
) { ) {
FlowApprovalRole flowApprovalRole = new FlowApprovalRole(); FlowApprovalRole flowApprovalRole = new FlowApprovalRole();
@ -270,11 +269,27 @@ public class FlowStartController {
flowApprovalRole.setType(flowChartDetailRecord.getOptType()); flowApprovalRole.setType(flowChartDetailRecord.getOptType());
flowApprovalRoles.add(flowApprovalRole); flowApprovalRoles.add(flowApprovalRole);
flowApprovalRole.setStepIndex(stepIndex); 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++; stepIndex++;
}else{ }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 for (String roleId:roleIds
) { ) {
FlowApprovalRole flowApprovalRole = new FlowApprovalRole(); FlowApprovalRole flowApprovalRole = new FlowApprovalRole();
@ -286,7 +301,7 @@ public class FlowStartController {
flowApprovalRole.setStepIndex(stepIndex); flowApprovalRole.setStepIndex(stepIndex);
} }*/
stepIndex++; stepIndex++;
} }