Commit c1c233e8 authored by hongguangwu's avatar hongguangwu

MVP1.6.6-预入职相关_导出优化

parent 84a9ec2d
......@@ -286,6 +286,16 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
}
String id = main.getId();
vo.setMain(main);
if (vo.getTpreEmpDeclaration() == null) {
// 预入职-员工申明
TPreEmpDeclaration tPreEmpDeclaration;
if (Common.isNotNull(main.getDeclarationId())) {
tPreEmpDeclaration = tPreEmpDeclarationService.getById(main.getDeclarationId());
} else {
tPreEmpDeclaration = tPreEmpDeclarationService.getTPreEmpDeclarationList();
}
vo.setTpreEmpDeclaration(tPreEmpDeclaration);
}
// 预入职-员工不良记录表
TPreEmpBadRecord tPreEmpBadRecord = tPreEmpBadRecordService.getTPreEmpBadRecordList(id);
if (tPreEmpBadRecord == null) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment