From a332ffab46b0d30e85b73ec023aa4e30c7b69e52 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期五, 12 三月 2021 02:36:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccidentCasesServiceImpl.java | 63 ++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 18 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccidentCasesServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccidentCasesServiceImpl.java
index 33ecc93..ae04ec7 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccidentCasesServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccidentCasesServiceImpl.java
@@ -7,22 +7,30 @@
import java.util.List;
import java.util.Optional;
+import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
import cc.mrbird.febs.common.core.entity.system.SystemUser;
import cc.mrbird.febs.common.core.exception.FebsException;
+import cc.mrbird.febs.common.core.utils.SortUtil;
import cc.mrbird.febs.server.hr.constant.MyConstant;
+import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.entity.EmpUnemployment;
+import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
+import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
+import cn.hutool.core.util.StrUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
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;
@@ -50,44 +58,49 @@
private final RedisService redisService;
private final EmpAccidentCasesMapper empAccidentcasesMapper;
+ 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<EmpAccidentCases> findEmpAccidentcasess(QueryRequest request, EmpAccidentCases empAccidentcases) {
- LambdaQueryWrapper<EmpAccidentCases> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpAccidentCases::getDelFlag, empAccidentcases.getDelFlag());
+ QueryWrapper<EmpAccidentCases> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("a.DelFlag", empAccidentcases.getDelFlag());
if (StringUtils.isNotBlank(empAccidentcases.getEmpNumb())) {
- queryWrapper.like(EmpAccidentCases::getEmpNumb, empAccidentcases.getEmpNumb());
+ queryWrapper.like("a.EmpNumb", empAccidentcases.getEmpNumb());
}
if (StringUtils.isNotBlank(empAccidentcases.getEmpName())) {
- queryWrapper.like(EmpAccidentCases::getEmpName, empAccidentcases.getEmpName());
+ queryWrapper.like("a.EmpName", empAccidentcases.getEmpName());
}
if (StringUtils.isNotBlank(empAccidentcases.getCertificateNumb())) {
- queryWrapper.like(EmpAccidentCases::getCertificateNumb, empAccidentcases.getCertificateNumb());
+ queryWrapper.like("a.CertificateNumb", empAccidentcases.getCertificateNumb());
}
if (StringUtils.isNotBlank(empAccidentcases.getDeptName())) {
- queryWrapper.like(EmpAccidentCases::getDeptName, empAccidentcases.getDeptName());
+ queryWrapper.like("a.DeptName", empAccidentcases.getDeptName());
}
if (StringUtils.isNotBlank(empAccidentcases.getInjuredTimeStr())) {
- queryWrapper.between(EmpAccidentCases::getInjuredTime, empAccidentcases.getInjuredTimeStr().split(",")[0],
+ queryWrapper.between("a.InjuredTime", empAccidentcases.getInjuredTimeStr().split(",")[0],
empAccidentcases.getInjuredTimeStr().split(",")[1]);
}
if (StringUtils.isNotBlank(empAccidentcases.getHrDoDateStr())) {
- queryWrapper.between(EmpAccidentCases::getHrDoDate, empAccidentcases.getHrDoDateStr().split(",")[0],
+ queryWrapper.between("a.HrDoDate", empAccidentcases.getHrDoDateStr().split(",")[0],
empAccidentcases.getHrDoDateStr().split(",")[1]);
}
if (empAccidentcases.getHospitalizatioFlag() != null && empAccidentcases.getHospitalizatioFlag() != 0) {
- queryWrapper.eq(EmpAccidentCases::getHospitalizatioFlag, empAccidentcases.getHospitalizatioFlag());
+ queryWrapper.eq("a.HospitalizatioFlag", empAccidentcases.getHospitalizatioFlag());
}
if (empAccidentcases.getSettleStatus() != null && empAccidentcases.getSettleStatus() != 0) {
- queryWrapper.eq(EmpAccidentCases::getSettleStatus, empAccidentcases.getSettleStatus());
+ queryWrapper.eq("a.SettleStatus", empAccidentcases.getSettleStatus());
}
if (StringUtils.isNotBlank(empAccidentcases.getEmpStatus())) {
- queryWrapper.eq(EmpAccidentCases::getEmpStatus, empAccidentcases.getEmpStatus());
+ queryWrapper.in("a.EmpStatus", empAccidentcases.getEmpStatus().split(","));
}
+ queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
+
Page<EmpAccidentCases> page = new Page<>(request.getPageNum(), request.getPageSize());
- return this.page(page, queryWrapper);
+ SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
+ return empAccidentcasesMapper.selectPageVo(page, queryWrapper);
}
@Override
@@ -102,7 +115,7 @@
public void createEmpAccidentcases(EmpAccidentCases empAccidentcases) throws FebsException {
LambdaQueryWrapper<EmpAccidentCases> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(EmpAccidentCases::getEmpId, empAccidentcases.getEmpId());
- lambdaQueryWrapper.eq(EmpAccidentCases::getHrDoDate, empAccidentcases.getHrDoDate());
+ lambdaQueryWrapper.eq(EmpAccidentCases::getInjuredTime, empAccidentcases.getInjuredTime());
lambdaQueryWrapper.ne(EmpAccidentCases::getDelFlag,1);
if (this.count(lambdaQueryWrapper) > 0) {
throw new FebsException(MyConstant.MESSAGE);
@@ -176,16 +189,29 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void importEmpAccidentCases(List<List<Object>> listObject) {
+ public void importEmpAccidentCases(List<List<Object>> listObject,List<String> returnList) {
for (List<Object> list : listObject) {
+ if (list.size()==0){
+ continue;
+ }
EmpAccidentCases empAccidentcases=new EmpAccidentCases();
empAccidentcases.setAccidentId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
empAccidentcases.setEmpNumb(list.get(0).toString());
List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
- Long deptId = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().get()
- .getDeptId();
+ 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;
+ }
+ EmpBaseInfo empBaseInfo = empBaseInfoService.getEmpBaseInfoByEmpNumb(list.get(0).toString());
+ if (null == empBaseInfo){
+ returnList.add(StrUtil.format("导入员工意外险案件异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
+ continue;
+ }
+ empAccidentcases.setDelFlag(2);
+ empAccidentcases.setEmpId(empBaseInfo.getEmpId());
empAccidentcases.setDeptName(list.get(1).toString());
- empAccidentcases.setDeptId(deptId);
+ empAccidentcases.setDeptId(dept.getDeptId());
empAccidentcases.setJobName(list.get(2).toString());
empAccidentcases.setEmpName(list.get(3).toString());
empAccidentcases.setCertificateNumb(list.get(4).toString());
@@ -202,7 +228,7 @@
empAccidentcases.setHospitalizatioFlag("未住院".equals(list.get(12).toString()) ? 0 : 1);
}
if (StringUtils.isNotBlank(list.get(13).toString())) {
- empAccidentcases.setBedNumb(list.get(14).toString());
+ empAccidentcases.setBedNumb(list.get(13).toString());
}
if (StringUtils.isNotBlank(list.get(14).toString())) {
empAccidentcases.setReprotTime(DateUtil.parseDate(list.get(14).toString()));
@@ -227,6 +253,7 @@
if (StringUtils.isNotBlank(list.get(22).toString())) {
empAccidentcases.setSettleDate(DateUtil.parseDate(list.get(22).toString()));
}
+ empAccidentcases.setEmpStatus(empBaseInfo.getEmpStatus());
this.save(empAccidentcases);
}
}
--
Gitblit v1.8.0