From cfce5a0402f09b7f7891f045a77b8a9ceea69e1f Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期四, 04 三月 2021 23:29:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java
index c387345..bf8185c 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java
@@ -15,18 +15,21 @@
import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.entity.constant.StringConstant;
import cc.mrbird.febs.common.core.entity.system.Dept;
import cc.mrbird.febs.common.core.utils.CastUtil;
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.EmpOccupational;
+import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.mapper.EmpOccupationalMapper;
import cc.mrbird.febs.server.hr.service.IEmpOccupationalService;
import cn.hutool.core.date.DateUtil;
@@ -49,45 +52,47 @@
private final RedisService redisService;
private final EmpOccupationalMapper empOccupationalMapper;
private final IEmpBaseInfoService empBaseInfoService;
+ private final IRemoteDeptService remoteDeptService;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
.map(u -> u.getUserId().toString())
.orElse("1");
@Override
public IPage<EmpOccupational> findEmpOccupationals(QueryRequest request, EmpOccupational empOccupational) {
- LambdaQueryWrapper<EmpOccupational> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpOccupational::getDelFlag, empOccupational.getDelFlag());
+ QueryWrapper<EmpOccupational> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("a.DelFlag", empOccupational.getDelFlag());
if (StringUtils.isNotBlank(empOccupational.getEmpNumb())) {
- queryWrapper.like(EmpOccupational::getEmpNumb, empOccupational.getEmpNumb());
+ queryWrapper.like("a.EmpNumb", empOccupational.getEmpNumb());
}
if (StringUtils.isNotBlank(empOccupational.getEmpName())) {
- queryWrapper.like(EmpOccupational::getEmpName, empOccupational.getEmpName());
+ queryWrapper.like("a.EmpName", empOccupational.getEmpName());
}
if (StringUtils.isNotBlank(empOccupational.getCertificateNumb())) {
- queryWrapper.like(EmpOccupational::getCertificateNumb, empOccupational.getCertificateNumb());
+ queryWrapper.like("a.CertificateNumb", empOccupational.getCertificateNumb());
}
if (StringUtils.isNotBlank(empOccupational.getDeptName())) {
- queryWrapper.like(EmpOccupational::getDeptName, empOccupational.getDeptName());
+ queryWrapper.like("a.DeptName", empOccupational.getDeptName());
}
if (StringUtils.isNotBlank(empOccupational.getInjuredTimeStr())) {
- queryWrapper.between(EmpOccupational::getInjuredTime, empOccupational.getInjuredTimeStr().split(",")[0],
+ queryWrapper.between("a.InjuredTime", empOccupational.getInjuredTimeStr().split(",")[0],
empOccupational.getInjuredTimeStr().split(",")[1]);
}
if (StringUtils.isNotBlank(empOccupational.getHrDoDateStr())) {
- queryWrapper.between(EmpOccupational::getHrDoDate, empOccupational.getHrDoDateStr().split(",")[0],
+ queryWrapper.between("a.HrDoDate", empOccupational.getHrDoDateStr().split(",")[0],
empOccupational.getHrDoDateStr().split(",")[1]);
}
if (empOccupational.getHospitalizatioFlag() != null && empOccupational.getHospitalizatioFlag() != 0) {
- queryWrapper.eq(EmpOccupational::getHospitalizatioFlag, empOccupational.getHospitalizatioFlag());
+ queryWrapper.eq("a.HospitalizatioFlag", empOccupational.getHospitalizatioFlag());
}
if (empOccupational.getSettleStatus() != null && empOccupational.getSettleStatus() != 0) {
- queryWrapper.eq(EmpOccupational::getSettleStatus, empOccupational.getSettleStatus());
+ queryWrapper.eq("a.SettleStatus", empOccupational.getSettleStatus());
}
if (StringUtils.isNotBlank(empOccupational.getEmpStatus())) {
- queryWrapper.eq(EmpOccupational::getEmpStatus, empOccupational.getEmpStatus());
+ queryWrapper.eq("a.EmpStatus", empOccupational.getEmpStatus());
}
+ queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
Page<EmpOccupational> page = new Page<>(request.getPageNum(), request.getPageSize());
- return this.page(page, queryWrapper);
+ return empOccupationalMapper.selectPageVo(page, queryWrapper);
}
@Override
--
Gitblit v1.8.0