From 3b0896e902214fa4a14c26b932204dc463ddfabb Mon Sep 17 00:00:00 2001
From: Alan <1124498879@qq.com>
Date: 星期六, 20 二月 2021 12:01:04 +0800
Subject: [PATCH] 提交超龄，字典，参数设置
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 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 93c98c8..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,7 @@
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;
@@ -376,6 +377,13 @@
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)){ //新进员工
@@ -385,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)){ //辞职申请人数
@@ -574,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