From 165e00495c05e4f89ac6c3902620e235944965ab Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期二, 09 二月 2021 00:09:57 +0800
Subject: [PATCH] 新增文件管理功能
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java | 97 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 85 insertions(+), 12 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 7182efb..6bfdf4f 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
@@ -1,21 +1,25 @@
package cc.mrbird.febs.server.hr.service.impl;
-import cc.mrbird.febs.common.core.constant.GlobalStatic;
+import cc.mrbird.febs.common.core.constant.DicCode;
import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.entity.system.Dept;
import cc.mrbird.febs.common.core.entity.system.DicItem;
import cc.mrbird.febs.common.core.utils.CastUtil;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;
import cc.mrbird.febs.common.redis.service.RedisService;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
+import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.mapper.EmpBaseInfoMapper;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
@@ -36,6 +40,7 @@
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
class EmpBaseInfoServiceImpl extends ServiceImpl<EmpBaseInfoMapper, EmpBaseInfo> implements IEmpBaseInfoService {
private final RedisService redisService;
+ private final IRemoteDeptService remoteDeptService;
private final EmpBaseInfoMapper empBaseInfoMapper;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
.map(u -> u.getUserId().toString())
@@ -44,20 +49,50 @@
@Override
public IPage<EmpBaseInfo> findEmpBaseInfos(QueryRequest request, EmpBaseInfo empBaseInfo) {
LambdaQueryWrapper<EmpBaseInfo> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpBaseInfo::getDelFlag, 0);
+ queryWrapper.eq(EmpBaseInfo::getDelFlag, empBaseInfo.getDelFlag());
+ if (StringUtils.isNotBlank(empBaseInfo.getSex())) {
+ queryWrapper.eq(EmpBaseInfo::getSex, empBaseInfo.getSex());
+ }
Page<EmpBaseInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
- IPage<EmpBaseInfo> iPage = this.page(page, queryWrapper);;
- List<EmpBaseInfo> list = iPage.getRecords();
- List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"),DicItem.class);
+ IPage<EmpBaseInfo> iPage = this.page(page, queryWrapper);
+ //设置部门
+ List<EmpBaseInfo> list = setDeptName(iPage.getRecords());
+ List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
list.forEach(p -> {
- p.setJobName("测试岗位");
- p.setMarriage("未婚");
+ p.setSexName("1".equals(p.getSex()) ? "男" : "女");
+ p.setEmpTypeName("1".equals(p.getEmpType()) ? "正式工" : "临时工");
+ p.setInsuranceTypeName("1".equals(p.getInsuranceType()) ? "（深户）五险一档" : "（非深户）五险一档");
+ p.setArchivesStatusName("0".equals(p.getArchivesStatus()) ? "未移交" : "已移交");
// 设置民族
- p.setNation(dicItems.stream()
- .filter(k -> "nation".equals(k.getDicCode()) && k.getDicItemCode().equals(p.getNation()))
+ p.setNationName(dicItems.stream()
+ .filter(k -> DicCode.NATION.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getNation()))
.findFirst()
.map(DicItem::getDicItemName)
.orElse("汉族"));
+ // 设置政治面貌
+ p.setPoliticsName(dicItems.stream()
+ .filter(k -> DicCode.PLITICAL.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getPolitics()))
+ .findFirst()
+ .map(DicItem::getDicItemName)
+ .orElse("群众"));
+ // 设置婚姻状况
+ p.setMarriageName(dicItems.stream()
+ .filter(k -> DicCode.MARRIAGE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getMarriage()))
+ .findFirst()
+ .map(DicItem::getDicItemName)
+ .orElse("未婚"));
+ // 设置学历
+ p.setEducationName(dicItems.stream()
+ .filter(k -> DicCode.EDUCATION.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getEducation()))
+ .findFirst()
+ .map(DicItem::getDicItemName)
+ .orElse("无学历"));
+ // 设置籍贯
+ p.setNativePlaceName(dicItems.stream()
+ .filter(k -> DicCode.NATIVEPLACE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getNativePlace()))
+ .findFirst()
+ .map(DicItem::getDicItemName)
+ .orElse("未知"));
});
iPage.setRecords(list);
return iPage;
@@ -66,7 +101,7 @@
@Override
public List<EmpBaseInfo> findEmpBaseInfos(EmpBaseInfo empBaseInfo) {
LambdaQueryWrapper<EmpBaseInfo> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpBaseInfo::getDelFlag, 0);
+ queryWrapper.eq(EmpBaseInfo::getDelFlag, empBaseInfo.getDelFlag());
return this.baseMapper.selectList(queryWrapper);
}
@@ -74,8 +109,6 @@
@Transactional(rollbackFor = Exception.class)
public void createEmpBaseInfo(EmpBaseInfo empBaseInfo) {
empBaseInfo.setEmpId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
- empBaseInfo.setDeptId(1L);
- empBaseInfo.setJobId(1L);
empBaseInfo.setCreator(operatorId);
empBaseInfo.setModifier(operatorId);
this.save(empBaseInfo);
@@ -117,4 +150,44 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
empBaseInfoMapper.logicDeleteByIds(list, operatorId);
}
+
+ /**
+ * 设置员工部门名称
+ * <p>
+ * date 2021-02-02 21:43
+ *
+ * @param empBaseInfoList 人员信息列表
+ * @return java.util.List<cc.mrbird.febs.server.hr.entity.EmpBaseInfo>
+ * @author: luoyibo
+ */
+ private List<EmpBaseInfo> setDeptName(List<EmpBaseInfo> empBaseInfoList) {
+ List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
+ for (EmpBaseInfo empBaseInfo : empBaseInfoList) {
+ // 设置部门
+ empBaseInfo.setDeptName(depts.stream()
+ .filter(k -> k.getDeptId().equals(empBaseInfo.getDeptId()))
+ .findFirst()
+ .map(Dept::getDeptName)
+ .orElse(""));
+ }
+ return empBaseInfoList;
+ }
+
+ @Override
+ public boolean verifyEmpNumb(EmpBaseInfo empBaseInfo) {
+ QueryWrapper<EmpBaseInfo> queryWrapper = new QueryWrapper<>();
+ queryWrapper.lambda().eq(EmpBaseInfo::getEmpNumb, empBaseInfo.getEmpNumb());
+ EmpBaseInfo tempEmpBaseInfo = this.getOne(queryWrapper);
+ if (tempEmpBaseInfo == null) {
+ return false;
+ }
+ return !empBaseInfo.getEmpId().equals(tempEmpBaseInfo.getEmpId());
+ }
+
+ @Override
+ public boolean momentToNormal(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ return empBaseInfoMapper.momentToNormal(list, operatorId) > 0;
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0