From d0295276c2161f6e4d0b43c5f55e256952116992 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期六, 20 二月 2021 22:21:56 +0800
Subject: [PATCH] feat(信息录入): 体检信息
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java | 149 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 144 insertions(+), 5 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 1302118..b04114a 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
@@ -2,6 +2,13 @@
import java.util.*;
+import cc.mrbird.febs.common.core.entity.system.SysConfig;
+import cc.mrbird.febs.server.hr.entity.EmpDimissionLog;
+import cc.mrbird.febs.server.hr.entity.EmpJobChange;
+import cc.mrbird.febs.server.hr.service.IEmpDimissionLogService;
+import cc.mrbird.febs.server.hr.service.IEmpJobChangeService;
+import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.date.DateUtil;
import cc.mrbird.febs.server.hr.entity.*;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@@ -23,6 +30,7 @@
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;
@@ -44,6 +52,8 @@
private final RedisService redisService;
private final IRemoteDeptService remoteDeptService;
private final EmpBaseInfoMapper empBaseInfoMapper;
+ private final IEmpDimissionLogService dimissionLogService;
+ private final IEmpJobChangeService jobChangeService;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
.map(u -> u.getUserId().toString())
@@ -159,7 +169,6 @@
} else{
empBaseInfo.setEmpId(dbInfo.getEmpId());
}
- empBaseInfo.setEmpStatus("0");
empBaseInfo.setCreator(operatorId);
empBaseInfo.setModifier(operatorId);
this.saveOrUpdate(empBaseInfo);
@@ -250,12 +259,131 @@
}
return this.getOne(queryWrapper);
}
+ /**
+ *
+ * 关闭员工档案
+ *
+ * date 2021-02-18 12:54
+ * @author: luoyibo
+ * @param empDimissionLog
+ * @return boolean
+ */
+ @Override
+ public boolean closeEmpArchives(EmpDimissionLog empDimissionLog) {
+ String[] str = empDimissionLog.getEmpIds().split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ String[] strDate = empDimissionLog.getEntryDates().split(",");
+ EmpDimissionLog dimissionLog = null;
+ for (int i = 0,k=str.length; i < k; i++) {
+ dimissionLog = new EmpDimissionLog();
+ dimissionLog.setCloseId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ dimissionLog.setEmpId(Long.parseLong(str[i]));
+ dimissionLog.setEntryDate(DateUtil.parse(strDate[i],"yyyy-MM-dd"));
+ dimissionLog.setDimissionDate(empDimissionLog.getDimissionDate());
+ dimissionLog.setDimissionType(empDimissionLog.getDimissionType());
+ dimissionLog.setRemark(empDimissionLog.getRemark());
+ dimissionLog.setSelfLeaveDay(empDimissionLog.getSelfLeaveDay());
+ dimissionLog.setReporter(empDimissionLog.getReporter());
+ dimissionLog.setCreator(operatorId);
+ dimissionLog.setModifier(operatorId);
+
+ dimissionLogService.save(dimissionLog);
+ }
+ return empBaseInfoMapper.closeEmpArchives(list, empDimissionLog.getDimissionType(), empDimissionLog.getDimissionDate(), empDimissionLog.getRemark(), operatorId)>0;
+ }
+ /**
+ *
+ * 员工岗位变更
+ *
+ * date 2021-02-18 20:32
+ * @author: luoyibo
+ * @param empJobChange 1
+ * @return boolean
+ */
+ @Override
+ public boolean changeEmpJob(EmpJobChange empJobChange) {
+ String[] str = empJobChange.getEmpIds().split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ String[] strName = empJobChange.getEmpNames().split(",");
+ String[] strDeptName = empJobChange.getOldDeptNames().split(",");
+ String[] strJobName = empJobChange.getOldJobNames().split(",");
+
+ EmpJobChange saveChange = null;
+
+ for (int i = 0,k=str.length; i <k ; i++) {
+ saveChange = new EmpJobChange();
+ saveChange.setJobChangeId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ saveChange.setEmpId(Long.parseLong(str[i]));
+ saveChange.setEmpName(strName[i]);
+ saveChange.setOldDeptName(strDeptName[i]);
+ saveChange.setOldJobName(strJobName[i]);
+ saveChange.setNewDeptName(empJobChange.getNewDeptName());
+ saveChange.setNewJobName(empJobChange.getNewJobName());
+ saveChange.setChangeType(empJobChange.getChangeType());
+ saveChange.setChangeDate(empJobChange.getChangeDate());
+ saveChange.setChangeReason(empJobChange.getChangeReason());
+ saveChange.setCreator(operatorId);
+ saveChange.setModifier(operatorId);
+
+ jobChangeService.save(saveChange);
+
+ }
+
+ Map<String, Object> mapParams = new HashMap<>();
+ mapParams.put("deptId", empJobChange.getDeptId());
+ mapParams.put("deptName", empJobChange.getNewDeptName());
+ mapParams.put("jobId", empJobChange.getJobId());
+ mapParams.put("jobName", empJobChange.getNewJobName());
+ mapParams.put("operatorId", operatorId);
+ return empBaseInfoMapper.changeEmpJob(list,mapParams)>0;
+ }
+
+ /**
+ * 导入员工
+ * @param listObject
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void importEmpBaseInfo(List<List<Object>> listObject) {
+ for (List<Object> list : listObject) {
+ EmpBaseInfo empBaseInfo = new EmpBaseInfo();
+ empBaseInfo.setEmpId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ empBaseInfo.setEmpNumb(list.get(0).toString());
+ List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
+ empBaseInfo.setDeptName(list.get(1).toString());
+ Long deptId=depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().get().getDeptId();
+ empBaseInfo.setDeptId(deptId);
+ empBaseInfo.setJobName(list.get(2).toString());
+ empBaseInfo.setEmpName(list.get(3).toString());
+ empBaseInfo.setCertificateNumb(list.get(4).toString());
+ empBaseInfo.setSex("男".equals(list.get(5).toString())?"1":"0");
+ if (StringUtils.isNotBlank(list.get(6).toString())) {
+ empBaseInfo.setAge(Integer.valueOf(list.get(6).toString()));
+ }
+ empBaseInfo.setEducation(list.get(7).toString());
+ empBaseInfo.setNativePlace(list.get(8).toString());
+ empBaseInfo.setTelePhone(list.get(9).toString());
+ if (StringUtils.isNotBlank(list.get(10).toString())) {
+ empBaseInfo.setEntryDate(DateUtil.parseDate(list.get(10).toString()));
+ }
+ empBaseInfo.setEmpStatus("0");
+ this.save(empBaseInfo);
+ }
+
+ }
@Override
public IPage<EmpBaseInfo> baseInfoList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name) {
Page<EmpBaseInfo> page = new Page<EmpBaseInfo>(new Long(pageNum), new Long(pageSize));
IPage<EmpBaseInfo> iPage =null;
+ List<SysConfig> sysConfig=this.baseMapper.sysConfig();
+ String manOld="";
+ String womanOld="";
+ if(sysConfig.size()>0){
+ manOld=sysConfig.get(0).getConfigValue();
+ womanOld=sysConfig.get(1).getConfigValue();
+ }
if("1".equals(number)){ //在职员工
iPage = this.empBaseInfoMapper.zzbaseInfoList(page, index,btime,etime,name);
}else if("2".equals(number)){ //新进员工
@@ -265,7 +393,7 @@
}else if("4".equals(number)){ //临时员工
iPage = this.empBaseInfoMapper.lsbaseInfoList(page, index,btime,etime,name);
}else if("5".equals(number)){ //超龄员工
- iPage = this.empBaseInfoMapper.baseInfoList(page, index,btime,etime,name);
+ iPage = this.empBaseInfoMapper.clbaseInfoList(page, index,btime,etime,name,manOld,womanOld);
}else if("6".equals(number)){ //离职员工总数
iPage = this.empBaseInfoMapper.lzbaseInfoList(page, index,btime,etime,name);
}else if("7".equals(number)){ //辞职申请人数
@@ -399,8 +527,12 @@
}
@Override
- public IPage<?> empBaseInfoTgList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name) {
- return null;
+ public IPage<EmpJobChange> empBaseInfoTgList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name) {
+ Page<EmpJobChange> page = new Page<EmpJobChange>(new Long(pageNum), new Long(pageSize));
+ IPage<EmpJobChange> iPage =null;
+ //调岗
+ iPage = this.empBaseInfoMapper.empBaseInfoTgList(page, index,btime,etime,name,number);
+ return iPage;
}
@Override
@@ -450,8 +582,15 @@
@Override
public Map<String, Object> countBaseInfoList(String index, String btime, String etime) {
+ List<SysConfig> sysConfig=this.baseMapper.sysConfig();
+ String manOld="";
+ String womanOld="";
+ if(sysConfig.size()>0){
+ manOld=sysConfig.get(0).getConfigValue();
+ womanOld=sysConfig.get(1).getConfigValue();
+ }
//在职员工,正式员工，临时员工，正常离职，自动离职，公司辞退 判断条件离职申请日期
- Map<String, Object> stringObjectMap = this.baseMapper.countBaseInfoList(index,btime,etime);
+ Map<String, Object> stringObjectMap = this.baseMapper.countBaseInfoList(index,btime,etime,manOld,womanOld);
//新进员工 判断条件入职日期
Integer xjygObjectMap =this.baseMapper.countXjygBaseInfoList(index,btime,etime);
if(xjygObjectMap!=null){
--
Gitblit v1.8.0