From d4428bee31e1278d5cf0fa43cdba12864831bb94 Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期二, 02 三月 2021 10:30:19 +0800
Subject: [PATCH] 增加两项查询项
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
index f989db5..f8d1e83 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
@@ -7,6 +7,7 @@
import cc.mrbird.febs.server.hr.entity.EmpWorkExperience;
import cc.mrbird.febs.server.hr.mapper.EmpWorkExperienceMapper;
import cc.mrbird.febs.server.hr.service.IEmpWorkExperienceService;
+import cn.hutool.core.date.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@@ -53,8 +54,11 @@
if (StringUtils.isNotBlank(empWorkexperience.getCertificateNumb())) {
queryWrapper.like(EmpWorkExperience::getCertificateNumb, empWorkexperience.getCertificateNumb());
}
- if (StringUtils.isNotBlank(empWorkexperience.getEmpStatus())) {
- queryWrapper.eq(EmpWorkExperience::getEmpStatus, empWorkexperience.getEmpStatus());
+ if (StringUtils.isNotBlank(empWorkexperience.getCertificateNumb())) {
+ queryWrapper.like(EmpWorkExperience::getCertificateNumb, empWorkexperience.getCertificateNumb());
+ }
+ if (StringUtils.isNotBlank(empWorkexperience.getJobContent())) {
+ queryWrapper.like(EmpWorkExperience::getJobContent, empWorkexperience.getJobContent());
}
Page<EmpWorkExperience> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
@@ -122,4 +126,26 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
return empWorkexperienceMapper.momentToNormal(list, operatorId)>0;
}
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void importEmpWorkExperience(List<List<Object>> listObject) {
+ for (List<Object> list : listObject) {
+ EmpWorkExperience workExperience = new EmpWorkExperience();
+ workExperience.setWorkExperienceId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ workExperience.setEmpNumb(list.get(0).toString());
+ workExperience.setEmpName(list.get(1).toString());
+ workExperience.setCertificateNumb(list.get(2).toString());
+ workExperience.setSex("男".equals(list.get(3).toString()) ? "1" : "2");
+ workExperience.setWorkUnit(list.get(4).toString());
+ if (StringUtils.isNotBlank(list.get(5).toString())) {
+ workExperience.setBeginDate(DateUtil.parseDate(list.get(5).toString()));
+ }
+ if (StringUtils.isNotBlank(list.get(6).toString())) {
+ workExperience.setBeginDate(DateUtil.parseDate(list.get(6).toString()));
+ }
+ workExperience.setJobContent(list.get(7).toString());
+ this.save(workExperience);
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0