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

提交候tgit

Browse Source
This commit is contained in:
quyixiao 2020-09-10 10:52:52 +08:00
parent 2e8a78b6ef
commit ad9b449f99
3 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -264,7 +264,6 @@ public class ResultRecordController extends AbstractController {
list.add(comment); list.add(comment);
} }
} }
String superStaff = recordAuthService.selectByStaffId(resultRecord.getStaffId()); String superStaff = recordAuthService.selectByStaffId(resultRecord.getStaffId());
int fileCount = recordFileService.selectRecordFileCountByRecordId(resultRecord.getId()); int fileCount = recordFileService.selectRecordFileCountByRecordId(resultRecord.getId());
return R.ok() return R.ok()

27
src/main/java/com/lz/modules/flow/service/impl/RecordAuthServiceImpl.java
View File

@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.lz.common.utils.NumberUtil; import com.lz.common.utils.NumberUtil;
import com.lz.common.utils.StringUtil; import com.lz.common.utils.StringUtil;
import com.lz.modules.app.dao.DepartmentsDao;
import com.lz.modules.app.entity.DepartmentsEntity; import com.lz.modules.app.entity.DepartmentsEntity;
import com.lz.modules.app.entity.DepartmentsStaffRelateEntity; import com.lz.modules.app.entity.DepartmentsStaffRelateEntity;
import com.lz.modules.app.entity.StaffEntity; import com.lz.modules.app.entity.StaffEntity;
@ -49,6 +50,9 @@ public class RecordAuthServiceImpl extends ServiceImpl<RecordAuthMapper, RecordA
@Autowired @Autowired
private DepartmentsService departmentsService; private DepartmentsService departmentsService;
@Autowired
private DepartmentsDao departmentsDao;
@Override @Override
public RecordAuth selectRecordAuthById(Long id){ public RecordAuth selectRecordAuthById(Long id){
return recordAuthMapper.selectRecordAuthById(id); return recordAuthMapper.selectRecordAuthById(id);
@ -147,10 +151,33 @@ public class RecordAuthServiceImpl extends ServiceImpl<RecordAuthMapper, RecordA
if (leader != null) { if (leader != null) {
StaffEntity staffEntity = staffService.selectStaffById(leader.getStaffId()); StaffEntity staffEntity = staffService.selectStaffById(leader.getStaffId());
return staffEntity.getName(); return staffEntity.getName();
} else {
Map<String, String> map = departmentsService.selectUserAllDepartmentInFo(departmentsStaffRelateEntity.getDepartmentId());
if (StringUtil.isNotBlank(map.get("dd2"))) {
StaffEntity staffEntity = getLeader(map.get("dd2"));
if (staffEntity != null) {
return staffEntity.getName();
}
}
if (StringUtil.isNotBlank(map.get("dd3"))) {
StaffEntity staffEntity = getLeader(map.get("dd3"));
if (staffEntity != null) {
return staffEntity.getName();
}
}
} }
return ""; return "";
} }
} }
public StaffEntity getLeader(String departmentId){
DepartmentsStaffRelateEntity leader = departmentsStaffRelateService.selectLeaderByDepartmentId(departmentId);
if(leader !=null && leader.getIsLeader().equals(1)){
StaffEntity staffEntity = staffService.selectStaffById(leader.getStaffId());
return staffEntity;
}
return null;
}
} }

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

@ -271,6 +271,15 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
if (flowDepartment == null) { if (flowDepartment == null) {
DepartmentsStaffRelateEntity departmentsStaffRelateEntity = departmentsStaffRelateService.selectLastDepartmentByStaffId(staffId); DepartmentsStaffRelateEntity departmentsStaffRelateEntity = departmentsStaffRelateService.selectLastDepartmentByStaffId(staffId);
DepartmentsStaffRelateEntity leader = departmentsStaffRelateService.selectLeaderByDepartmentId(departmentsStaffRelateEntity.getDepartmentId()); DepartmentsStaffRelateEntity leader = departmentsStaffRelateService.selectLeaderByDepartmentId(departmentsStaffRelateEntity.getDepartmentId());
if(leader == null){
Map<String, String> map = departmentsService.selectUserAllDepartmentInFo(departmentsStaffRelateEntity.getDepartmentId());
if (StringUtil.isNotBlank(map.get("dd2"))) {
leader = departmentsStaffRelateService.selectLeaderByDepartmentId(map.get("dd2"));
if(leader ==null && StringUtil.isNotBlank(map.get("dd3"))){
leader = departmentsStaffRelateService.selectLeaderByDepartmentId(map.get("dd3"));
}
}
}
flowDepartment = flowDepartmentService.selectByStaffId(leader.getStaffId()); flowDepartment = flowDepartmentService.selectByStaffId(leader.getStaffId());
flowId = TypeFlowDto.getFlowId(flowDepartment.getFlowIds(), Constant.CHILD, type);//表示是部门下的普通员工 flowId = TypeFlowDto.getFlowId(flowDepartment.getFlowIds(), Constant.CHILD, type);//表示是部门下的普通员工
list.add(flowDepartment); list.add(flowDepartment);