From 4fd6fc409a6527b13932d45f061a12579763e961 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期日, 07 四月 2024 19:49:40 +0800
Subject: [PATCH] fix: 问题修复 1.备注板块打开时提示绑定错误 2.合同板块不能保存问题
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java | 70 +++++++++++++++++++---------------
1 files changed, 39 insertions(+), 31 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 fe8bcbd..10d89f1 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,35 +1,32 @@
package cc.mrbird.febs.server.hr.service.impl;
import cc.mrbird.febs.common.core.constant.ModuleCode;
-import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
-import cc.mrbird.febs.common.core.utils.SortUtil;
-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.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.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.entity.EmpRemarkInfo;
+import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
+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 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 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.*;
@@ -68,9 +65,13 @@
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.getAllDeptName())) {
+ queryWrapper.like("b.allDeptName", empRemarkinfo.getAllDeptName());
}
+
+ 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]);
@@ -80,12 +81,10 @@
}
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());
- SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
+ SortUtil.handlePageSort(request, page, "remarkDate", FebsConstant.ORDER_ASC, true);
return empRemarkinfoMapper.selectPageVo(page, queryWrapper);
}
@@ -160,6 +159,9 @@
empRemarkinfo.setRemarkId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
empRemarkinfo.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()));
@@ -170,16 +172,22 @@
returnList.add(StrUtil.format("导入员工备注信息服务异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
continue;
}
- empRemarkinfo.setDelFlag(2);
+ empRemarkinfo.setDelFlag(0);
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()));
- }
+ try {
+ if (StringUtils.isNotBlank(list.get(5).toString())) {
+ empRemarkinfo.setRemarkDate(DateUtil.parse(list.get(5).toString()));
+ }
+ }catch (Exception e){
+ returnList.add(StrUtil.format("导入员工备注信息服务异常: 出现位置第{}行, 原因:{}时间格式错误",listObject.indexOf(list)+1,list.get(0).toString()));
+ continue;
+ }
+
empRemarkinfo.setRemarkContent(list.get(6).toString());
this.save(empRemarkinfo);
}
--
Gitblit v1.8.0