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

Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0

Browse Source
This commit is contained in:
杜建超 2020-12-02 16:48:17 +08:00
commit 33add7066a
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/lz/modules/flow/service/FlowService.java
View File

@ -38,4 +38,5 @@ public interface FlowService extends IService<Flow> {
FlowChart selectFlowChartByChartId(Long flowId); FlowChart selectFlowChartByChartId(Long flowId);
FlowChart selectFlowChartByFlow(Flow flow);
} }

5
src/main/java/com/lz/modules/flow/service/impl/FlowServiceImpl.java
View File

@ -77,6 +77,11 @@ public class FlowServiceImpl extends ServiceImpl<FlowMapper, Flow> implements Fl
return flowChart; return flowChart;
} }
@Override
public FlowChart selectFlowChartByFlow(Flow flow){
FlowChart flowChart = flowChartService.selectFlowChartById(flow.getChartId());
return flowChart;
}

5
src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
View File

@ -841,10 +841,11 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
public void insertFlowRecord(FlowRecord flowRecord,StaffEntity approvalStaff,List<Flow> flows,FlowApprovalRole flowApprovalRole ,ResultRecord resultRecord,int i,Integer stepType ){ public void insertFlowRecord(FlowRecord flowRecord,StaffEntity approvalStaff,List<Flow> flows,FlowApprovalRole flowApprovalRole ,ResultRecord resultRecord,int i,Integer stepType ){
flowRecord.setApprovalStaffName(approvalStaff.getName()); flowRecord.setApprovalStaffName(approvalStaff.getName());
flowRecord.setApprovalStaffId(approvalStaff.getId()); flowRecord.setApprovalStaffId(approvalStaff.getId());
flowRecord.setFlowName(getFlow(flows, flowApprovalRole.getFlowId()).getOptDesc()); Flow flow = getFlow(flows, flowApprovalRole.getFlowId());
flowRecord.setFlowName(flow.getOptDesc());
flowRecord.setRecordStaffId(resultRecord.getStaffId()); flowRecord.setRecordStaffId(resultRecord.getStaffId());
flowRecord.setFlowId(flowApprovalRole.getFlowId()); flowRecord.setFlowId(flowApprovalRole.getFlowId());
FlowChart flowChart = flowService.selectFlowChartByChartId(flowApprovalRole.getFlowId()); FlowChart flowChart = flowService.selectFlowChartByFlow(flow);
flowRecord.setProcessId(flowChart.getProcessId()); flowRecord.setProcessId(flowChart.getProcessId());
flowRecord.setFlowProcess(flowChart.getFlowProcess()); flowRecord.setFlowProcess(flowChart.getFlowProcess());
String staffRole = StaffRoles.getStaffRole(approvalStaff.getId(), StringUtil.strToLongs(flowApprovalRole.getRoleId())); String staffRole = StaffRoles.getStaffRole(approvalStaff.getId(), StringUtil.strToLongs(flowApprovalRole.getRoleId()));