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-11-13 09:55:06 +08:00
commit c0fdf12869
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1171,7 +1171,6 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
StaffEntity staffEntity = staffService.selectStaffById(resultComment.getStaffId());
resultComment.setAvatar(staffEntity.getAvatar());
}
Map<String,Integer> auth = new HashMap<>();
auth.put("showResult",1);
auth.put("showScore",1);
@ -1202,6 +1201,14 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
}
}
}
for(FlowRecordResp flowRecordResp : flowRecordList){
List<FlowDetailResp> flowDetailResps = flowRecordResp.getFlowDetailRespList();
if(flowDetailResps !=null && flowDetailResps.size() ==1 ){
auth.put("transfer",flowDetailResps.get(0).getTransfer());
auth.put("tiaozhuang",flowDetailResps.get(0).getTiaozhuang());
}
}
Map<String, Object> map = new HashMap<>();
map.put("flowRecordList", flowRecordList);
map.put("resultCommentList", resultCommentList);
@ -1244,7 +1251,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
flowDetailResp.setAvatar(staffEntity.getAvatar());
DepartmentsEntity departmentsEntity = departmentsDao.selectByDepartmentId(departmentsStaffRelateEntity.getDepartmentId());
flowDetailResp.setDepartName(departmentsEntity.getDepartmentName());
if(new Integer(0).equals(flowRecord.getStatus()) || new Integer(2).equals(flowRecord.getStatus()) ){
if((new Integer(0).equals(flowRecord.getStatus()) || new Integer(2).equals(flowRecord.getStatus())) && flowRecord.getFlowProcess() != 0 ){
int position = 0 ;
StaffRole staffRole = staffRoleService.selectStaffRolesByStaffIdDepartmentLevelList(loginUserId,
Arrays.asList(new String[]{RoleEnums.CHILD_PM.getName(),RoleEnums.MASTER_PM.getName()}));