From e42bbb438b21ad7ef01888b7172ee5f810d2ab39 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期二, 06 四月 2021 01:42:57 +0800
Subject: [PATCH] fix(人力微服务): 修改前端，后端判断比较多，撤回上版本操作
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 696457b..0ff97a1 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
@@ -80,7 +80,7 @@
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
Page<EmpWorkExperience> page = new Page<>(request.getPageNum(), request.getPageSize());
- SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
+ SortUtil.handlePageSort(request, page, "beginDate", FebsConstant.ORDER_ASC, true);
return this.empWorkexperienceMapper.selectPageVo(page, queryWrapper);
}
@@ -167,7 +167,7 @@
@Transactional(rollbackFor = Exception.class)
public void importEmpWorkExperience(List<List<Object>> listObject,List<String> returnList) {
for (List<Object> list : listObject) {
- if (list.size()==0){
+ if (list.size()==0||StrUtil.isBlank(list.get(0).toString())){
continue;
}
EmpBaseInfo empId = empBaseInfoService.getEmpBaseInfoByEmpNumb(list.get(0).toString());
@@ -185,7 +185,7 @@
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.setSex(list.get(3).toString());
workExperience.setWorkUnit(list.get(4).toString());
if (StringUtils.isNotBlank(list.get(5).toString())) {
workExperience.setBeginDate(DateUtil.parseDate(list.get(5).toString()));
@@ -196,7 +196,7 @@
workExperience.setJobContent(list.get(7).toString());
workExperience.setCreator(FebsUtil.getUserId());
workExperience.setModifier(FebsUtil.getUserId());
- workExperience.setDelFlag(2);
+ workExperience.setDelFlag(0);
this.save(workExperience);
}
}
--
Gitblit v1.8.0