From 97da80513b900a42de9ecf3fbbaa35000b57fd17 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期日, 14 三月 2021 16:14:16 +0800
Subject: [PATCH] xx
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java | 115 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 74 insertions(+), 41 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 cd8b024..c45db03 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
@@ -571,24 +571,26 @@
manOld = sysConfig.get(0).getConfigValue();
womanOld = sysConfig.get(1).getConfigValue();
}
+ String[] split = remoteDeptService.userRightDepts().split(StringConstant.COMMA);
+ List<String> lists= Arrays.asList(split);
if ("1".equals(number)) { //在职员工
- iPage = this.empBaseInfoMapper.zzbaseInfoList(page, index, btime, etime, name);
+ iPage = this.empBaseInfoMapper.zzbaseInfoList(page, index, btime, etime, name,lists);
} else if ("2".equals(number)) { //新进员工
- iPage = this.empBaseInfoMapper.xjbaseInfoList(page, index, btime, etime, name);
+ iPage = this.empBaseInfoMapper.xjbaseInfoList(page, index, btime, etime, name,lists);
} else if ("3".equals(number)) { //正式员工
- iPage = this.empBaseInfoMapper.zsbaseInfoList(page, index, btime, etime, name);
+ iPage = this.empBaseInfoMapper.zsbaseInfoList(page, index, btime, etime, name,lists);
} else if ("4".equals(number)) { //临时员工
- iPage = this.empBaseInfoMapper.lsbaseInfoList(page, index, btime, etime, name);
+ iPage = this.empBaseInfoMapper.lsbaseInfoList(page, index, btime, etime, name,lists);
} else if ("5".equals(number)) { //超龄员工
- iPage = this.empBaseInfoMapper.clbaseInfoList(page, index, btime, etime, name, manOld, womanOld);
+ iPage = this.empBaseInfoMapper.clbaseInfoList(page, index, btime, etime, name, manOld, womanOld,lists);
} else if ("6".equals(number)) { //离职员工总数
- iPage = this.empBaseInfoMapper.lzbaseInfoList(page, index, btime, etime, name);
+ iPage = this.empBaseInfoMapper.lzbaseInfoList(page, index, btime, etime, name,lists);
} else if ("7".equals(number)) { //辞职申请人数
- iPage = this.empBaseInfoMapper.cjbaseInfoList(page, index, btime, etime, name);
+ iPage = this.empBaseInfoMapper.cjbaseInfoList(page, index, btime, etime, name,lists);
} else if ("8".equals(number) || "9".equals(number) || "10".equals(number)) { //正常离职人数 ,自动离职人数 ,公司辞退人数
- iPage = this.empBaseInfoMapper.zcbaseInfoList(page, index, btime, etime, name, number);
+ iPage = this.empBaseInfoMapper.zcbaseInfoList(page, index, btime, etime, name, number,lists);
} else if ("11".equals(number)) { //身份证到期
- iPage = this.empBaseInfoMapper.sfzbaseInfoList(page, index, btime, etime, name);
+ iPage = this.empBaseInfoMapper.sfzbaseInfoList(page, index, btime, etime, name,lists);
}
//设置部门
List<EmpBaseInfo> list = setDeptName(iPage.getRecords());
@@ -652,12 +654,14 @@
public IPage<EmpBaseInfo> baseInfoHeList(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;
+ String[] split = remoteDeptService.userRightDepts().split(StringConstant.COMMA);
+ List<String> lists= Arrays.asList(split);
if ("11".equals(number) || "13".equals(number) || "14".equals(number)) { //有效合同 ,新签合同,续签合同
- iPage = this.empBaseInfoMapper.yxbaseInfoList(page, index, btime, etime, name, number);
+ iPage = this.empBaseInfoMapper.yxbaseInfoList(page, index, btime, etime, name, number,lists);
} else if ("12".equals(number)) { //到期合同
- iPage = this.empBaseInfoMapper.dqbaseInfoList(page, index, btime, etime, name);
+ iPage = this.empBaseInfoMapper.dqbaseInfoList(page, index, btime, etime, name,lists);
} else if ("15".equals(number)) { //解除合同
- iPage = this.empBaseInfoMapper.jcseInfoList(page, index, btime, etime, name);
+ iPage = this.empBaseInfoMapper.jcseInfoList(page, index, btime, etime, name,lists);
}
//设置部门
List<EmpBaseInfo> list = setDeptName(iPage.getRecords());
@@ -681,7 +685,9 @@
Page<EmpDimissionAttend> page = new Page<EmpDimissionAttend>(new Long(pageNum), new Long(pageSize));
IPage<EmpDimissionAttend> iPage = null;
//q出勤人数 员工加班 员工旷工
- iPage = this.empBaseInfoMapper.empBaseInfoCqList(page, index, btime, etime, name, number);
+ String[] split = remoteDeptService.userRightDepts().split(StringConstant.COMMA);
+ List<String> lists= Arrays.asList(split);
+ iPage = this.empBaseInfoMapper.empBaseInfoCqList(page, index, btime, etime, name, number,lists);
return iPage;
}
@@ -691,7 +697,9 @@
Page<EmpLeaveInfo> page = new Page<EmpLeaveInfo>(new Long(pageNum), new Long(pageSize));
IPage<EmpLeaveInfo> iPage = null;
//员工请假
- iPage = this.empBaseInfoMapper.empBaseInfoQjList(page, index, btime, etime, name, number);
+ String[] split = remoteDeptService.userRightDepts().split(StringConstant.COMMA);
+ List<String> lists= Arrays.asList(split);
+ iPage = this.empBaseInfoMapper.empBaseInfoQjList(page, index, btime, etime, name, number,lists);
return iPage;
}
@@ -700,7 +708,9 @@
Page<EmpPhysicalExam> page = new Page<EmpPhysicalExam>(new Long(pageNum), new Long(pageSize));
IPage<EmpPhysicalExam> iPage = null;
//员工体检
- iPage = this.empBaseInfoMapper.empBaseInfoTjList(page, index, btime, etime, name, number);
+ String[] split = remoteDeptService.userRightDepts().split(StringConstant.COMMA);
+ List<String> lists= Arrays.asList(split);
+ iPage = this.empBaseInfoMapper.empBaseInfoTjList(page, index, btime, etime, name, number,lists);
return iPage;
}
@@ -709,7 +719,9 @@
Page<EmpLaborTrouble> page = new Page<EmpLaborTrouble>(new Long(pageNum), new Long(pageSize));
IPage<EmpLaborTrouble> iPage = null;
//劳资案件
- iPage = this.empBaseInfoMapper.empBaseInfoLzList(page, index, btime, etime, name, number);
+ String[] split = remoteDeptService.userRightDepts().split(StringConstant.COMMA);
+ List<String> lists= Arrays.asList(split);
+ iPage = this.empBaseInfoMapper.empBaseInfoLzList(page, index, btime, etime, name, number,lists);
return iPage;
}
@@ -718,7 +730,9 @@
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);
+ String[] split = remoteDeptService.userRightDepts().split(StringConstant.COMMA);
+ List<String> lists= Arrays.asList(split);
+ iPage = this.empBaseInfoMapper.empBaseInfoTgList(page, index, btime, etime, name, number,lists);
return iPage;
}
@@ -727,7 +741,9 @@
Page<EmpOccupational> page = new Page<EmpOccupational>(new Long(pageNum), new Long(pageSize));
IPage<EmpOccupational> iPage = null;
//工伤案件
- iPage = this.empBaseInfoMapper.empBaseInfoGsList(page, index, btime, etime, name, number);
+ String[] split = remoteDeptService.userRightDepts().split(StringConstant.COMMA);
+ List<String> lists= Arrays.asList(split);
+ iPage = this.empBaseInfoMapper.empBaseInfoGsList(page, index, btime, etime, name, number,lists);
return iPage;
}
@@ -736,7 +752,9 @@
Page<EmpAccidentCases> page = new Page<EmpAccidentCases>(new Long(pageNum), new Long(pageSize));
IPage<EmpAccidentCases> iPage = null;
//意外险案件
- iPage = this.empBaseInfoMapper.empBaseInfoYwList(page, index, btime, etime, name, number);
+ String[] split = remoteDeptService.userRightDepts().split(StringConstant.COMMA);
+ List<String> lists= Arrays.asList(split);
+ iPage = this.empBaseInfoMapper.empBaseInfoYwList(page, index, btime, etime, name, number,lists);
return iPage;
}
@@ -745,7 +763,9 @@
Page<EmpInsurance> page = new Page<EmpInsurance>(new Long(pageNum), new Long(pageSize));
IPage<EmpInsurance> iPage = null;
//社保
- iPage = this.empBaseInfoMapper.empBaseInfoSbList(page, index, btime, etime, name, number);
+ String[] split = remoteDeptService.userRightDepts().split(StringConstant.COMMA);
+ List<String> lists= Arrays.asList(split);
+ iPage = this.empBaseInfoMapper.empBaseInfoSbList(page, index, btime, etime, name, number,lists);
return iPage;
}
@@ -754,7 +774,9 @@
Page<EmpUnemployment> page = new Page<EmpUnemployment>(new Long(pageNum), new Long(pageSize));
IPage<EmpUnemployment> iPage = null;
//失业金
- iPage = this.empBaseInfoMapper.empBaseInfoSyjList(page, index, btime, etime, name, number);
+ String[] split = remoteDeptService.userRightDepts().split(StringConstant.COMMA);
+ List<String> lists= Arrays.asList(split);
+ iPage = this.empBaseInfoMapper.empBaseInfoSyjList(page, index, btime, etime, name, number,lists);
return iPage;
}
@@ -763,7 +785,9 @@
Page<EmpBadRecord> page = new Page<EmpBadRecord>(new Long(pageNum), new Long(pageSize));
IPage<EmpBadRecord> iPage = null;
//不良记录
- iPage = this.empBaseInfoMapper.empBaseInfoBlList(page, index, btime, etime, name, number);
+ String[] split = remoteDeptService.userRightDepts().split(StringConstant.COMMA);
+ List<String> lists= Arrays.asList(split);
+ iPage = this.empBaseInfoMapper.empBaseInfoBlList(page, index, btime, etime, name, number,lists);
return iPage;
}
@@ -776,55 +800,59 @@
manOld = sysConfig.get(0).getConfigValue();
womanOld = sysConfig.get(1).getConfigValue();
}
+ QueryWrapper queryWrapper=new QueryWrapper();
+ queryWrapper.in("t1.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
//在职员工,正式员工，临时员工，超龄员工
- Map<String, Object> stringObjectMap = this.baseMapper.countBaseInfoList(index, btime, etime, manOld, womanOld);
+ Map<String, Object> stringObjectMap = this.baseMapper.countBaseInfoList(index, btime, etime, manOld, womanOld,queryWrapper);
//正常离职，自动离职，公司辞退 判断条件创建日期
- Map<String, Object> zclzObjectMap = this.baseMapper.countZcygBaseInfoList(index, btime, etime);
+ Map<String, Object> zclzObjectMap = this.baseMapper.countZcygBaseInfoList(index, btime, etime,queryWrapper);
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);
+ Integer xjygObjectMap = this.baseMapper.countXjygBaseInfoList(index, btime, etime,queryWrapper);
if (xjygObjectMap != null) {
stringObjectMap.put("xjyg", xjygObjectMap);
}
//离职员工总数
- Integer empStatus = this.baseMapper.selectCount(new QueryWrapper<EmpBaseInfo>().eq("delFlag", 0).eq("empStatus", 1));
+ Integer empStatus = this.baseMapper.selectCountlz(new QueryWrapper<EmpBaseInfo>()
+ .eq("t.delFlag", 0).eq("t.empStatus", 1)
+ .in("t1.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA)));
if (empStatus != null) {
stringObjectMap.put("lzyg", empStatus);
}
//解除合同 判断条件离职申请日期
- Map<String, Object> lzygObjectMap = this.baseMapper.countLzygBaseInfoList(index, btime, etime);
+ Map<String, Object> lzygObjectMap = this.baseMapper.countLzygBaseInfoList(index, btime, etime,queryWrapper);
if (lzygObjectMap != null) {
stringObjectMap.put("jcht", lzygObjectMap.get("jcht").toString());
}
//辞职申请员工总数 判断条件辞职申请日期
- Integer czygObjectMap = this.baseMapper.countCzygBaseInfoList(index, btime, etime);
+ Integer czygObjectMap = this.baseMapper.countCzygBaseInfoList(index, btime, etime,queryWrapper);
if (czygObjectMap != null) {
stringObjectMap.put("czyg", czygObjectMap);
}
//有效合同 判断条件合同签订日期
- Map<String, Object> yxhtObjectMap = this.baseMapper.countYxhtBaseInfoList(index, btime, etime);
+ Map<String, Object> yxhtObjectMap = this.baseMapper.countYxhtBaseInfoList(index, btime, etime,queryWrapper);
if (yxhtObjectMap != null) {
stringObjectMap.put("yxht", yxhtObjectMap.get("yxht").toString());
}
//新签合同，续签合同 判断条件合同签订日期
- Map<String, Object> xqhtObjectMap = this.baseMapper.countXqhtBaseInfoList(index, btime, etime);
+ Map<String, Object> xqhtObjectMap = this.baseMapper.countXqhtBaseInfoList(index, btime, etime,queryWrapper);
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);
+ Integer dqhtObjectMap = this.baseMapper.countDqhtBaseInfoList(index, btime, etime,queryWrapper);
if (dqhtObjectMap != null) {
stringObjectMap.put("dqht", dqhtObjectMap);
}
//出勤人数，员工加班，员工旷工 判断条件考勤月份 本年，本月
- Map<String, Object> cqrsObjectMap = this.baseMapper.countCqrsBaseInfoList(index, btime, etime);
+ Map<String, Object> cqrsObjectMap = this.baseMapper.countCqrsBaseInfoList(index, btime, etime,queryWrapper);
if (cqrsObjectMap != null) {
stringObjectMap.put("cqrs", cqrsObjectMap.get("cqrs").toString());
stringObjectMap.put("ygjb", cqrsObjectMap.get("ygjb").toString());
@@ -832,51 +860,51 @@
}
//员工请假 判断条件到岗时间
- Integer ygqjObjectMap = this.baseMapper.countYgqjBaseInfoList(index, btime, etime);
+ Integer ygqjObjectMap = this.baseMapper.countYgqjBaseInfoList(index, btime, etime,queryWrapper);
if (ygqjObjectMap != null) {
stringObjectMap.put("ygqj", ygqjObjectMap);
}
//劳资案件 判断条件仲裁日期
- Integer lzajObjectMap = this.baseMapper.countLzajBaseInfoList(index, btime, etime);
+ Integer lzajObjectMap = this.baseMapper.countLzajBaseInfoList(index, btime, etime,queryWrapper);
if (lzajObjectMap != null) {
stringObjectMap.put("lzaj", lzajObjectMap);
}
//工伤案件，意外险案件 判断条件受伤日期
- Map<String, Object> gsajObjectMap = this.baseMapper.countGsajBaseInfoList(index, btime, etime);
+ Map<String, Object> gsajObjectMap = this.baseMapper.countGsajBaseInfoList(index, btime, etime,queryWrapper);
if (gsajObjectMap != null) {
stringObjectMap.put("gsaj", gsajObjectMap.get("gsaj").toString());
stringObjectMap.put("ywxaj", gsajObjectMap.get("ywxaj").toString());
}
//社保申请 判断条件社保申请日期
- Integer sbsqObjectMap = this.baseMapper.countSbsqBaseInfoList(index, btime, etime);
+ Integer sbsqObjectMap = this.baseMapper.countSbsqBaseInfoList(index, btime, etime,queryWrapper);
if (sbsqObjectMap != null) {
stringObjectMap.put("sbsq", sbsqObjectMap);
}
//失业金领取 判断条件失业金申请日期
- Integer syjObjectMap = this.baseMapper.countSyjBaseInfoList(index, btime, etime);
+ Integer syjObjectMap = this.baseMapper.countSyjBaseInfoList(index, btime, etime,queryWrapper);
if (syjObjectMap != null) {
stringObjectMap.put("syj", syjObjectMap);
}
//员工体检 判断条件体检日期
- Integer ygtjObjectMap = this.baseMapper.countYgtjBaseInfoList(index, btime, etime);
+ Integer ygtjObjectMap = this.baseMapper.countYgtjBaseInfoList(index, btime, etime,queryWrapper);
if (ygtjObjectMap != null) {
stringObjectMap.put("ygtj", ygtjObjectMap);
}
//身份证到期 判断条件身份证有效时间
- Integer sfzObjectMap = this.baseMapper.countSfzBaseInfoList(index, btime, etime);
+ Integer sfzObjectMap = this.baseMapper.countSfzBaseInfoList(index, btime, etime,queryWrapper);
if (sfzObjectMap != null) {
stringObjectMap.put("sfz", sfzObjectMap);
}
//员工调岗 判断条件身份证有效时间
- Integer ygtgObjectMap = this.baseMapper.countYgtgBaseInfoList(index, btime, etime);
+ Integer ygtgObjectMap = this.baseMapper.countYgtgBaseInfoList(index, btime, etime,queryWrapper);
if (ygtgObjectMap != null) {
stringObjectMap.put("ygtg", ygtgObjectMap);
}
//不良记录 判断条件身份证有效时间
- Integer bljlObjectMap = this.baseMapper.countBljlBaseInfoList(index, btime, etime);
+ Integer bljlObjectMap = this.baseMapper.countBljlBaseInfoList(index, btime, etime,queryWrapper);
if (bljlObjectMap != null) {
stringObjectMap.put("bljl", bljlObjectMap);
}
@@ -1215,4 +1243,9 @@
return this.count(queryWrapper) > 0;
}
+
+ @Override
+ public List<EmpBaseInfo> listAll(QueryWrapper<EmpBaseInfo> wrapper) {
+ return this.baseMapper.listAll(wrapper);
+ }
}
--
Gitblit v1.8.0