|
@@ -216,7 +216,7 @@ public class ExpertExportManage { |
|
|
experts.forEach(w -> { |
|
|
experts.forEach(w -> { |
|
|
ExpertInfoDTO expert = new ExpertInfoDTO(); |
|
|
ExpertInfoDTO expert = new ExpertInfoDTO(); |
|
|
if (ExpertAttendStatusEnum.ON_LEAVE.eq(w.getStatus())) { |
|
|
if (ExpertAttendStatusEnum.ON_LEAVE.eq(w.getStatus())) { |
|
|
expert.setBank(w.getExpertName() + "(请假)"); |
|
|
|
|
|
|
|
|
expert.setName(w.getExpertName() + "(请假)"); |
|
|
} else { |
|
|
} else { |
|
|
expert.setName(w.getExpertName()); |
|
|
expert.setName(w.getExpertName()); |
|
|
} |
|
|
} |
|
@@ -224,6 +224,9 @@ public class ExpertExportManage { |
|
|
if (expertUser != null) { |
|
|
if (expertUser != null) { |
|
|
expert.setCompany(expertUser.getCompany()); |
|
|
expert.setCompany(expertUser.getCompany()); |
|
|
expert.setJob(expertUser.getAdministrativeDuties()); |
|
|
expert.setJob(expertUser.getAdministrativeDuties()); |
|
|
|
|
|
} else { |
|
|
|
|
|
expert.setCompany(StrUtil.EMPTY); |
|
|
|
|
|
expert.setJob(StrUtil.EMPTY); |
|
|
} |
|
|
} |
|
|
data.getExperts().add(expert); |
|
|
data.getExperts().add(expert); |
|
|
}); |
|
|
}); |
|
|