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

提交修改

Browse Source
This commit is contained in:
quyixiao 2022-06-13 14:13:41 +08:00
parent 577a885323
commit 7dd32338bd
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java
View File

@ -873,7 +873,7 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
log.info("初始化任务中绩效数量{}", startStartDto.getResultRecordList().size());
for (ResultRecord resultRecord : startStartDto.getResultRecordList()) {
try {
String newNo = oldNo + "_initFlowRecord_" + resultRecord.getStartId();
String newNo = oldNo + "_initFlowRecord_" + resultRecord.getStaffId();
Logger.threadLocalNo.set(newNo);
log.info("初始化绩效{}", resultRecord);
resultRecordService.initFlowRecord(resultRecord, startStartDto.getFlows(), startStartDto.getFlowApprovalRoles());

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

@ -796,7 +796,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
@Override
public R initFlowRecord(ResultRecord resultRecord, List<Flow> flows, List<FlowApprovalRole> flowApprovalRoles) {
log.info("员工id :" + resultRecord.getStaffId() + " ,员工名称 " + resultRecord.getStaffName());
log.info("initFlowRecord 员工id :" + resultRecord.getStaffId() + " ,员工名称 " + resultRecord.getStaffName());
int i = 0;
for (FlowApprovalRole flowApprovalRole : flowApprovalRoles) {
FlowRecord flowRecord = new FlowRecord();
@ -830,19 +830,21 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
} else {
log.info("222222222------");
DepartmentsStaffRelateEntity relateEntity = departmentsStaffRelateService.selectLastDepartmentByStaffId(resultRecord.getStaffId());
Map<String, String> map = departmentsService.selectUserAllDepartmentIds(relateEntity.getDepartmentId());
List<StaffRoleDepartment> staffRoleDepartments = staffRoleDepartmentService.selectStaffRoleDepartmentByStaffRoleId(staffRole.getId());
boolean flag = false;
for (StaffRoleDepartment staffRoleDepartment : staffRoleDepartments) {
String departmentName = map.get(staffRoleDepartment.getDepartmentId());
if (StringUtil.isNotBlank(departmentName)) {
flag = true;
break;
if(relateEntity !=null ){
Map<String, String> map = departmentsService.selectUserAllDepartmentIds(relateEntity.getDepartmentId());
List<StaffRoleDepartment> staffRoleDepartments = staffRoleDepartmentService.selectStaffRoleDepartmentByStaffRoleId(staffRole.getId());
boolean flag = false;
for (StaffRoleDepartment staffRoleDepartment : staffRoleDepartments) {
String departmentName = map.get(staffRoleDepartment.getDepartmentId());
if (StringUtil.isNotBlank(departmentName)) {
flag = true;
break;
}
}
if (flag) { //如果管理员是管理特定部门
log.info("如果管理员是管理特定部门===========");
insertFlowRecord(flowRecord, approvalStaff, flows, flowApprovalRole, resultRecord, i, 1);
}
}
if (flag) { //如果管理员是管理特定部门
log.info("如果管理员是管理特定部门===========");
insertFlowRecord(flowRecord, approvalStaff, flows, flowApprovalRole, resultRecord, i, 1);
}
}
}