From 97816a0fa698c71e7c75033bd6ba5ad3172a17f2 Mon Sep 17 00:00:00 2001
From: yubo <autumnal_wind@yeah.net>
Date: 星期三, 11 三月 2026 18:01:46 +0800
Subject: [PATCH] feat(hr): 添加员工提醒功能增强
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java | 277 ++++++++++++++++++++++++++++---------------------------
1 files changed, 140 insertions(+), 137 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 5e2e82d..5aaf8a9 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
@@ -1,47 +1,40 @@
package cc.mrbird.febs.server.hr.service.impl;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Optional;
-
import cc.mrbird.febs.common.core.constant.DicCode;
+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.entity.system.DicItem;
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.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.IEmpBaseInfoService;
+import cc.mrbird.febs.server.hr.service.IEmpOccupationalService;
+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.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;
-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;
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:EmpOccupational
@@ -57,48 +50,48 @@
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
class EmpOccupationalServiceImpl extends ServiceImpl<EmpOccupationalMapper, EmpOccupational> implements IEmpOccupationalService {
- private final RedisService redisService;
+ private final RedisService redisService;
private final EmpOccupationalMapper empOccupationalMapper;
- private final IEmpBaseInfoService empBaseInfoService;
- private final IRemoteDeptService remoteDeptService;
+ 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) {
- QueryWrapper<EmpOccupational> queryWrapper = new QueryWrapper<>();
+ QueryWrapper<EmpOccupational> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("a.DelFlag", empOccupational.getDelFlag());
if (StringUtils.isNotBlank(empOccupational.getEmpNumb())) {
- queryWrapper.like("a.EmpNumb", empOccupational.getEmpNumb());
- }
- if (StringUtils.isNotBlank(empOccupational.getEmpName())) {
- queryWrapper.like("a.EmpName", empOccupational.getEmpName());
- }
- if (StringUtils.isNotBlank(empOccupational.getCertificateNumb())) {
- queryWrapper.like("a.CertificateNumb", empOccupational.getCertificateNumb());
- }
- if (StringUtils.isNotBlank(empOccupational.getDeptName())) {
- queryWrapper.like("a.DeptName", empOccupational.getDeptName());
- }
- if (StringUtils.isNotBlank(empOccupational.getInjuredTimeStr())) {
- queryWrapper.between("a.InjuredTime", empOccupational.getInjuredTimeStr().split(",")[0],
- empOccupational.getInjuredTimeStr().split(",")[1]);
- }
- if (StringUtils.isNotBlank(empOccupational.getHrDoDateStr())) {
- queryWrapper.between("a.HrDoDate", empOccupational.getHrDoDateStr().split(",")[0],
- empOccupational.getHrDoDateStr().split(",")[1]);
- }
- if (empOccupational.getHospitalizatioFlag() != null && empOccupational.getHospitalizatioFlag() != 0) {
- queryWrapper.eq("a.HospitalizatioFlag", empOccupational.getHospitalizatioFlag());
- }
- if (empOccupational.getSettleStatus() != null && empOccupational.getSettleStatus() != 0) {
- queryWrapper.eq("a.SettleStatus", empOccupational.getSettleStatus());
- }
- if (StringUtils.isNotBlank(empOccupational.getEmpStatus())) {
- queryWrapper.in("a.EmpStatus", empOccupational.getEmpStatus().split(","));
- }
- queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
+ queryWrapper.like("a.EmpNumb", empOccupational.getEmpNumb());
+ }
+ if (StringUtils.isNotBlank(empOccupational.getEmpName())) {
+ queryWrapper.like("a.EmpName", empOccupational.getEmpName());
+ }
+ if (StringUtils.isNotBlank(empOccupational.getCertificateNumb())) {
+ queryWrapper.like("a.CertificateNumb", empOccupational.getCertificateNumb());
+ }
+ if (StringUtils.isNotBlank(empOccupational.getDeptName())) {
+ queryWrapper.like("b.allDeptName", empOccupational.getDeptName());
+ }
+ if (StringUtils.isNotBlank(empOccupational.getInjuredTimeStr())) {
+ queryWrapper.between("a.InjuredTime", empOccupational.getInjuredTimeStr().split(",")[0],
+ empOccupational.getInjuredTimeStr().split(",")[1]);
+ }
+ if (StringUtils.isNotBlank(empOccupational.getHrDoDateStr())) {
+ queryWrapper.between("a.HrDoDate", empOccupational.getHrDoDateStr().split(",")[0],
+ empOccupational.getHrDoDateStr().split(",")[1]);
+ }
+ if (empOccupational.getHospitalizatioFlag() != null && empOccupational.getHospitalizatioFlag() != 0) {
+ queryWrapper.eq("a.HospitalizatioFlag", empOccupational.getHospitalizatioFlag());
+ }
+ if (empOccupational.getSettleStatus() != null && empOccupational.getSettleStatus() != 0) {
+ queryWrapper.eq("a.SettleStatus", empOccupational.getSettleStatus());
+ }
+ if (StringUtils.isNotBlank(empOccupational.getEmpStatus())) {
+ queryWrapper.in("b.EmpStatus", empOccupational.getEmpStatus().split(","));
+ }
+ queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
Page<EmpOccupational> page = new Page<>(request.getPageNum(), request.getPageSize());
SortUtil.handlePageSort(request, page, "injuredTime", FebsConstant.ORDER_ASC, true);
IPage<EmpOccupational> pageList = empOccupationalMapper.selectPageVo(page, queryWrapper);
@@ -122,19 +115,19 @@
LambdaQueryWrapper<EmpOccupational> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(EmpOccupational::getEmpId, empOccupational.getEmpId());
lambdaQueryWrapper.eq(EmpOccupational::getInjuredTime, empOccupational.getInjuredTime());
- lambdaQueryWrapper.ne(EmpOccupational::getDelFlag,1);
+ lambdaQueryWrapper.ne(EmpOccupational::getDelFlag, 1);
if (this.count(lambdaQueryWrapper) > 0) {
throw new FebsException(MyConstant.MESSAGE);
}
empOccupational.setOccupationalId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
- if(empOccupational.getSubmitTime()==null){
+ if (empOccupational.getSubmitTime() == null) {
empOccupational.setSubmitTime(empOccupational.getInjuredTime());
}
- if(empOccupational.getReportTime()==null){
+ if (empOccupational.getReportTime() == null) {
empOccupational.setReportTime(empOccupational.getInjuredTime());
}
- if(empOccupational.getHrDoDate()==null){
+ if (empOccupational.getHrDoDate() == null) {
empOccupational.setHrDoDate(empOccupational.getInjuredTime());
}
empOccupational.setCreator(operatorId);
@@ -183,84 +176,94 @@
public boolean momentToNormal(String ids) {
String[] str = ids.split(",");
List<String> list = new ArrayList<>(Arrays.asList(str));
- return empOccupationalMapper.momentToNormal(list, operatorId)>0;
+ return empOccupationalMapper.momentToNormal(list, operatorId) > 0;
}
@Override
- @Transactional(rollbackFor = Exception.class)
- public void importEmpOccupational(List<List<Object>> listObject,List<String> returnList) {
- for (List<Object> list : listObject) {
- if (list.size()==0||StrUtil.isBlank(list.get(0).toString())){
- continue;
- }
- EmpOccupational empOccupational=new EmpOccupational();
- empOccupational.setOccupationalId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
- empOccupational.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;
- }
- empOccupational.setDelFlag(0);
- empOccupational.setEmpId(empBaseInfo.getEmpId());
- empOccupational.setDeptName(list.get(1).toString());
- empOccupational.setDeptId(dept.getDeptId());
- empOccupational.setJobName(list.get(2).toString());
- empOccupational.setEmpName(list.get(3).toString());
- empOccupational.setCertificateNumb(list.get(4).toString());
- if (StringUtils.isNotBlank(list.get(5).toString())) {
- empOccupational.setInjuredTime(DateUtil.parseDateTime(list.get(5).toString()));
- }
- empOccupational.setInjuredAddress(list.get(6).toString());
- empOccupational.setInjuredPart(list.get(7).toString());
- empOccupational.setInjuredDescribe(list.get(8).toString());
- empOccupational.setInjuredDiacrisis(list.get(9).toString());
- empOccupational.setHospitalName(list.get(10).toString());
- empOccupational.setTreatmentName(list.get(11).toString());
- if (StringUtils.isNotBlank(list.get(12).toString())) {
- empOccupational.setHospitalizatioFlag("未住院".equals(list.get(12).toString()) ? 0 : 1);
- }
- if (StringUtils.isNotBlank(list.get(13).toString())) {
- empOccupational.setBedNumb(list.get(13).toString());
- }
- if (StringUtils.isNotBlank(list.get(14).toString())) {
- empOccupational.setReportTime(DateUtil.parseDate(list.get(14).toString()));
- }
- if (StringUtils.isNotBlank(list.get(15).toString())) {
- empOccupational.setSubmitTime(DateUtil.parseDate(list.get(15).toString()));
- }
- empOccupational.setSbumitBy(list.get(16).toString());
- if (StringUtils.isNotBlank(list.get(17).toString())) {
- empOccupational.setExpensesFee(new BigDecimal(list.get(17).toString()));
- }
- if (StringUtils.isNotBlank(list.get(18).toString())) {
- empOccupational.setCompensated(new BigDecimal(list.get(18).toString()));
- }
- empOccupational.setExpenseReport(list.get(19).toString());
- if (StringUtils.isNotBlank(list.get(20).toString())) {
- empOccupational.setHrDoDate(DateUtil.parseDate(list.get(20).toString()));
- }
- if (StringUtils.isNotBlank(list.get(21).toString())) {
- empOccupational.setSettleStatus("未结案".equals(list.get(21).toString()) ? 0 : 1);
- }
- if (StringUtils.isNotBlank(list.get(22).toString())) {
- empOccupational.setSettleDate(DateUtil.parseDate(list.get(22).toString()));
- }
- empOccupational.setEmpStatus(empBaseInfo.getEmpStatus());
- this.save(empOccupational);
- }
+ @Transactional(rollbackFor = Exception.class)
+ public void importEmpOccupational(List<List<Object>> listObject, List<String> returnList) {
+ for (List<Object> list : listObject) {
+ if (list.size() == 0 || StrUtil.isBlank(list.get(0).toString())) {
+ continue;
+ }
+ EmpOccupational empOccupational = new EmpOccupational();
+ empOccupational.setOccupationalId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ empOccupational.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;
+ }
+ empOccupational.setDelFlag(0);
+ empOccupational.setEmpId(empBaseInfo.getEmpId());
+ empOccupational.setDeptName(list.get(1).toString());
+ empOccupational.setDeptId(dept.getDeptId());
+ empOccupational.setJobName(list.get(2).toString());
+ empOccupational.setEmpName(list.get(3).toString());
+ empOccupational.setCertificateNumb(list.get(4).toString());
+
+ empOccupational.setInjuredAddress(list.get(6).toString());
+ empOccupational.setInjuredPart(list.get(7).toString());
+ empOccupational.setInjuredDescribe(list.get(8).toString());
+ empOccupational.setInjuredDiacrisis(list.get(9).toString());
+ empOccupational.setHospitalName(list.get(10).toString());
+ empOccupational.setTreatmentName(list.get(11).toString());
+ if (StringUtils.isNotBlank(list.get(12).toString())) {
+ empOccupational.setHospitalizatioFlag("未住院".equals(list.get(12).toString()) ? 0 : 1);
+ }
+ if (StringUtils.isNotBlank(list.get(13).toString())) {
+ empOccupational.setBedNumb(list.get(13).toString());
+ }
+ try {
+
+
+ if (StringUtils.isNotBlank(list.get(5).toString())) {
+ empOccupational.setInjuredTime(DateUtil.parse(list.get(5).toString()));
+ }
+ if (StringUtils.isNotBlank(list.get(14).toString())) {
+ empOccupational.setReportTime(DateUtil.parse(list.get(14).toString()));
+ }
+ if (StringUtils.isNotBlank(list.get(15).toString())) {
+ empOccupational.setSubmitTime(DateUtil.parse(list.get(15).toString()));
+ }
+ if (StringUtils.isNotBlank(list.get(20).toString())) {
+ empOccupational.setHrDoDate(DateUtil.parse(list.get(20).toString()));
+ }
+ if (StringUtils.isNotBlank(list.get(22).toString())) {
+ empOccupational.setSettleDate(DateUtil.parse(list.get(22).toString()));
+ }
+ } catch (Exception e) {
+ returnList.add(StrUtil.format("导入员工工伤案件异常: 出现位置第{}行, 原因:{}时间格式错误", listObject.indexOf(list) + 1, list.get(0).toString()));
+ continue;
+ }
+ empOccupational.setSbumitBy(list.get(16).toString());
+ if (StringUtils.isNotBlank(list.get(17).toString())) {
+ empOccupational.setExpensesFee(new BigDecimal(list.get(17).toString()));
+ }
+ if (StringUtils.isNotBlank(list.get(18).toString())) {
+ empOccupational.setCompensated(new BigDecimal(list.get(18).toString()));
+ }
+ empOccupational.setExpenseReport(list.get(19).toString());
+
+ if (StringUtils.isNotBlank(list.get(21).toString())) {
+ empOccupational.setSettleStatus("未结案".equals(list.get(21).toString()) ? 0 : 1);
+ }
+
+ empOccupational.setEmpStatus(empBaseInfo.getEmpStatus());
+ this.save(empOccupational);
+ }
}
- private List<EmpOccupational> covertDicItemName(List<EmpOccupational> list){
+ private List<EmpOccupational> covertDicItemName(List<EmpOccupational> list) {
List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
list.parallelStream().forEachOrdered(p -> {
// 设置结案状态
--
Gitblit v1.8.0