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 15:54:51 +08:00
parent 4aa5aa4dd4
commit 7044bebf95
3 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,7 @@ package com.lz.modules.flow.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.lz.modules.flow.entity.Flow;
import com.lz.modules.flow.entity.FlowChart;
import java.util.List;
@ -33,4 +34,6 @@ public interface FlowService extends IService<Flow> {
List<Flow> selectByFlowId(Long flowId);
FlowChart selectFlowChartByChartId(Long flowId);
}

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

@ -3,6 +3,8 @@ package com.lz.modules.flow.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.lz.modules.flow.dao.FlowMapper;
import com.lz.modules.flow.entity.Flow;
import com.lz.modules.flow.entity.FlowChart;
import com.lz.modules.flow.service.FlowChartService;
import com.lz.modules.flow.service.FlowService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -26,6 +28,9 @@ public class FlowServiceImpl extends ServiceImpl<FlowMapper, Flow> implements Fl
private FlowMapper flowMapper;
@Autowired
private FlowChartService flowChartService;
@Override
public Flow selectFlowById(Long id){
@ -65,5 +70,12 @@ public class FlowServiceImpl extends ServiceImpl<FlowMapper, Flow> implements Fl
return flowMapper.selectByFlowId(flowId);
}
@Override
public FlowChart selectFlowChartByChartId(Long flowId) {
Flow flow = flowMapper.selectFlowById(flowId);
FlowChart flowChart = flowChartService.selectFlowChartById(flow.getChartId());
return flowChart;
}
}

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

@ -121,6 +121,9 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
@Autowired
private FlowApprovalRoleService flowApprovalRoleService;
@Autowired
private FlowChartService flowChartService;
@Value("${dingtalk.appid}")
private String appid;
@ -783,6 +786,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
}else if(FlowApprovalRoleTypeEnums.FOUR_SUPPER.getType().equals(flowApprovalRole.getType())){
staffEntity = getDepartmentStaff(map,5);
}
flowRecord.setApprovalStaffName(staffEntity.getName());
flowRecord.setApprovalStaffId(staffEntity.getId());
flowRecord.setFlowName(getFlow(flows,flowApprovalRole.getFlowId()).getOptDesc());
@ -792,6 +796,8 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
if(i == 0 ){
flowRecord.setStatus(FlowRecordStatusEnums.CURRENT_FLOW_STATUS.getStatus());
resultRecord.setFlowStaffIdRole(staffRole);
FlowChart flowChart = flowService.selectFlowChartByChartId(flowRecord.getFlowId());
resultRecord.setFlowProcess(flowChart.getFlowProcess());
}else{
flowRecord.setStatus(FlowRecordStatusEnums.UN_TO_STATUS.getStatus());
}
@ -847,6 +853,8 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
break;
}
}
FlowChart flowChart = flowService.selectFlowChartByChartId(currentFlowRecord.getFlowId());
resultRecord.setFlowProcess(flowChart.getFlowProcess());
resultRecord.setFlowStaffIdRole(currentFlowRecord.getFlowStaffIdRole());
resultRecord.setCurrentApprovalStaffId(currentFlowRecord.getApprovalStaffId());
resultRecord.setCurrentApprovalStaffName(currentFlowRecord.getApprovalStaffName());
@ -866,11 +874,16 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
resultRecord.setCurrentApprovalStaffId(currentFlowRecord.getApprovalStaffId());
resultRecord.setCurrentApprovalStaffName(currentFlowRecord.getApprovalStaffName());
resultRecord.setFlowStaffIdRole(currentFlowRecord.getFlowStaffIdRole());
FlowChart flowChart = flowService.selectFlowChartByChartId(currentFlowRecord.getFlowId());
resultRecord.setFlowProcess(flowChart.getFlowProcess());
resultRecordService.updateResultRecordById(resultRecord);
}
return R.ok();
}
private R urge(ApprovalDto approvalDto) {
ResultRecord resultRecord = resultRecordMapper.selectResultRecordById(approvalDto.getResultRecordId());
if(!resultRecord.getCurrentApprovalStaffId().equals(approvalDto.getLoginUserId())){