From c294865250a10b3b0f5661e1e2e7b127917552c7 Mon Sep 17 00:00:00 2001
From: Alan <1124498879@qq.com>
Date: 星期日, 21 二月 2021 13:46:06 +0800
Subject: [PATCH] 提交首页查询Bug
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 114 insertions(+), 6 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 b04114a..291d4d1 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
@@ -152,6 +152,98 @@
iPage.setRecords(list);
return iPage;
}
+
+ @Override
+ public IPage<EmpBaseInfo> findZsEmpBaseInfos(QueryRequest request, EmpBaseInfo empBaseInfo) {
+ LambdaQueryWrapper<EmpBaseInfo> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EmpBaseInfo::getDelFlag, empBaseInfo.getDelFlag());
+ if (StringUtils.isNotBlank(empBaseInfo.getEmpNumb())) {
+ queryWrapper.like(EmpBaseInfo::getEmpNumb, empBaseInfo.getEmpNumb());
+ }
+ if (StringUtils.isNotBlank(empBaseInfo.getEmpName())) {
+ queryWrapper.like(EmpBaseInfo::getEmpName, empBaseInfo.getEmpName());
+ }
+ if (StringUtils.isNotBlank(empBaseInfo.getCertificateNumb())) {
+ queryWrapper.like(EmpBaseInfo::getCertificateNumb, empBaseInfo.getCertificateNumb());
+ }
+ if (StringUtils.isNotBlank(empBaseInfo.getDeptName())) {
+ queryWrapper.like(EmpBaseInfo::getDeptName, empBaseInfo.getDeptName());
+ }
+ if (StringUtils.isNotBlank(empBaseInfo.getEntryDateStr())) {
+ queryWrapper.between(EmpBaseInfo::getEntryDate, empBaseInfo.getEntryDateStr().split(",")[0], empBaseInfo.getEntryDateStr().split(",")[1]);
+ }
+ if (StringUtils.isNotBlank(empBaseInfo.getDimissionDateStr())) {
+ queryWrapper.between(EmpBaseInfo::getDimissionDate, empBaseInfo.getDimissionDateStr().split(",")[0], empBaseInfo.getDimissionDateStr().split(",")[1]);
+ }
+ if (StringUtils.isNotBlank(empBaseInfo.getSex())) {
+ queryWrapper.in(EmpBaseInfo::getSex, empBaseInfo.getSex().split(","));
+ }
+ if (StringUtils.isNotBlank(empBaseInfo.getEducation())) {
+ queryWrapper.in(EmpBaseInfo::getEducation, empBaseInfo.getEducation().split(","));
+ }
+ if (StringUtils.isNotBlank(empBaseInfo.getPolitics())) {
+ queryWrapper.in(EmpBaseInfo::getPolitics, empBaseInfo.getPolitics().split(","));
+ }
+ if (StringUtils.isNotBlank(empBaseInfo.getAgeStr())) {
+ String[] ages=empBaseInfo.getAgeStr().split(",");
+ for (int i = 0; i < ages.length; i++) {
+ String ageBtn=ages[i];
+ queryWrapper.between(EmpBaseInfo::getAge, ageBtn.split("-")[0], ageBtn.split("-")[1]);
+ }
+ }
+ if (StringUtils.isNotBlank(empBaseInfo.getArchivesStatus())) {
+ queryWrapper.in(EmpBaseInfo::getArchivesStatus, empBaseInfo.getArchivesStatus().split(","));
+ }
+ if (StringUtils.isNotBlank(empBaseInfo.getInsuranceType())) {
+ queryWrapper.in(EmpBaseInfo::getInsuranceType, empBaseInfo.getInsuranceType().split(","));
+ }
+ if (StringUtils.isNotBlank(empBaseInfo.getEmpStatus())) {
+ queryWrapper.in(EmpBaseInfo::getEmpStatus, empBaseInfo.getEmpStatus().split(","));
+ }
+ Page<EmpBaseInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
+ 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.setSexName("1".equals(p.getSex()) ? "男" : "女");
+ p.setEmpTypeName("1".equals(p.getEmpType()) ? "正式工" : "临时工");
+ p.setInsuranceTypeName("1".equals(p.getInsuranceType()) ? "（深户）五险一档" : "（非深户）五险一档");
+ p.setArchivesStatusName("0".equals(p.getArchivesStatus()) ? "未移交" : "已移交");
+ // 设置民族
+ 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;
+ }
@Override
public List<EmpBaseInfo> findEmpBaseInfos(EmpBaseInfo empBaseInfo) {
@@ -589,17 +681,29 @@
manOld=sysConfig.get(0).getConfigValue();
womanOld=sysConfig.get(1).getConfigValue();
}
- //在职员工,正式员工，临时员工，正常离职，自动离职，公司辞退 判断条件离职申请日期
+ //在职员工,正式员工，临时员工，超龄员工
Map<String, Object> stringObjectMap = this.baseMapper.countBaseInfoList(index,btime,etime,manOld,womanOld);
+ //正常离职，自动离职，公司辞退 判断条件创建日期
+ Map<String, Object> zclzObjectMap =this.baseMapper.countZcygBaseInfoList(index,btime,etime);
+ if(zclzObjectMap!=null){
+ stringObjectMap.put("zclz",zclzObjectMap.get("zclz").toString());
+ stringObjectMap.put("zdlz",zclzObjectMap.get("zdlz").toString());
+ stringObjectMap.put("gsct",zclzObjectMap.get("gsct").toString());
+ }
//新进员工 判断条件入职日期
Integer xjygObjectMap =this.baseMapper.countXjygBaseInfoList(index,btime,etime);
if(xjygObjectMap!=null){
stringObjectMap.put("xjyg",xjygObjectMap);
}
- //离职员工总数,解除合同 判断条件离职申请日期
+
+ //离职员工总数
+ Integer empStatus = this.baseMapper.selectCount(new QueryWrapper<EmpBaseInfo>().eq("empStatus", 1));
+ if(empStatus!=null){
+ stringObjectMap.put("lzyg",empStatus);
+ }
+ //解除合同 判断条件离职申请日期
Map<String, Object> lzygObjectMap =this.baseMapper.countLzygBaseInfoList(index,btime,etime);
if(lzygObjectMap!=null){
- stringObjectMap.put("lzyg",lzygObjectMap.get("lzyg").toString());
stringObjectMap.put("jcht",lzygObjectMap.get("jcht").toString());
}
//辞职申请员工总数 判断条件辞职申请日期
@@ -607,12 +711,16 @@
if(czygObjectMap!=null){
stringObjectMap.put("czyg",czygObjectMap);
}
- //有效合同，新签合同，续签合同 判断条件合同签订日期
+ //有效合同 判断条件合同签订日期
Map<String, Object> yxhtObjectMap =this.baseMapper.countYxhtBaseInfoList(index,btime,etime);
if(yxhtObjectMap!=null){
stringObjectMap.put("yxht",yxhtObjectMap.get("yxht").toString());
- stringObjectMap.put("xinqht",yxhtObjectMap.get("xinqht").toString());
- stringObjectMap.put("xqht",yxhtObjectMap.get("xqht").toString());
+ }
+ //新签合同，续签合同 判断条件合同签订日期
+ Map<String, Object> xqhtObjectMap =this.baseMapper.countXqhtBaseInfoList(index,btime,etime);
+ if(yxhtObjectMap!=null){
+ stringObjectMap.put("xinqht",xqhtObjectMap.get("xinqht").toString());
+ stringObjectMap.put("xqht",xqhtObjectMap.get("xqht").toString());
}
//到期合同 判断条件合同结束时间
Integer dqhtObjectMap =this.baseMapper.countDqhtBaseInfoList(index,btime,etime);
--
Gitblit v1.8.0