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/EmpBaseInfoServiceImpl.java | 30 ++++++++++++++----------------
1 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
index bdd0418..4204352 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
@@ -93,7 +93,7 @@
@Override
public IPage<EmpBaseInfo> findZsEmpBaseInfos(QueryRequest request, EmpBaseInfo empBaseInfo) {
Page<EmpBaseInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
- SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
+ SortUtil.handlePageSort(request, page, "entryDate", FebsConstant.ORDER_ASC, true);
IPage<EmpBaseInfo> iPage = empBaseInfoMapper.selectPageVo(page, createQueryWrapper(empBaseInfo));
//设置部门
// List<EmpBaseInfo> list = setDeptName(iPage.getRecords());
@@ -175,10 +175,10 @@
String operatorId = Optional.of(FebsUtil.getUserId()).orElse("1");
EmpBaseInfo dbInfo = this.getEmpBaseInfo(empBaseInfo);
Long empId = SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE);
- boolean saveDimissionLog = false;
+ boolean saveDimissionLog = true;
if (dbInfo == null) {
empBaseInfo.setEmpId(empId);
- saveDimissionLog = true;
+ // saveDimissionLog = true;
} else {
empBaseInfo.setEmpId(dbInfo.getEmpId());
}
@@ -193,18 +193,16 @@
empBaseInfo.setModifier(operatorId);
this.saveOrUpdate(empBaseInfo);
- if(saveDimissionLog) {
- EmpDimissionLog dimissionLog = new EmpDimissionLog();
- dimissionLog.setCloseId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
- dimissionLog.setEmpId(empId);
- dimissionLog.setEntryDate(empBaseInfo.getEntryDate());
- dimissionLog.setDimissionType("20");
- dimissionLog.setRemark(empBaseInfo.getRemark());
- dimissionLog.setCreator(operatorId);
- dimissionLog.setModifier(operatorId);
+ EmpDimissionLog dimissionLog = new EmpDimissionLog();
+ dimissionLog.setCloseId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ dimissionLog.setEmpId(empId);
+ dimissionLog.setEntryDate(empBaseInfo.getEntryDate());
+ dimissionLog.setDimissionType("20");
+ dimissionLog.setRemark(empBaseInfo.getRemark());
+ dimissionLog.setCreator(operatorId);
+ dimissionLog.setModifier(operatorId);
- dimissionLogService.save(dimissionLog);
- }
+ dimissionLogService.save(dimissionLog);
}
@Override
@@ -547,7 +545,7 @@
}
if (StringUtils.isNotBlank(list.get(13).toString())) {
- empBaseInfo.setSeniority(Integer.valueOf(list.get(13).toString()));
+ empBaseInfo.setSeniority(list.get(13).toString());
}
//籍贯
@@ -639,7 +637,7 @@
inputStream.read(buff);
inputStream.close();
- String contentType = empBaseInfo.getImagePath().substring(empBaseInfo.getImagePath().indexOf(".")+1);
+ String contentType = empBaseInfo.getImagePath().substring(empBaseInfo.getImagePath().lastIndexOf(".")+1);
if (contentType.equals("tif")){
//设置发送到客户端的响应内容类型
response.setContentType("image/tiff");
--
Gitblit v1.8.0