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-12-11 14:36:10 +08:00
commit 4fef586a34
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/lz/modules/app/dto/TaskCommentDto.java
View File

@ -20,5 +20,6 @@ public class TaskCommentDto {
private String atStaffNames; private String atStaffNames;
private String avatar; private String avatar;
private String taskName; private String taskName;
private String position;//
} }

1
src/main/java/com/lz/modules/app/service/StaffOccupationService.java
View File

@ -38,5 +38,6 @@ public interface StaffOccupationService extends IService<StaffOccupationEntity>
List<StaffOccupationEntity> selectAll(); List<StaffOccupationEntity> selectAll();
List<StaffTypeDto> selectStaffTypesByStaffIds(List<Long> staffIds); List<StaffTypeDto> selectStaffTypesByStaffIds(List<Long> staffIds);
} }

10
src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java
View File

@ -13,6 +13,7 @@ import com.lz.modules.app.dto.*;
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;
import com.lz.modules.app.entity.StaffOccupationEntity;
import com.lz.modules.app.enums.DepartmentPMEnums; import com.lz.modules.app.enums.DepartmentPMEnums;
import com.lz.modules.app.enums.EvaluationGroupEnums; import com.lz.modules.app.enums.EvaluationGroupEnums;
import com.lz.modules.app.enums.RoleEnums; import com.lz.modules.app.enums.RoleEnums;
@ -21,6 +22,7 @@ import com.lz.modules.app.model.RoleModel;
import com.lz.modules.app.model.TaskModel; import com.lz.modules.app.model.TaskModel;
import com.lz.modules.app.service.DepartmentsService; import com.lz.modules.app.service.DepartmentsService;
import com.lz.modules.app.service.DepartmentsStaffRelateService; import com.lz.modules.app.service.DepartmentsStaffRelateService;
import com.lz.modules.app.service.StaffOccupationService;
import com.lz.modules.flow.dao.RecordRoleMapper; import com.lz.modules.flow.dao.RecordRoleMapper;
import com.lz.modules.flow.dao.StaffRoleDepartmentMapper; import com.lz.modules.flow.dao.StaffRoleDepartmentMapper;
import com.lz.modules.flow.dao.StaffRoleMapper; import com.lz.modules.flow.dao.StaffRoleMapper;
@ -117,6 +119,9 @@ public class StaffRoleServiceImpl extends ServiceImpl<StaffRoleMapper, StaffRole
private DingtalkBusiness dingtalkBusiness; private DingtalkBusiness dingtalkBusiness;
@Autowired
private StaffOccupationService staffOccupationService;
@Override @Override
public StaffRole selectStaffRoleById(Long id) { public StaffRole selectStaffRoleById(Long id) {
return staffRoleMapper.selectStaffRoleById(id); return staffRoleMapper.selectStaffRoleById(id);
@ -686,8 +691,13 @@ public class StaffRoleServiceImpl extends ServiceImpl<StaffRoleMapper, StaffRole
taskCommentDto.setTaskName(resultTask.getName()); taskCommentDto.setTaskName(resultTask.getName());
} }
} }
StaffOccupationEntity staffOccupationEntity = staffOccupationService.getStaffOccupationByStaffId(staffEntity.getId());
if(staffOccupationEntity !=null ){
taskCommentDto.setPosition(staffOccupationEntity.getPosition());
}
taskCommentDtoList.add(taskCommentDto); taskCommentDtoList.add(taskCommentDto);
} }
pageUtils.setList(taskCommentDtoList); pageUtils.setList(taskCommentDtoList);
return R.ok().put("data", pageUtils); return R.ok().put("data", pageUtils);
} }