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-11-13 09:59:43 +08:00
parent df46dd588e
commit d5623b7d3e
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/lz/modules/app/resp/FlowRecordResp.java
View File

@ -13,6 +13,10 @@ public class FlowRecordResp {
private int status; private int status;
private int realStatus;
private List<FlowDetailResp> flowDetailRespList; private List<FlowDetailResp> flowDetailRespList;
} }

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

@ -1146,6 +1146,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
} }
FlowRecordResp resp = new FlowRecordResp(); FlowRecordResp resp = new FlowRecordResp();
resp.setFlowName(flowRecord.getFlowName()); resp.setFlowName(flowRecord.getFlowName());
resp.setRealStatus(flowRecord.getStatus());
resp.setStaffName(flowRecord.getApprovalStaffName()); resp.setStaffName(flowRecord.getApprovalStaffName());
resp.setStatus(flowRecord.getStatus() == 2 ? 1 : flowRecord.getStatus()); resp.setStatus(flowRecord.getStatus() == 2 ? 1 : flowRecord.getStatus());
@ -1204,11 +1205,12 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
for(FlowRecordResp flowRecordResp : flowRecordList){ for(FlowRecordResp flowRecordResp : flowRecordList){
List<FlowDetailResp> flowDetailResps = flowRecordResp.getFlowDetailRespList(); List<FlowDetailResp> flowDetailResps = flowRecordResp.getFlowDetailRespList();
if(flowDetailResps !=null && flowDetailResps.size() ==1 ){ if(flowDetailResps !=null && flowDetailResps.size() ==1 && flowRecordResp.getRealStatus() == 2){
auth.put("transfer",flowDetailResps.get(0).getTransfer()); auth.put("transfer",flowDetailResps.get(0).getTransfer());
auth.put("tiaozhuang",flowDetailResps.get(0).getTiaozhuang()); auth.put("tiaozhuang",flowDetailResps.get(0).getTiaozhuang());
} }
} }
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("flowRecordList", flowRecordList); map.put("flowRecordList", flowRecordList);
map.put("resultCommentList", resultCommentList); map.put("resultCommentList", resultCommentList);
@ -1232,7 +1234,6 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
return auth; return auth;
} }
public void mySetFlowDetailRespList(List<FlowDetailResp> flowDetailRespList ,FlowRecord flowRecord,Long loginUserId,Long recordStaffId){ public void mySetFlowDetailRespList(List<FlowDetailResp> flowDetailRespList ,FlowRecord flowRecord,Long loginUserId,Long recordStaffId){
FlowDetailResp flowDetailResp = new FlowDetailResp(); FlowDetailResp flowDetailResp = new FlowDetailResp();
flowDetailResp.setCurrentStaffId(flowRecord.getApprovalStaffId()); flowDetailResp.setCurrentStaffId(flowRecord.getApprovalStaffId());
@ -1251,7 +1252,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
flowDetailResp.setAvatar(staffEntity.getAvatar()); flowDetailResp.setAvatar(staffEntity.getAvatar());
DepartmentsEntity departmentsEntity = departmentsDao.selectByDepartmentId(departmentsStaffRelateEntity.getDepartmentId()); DepartmentsEntity departmentsEntity = departmentsDao.selectByDepartmentId(departmentsStaffRelateEntity.getDepartmentId());
flowDetailResp.setDepartName(departmentsEntity.getDepartmentName()); flowDetailResp.setDepartName(departmentsEntity.getDepartmentName());
if((new Integer(0).equals(flowRecord.getStatus()) || new Integer(2).equals(flowRecord.getStatus())) && flowRecord.getFlowProcess() != 0 ){ if(new Integer(0).equals(flowRecord.getStatus()) || new Integer(2).equals(flowRecord.getStatus())){
int position = 0 ; int position = 0 ;
StaffRole staffRole = staffRoleService.selectStaffRolesByStaffIdDepartmentLevelList(loginUserId, StaffRole staffRole = staffRoleService.selectStaffRolesByStaffIdDepartmentLevelList(loginUserId,
Arrays.asList(new String[]{RoleEnums.CHILD_PM.getName(),RoleEnums.MASTER_PM.getName()})); Arrays.asList(new String[]{RoleEnums.CHILD_PM.getName(),RoleEnums.MASTER_PM.getName()}));
@ -1292,6 +1293,9 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
*/ */
if(position == 1){ //如果是绩效管理员 if(position == 1){ //如果是绩效管理员
initTiaoZhuangZhuangJiao(flowDetailResp,1,1); initTiaoZhuangZhuangJiao(flowDetailResp,1,1);
if(flowRecord.getFlowProcess() == 0 ){//目标制定有转交，但是没有跳过
initTiaoZhuangZhuangJiao(flowDetailResp,0,1);
}
}else if (position == 2 ){ //如果是审批节点人员 }else if (position == 2 ){ //如果是审批节点人员
Map<String,Integer> auth = getAuth(flowRecord.getFlowStaffIdRole()); Map<String,Integer> auth = getAuth(flowRecord.getFlowStaffIdRole());
if(new Integer(1).equals(auth.get("transfer"))){ if(new Integer(1).equals(auth.get("transfer"))){