From 6d05ae432c4d76e521e031a76232a6dd1b0ff105 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期二, 09 三月 2021 09:20:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java | 94 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 89 insertions(+), 5 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 0fbe628..d9a5e1a 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,20 +1,33 @@
package cc.mrbird.febs.server.hr.service.impl;
import cc.mrbird.febs.common.core.constant.ModuleCode;
+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;
import cc.mrbird.febs.server.hr.service.IEmpRemarkinfoService;
+import cn.hutool.core.date.DateUtil;
+
+import cn.hutool.core.util.StrUtil;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
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;
import cc.mrbird.febs.common.core.utils.SequenceUtil;
+import cc.mrbird.febs.common.redis.service.RedisService;
import java.util.*;
@@ -32,23 +45,51 @@
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
class EmpRemarkInfoServiceImpl extends ServiceImpl<EmpRemarkInfoMapper, EmpRemarkInfo> implements IEmpRemarkinfoService {
+ 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, 0);
+ QueryWrapper<EmpRemarkInfo> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("a.DelFlag", empRemarkinfo.getDelFlag());
+ if (StringUtils.isNotBlank(empRemarkinfo.getEmpNumb())) {
+ queryWrapper.like("a.EmpNumb", empRemarkinfo.getEmpNumb());
+ }
+ if (StringUtils.isNotBlank(empRemarkinfo.getEmpName())) {
+ queryWrapper.like("a.EmpName", empRemarkinfo.getEmpName());
+ }
+ if (StringUtils.isNotBlank(empRemarkinfo.getCertificateNumb())) {
+ queryWrapper.like("a.CertificateNumb", empRemarkinfo.getCertificateNumb());
+ }
+ if (StringUtils.isNotBlank(empRemarkinfo.getDeptName())) {
+ queryWrapper.like("a.DeptName", empRemarkinfo.getDeptName());
+ }
+ if (StringUtils.isNotBlank(empRemarkinfo.getRemarkDateStr())) {
+ queryWrapper.between("a.RemarkDate", empRemarkinfo.getRemarkDateStr().split(",")[0],
+ empRemarkinfo.getRemarkDateStr().split(",")[1]);
+ }
+ if (StringUtils.isNotBlank(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);
+ return empRemarkinfoMapper.selectPageVo(page, queryWrapper);
}
@Override
public List<EmpRemarkInfo> findEmpRemarkinfos(EmpRemarkInfo empRemarkinfo) {
LambdaQueryWrapper<EmpRemarkInfo> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpRemarkInfo::getDelFlag, 0);
+ queryWrapper.eq(EmpRemarkInfo::getDelFlag, empRemarkinfo.getDelFlag());
return this.baseMapper.selectList(queryWrapper);
}
@@ -97,4 +138,47 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
empRemarkinfoMapper.logicDeleteByIds(list, operatorId);
}
-}
\ No newline at end of file
+
+ @Override
+ public boolean momentToNormal(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ return empRemarkinfoMapper.momentToNormal(list, operatorId)>0;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void importEmpRemarkInfo(List<List<Object>> listObject,List<String> returnList) {
+ for (List<Object> list : listObject) {
+ if (list.size()==0){
+ continue;
+ }
+ EmpRemarkInfo empRemarkinfo=new EmpRemarkInfo();
+ empRemarkinfo.setRemarkId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ empRemarkinfo.setEmpNumb(list.get(0).toString());
+ List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
+ Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().orElse(null);
+ if (null == dept) {
+ returnList.add(StrUtil.format("导入员工备注信息服务异常: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list)+1,list.get(1).toString()));
+ continue;
+ }
+ Long empId = empBaseInfoService.getEmpIdByEmpNumb(list.get(0).toString());
+ if (null == empId){
+ returnList.add(StrUtil.format("导入员工备注信息服务异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
+ continue;
+ }
+ empRemarkinfo.setDelFlag(2);
+ empRemarkinfo.setEmpId(empId);
+ empRemarkinfo.setDeptName(list.get(1).toString());
+ empRemarkinfo.setDeptId(dept.getDeptId());
+ empRemarkinfo.setJobName(list.get(2).toString());
+ empRemarkinfo.setEmpName(list.get(3).toString());
+ empRemarkinfo.setCertificateNumb(list.get(4).toString());
+ if (StringUtils.isNotBlank(list.get(5).toString())) {
+ empRemarkinfo.setRemarkDate(DateUtil.parseDateTime(list.get(5).toString()));
+ }
+ empRemarkinfo.setRemarkContent(list.get(6).toString());
+ this.save(empRemarkinfo);
+ }
+ }
+}
--
Gitblit v1.8.0