From 6d240fbbf6a47b4125320f26c4f5c537e1493fb6 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 05 十一月 2021 22:19:12 +0800
Subject: [PATCH] fix(bug修复): 到期合同的统计条件修改为只针对在职员工统计
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccidentCasesServiceImpl.java | 191 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 170 insertions(+), 21 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 3916048..437282e 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
@@ -1,26 +1,41 @@
package cc.mrbird.febs.server.hr.service.impl;
import cc.mrbird.febs.common.core.constant.ModuleCode;
+import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
+import cc.mrbird.febs.common.core.entity.constant.StringConstant;
+import cc.mrbird.febs.common.core.entity.system.Dept;
+import cc.mrbird.febs.common.core.exception.FebsException;
+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.core.utils.SortUtil;
+import cc.mrbird.febs.common.redis.service.RedisService;
+import cc.mrbird.febs.server.hr.constant.MyConstant;
import cc.mrbird.febs.server.hr.entity.EmpAccidentCases;
+import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
+import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.mapper.EmpAccidentCasesMapper;
import cc.mrbird.febs.server.hr.service.IEmpAccidentCasesService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.annotation.Propagation;
-import lombok.RequiredArgsConstructor;
+import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
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.utils.FebsUtil;
-import cc.mrbird.febs.common.core.utils.SequenceUtil;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import java.math.BigDecimal;
import java.util.*;
/**
- * name:EmpAccidentcases
- * package:cc.mrbird.febs.server.hr.controller
+ * name:EmpAccidentcases package:cc.mrbird.febs.server.hr.controller
* description:员工意外险案件服务接口实现
*
* @author luoyibo
@@ -30,19 +45,54 @@
@Service
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
-class EmpAccidentCasesServiceImpl extends ServiceImpl<EmpAccidentCasesMapper, EmpAccidentCases> implements IEmpAccidentCasesService {
+class EmpAccidentCasesServiceImpl extends ServiceImpl<EmpAccidentCasesMapper, EmpAccidentCases>
+ implements IEmpAccidentCasesService {
+ private final RedisService redisService;
private final EmpAccidentCasesMapper empAccidentcasesMapper;
- private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
- .map(u -> u.getUserId().toString())
+ 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("a.EmpNumb", empAccidentcases.getEmpNumb());
+ }
+ if (StringUtils.isNotBlank(empAccidentcases.getEmpName())) {
+ queryWrapper.like("a.EmpName", empAccidentcases.getEmpName());
+ }
+ if (StringUtils.isNotBlank(empAccidentcases.getCertificateNumb())) {
+ queryWrapper.like("a.CertificateNumb", empAccidentcases.getCertificateNumb());
+ }
+ if (StringUtils.isNotBlank(empAccidentcases.getDeptName())) {
+ queryWrapper.like("b.allDeptName", empAccidentcases.getDeptName());
+ }
+ if (StringUtils.isNotBlank(empAccidentcases.getInjuredTimeStr())) {
+ queryWrapper.between("a.InjuredTime", empAccidentcases.getInjuredTimeStr().split(",")[0],
+ empAccidentcases.getInjuredTimeStr().split(",")[1]);
+ }
+ if (StringUtils.isNotBlank(empAccidentcases.getHrDoDateStr())) {
+ queryWrapper.between("a.HrDoDate", empAccidentcases.getHrDoDateStr().split(",")[0],
+ empAccidentcases.getHrDoDateStr().split(",")[1]);
+ }
+ if (empAccidentcases.getHospitalizatioFlag() != null && empAccidentcases.getHospitalizatioFlag() != 0) {
+ queryWrapper.eq("a.HospitalizatioFlag", empAccidentcases.getHospitalizatioFlag());
+ }
+ if (empAccidentcases.getSettleStatus() != null && empAccidentcases.getSettleStatus() != 0) {
+ queryWrapper.eq("a.SettleStatus", empAccidentcases.getSettleStatus());
+ }
+ if (StringUtils.isNotBlank(empAccidentcases.getEmpStatus())) {
+ queryWrapper.in("b.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, "injuredTime", FebsConstant.ORDER_ASC, true);
+ return empAccidentcasesMapper.selectPageVo(page, queryWrapper);
}
@Override
@@ -54,15 +104,22 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void createEmpAccidentcases(EmpAccidentCases empAccidentcases) {
+ public void createEmpAccidentcases(EmpAccidentCases empAccidentcases) throws FebsException {
+ LambdaQueryWrapper<EmpAccidentCases> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(EmpAccidentCases::getEmpId, empAccidentcases.getEmpId());
+ lambdaQueryWrapper.eq(EmpAccidentCases::getInjuredTime, empAccidentcases.getInjuredTime());
+ lambdaQueryWrapper.ne(EmpAccidentCases::getDelFlag, 1);
+ if (this.count(lambdaQueryWrapper) > 0) {
+ throw new FebsException(MyConstant.MESSAGE);
+ }
empAccidentcases.setAccidentId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
- if(empAccidentcases.getReprotTime()==null){
+ if (empAccidentcases.getReprotTime() == null) {
empAccidentcases.setReprotTime(empAccidentcases.getInjuredTime());
}
- if(empAccidentcases.getSubmitTime()==null){
+ if (empAccidentcases.getSubmitTime() == null) {
empAccidentcases.setSubmitTime(empAccidentcases.getInjuredTime());
}
- if(empAccidentcases.getHrDoDate()==null){
+ if (empAccidentcases.getHrDoDate() == null) {
empAccidentcases.setHrDoDate(empAccidentcases.getInjuredTime());
}
empAccidentcases.setCreator(operatorId);
@@ -72,7 +129,15 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void updateEmpAccidentcases(EmpAccidentCases empAccidentcases) {
+ public void updateEmpAccidentcases(EmpAccidentCases empAccidentcases) throws FebsException {
+ LambdaQueryWrapper<EmpAccidentCases> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(EmpAccidentCases::getEmpId, empAccidentcases.getEmpId());
+ lambdaQueryWrapper.eq(EmpAccidentCases::getHrDoDate, empAccidentcases.getHrDoDate());
+ lambdaQueryWrapper.ne(EmpAccidentCases::getDelFlag, 1);
+ lambdaQueryWrapper.ne(EmpAccidentCases::getAccidentId, empAccidentcases.getAccidentId());
+ if (this.count(lambdaQueryWrapper) > 0) {
+ throw new FebsException(MyConstant.MESSAGE);
+ }
EmpAccidentCases dbData = this.getById(empAccidentcases.getAccidentId());
empAccidentcases.setCreateTime(dbData.getCreateTime());
empAccidentcases.setCreator(dbData.getCreator());
@@ -113,4 +178,88 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
return empAccidentcasesMapper.momentToNormal(list, operatorId) > 0;
}
-}
\ No newline at end of file
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void importEmpAccidentCases(List<List<Object>> listObject, List<String> returnList) {
+ for (List<Object> list : listObject) {
+ if (list.size() == 0 || StrUtil.isBlank(list.get(0).toString())) {
+ 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);
+ if (null == depts) {
+ depts = remoteDeptService.setDeptRedis();
+ }
+ 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(0);
+ empAccidentcases.setEmpId(empBaseInfo.getEmpId());
+ empAccidentcases.setDeptName(list.get(1).toString());
+ empAccidentcases.setDeptId(dept.getDeptId());
+ empAccidentcases.setJobName(list.get(2).toString());
+ empAccidentcases.setEmpName(list.get(3).toString());
+ empAccidentcases.setCertificateNumb(list.get(4).toString());
+
+ empAccidentcases.setInjuredAddress(list.get(6).toString());
+ empAccidentcases.setInjuredPart(list.get(7).toString());
+ empAccidentcases.setInjuredDescribe(list.get(8).toString());
+ empAccidentcases.setInjuredDiacrisis(list.get(9).toString());
+ empAccidentcases.setHospitalName(list.get(10).toString());
+ empAccidentcases.setTreatmentName(list.get(11).toString());
+ if (StringUtils.isNotBlank(list.get(12).toString())) {
+ empAccidentcases.setHospitalizatioFlag("未住院".equals(list.get(12).toString()) ? 0 : 1);
+ }
+ if (StringUtils.isNotBlank(list.get(13).toString())) {
+ empAccidentcases.setBedNumb(list.get(13).toString());
+ }
+ try {
+ if (StringUtils.isNotBlank(list.get(5).toString())) {
+ empAccidentcases.setInjuredTime(DateUtil.parse(list.get(5).toString()));
+ }
+ if (StringUtils.isNotBlank(list.get(14).toString())) {
+ empAccidentcases.setReprotTime(DateUtil.parse(list.get(14).toString()));
+ }
+ if (StringUtils.isNotBlank(list.get(15).toString())) {
+ empAccidentcases.setSubmitTime(DateUtil.parse(list.get(15).toString()));
+ }
+ if (StringUtils.isNotBlank(list.get(20).toString())) {
+ empAccidentcases.setHrDoDate(DateUtil.parse(list.get(20).toString()));
+ }
+ if (StringUtils.isNotBlank(list.get(22).toString())) {
+ empAccidentcases.setSettleDate(DateUtil.parse(list.get(22).toString()));
+ }
+ } catch (Exception e) {
+ returnList.add(StrUtil.format("导入员工意外险案件异常: 出现位置第{}行, 原因:{}时间格式错误", listObject.indexOf(list) + 1, list.get(0).toString()));
+ continue;
+ }
+ empAccidentcases.setSbumitBy(list.get(16).toString());
+ if (StringUtils.isNotBlank(list.get(17).toString())) {
+ empAccidentcases.setExpensesFee(new BigDecimal(list.get(17).toString()));
+ }
+ if (StringUtils.isNotBlank(list.get(18).toString())) {
+ empAccidentcases.setInnsureFee(new BigDecimal(list.get(18).toString()));
+ }
+ empAccidentcases.setExpenseReport(list.get(19).toString());
+
+ if (StringUtils.isNotBlank(list.get(21).toString())) {
+ empAccidentcases.setSettleStatus("未结案".equals(list.get(21).toString()) ? 0 : 1);
+ }
+
+ empAccidentcases.setEmpStatus(empBaseInfo.getEmpStatus());
+ this.save(empAccidentcases);
+ }
+ }
+
+
+}
--
Gitblit v1.8.0