From 65f1296728ac4a2c207d411b50659af683628413 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 30 七月 2021 09:22:39 +0800
Subject: [PATCH] fix: 导入新员工时也同步写一条入职记录
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java | 76 +++++++++++++++++++-------------------
1 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java
index 942ce79..ec1462f 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java
@@ -56,7 +56,7 @@
@Override
public IPage<EmpPhysicalExam> findEmpPhysicalExams(QueryRequest request, EmpPhysicalExam empPhysicalexam) {
- QueryWrapper<EmpPhysicalExam> queryWrapper = new QueryWrapper<>();
+ QueryWrapper<EmpPhysicalExam> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("a.DelFlag", empPhysicalexam.getDelFlag());
if (StringUtils.isNotBlank(empPhysicalexam.getEmpNumb())) {
queryWrapper.like("a.EmpNumb", empPhysicalexam.getEmpNumb());
@@ -121,9 +121,9 @@
@Transactional(rollbackFor = Exception.class)
public void createEmpPhysicalExam(EmpPhysicalExam empPhysicalexam) {
empPhysicalexam.setPhysicalExamId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
- if("1".equals(empPhysicalexam.getSex())){
+ if ("1".equals(empPhysicalexam.getSex())) {
empPhysicalexam.setSex("男");
- } else if("2".equals(empPhysicalexam.getSex())){
+ } else if ("2".equals(empPhysicalexam.getSex())) {
empPhysicalexam.setSex("女");
}
empPhysicalexam.setCreator(operatorId);
@@ -178,66 +178,66 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void importEmpPhysicalExam(List<List<Object>> listObject,List<String> returnList,List<DicItem> dicItems) {
- for (List<Object> list : listObject) {
- if (list.size()==0||StrUtil.isBlank(list.get(0).toString())){
+ public void importEmpPhysicalExam(List<List<Object>> listObject, List<String> returnList, List<DicItem> dicItems) {
+ for (List<Object> list : listObject) {
+ if (list.size() == 0 || StrUtil.isBlank(list.get(0).toString())) {
continue;
}
- EmpPhysicalExam physicalExam = new EmpPhysicalExam();
- physicalExam.setPhysicalExamId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
- physicalExam.setEmpNumb(list.get(0).toString());
- physicalExam.setDeptName(list.get(1).toString());
- List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
- if(null == depts){
- depts =remoteDeptService.setDeptRedis();
+ EmpPhysicalExam physicalExam = new EmpPhysicalExam();
+ physicalExam.setPhysicalExamId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ physicalExam.setEmpNumb(list.get(0).toString());
+ physicalExam.setDeptName(list.get(1).toString());
+ List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
+ if (null == depts) {
+ depts = remoteDeptService.setDeptRedis();
}
Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().orElse(null);
if (null == dept) {
- returnList.add(StrUtil.format("导入员工体检信息异常: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list)+1,list.get(1).toString()));
+ returnList.add(StrUtil.format("导入员工体检信息异常: 出现位置第{}行, 原因:{}部门不存在", listObject.indexOf(list) + 1, list.get(1).toString()));
continue;
}
Long empId = empBaseInfoService.getEmpIdByEmpNumb(list.get(0).toString());
- if (null == empId){
- returnList.add(StrUtil.format("导入员工体检信息异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
+ if (null == empId) {
+ returnList.add(StrUtil.format("导入员工体检信息异常: 出现位置第{}行, 原因:{}员工编号不存在", listObject.indexOf(list) + 1, list.get(0).toString()));
continue;
}
physicalExam.setDelFlag(0);
physicalExam.setEmpId(empId);
physicalExam.setDeptName(list.get(1).toString());
- physicalExam.setDeptId(dept.getDeptId());
- physicalExam.setJobName(list.get(2).toString());
- physicalExam.setEmpName(list.get(3).toString());
- physicalExam.setCertificateNumb(list.get(4).toString());
- physicalExam.setSex(list.get(5).toString());
- physicalExam.setHospital(list.get(6).toString());
- try {
+ physicalExam.setDeptId(dept.getDeptId());
+ physicalExam.setJobName(list.get(2).toString());
+ physicalExam.setEmpName(list.get(3).toString());
+ physicalExam.setCertificateNumb(list.get(4).toString());
+ physicalExam.setSex(list.get(5).toString());
+ physicalExam.setHospital(list.get(6).toString());
+ try {
if (StringUtils.isNotBlank(list.get(7).toString())) {
physicalExam.setPhysicalExamDate(DateUtil.parse(list.get(7).toString()));
}
- }catch (Exception e){
- returnList.add(StrUtil.format("导入员工体检信息异常: 出现位置第{}行, 原因:{}时间格式错误",listObject.indexOf(list)+1,list.get(0).toString()));
+ } catch (Exception e) {
+ returnList.add(StrUtil.format("导入员工体检信息异常: 出现位置第{}行, 原因:{}时间格式错误", listObject.indexOf(list) + 1, list.get(0).toString()));
continue;
}
//体检
- DicItem dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"physicalExamType")&&StrUtil.equals(j.getDicItemName(),list.get(8).toString())).findFirst().orElse(null);
- if (null!=dicItem){
+ DicItem dicItem = dicItems.parallelStream().filter(j -> StrUtil.equalsIgnoreCase(j.getDicCode(), "physicalExamType") && StrUtil.equals(j.getDicItemName(), list.get(8).toString())).findFirst().orElse(null);
+ if (null != dicItem) {
physicalExam.setPhysicalExamType(dicItem.getDicItemCode());
}
- physicalExam.setBloodPressure(list.get(9).toString());
- physicalExam.setTransaminase(list.get(10).toString());
- //心电图
+ physicalExam.setBloodPressure(list.get(9).toString());
+ physicalExam.setTransaminase(list.get(10).toString());
+ //心电图
- dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"ecg")&&StrUtil.equals(j.getDicItemName(),list.get(11).toString())).findFirst().orElse(null);
- if (null!=dicItem){
+ dicItem = dicItems.parallelStream().filter(j -> StrUtil.equalsIgnoreCase(j.getDicCode(), "ecg") && StrUtil.equals(j.getDicItemName(), list.get(11).toString())).findFirst().orElse(null);
+ if (null != dicItem) {
physicalExam.setEcg(dicItem.getDicItemCode());
}
- physicalExam.setConclusion(list.get(12).toString());
- physicalExam.setReviewRecord(list.get(13).toString());
- physicalExam.setRemark(list.get(14).toString());
- this.save(physicalExam);
- }
- }
+ physicalExam.setConclusion(list.get(12).toString());
+ physicalExam.setReviewRecord(list.get(13).toString());
+ physicalExam.setRemark(list.get(14).toString());
+ this.save(physicalExam);
+ }
+ }
}
--
Gitblit v1.8.0