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

解决绩效详情流转玩时的bug

Browse Source
This commit is contained in:
wulin 2020-11-13 14:33:37 +08:00
parent eaa4fa541c
commit 7d5c4122b3
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/lz/modules/app/controller/ResultRecordController.java
View File

@ -397,8 +397,17 @@ public class ResultRecordController extends AbstractController {
log.info("无法找到评分人员，开始找绩效管理人员"); log.info("无法找到评分人员，开始找绩效管理人员");
staffs = staffService.findManger(resultRecord.getId(), ChartFlowType.SCORE.getCode()); staffs = staffService.findManger(resultRecord.getId(), ChartFlowType.SCORE.getCode());
} }
List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByRecordIdStatus(resultRecord.getId(), 2);//获取当前的流程节点 List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByRecordIdStatus(resultRecord.getId(), 0);//获取未执行的节点
if(flowRecords.get(0).getFlowProcess().intValue() > ChartFlowType.SCORE.getCode()){ if(flowRecords.size() > 0){
if(flowRecords.get(0).getFlowProcess().intValue() > ChartFlowType.SCORE.getCode()){
//流程已经到了审批节点，那么判断评分是否为或签，如果是那么只需要返回实际评分的那个人即可，否则全部返回
flowRecords = flowRecordService.selectFlowRecordByRecordIdFlowProcess(resultRecord.getId(), ChartFlowType.SCORE.getCode());//获取当前的流程节点
if(flowRecords.get(0).getType().intValue() == 1){
//或签
isAllScore = false;
}
}
}else{//绩效流程已经走完
//流程已经到了审批节点，那么判断评分是否为或签，如果是那么只需要返回实际评分的那个人即可，否则全部返回 //流程已经到了审批节点，那么判断评分是否为或签，如果是那么只需要返回实际评分的那个人即可，否则全部返回
flowRecords = flowRecordService.selectFlowRecordByRecordIdFlowProcess(resultRecord.getId(), ChartFlowType.SCORE.getCode());//获取当前的流程节点 flowRecords = flowRecordService.selectFlowRecordByRecordIdFlowProcess(resultRecord.getId(), ChartFlowType.SCORE.getCode());//获取当前的流程节点
if(flowRecords.get(0).getType().intValue() == 1){ if(flowRecords.get(0).getType().intValue() == 1){
@ -410,6 +419,7 @@ public class ResultRecordController extends AbstractController {
for (StaffEntity staff:staffs for (StaffEntity staff:staffs
) { ) {
ResultScoreDto resultScore = new ResultScoreDto(); ResultScoreDto resultScore = new ResultScoreDto();

2
src/main/resources/mapper/flow/FlowRecordMapper.xml
View File

@ -238,7 +238,7 @@
<select id="selectFlowRecordByRecordIdStatus" resultType="com.lz.modules.flow.entity.FlowRecord"> <select id="selectFlowRecordByRecordIdStatus" resultType="com.lz.modules.flow.entity.FlowRecord">
select * from lz_flow_record where is_delete = 0 and record_id = #{resultRecordId} and status = #{status} select * from lz_flow_record where is_delete = 0 and record_id = #{resultRecordId} and status = #{status} order by flow_index asc
</select> </select>
<select id="selectFlowRecordByRecordIdAndFlowId" resultType="com.lz.modules.flow.entity.FlowRecord"> <select id="selectFlowRecordByRecordIdAndFlowId" resultType="com.lz.modules.flow.entity.FlowRecord">