From d7b6f020d3b6cce69f19f5198da95513c5d57b32 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期二, 23 九月 2025 21:53:14 +0800
Subject: [PATCH] 1.系统管理中系统参数增加了将配置项写入缓存的功能 2.系统管理启动时将配置项写入缓存 3.员工基本信息增加了年假字段 4.员工基本信息服务增加了计算年假的功能
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java | 43 +++++++++++++++++++++++--------------------
1 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java
index c69eaba..95501d8 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java
@@ -1,37 +1,34 @@
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.EmpBadRecord;
import cc.mrbird.febs.server.hr.entity.EmpBadRecord;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.mapper.EmpBadRecordMapper;
import cc.mrbird.febs.server.hr.service.IEmpBadRecordService;
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.QueryWrapper;
-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.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 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.util.*;
@@ -71,7 +68,7 @@
queryWrapper.like("a.CertificateNumb", empBadrecord.getCertificateNumb());
}
if (StringUtils.isNotBlank(empBadrecord.getDeptName())) {
- queryWrapper.like("a.DeptName", empBadrecord.getDeptName());
+ queryWrapper.like("b.allDeptName", empBadrecord.getDeptName());
}
if (StringUtils.isNotBlank(empBadrecord.getBadDateStr())) {
queryWrapper.between("a.badDate", empBadrecord.getBadDateStr().split(",")[0],empBadrecord.getBadDateStr().split(",")[1]);
@@ -187,16 +184,22 @@
returnList.add(StrUtil.format("导入员工不良记录信息异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
continue;
}
- empBadrecord.setDelFlag(2);
+ empBadrecord.setDelFlag(0);
empBadrecord.setEmpId(empId);
empBadrecord.setDeptName(list.get(1).toString());
empBadrecord.setDeptId(dept.getDeptId());
empBadrecord.setJobName(list.get(2).toString());
empBadrecord.setEmpName(list.get(3).toString());
empBadrecord.setCertificateNumb(list.get(4).toString());
- if (StringUtils.isNotBlank(list.get(5).toString())) {
- empBadrecord.setBadDate(DateUtil.parseDateTime(list.get(5).toString()));
- }
+ try {
+ if (StringUtils.isNotBlank(list.get(5).toString())) {
+ empBadrecord.setBadDate(DateUtil.parse(list.get(5).toString()));
+ }
+ }catch (Exception e){
+ returnList.add(StrUtil.format("导入员工不良记录信息异常: 出现位置第{}行, 原因:{}时间格式错误",listObject.indexOf(list)+1,list.get(0).toString()));
+ continue;
+ }
+
empBadrecord.setBadContent(list.get(6).toString());
empBadrecord.setReporter(list.get(7).toString());
empBadrecord.setRemark(list.get(8).toString());
--
Gitblit v1.8.0