From 1f8196dae2aeabdefce2ff82ee4cd86706b5c48b Mon Sep 17 00:00:00 2001
From: Alan <1124498879@qq.com>
Date: 星期一, 22 二月 2021 15:24:57 +0800
Subject: [PATCH] 修改导出bug
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java | 28 ++++++++++++++++++++++------
1 files changed, 22 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 66f2daf..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
@@ -681,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());
}
//辞职申请员工总数 判断条件辞职申请日期
@@ -699,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