From e42bbb438b21ad7ef01888b7172ee5f810d2ab39 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期二, 06 四月 2021 01:42:57 +0800
Subject: [PATCH] fix(人力微服务): 修改前端，后端判断比较多，撤回上版本操作
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccidentCasesServiceImpl.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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 12168fa..2af3954 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,8 +7,10 @@
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;
@@ -92,10 +94,12 @@
queryWrapper.eq("a.SettleStatus", empAccidentcases.getSettleStatus());
}
if (StringUtils.isNotBlank(empAccidentcases.getEmpStatus())) {
- queryWrapper.eq("a.EmpStatus", 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());
+ SortUtil.handlePageSort(request, page, "injuredTime", FebsConstant.ORDER_ASC, true);
return empAccidentcasesMapper.selectPageVo(page, queryWrapper);
}
@@ -111,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);
@@ -187,13 +191,16 @@
@Transactional(rollbackFor = Exception.class)
public void importEmpAccidentCases(List<List<Object>> listObject,List<String> returnList) {
for (List<Object> list : listObject) {
- if (list.size()==0){
+ 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()));
@@ -204,7 +211,7 @@
returnList.add(StrUtil.format("导入员工意外险案件异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
continue;
}
- empAccidentcases.setDelFlag(2);
+ empAccidentcases.setDelFlag(0);
empAccidentcases.setEmpId(empBaseInfo.getEmpId());
empAccidentcases.setDeptName(list.get(1).toString());
empAccidentcases.setDeptId(dept.getDeptId());
@@ -253,4 +260,6 @@
this.save(empAccidentcases);
}
}
+
+
}
--
Gitblit v1.8.0