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

提交修改

Browse Source
This commit is contained in:
quyixiao 2020-10-26 12:27:39 +08:00
commit 564cbe371f
3 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;
}

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;
//审批人角色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;
}

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<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>() {
@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++;
}