From 1703c96b6833244340dc10bf746d8c08a331008c Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期二, 16 三月 2021 11:22:18 +0800
Subject: [PATCH] fix(bug修复): 用户部门显示allDeptName
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java
index 9279b56..ddb7d04 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java
@@ -1,8 +1,11 @@
package cc.mrbird.febs.server.hr.service.impl;
import cc.mrbird.febs.common.core.constant.ModuleCode;
+import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
+import cc.mrbird.febs.common.core.utils.SortUtil;
import cc.mrbird.febs.server.hr.entity.EmpBadRecord;
import cc.mrbird.febs.server.hr.entity.EmpRemarkInfo;
+import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.entity.EmpRemarkInfo;
import cc.mrbird.febs.server.hr.mapper.EmpRemarkInfoMapper;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
@@ -16,10 +19,12 @@
import org.springframework.transaction.annotation.Propagation;
import lombok.RequiredArgsConstructor;
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.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;
@@ -45,35 +50,43 @@
private final RedisService redisService;
private final EmpRemarkInfoMapper empRemarkinfoMapper;
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<EmpRemarkInfo> findEmpRemarkinfos(QueryRequest request, EmpRemarkInfo empRemarkinfo) {
- LambdaQueryWrapper<EmpRemarkInfo> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpRemarkInfo::getDelFlag, empRemarkinfo.getDelFlag());
+ QueryWrapper<EmpRemarkInfo> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("a.DelFlag", empRemarkinfo.getDelFlag());
if (StringUtils.isNotBlank(empRemarkinfo.getEmpNumb())) {
- queryWrapper.like(EmpRemarkInfo::getEmpNumb, empRemarkinfo.getEmpNumb());
+ queryWrapper.like("a.EmpNumb", empRemarkinfo.getEmpNumb());
}
if (StringUtils.isNotBlank(empRemarkinfo.getEmpName())) {
- queryWrapper.like(EmpRemarkInfo::getEmpName, empRemarkinfo.getEmpName());
+ queryWrapper.like("a.EmpName", empRemarkinfo.getEmpName());
}
if (StringUtils.isNotBlank(empRemarkinfo.getCertificateNumb())) {
- queryWrapper.like(EmpRemarkInfo::getCertificateNumb, empRemarkinfo.getCertificateNumb());
+ queryWrapper.like("a.CertificateNumb", empRemarkinfo.getCertificateNumb());
}
if (StringUtils.isNotBlank(empRemarkinfo.getDeptName())) {
- queryWrapper.like(EmpRemarkInfo::getDeptName, empRemarkinfo.getDeptName());
+ queryWrapper.like("a.DeptName", empRemarkinfo.getDeptName());
}
if (StringUtils.isNotBlank(empRemarkinfo.getRemarkDateStr())) {
- queryWrapper.between(EmpRemarkInfo::getRemarkDate, empRemarkinfo.getRemarkDateStr().split(",")[0],
+ queryWrapper.between("a.RemarkDate", empRemarkinfo.getRemarkDateStr().split(",")[0],
empRemarkinfo.getRemarkDateStr().split(",")[1]);
}
if (StringUtils.isNotBlank(empRemarkinfo.getRemarkContent())) {
- queryWrapper.like(EmpRemarkInfo::getRemarkContent, empRemarkinfo.getRemarkContent());
+ queryWrapper.like("a.RemarkContent", empRemarkinfo.getRemarkContent());
}
+ if (StringUtils.isNotBlank(empRemarkinfo.getEmpStatus())) {
+ queryWrapper.in("b.EmpStatus", empRemarkinfo.getEmpStatus().split(","));
+ } else {
+ queryWrapper.in("b.EmpStatus", 0);
+ }
+ queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
Page<EmpRemarkInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
- return this.page(page, queryWrapper);
+ SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
+ return empRemarkinfoMapper.selectPageVo(page, queryWrapper);
}
@Override
--
Gitblit v1.8.0